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

crop stomp fix

Browse source
This commit is contained in:
AstrlJelly 2023-12-05 16:32:02 -05:00
parent 5802dbf1e6
commit 84187ce617
1 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,8 @@ namespace HeavenStudio.Games.Loaders
new GameAction("plantCollect", "Veggie Collection Values") new GameAction("plantCollect", "Veggie Collection Values")
{ {
function = delegate { var e = eventCaller.currentEntity; function = delegate { var e = eventCaller.currentEntity;
CropStomp.instance.SetCollectThresholds(e["threshold"], e["limit"], e["force"], e["forceAmount"]); }, CropStomp.instance.SetCollectThresholds(e["threshold"], e["limit"], e["force"], e["forceAmount"]);
},
defaultLength = 0.5f, defaultLength = 0.5f,
parameters = new List<Param>() parameters = new List<Param>()
{ {
@ -125,7 +126,7 @@ namespace HeavenStudio.Games
private void Awake() private void Awake()
{ {
instance = this;// Finding grass sprite width for grass scrolling. instance = this; // Finding grass sprite width for grass scrolling.
farmer.Init(); farmer.Init();
Sprite sprite = grass.sprite; Sprite sprite = grass.sprite;
float borderLeft = sprite.rect.xMin + sprite.border.x; float borderLeft = sprite.rect.xMin + sprite.border.x;
@ -172,22 +173,20 @@ namespace HeavenStudio.Games
} }
// find out when the next game switch (or remix end) happens // find out when the next game switch (or remix end) happens
var firstEnd = entities.Find(c => c.datamodel is "gameManager/switchGame/cropStomp" or "gameManager/end" && c.beat > startBeat); RiqEntity firstEnd = entities.Find(c => c.datamodel is "gameManager/switchGame/cropStomp" or "gameManager/end" && c.beat > startBeat);
endBeat = firstEnd?.beat ?? double.MaxValue; endBeat = firstEnd?.beat ?? double.MaxValue;
// Veggie and mole events. // Veggie and mole events.
var vegEvents = entities.FindAll(v => v.datamodel == "cropStomp/veggies"); List<RiqEntity> vegEvents = entities.FindAll(v => v.datamodel == "cropStomp/veggies");
var moleEvents = entities.FindAll(m => m.datamodel == "cropStomp/mole"); List<RiqEntity> moleEvents = entities.FindAll(m => m.datamodel == "cropStomp/mole");
// Spawn veggies. // Spawn veggies.
for (int i = 0; i < vegEvents.Count; i++) for (int i = 0; i < vegEvents.Count; i++) {
{
var vegBeat = vegEvents[i].beat; var vegBeat = vegEvents[i].beat;
var vegLength = vegEvents[i].length; var vegLength = vegEvents[i].length;
// Only consider veggie events that aren't past the start point. // Only consider veggie events that aren't past the start point.
if (startBeat <= vegBeat + vegLength) if (startBeat <= vegBeat + vegLength) {
{
int veggiesInEvent = Mathf.CeilToInt(vegLength + 1) / 2; int veggiesInEvent = Mathf.CeilToInt(vegLength + 1) / 2;
for (int b = 0; b < veggiesInEvent; b++) for (int b = 0; b < veggiesInEvent; b++)
@ -202,12 +201,10 @@ namespace HeavenStudio.Games
} }
// Spawn moles. // Spawn moles.
for (int i = 0; i < moleEvents.Count; i++) for (int i = 0; i < moleEvents.Count; i++) {
{
var moleBeat = moleEvents[i].beat; var moleBeat = moleEvents[i].beat;
if (startBeat <= moleBeat && moleBeat < endBeat) if (startBeat <= moleBeat && moleBeat < endBeat) {
{
SpawnVeggie(moleBeat, startBeat, true); SpawnVeggie(moleBeat, startBeat, true);
} }
} }
@ -245,8 +242,7 @@ namespace HeavenStudio.Games
{ {
var cond = Conductor.instance; var cond = Conductor.instance;
if (!cond.isPlaying || !isMarching) if (!cond.isPlaying || !isMarching) return;
return;
// Debug.Log(newBeat); // Debug.Log(newBeat);
@ -299,9 +295,7 @@ namespace HeavenStudio.Games
private void LateUpdate() private void LateUpdate()
{ {
if (!isMarching) if (!isMarching) return;
return;
isFlicking = false; isFlicking = false;
} }
@ -378,8 +372,8 @@ namespace HeavenStudio.Games
if (shakeTween != null) shakeTween.Kill(true); if (shakeTween != null) shakeTween.Kill(true);
DOTween.Punch(() => DOTween.Punch(() =>
GameCamera.additionalPosition, GameCamera.AdditionalPosition,
x => GameCamera.additionalPosition = x, x => GameCamera.AdditionalPosition = x,
new Vector3(0, 0.75f, 0), Conductor.instance.pitchedSecPerBeat * 0.5f, 18, 1f new Vector3(0, 0.75f, 0), Conductor.instance.pitchedSecPerBeat * 0.5f, 18, 1f
); );