Mirrors/HeavenStudio
1
0
Fork 0
mirror of https://github.com/RHeavenStudio/HeavenStudio.git synced 2025-06-12 15:17:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Second PlayerActionEvent Pass (#206)

Browse Source 
* fix crop stomp input scheduling bugs

* update space soccer to use PlayerActionEvent

* update spaceball to use PlayerActionEvent

make PlayerActionEvents clean themselves up on game switch

* update rhythm rally to use PlayerActionEvent

* update rhythm tweezers to use PlayerActionEvent

* update mahou tsukai to use PlayerActionEvent

* reduce logging level
This commit is contained in:
minenice55
2023-01-15 22:05:25 -05:00
committed by GitHub
parent 330c538947
commit dd0531f48f
13 changed files with 283 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Assets/Scripts/Games/CropStomp/CropStomp.cs
View File

@ -94,6 +94,7 @@ namespace HeavenStudio.Games
var entities = GameManager.instance.Beatmap.entities;
float startBeat = cond.songPositionInBeats;
float endBeat = Single.MaxValue;
if (inactiveStart == -1f)
{
@ -136,6 +137,21 @@ namespace HeavenStudio.Games
inactiveStart = -1f;
}
// find out when the next game switch (or remix end) happens
var allEnds = EventCaller.GetAllInGameManagerList("gameManager", new string[] { "switchGame", "end" });
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.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");
@ -154,7 +170,7 @@ namespace HeavenStudio.Games
for (int b = 0; b < veggiesInEvent; b++)
{
var targetVeggieBeat = vegBeat + 2f * b;
if (startBeat <= targetVeggieBeat)
if (startBeat <= targetVeggieBeat && targetVeggieBeat < endBeat)
{
SpawnVeggie(targetVeggieBeat, startBeat, false);
}
@ -167,7 +183,7 @@ namespace HeavenStudio.Games
{
var moleBeat = moleEvents[i].beat;
if (startBeat <= moleBeat)
if (startBeat <= moleBeat && moleBeat < endBeat)
{
SpawnVeggie(moleBeat, startBeat, true);
}

2
Assets/Scripts/Games/CropStomp/Veggie.cs
View File

@ -223,7 +223,7 @@ namespace HeavenStudio.Games.Scripts_CropStomp
stompedBeat = cond.songPositionInBeats;
landBeat = targetBeat + (float)cond.BeatsToSecs(Minigame.EndTime()-1, cond.GetBpmAtBeat(targetBeat));
landBeat = targetBeat + (float)cond.SecsToBeats(Minigame.EndTime()-1, cond.GetBpmAtBeat(targetBeat));
if (autoTriggered)
{