Pajama Party: fix sleep action type not carrying over between transitions
This commit is contained in:
parent
91db8ade80
commit
d10f2b9d7d
|
@ -37,7 +37,7 @@ namespace HeavenStudio.Games.Loaders
|
||||||
new Param("type", PajamaParty.SleepType.Normal, "Sleep Type", "Type of sleep action to use"),
|
new Param("type", PajamaParty.SleepType.Normal, "Sleep Type", "Type of sleep action to use"),
|
||||||
new Param("toggle", false, "Alt. Animation", "Use an alternate animation for Mako")
|
new Param("toggle", false, "Alt. Animation", "Use an alternate animation for Mako")
|
||||||
},
|
},
|
||||||
inactiveFunction = delegate {var e = eventCaller.currentEntity; PajamaParty.WarnSleepSequence(e.beat, e["toggle"]);}
|
inactiveFunction = delegate {var e = eventCaller.currentEntity; PajamaParty.WarnSleepSequence(e.beat, e["toggle"], e["type"]);}
|
||||||
},
|
},
|
||||||
new GameAction("throw", "Throw Pillows")
|
new GameAction("throw", "Throw Pillows")
|
||||||
{
|
{
|
||||||
|
@ -280,7 +280,7 @@ namespace HeavenStudio.Games
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void WarnSleepSequence(float beat, bool alt = false)
|
public static void WarnSleepSequence(float beat, bool alt = false, int action = (int) PajamaParty.SleepType.Normal)
|
||||||
{
|
{
|
||||||
MultiSound.Play(new MultiSound.Sound[] {
|
MultiSound.Play(new MultiSound.Sound[] {
|
||||||
new MultiSound.Sound("pajamaParty/siesta1", beat),
|
new MultiSound.Sound("pajamaParty/siesta1", beat),
|
||||||
|
@ -291,6 +291,7 @@ namespace HeavenStudio.Games
|
||||||
}, forcePlay: true);
|
}, forcePlay: true);
|
||||||
WantSleepSequence = beat;
|
WantSleepSequence = beat;
|
||||||
WantSleepType = alt;
|
WantSleepType = alt;
|
||||||
|
WantSleepAction = action;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void DoBedImpact()
|
public void DoBedImpact()
|
||||||
|
|
Loading…
Reference in a new issue