mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

bg cats work better

Browse source
This commit is contained in:
Rapandrasmus 2024-02-26 20:49:11 +01:00
parent f788bd5e59
commit 666a5d68c5
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Assets/Scripts/Games/LumBEARjack/LBJBGCat.cs
View file

@ -36,19 +36,17 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack
_anim.DoNormalizedAnimation("CatDance", normalized); _anim.DoNormalizedAnimation("CatDance", normalized);
} }
public void Activate(double beat, double length, bool inToScene, bool moveInstant, bool dance, bool instant) public void Activate(double beat, double length, bool inToScene, bool moveInstant, bool dance, bool instantStart, bool instantEnd)
{ {
_moveScript.Move(beat, moveInstant ? 0 : length, inToScene); _moveScript.Move(beat, moveInstant ? 0 : length, inToScene);
double overflowBeat = beat % 2; double overflowBeat = beat % 2;
double toBeat = 2.0 - overflowBeat; double toBeat = 2.0 - overflowBeat;
_danceBeat = beat + (instant ? -overflowBeat : toBeat) - 0.5; _danceBeat = beat + (instantStart ? -overflowBeat : toBeat) - 0.5;
if (!inToScene) _danceBeat = double.MaxValue; if (!inToScene) _danceBeat = double.MaxValue;
_stopDanceBeat = beat + (instant ? -overflowBeat : toBeat) - 0.5; _stopDanceBeat = beat + (instantEnd ? -overflowBeat : toBeat) - 0.5;
if (dance) _stopDanceBeat = double.MaxValue; if (dance) _stopDanceBeat = double.MaxValue;
} }
} }

7
Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs
View file

@ -981,20 +981,21 @@ namespace HeavenStudio.Games
bgCats = Math.Clamp(bgCats, 0, 12); bgCats = Math.Clamp(bgCats, 0, 12);
bgCats -= 1; bgCats -= 1;
beforeBgCats -= 1; beforeBgCats -= 1;
Debug.Log(bgCats - beforeBgCats);
for (int i = 0; i < _bgCats.Length; i++) for (int i = 0; i < _bgCats.Length; i++)
{ {
if (bgCats < beforeBgCats) if (bgCats < beforeBgCats)
{ {
_bgCats[i].Activate(beat, length, bgCats >= i, instant || !(i > bgCats && i <= beforeBgCats), dance, instant || i <= bgCats); _bgCats[i].Activate(beat, length, bgCats >= i, instant || !(i > bgCats && i <= beforeBgCats), dance, instant || i <= bgCats, instant);
} }
else if (bgCats > beforeBgCats) else if (bgCats > beforeBgCats)
{ {
_bgCats[i].Activate(beat, length, bgCats >= i, instant || !(i > beforeBgCats && i <= bgCats), dance, instant || i <= beforeBgCats); _bgCats[i].Activate(beat, length, bgCats >= i, instant || !(i > beforeBgCats && i <= bgCats), dance, instant || i <= beforeBgCats, instant);
} }
else else
{ {
_bgCats[i].Activate(beat, length, bgCats >= i, true, dance, instant); _bgCats[i].Activate(beat, length, bgCats >= i, true, dance, true, instant);
} }
} }
} }