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

Fixed Working Dough Swing (#948)

Browse source 
Working Dough was overlooked when swing was being added, this should fix it
This commit is contained in:
wookywok 2024-05-19 16:14:29 -05:00 committed by GitHub
parent bb8f60b136
commit b7d7d25212
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Assets/Scripts/Games/WorkingDough/BGBall.cs
View file

@ -15,7 +15,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough
public void Init(double beat, bool hasGandw) public void Init(double beat, bool hasGandw)
{ {
startBeat = beat; startBeat = Conductor.instance.GetUnSwungBeat(beat);
path = WorkingDough.instance.GetPath("BGBall"); path = WorkingDough.instance.GetPath("BGBall");
if (gandw != null) gandw.SetActive(hasGandw); if (gandw != null) gandw.SetActive(hasGandw);
Update(); Update();
@ -27,7 +27,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
double beat = cond.songPositionInBeats; double beat = cond.unswungSongPositionInBeats;
if (startBeat != double.MinValue) if (startBeat != double.MinValue)
{ {
Vector3 pos = GetPathPositionFromBeat(path, Math.Max(startBeat, beat), startBeat); Vector3 pos = GetPathPositionFromBeat(path, Math.Max(startBeat, beat), startBeat);

4
Assets/Scripts/Games/WorkingDough/NPCDoughBall.cs
View file

@ -15,7 +15,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough
public void Init(double beat, bool hasGandw) public void Init(double beat, bool hasGandw)
{ {
startBeat = beat; startBeat = Conductor.instance.GetUnSwungBeat(beat);
path = WorkingDough.instance.GetPath("NPCBall"); path = WorkingDough.instance.GetPath("NPCBall");
if (gandw != null) gandw.SetActive(hasGandw); if (gandw != null) gandw.SetActive(hasGandw);
Update(); Update();
@ -27,7 +27,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
double beat = cond.songPositionInBeats; double beat = cond.unswungSongPositionInBeats;
if (startBeat > double.MinValue) if (startBeat > double.MinValue)
{ {
Vector3 pos = GetPathPositionFromBeat(path, Math.Max(beat, startBeat), startBeat); Vector3 pos = GetPathPositionFromBeat(path, Math.Max(beat, startBeat), startBeat);

8
Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs
View file

@ -47,7 +47,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough
public void Init(double beat, bool isBig, bool hasGandw) public void Init(double beat, bool isBig, bool hasGandw)
{ {
startBeat = beat; startBeat = Conductor.instance.GetUnSwungBeat(beat);
big = isBig; big = isBig;
canJust = true; canJust = true;
canWrong = true; canWrong = true;
@ -75,7 +75,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough
if (startBeat > double.MinValue) if (startBeat > double.MinValue)
{ {
Vector3 pos = new Vector3(); Vector3 pos = new Vector3();
double beat = cond.songPositionInBeats; double beat = cond.unswungSongPositionInBeats;
switch (currentState) switch (currentState)
{ {
case State.None: case State.None:
@ -137,7 +137,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough
wrongInput.CleanUp(); wrongInput.CleanUp();
} }
if (currentState is State.Hit or State.Barely or State.Weak) return; if (currentState is State.Hit or State.Barely or State.Weak) return;
double beat = Conductor.instance.songPositionInBeatsAsDouble; double beat = Conductor.instance.unswungSongPositionInBeatsAsDouble;
startBeat = beat; startBeat = beat;
game.playerImpact.SetActive(true); game.playerImpact.SetActive(true);
BeatAction.New(game, new List<BeatAction.Action>() BeatAction.New(game, new List<BeatAction.Action>()
@ -195,7 +195,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough
rightInput.CleanUp(); rightInput.CleanUp();
} }
if (currentState is State.Hit or State.Barely or State.Weak) return; if (currentState is State.Hit or State.Barely or State.Weak) return;
double beat = Conductor.instance.songPositionInBeats; double beat = Conductor.instance.unswungSongPositionInBeats;
game.playerImpact.SetActive(true); game.playerImpact.SetActive(true);
BeatAction.New(game, new List<BeatAction.Action>() BeatAction.New(game, new List<BeatAction.Action>()
{ {

2
ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
View file

@ -403,5 +403,7 @@ MonoBehaviour:
- Assets/Scripts/Games/LaunchParty/LaunchPartyRocket.cs - Assets/Scripts/Games/LaunchParty/LaunchPartyRocket.cs
- Assets/Scripts/Util/BeatAction.cs - Assets/Scripts/Util/BeatAction.cs
- Assets/Scripts/Games/FanClub/NtrIdolAri.cs - Assets/Scripts/Games/FanClub/NtrIdolAri.cs
- Assets/Scripts/Games/WorkingDough/NPCDoughBall.cs
- Assets/Scripts/Games/WorkingDough/BGBall.cs
PathsToSkipImportEvent: [] PathsToSkipImportEvent: []
PathsToIgnoreOverwriteSettingOnAttribute: [] PathsToIgnoreOverwriteSettingOnAttribute: []