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

basic fix

Browse source
This commit is contained in:
fu-majime 2024-03-27 11:30:21 +09:00
parent 84b1596f33
commit 3bdee7ca71
3 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Assets/Scripts/Games/Fillbots/Fillbots.cs
View file

@ -17,7 +17,9 @@ namespace HeavenStudio.Games.Loaders
preFunction = delegate { Fillbots.PreSpawnFillbot(eventCaller.currentEntity.beat, 3, Scripts_Fillbots.BotSize.Medium, Scripts_Fillbots.BotVariant.Normal); }, preFunction = delegate { Fillbots.PreSpawnFillbot(eventCaller.currentEntity.beat, 3, Scripts_Fillbots.BotSize.Medium, Scripts_Fillbots.BotVariant.Normal); },
defaultLength = 8f defaultLength = 8f
} }
}); },
new List<string>() { "ntr", "normal" }, "ntrFillbots", "en", new List<string>() { }
);
} }
} }
} }
@ -79,12 +81,12 @@ namespace HeavenStudio.Games
} }
queuedBots.Clear(); queuedBots.Clear();
} }
if (PlayerInput.Pressed() && !IsExpectingInputNow(InputType.STANDARD_DOWN)) if (PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress))
{ {
filler.DoScaledAnimationAsync("Hold", 0.5f); filler.DoScaledAnimationAsync("Hold", 0.5f);
SoundByte.PlayOneShotGame("fillbots/armExtension"); SoundByte.PlayOneShotGame("fillbots/armExtension");
} }
if (PlayerInput.PressedUp() && !IsExpectingInputNow(InputType.STANDARD_UP)) if (PlayerInput.GetIsAction(InputAction_BasicRelease) && !IsExpectingInputNow(InputAction_BasicRelease))
{ {
filler.DoScaledAnimationAsync("ReleaseWhiff", 0.5f); filler.DoScaledAnimationAsync("ReleaseWhiff", 0.5f);
SoundByte.PlayOneShotGame("fillbots/armRetractionWhiff"); SoundByte.PlayOneShotGame("fillbots/armRetractionWhiff");
@ -161,7 +163,7 @@ namespace HeavenStudio.Games
spawnedBot.holdLength = holdLength; spawnedBot.holdLength = holdLength;
} }
spawnedBot.Init(beat); spawnedBot.Init(beat);
BeatAction.New(instance.gameObject, new List<BeatAction.Action>() BeatAction.New(instance, new List<BeatAction.Action>()
{ {
new BeatAction.Action(beat, delegate new BeatAction.Action(beat, delegate
{ {
@ -170,7 +172,7 @@ namespace HeavenStudio.Games
}), }),
new BeatAction.Action(beat + 3, delegate new BeatAction.Action(beat + 3, delegate
{ {
if (!PlayerInput.Pressing()) filler.DoScaledAnimationAsync("FillerPrepare", 0.5f); if (!PlayerInput.GetIsAction(InputAction_BasicPress)) filler.DoScaledAnimationAsync("FillerPrepare", 0.5f);
conveyerStartBeat = beat + 3; conveyerStartBeat = beat + 3;
}) })
}); });

10
Assets/Scripts/Games/Fillbots/NtrFillbot.cs
View file

