Mirrors/HeavenStudio
1
0
Fork 0
mirror of https://github.com/RHeavenStudio/HeavenStudio.git synced 2025-06-12 18:57:40 +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

18
Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs
View File

@ -88,9 +88,7 @@ namespace HeavenStudio.Games
private int clapIndex;
private ClappyTrioPlayer ClappyTrioPlayer;
public bool playerHitLast = false;
public bool missed;
public int misses;
bool shouldBop;
bool doEmotion = true;
public int emoCounter;
@ -186,7 +184,6 @@ namespace HeavenStudio.Games
ClappyTrioPlayer.clapStarted = true;
ClappyTrioPlayer.canHit = true; // this is technically a lie, this just restores the ability to hit
playerHitLast = false;
isClapping = true;
// makes the other lions clap
@ -221,15 +218,18 @@ namespace HeavenStudio.Games
shouldBop = autoBop;
if (startBop)
{
List<BeatAction.Action> bops = new List<BeatAction.Action>();
for (int i = 0; i < length; i++)
{
if (i == 0 && startBop && autoBop) continue;
float spawnBeat = beat + i;
BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
bops.Add(new BeatAction.Action(spawnBeat, delegate { Bop(spawnBeat); }));
if (i == length - 1)
{
new BeatAction.Action(spawnBeat, delegate { Bop(spawnBeat); })
});
bops.Add(new BeatAction.Action(spawnBeat, delegate { misses = 0; }));
}
}
if (bops.Count > 0) BeatAction.New(instance.gameObject, bops);
}
}
@ -237,14 +237,14 @@ namespace HeavenStudio.Games
{
if (doEmotion && emoCounter > 0)
{
if (playerHitLast)
if (misses == 0)
{
for (int i = 0; i < Lion.Count; i++)
{
SetFace(i, 1);
}
}
else if (missed)
else if (misses > 0)
{
var a = EventCaller.GetAllInGameManagerList("clappyTrio", new string[] { "clap" });
var b = a.FindAll(c => c.beat < beat);

9
Assets/Scripts/Games/ClappyTrio/ClappyTrioPlayer.cs
View File

@ -54,8 +54,7 @@ namespace HeavenStudio.Games.Scripts_ClappyTrio
}
private void Miss(PlayerActionEvent caller) {
game.playerHitLast = false;
game.missed = true;
game.misses++;
game.emoCounter = 2;
if (clapStarted)
@ -71,16 +70,12 @@ namespace HeavenStudio.Games.Scripts_ClappyTrio
{
clapEffect.SetActive(true);
Jukebox.PlayOneShotGame("clappyTrio/rightClap");
if (this.canHit)
game.playerHitLast = true;
}
else
{
clapEffect.SetActive(false);
Jukebox.PlayOneShot("miss");
game.playerHitLast = false;
game.missed = true;
game.misses++;
if (clapStarted)
this.canHit = false;