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

convert animation playing to beat scaled playing

Browse source
This commit is contained in:
AstrlJelly 2023-11-12 15:51:26 -05:00
parent 9d753b9ec2
commit 1d4b2b9e3b
3 changed files with 13 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
Assets/Scripts/Games/CropStomp/CropStomp.cs
View file

@ -134,114 +134,6 @@ namespace HeavenStudio.Games
grassWidth = borderWidthPixels / sprite.pixelsPerUnit;
legsAnim.Play("LiftFront", 0, 1); // Start with leg up.
// if (!Conductor.instance.isPlaying) {
// OnGameSwitch(Conductor.instance.songPositionInBeatsAsDouble);
// }
// Initialize vegetables.
// var cond = Conductor.instance;
// var entities = GameManager.instance.Beatmap.Entities;
// double startBeat = cond.songPositionInBeatsAsDouble;
// double endBeat = double.MaxValue;
// if (inactiveStart == -1f)
// {
// // Find the beat of the closest "start marching" event.
// var marchStarts = entities.FindAll(m => m.datamodel == "cropStomp/start marching");
// for (int i = 0; i < marchStarts.Count; i++)
// {
// var sampleBeat = marchStarts[i].beat;
// if (cond.songPositionInBeatsAsDouble <= sampleBeat + 0.25f) // 0.25-beat buffer in case the start marching event is directly next to the game switch event.
// {
// startBeat = sampleBeat;
// break;
// }
// }
// }
// else
// {
// // Find the beat of the next step, assuming marching started at inactiveStart.
// int stepsPassed = 0;
// while (inactiveStart + (stepsPassed * 2f) < cond.songPositionInBeatsAsDouble)
// {
// stepsPassed++;
// if (stepsPassed > 1000)
// {
// Debug.Log("Loop broke!");
// return;
// }
// }
// startBeat = inactiveStart + (stepsPassed * 2f);
// // Cue the marching proper to begin when applicable.
// BeatAction.New(this, new() { new(startBeat - 0.25f, delegate { StartMarching(startBeat); }) });
// inactiveStart = -1f;
// }
// // find out when the next game switch (or remix end) happens
// var allEnds = EventCaller.GetAllInGameManagerList("gameManager", new string[] { "switchGame", "end" });
// if (allEnds.Count == 0)
// {
// endBeat = double.MaxValue;
// }
// else
// {
// allEnds.Sort((x, y) => x.beat.CompareTo(y.beat));
// //get the beat of the closest end event
// foreach (var end in allEnds)
// {
// if (end.datamodel != "gameManager/end" && end.datamodel.Split(2) == "cropStomp") continue;
// if (end.beat > startBeat)
// {
// endBeat = end.beat;
// break;
// }
// }
// }
// // Veggie and mole events.
// var vegEvents = entities.FindAll(v => v.datamodel == "cropStomp/veggies");
// var moleEvents = entities.FindAll(m => m.datamodel == "cropStomp/mole");
// // Spawn veggies.
// for (int i = 0; i < vegEvents.Count; i++)
// {
// var vegBeat = vegEvents[i].beat;
// var vegLength = vegEvents[i].length;
// // Only consider veggie events that aren't past the start point.
// if (startBeat <= vegBeat + vegLength)
// {
// int veggiesInEvent = Mathf.CeilToInt(vegLength + 1) / 2;
// for (int b = 0; b < veggiesInEvent; b++)
// {
// var targetVeggieBeat = vegBeat + 2f * b;
// if (startBeat <= targetVeggieBeat && targetVeggieBeat < endBeat)
// {
// SpawnVeggie(targetVeggieBeat, startBeat, false);
// }
// }
// }
// }
// // Spawn moles.
// for (int i = 0; i < moleEvents.Count; i++)
// {
// var moleBeat = moleEvents[i].beat;
// if (startBeat <= moleBeat && moleBeat < endBeat)
// {
// SpawnVeggie(moleBeat, startBeat, true);
// }
// }
}
public override void OnGameSwitch(double beat)
@ -374,11 +266,11 @@ namespace HeavenStudio.Games
if (PlayerInput.GetIsAction(InputAction_BasicRelease) && !IsExpectingInputNow(InputAction_BasicRelease))
{
bodyAnim.Play("Raise");
bodyAnim.DoScaledAnimationAsync("Raise", 0.5f);
}
if (PlayerInput.GetIsAction(InputAction_Flick) && !IsExpectingInputNow(InputAction_FlickRelease))
{
bodyAnim.Play("Pick");
bodyAnim.DoScaledAnimationAsync("Pick", 0.5f);
}
if (cameraLocked) return;
@ -444,7 +336,7 @@ namespace HeavenStudio.Games
stepCount += 1;
var stepAnim = (stepCount % 2 != 0) ? "StepFront" : "StepBack";
legsAnim.Play(stepAnim, 0, 0);
legsAnim.DoScaledAnimationAsync(stepAnim, 0.5f);
isStepping = true;
}
@ -453,7 +345,7 @@ namespace HeavenStudio.Games
else
{
var liftAnim = (stepCount % 2 != 0) ? "LiftBack" : "LiftFront";
legsAnim.Play(liftAnim, 0, 0);
legsAnim.DoScaledAnimationAsync(liftAnim, 0.5f);
var farmerPos = farmerTrans.localPosition;
farmerTrans.localPosition = new Vector3(farmerPos.x - stepDistance, farmerPos.y, farmerPos.z);
@ -479,7 +371,7 @@ namespace HeavenStudio.Games
var stompAnim = (stepCount % 2 != 0) ? "StompFront" : "StompBack";
legsAnim.Play(stompAnim, 0, 0);
legsAnim.DoScaledAnimationAsync(stompAnim, 0.5f);
SoundByte.PlayOneShotGame("cropStomp/stomp");

6
Assets/Scripts/Games/CropStomp/Farmer.cs
View file

@ -70,7 +70,7 @@ namespace HeavenStudio.Games.Scripts_CropStomp
if (PlayerInput.GetIsAction(CropStomp.InputAction_BasicPress) && !game.IsExpectingInputNow(CropStomp.InputAction_BasicPress))
{
game.bodyAnim.Play("Crouch", 0, 0);
game.bodyAnim.DoScaledAnimationAsync("Crouch", 0.5f);
}
}
@ -134,10 +134,10 @@ namespace HeavenStudio.Games.Scripts_CropStomp
{
if (GameManager.instance.currentGame != "cropStomp" || !game.isMarching) return;
if (ng) {
game.bodyAnim.Play("Crouch", 0, 0);
game.bodyAnim.DoScaledAnimationAsync("Crouch", 0.5f);
} else {
game.Stomp();
game.bodyAnim.Play("Stomp", 0, 0);
game.bodyAnim.DoScaledAnimationAsync("Stomp", 0.5f);
}
nextStompBeat += 2f;
stomp?.Disable();

10
Assets/Scripts/Games/CropStomp/Veggie.cs
View file

@ -100,7 +100,7 @@ namespace HeavenStudio.Games.Scripts_CropStomp
private void PickJust(PlayerActionEvent caller, float state)
{
game.bodyAnim.Play("Pick", 0, 0);
game.bodyAnim.DoScaledAnimationAsync("Pick", 0.5f);
game.isFlicking = true;
if (!pickEligible) return;
if (GameManager.instance.autoplay)
@ -177,7 +177,7 @@ namespace HeavenStudio.Games.Scripts_CropStomp
var distDiff = transform.position.x - game.farmerTrans.position.x;
if (distDiff > 1.5f)
{
moleAnim.Play("Chuckle", 0, 0);
moleAnim.DoScaledAnimationAsync("Chuckle", 0.5f);
moleLaughing = true;
}
}
@ -233,7 +233,7 @@ namespace HeavenStudio.Games.Scripts_CropStomp
if (autoTriggered)
{
game.Stomp();
game.bodyAnim.Play("Stomp", 0, 0);
game.bodyAnim.DoScaledAnimationAsync("Stomp", 0.5f);
}
if (!isMole)
@ -244,7 +244,7 @@ namespace HeavenStudio.Games.Scripts_CropStomp
}
else
{
moleAnim.Play("Idle", 0, 0);
moleAnim.DoScaledAnimationAsync("Idle", 0.5f);
}
var veggieScale = veggieTrans.localScale;
@ -260,7 +260,7 @@ namespace HeavenStudio.Games.Scripts_CropStomp
if (autoTriggered)
{
game.bodyAnim.Play("Pick", 0, 0);
game.bodyAnim.DoScaledAnimationAsync("Pick", 0.5f);
game.isFlicking = true;
}