@ -116,7 +116,7 @@ namespace HeavenStudio.Games.Scripts_Fillbots
{ {
startBeat = beat; startBeat = beat;
BeatAction.New(gameObject, new List<BeatAction.Action>() BeatAction.New(game, new List<BeatAction.Action>()
{ {
new BeatAction.Action(beat, delegate { legs.Play("Impact", 0, 0); legsHaveFallen = true; legsTrans.position = new Vector3(legsTrans.position.x, legsPosY); }), new BeatAction.Action(beat, delegate { legs.Play("Impact", 0, 0); legsHaveFallen = true; legsTrans.position = new Vector3(legsTrans.position.x, legsPosY); }),
new BeatAction.Action(beat + 1, delegate { body.Play("Impact", 0, 0); bodyHasFallen = true; bodyTrans.position = new Vector3(bodyTrans.position.x, bodyPosY);}), new BeatAction.Action(beat + 1, delegate { body.Play("Impact", 0, 0); bodyHasFallen = true; bodyTrans.position = new Vector3(bodyTrans.position.x, bodyPosY);}),
@ -145,7 +145,7 @@ namespace HeavenStudio.Games.Scripts_Fillbots
new MultiSound.Sound("fillbots/" + sizePrefix + "Fall", beat + 2), new MultiSound.Sound("fillbots/" + sizePrefix + "Fall", beat + 2),
}); });
game.ScheduleInput(startBeat, 4, InputType.STANDARD_DOWN, JustHold, HoldOut, HoldOut); game.ScheduleInput(startBeat, 4, Fillbots.InputAction_BasicPress, JustHold, HoldOut, HoldOut);
game.currentBots.Add(this); game.currentBots.Add(this);
} }
@ -194,13 +194,13 @@ namespace HeavenStudio.Games.Scripts_Fillbots
} }
fillAnim.DoNormalizedAnimation("Fill", Mathf.Clamp(normalizedBeat, 0, 1)); fillAnim.DoNormalizedAnimation("Fill", Mathf.Clamp(normalizedBeat, 0, 1));
if (!game.IsExpectingInputNow(InputType.STANDARD_UP) && normalizedExplodeBeat >= 1f) if (!game.IsExpectingInputNow(Fillbots.InputAction_BasicRelease) && normalizedExplodeBeat >= 1f)
{ {
SoundByte.PlayOneShotGame("fillbots/explosion"); SoundByte.PlayOneShotGame("fillbots/explosion");
game.currentBots.Remove(this); game.currentBots.Remove(this);
Destroy(gameObject); Destroy(gameObject);
} }
else if (PlayerInput.PressedUp() && !game.IsExpectingInputNow(InputType.STANDARD_UP)) else if (PlayerInput.GetIsAction(Fillbots.InputAction_BasicRelease) && !game.IsExpectingInputNow(Fillbots.InputAction_BasicRelease))
{ {
if (normalizedBeat < 1) if (normalizedBeat < 1)
{ {
@ -248,7 +248,7 @@ namespace HeavenStudio.Games.Scripts_Fillbots
fullBody.DoScaledAnimationAsync("Hold", 1f); fullBody.DoScaledAnimationAsync("Hold", 1f);
SoundByte.PlayOneShotGame("fillbots/beep"); SoundByte.PlayOneShotGame("fillbots/beep");
fillSound = SoundByte.PlayOneShotGame("fillbots/water", -1, 1 / (float)(holdLength / 3), 1, true); fillSound = SoundByte.PlayOneShotGame("fillbots/water", -1, 1 / (float)(holdLength / 3), 1, true);
releaseEvent = game.ScheduleInput(startBeat + 4, holdLength, InputType.STANDARD_UP, JustRelease, OutRelease, OutRelease); releaseEvent = game.ScheduleInput(startBeat + 4, holdLength, Fillbots.InputAction_BasicRelease, JustRelease, OutRelease, OutRelease);
beepEvent = new GameEvent() beepEvent = new GameEvent()
{ {
startBeat = startBeat + 4, startBeat = startBeat + 4,

10
Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
View file

@ -193,6 +193,16 @@ namespace HeavenStudio
Debug.LogWarning("Game loader NtrIdolLoader failed!"); Debug.LogWarning("Game loader NtrIdolLoader failed!");
} }
game = NtrFillbotsLoader.AddGame(eventCaller);
if (game != null)
{
eventCaller.minigames.Add(game.name, game);
}
else
{
Debug.LogWarning("Game loader NtrFillbotsLoader failed!");
}
game = AgbFireworkLoader.AddGame(eventCaller); game = AgbFireworkLoader.AddGame(eventCaller);
if (game != null) if (game != null)
{ {