Mirrors/HeavenStudio
1
0
Fork 0
mirror of https://github.com/RHeavenStudio/HeavenStudio.git synced 2025-06-12 16:37:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Misc. Fixes and Additions (#440)

Browse Source 
* Ringside fixes

* Clappy Trio bop logic fix

* Quiz show answer reaction fix

* prequel background begone!

* You can now hide the alien in spaceball

* Fixed lightning toss jank

* btsds recolor, need to add lights next

* Btsds lights and recolor

* fixed sweat particle rendering over reporter

* Asset bundles accomodation
This commit is contained in:
Rapandrasmus
2023-05-28 20:48:41 +02:00
committed by GitHub
parent 0552d02207
commit 5cbcc39c8b
154 changed files with 11212 additions and 2462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/Scripts/Games/Spaceball/Alien.cs
View File

@ -8,6 +8,7 @@ namespace HeavenStudio.Games.Scripts_Spaceball
private float showBeat = 0;
private bool isShowing = false;
private bool isHiding = false;
const string IdleAnim = "AlienIdle";
const string SwingAnim = "AlienSwing";
@ -21,12 +22,12 @@ namespace HeavenStudio.Games.Scripts_Spaceball
private void Update()
{
if (Conductor.instance.isPlaying && !isShowing)
if (Conductor.instance.isPlaying && !isShowing && !isHiding)
{
anim.Play(SwingAnim, 0, Conductor.instance.GetLoopPositionFromBeat(0, 1f));
anim.speed = 0;
}
else if (!Conductor.instance.isPlaying)
else if (!Conductor.instance.isPlaying && !isHiding)
{
anim.Play(IdleAnim, 0, 0);
}
@ -34,7 +35,7 @@ namespace HeavenStudio.Games.Scripts_Spaceball
if (isShowing)
{
float normalizedBeat = Conductor.instance.GetPositionFromBeat(showBeat, 1f);
anim.Play(ShowAnim, 0, normalizedBeat);
if (!isHiding) anim.Play(ShowAnim, 0, normalizedBeat);
anim.speed = 0;
if (normalizedBeat >= 2)
@ -44,10 +45,12 @@ namespace HeavenStudio.Games.Scripts_Spaceball
}
}
public void Show(float showBeat)
public void Show(float showBeat, bool hide)
{
isShowing = true;
this.showBeat = showBeat;
isHiding = hide;
if (hide) anim.Play("AlienHide", 0, 0);
}
}
}

6
Assets/Scripts/Games/Spaceball/Spaceball.cs
View File

@ -44,7 +44,11 @@ namespace HeavenStudio.Games.Loaders
},
new GameAction("alien", "Show Alien")
{
function = delegate { Spaceball.instance.alien.Show(eventCaller.currentEntity.beat); }
function = delegate { Spaceball.instance.alien.Show(eventCaller.currentEntity.beat, eventCaller.currentEntity["hide"]); },
parameters = new List<Param>()
{
new Param("hide", false, "Hide", "Should the alien be hidden?")
}
},
new GameAction("camera", "Zoom Camera")
{