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

Persistant treats

Browse source
This commit is contained in:
Rapandrasmus 2023-11-21 19:21:46 +01:00
parent 44b263bc6e
commit 74731cdcb1
2 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Assets/Scripts/Games/BlueBear/BlueBear.cs
View file

@ -17,12 +17,14 @@ namespace HeavenStudio.Games.Loaders
{
new GameAction("donut", "Donut")
{
function = delegate { BlueBear.instance.SpawnTreat(eventCaller.currentEntity.beat, false); },
preFunction = delegate { BlueBear.TreatSound(eventCaller.currentEntity.beat, false); },
function = delegate { BlueBear.instance.SpawnTreat(eventCaller.currentEntity.beat, false, eventCaller.currentEntity.beat); },
defaultLength = 3,
},
new GameAction("cake", "Cake")
{
function = delegate { BlueBear.instance.SpawnTreat(eventCaller.currentEntity.beat, true); },
preFunction = delegate { BlueBear.TreatSound(eventCaller.currentEntity.beat, true); },
function = delegate { BlueBear.instance.SpawnTreat(eventCaller.currentEntity.beat, true, eventCaller.currentEntity.beat); },
defaultLength = 4,
},
new GameAction("setEmotion", "Set Emotion")
@ -190,14 +192,14 @@ namespace HeavenStudio.Games
void OnDestroy()
{
if (Conductor.instance.isPlaying || Conductor.instance.isPaused) return;
rightCrumbAppearThreshold = 15;
leftCrumbAppearThreshold = 30;
eatenTreats = 0;
foreach (var evt in scheduledInputs)
{
evt.Disable();
}
if (Conductor.instance.isPlaying || Conductor.instance.isPaused) return;
rightCrumbAppearThreshold = 15;
leftCrumbAppearThreshold = 30;
eatenTreats = 0;
}
private void Awake()
@ -275,6 +277,29 @@ namespace HeavenStudio.Games
UpdateStory();
}
public override void OnPlay(double beat)
{
HandleTreatsOnStart(beat);
}
public override void OnGameSwitch(double beat)
{
HandleTreatsOnStart(beat);
}
private void HandleTreatsOnStart(double gameswitchBeat)
{
var allTreatEvents = EventCaller.GetAllInGameManagerList("blueBear", new string[] { "donut", "cake" });
foreach (var e in allTreatEvents)
{
if (e.beat + e.length - 1 > gameswitchBeat && e.beat < gameswitchBeat)
{
SpawnTreat(e.beat, e.datamodel == "blueBear/cake", gameswitchBeat);
}
}
}
public void Wind()
{
windAnim.Play("Wind", 0, 0);
@ -392,7 +417,7 @@ namespace HeavenStudio.Games
}
}
public void SpawnTreat(double beat, bool isCake)
public void SpawnTreat(double beat, bool isCake, double gameSwitchBeat)
{
var objectToSpawn = isCake ? cakeBase : donutBase;
var newTreat = GameObject.Instantiate(objectToSpawn, foodHolder);
@ -403,9 +428,12 @@ namespace HeavenStudio.Games
newTreat.SetActive(true);
SoundByte.PlayOneShotGame(isCake ? "blueBear/cake" : "blueBear/donut");
if (beat >= gameSwitchBeat) SquashBag(isCake);
}
SquashBag(isCake);
public static void TreatSound(double beat, bool isCake)
{
SoundByte.PlayOneShot(isCake ? "games/blueBear/cake" : "games/blueBear/donut", beat);
}
public void SquashBag(bool isCake)

2
Assets/Scripts/Games/BlueBear/Treat.cs
View file

@ -91,8 +91,6 @@ namespace HeavenStudio.Games.Scripts_BlueBear
EatFood();
}
private void Miss(PlayerActionEvent caller) { }
private void Out(PlayerActionEvent caller) { }
void SpawnCrumbs()