etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-23 01:55:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #26 from jakobwcrowe/megaminerzero

Browse source 
Tweezers programming fixes
This commit is contained in:
Jenny Crowe 2022-02-10 03:15:31 -07:00 committed by GitHub
commit 31b5d5408d
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs
View file

@ -19,7 +19,7 @@ namespace RhythmHeavenMania.Games.RhythmTweezers
public GameObject hairBase; public GameObject hairBase;
public GameObject longHairBase; public GameObject longHairBase;
[SerializeField] private GameObject HairsHolder; public GameObject HairsHolder;
[NonSerialized] public int hairsLeft = 0; [NonSerialized] public int hairsLeft = 0;
public float beatInterval = 4f; public float beatInterval = 4f;
@ -79,13 +79,17 @@ namespace RhythmHeavenMania.Games.RhythmTweezers
public void SetIntervalStart(float beat, float interval = 4f) public void SetIntervalStart(float beat, float interval = 4f)
{ {
// End transition early if the interval starts a lil early. // Don't do these things if the interval was already started.
StopTransitionIfActive(); if (!intervalStarted)
{
// End transition early if the interval starts a lil early.
StopTransitionIfActive();
hairsLeft = 0;
intervalStarted = true;
}
intervalStartBeat = beat; intervalStartBeat = beat;
beatInterval = interval; beatInterval = interval;
intervalStarted = true;
hairsLeft = 0;
} }
const float vegDupeOffset = 16.7f; const float vegDupeOffset = 16.7f;
@ -136,7 +140,9 @@ namespace RhythmHeavenMania.Games.RhythmTweezers
// Set tweezer to follow vegetable. // Set tweezer to follow vegetable.
var currentTweezerPos = Tweezers.transform.localPosition; var currentTweezerPos = Tweezers.transform.localPosition;
Tweezers.transform.localPosition = new Vector3(currentTweezerPos.x, Vegetable.transform.localPosition.y + 1f, currentTweezerPos.z); var vegetablePos = Vegetable.transform.localPosition;
var vegetableHolderPos = VegetableHolder.transform.localPosition;
Tweezers.transform.localPosition = new Vector3(vegetableHolderPos.x, vegetablePos.y + 1f, currentTweezerPos.z);
} }
private void ResetVegetable() private void ResetVegetable()
@ -145,7 +151,9 @@ namespace RhythmHeavenMania.Games.RhythmTweezers
{ {
var go = t.gameObject; var go = t.gameObject;
if (go != hairBase) if (go != hairBase)
{
GameObject.Destroy(go); GameObject.Destroy(go);
}
} }
VegetableAnimator.Play("Idle", 0, 0); VegetableAnimator.Play("Idle", 0, 0);