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

Various small additions and changes (#105)

Browse Source 
* Fan Club: spotlight effects

* new icons for Pajama Party, Karate Man

* Editor: make context use Rodin font

* idem for entities

* Blue Bear: import HQ texture

* Pajama Party: option to sleep forever

* Space Soccer: option to mute the dispense sound
This commit is contained in:
minenice55
2022-06-18 02:31:19 -04:00
committed by GitHub
parent 8d571f6443
commit ef0f090ba7
53 changed files with 10144 additions and 1494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Assets/Scripts/Games/PajamaParty/PajamaParty.cs
View File

@ -22,8 +22,9 @@ namespace HeavenStudio.Games.Loaders
inactiveFunction: delegate {PajamaParty.WarnFiveJump(eventCaller.currentEntity.beat);}
),
//idem
new GameAction("slumber", delegate {var e = eventCaller.currentEntity; PajamaParty.instance.DoSleepSequence(e.beat, e.toggle);}, 8f, false, parameters: new List<Param>()
new GameAction("slumber", delegate {var e = eventCaller.currentEntity; PajamaParty.instance.DoSleepSequence(e.beat, e.toggle, e.type);}, 8f, false, parameters: new List<Param>()
{
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")
},
inactiveFunction: delegate {var e = eventCaller.currentEntity; PajamaParty.WarnSleepSequence(e.beat, e.toggle);}
@ -66,6 +67,12 @@ namespace HeavenStudio.Games
static float WantThrowSequence = Single.MinValue;
static float WantSleepSequence = Single.MinValue;
static bool WantSleepType = false;
static int WantSleepAction = (int) PajamaParty.SleepType.Normal;
public enum SleepType {
Normal,
NoAwake,
}
void Awake()
{
@ -128,7 +135,7 @@ namespace HeavenStudio.Games
}
if (WantSleepSequence != Single.MinValue)
{
DoSleepSequence(WantSleepSequence, WantSleepType, false);
DoSleepSequence(WantSleepSequence, WantSleepType, WantSleepAction, false);
WantSleepSequence = Single.MinValue;
}
}
@ -245,11 +252,11 @@ namespace HeavenStudio.Games
}, forcePlay: force);
}
public void DoSleepSequence(float beat, bool alt = false, bool doSound = true)
public void DoSleepSequence(float beat, bool alt = false, int action = (int) PajamaParty.SleepType.Normal, bool doSound = true)
{
var cond = Conductor.instance;
Mako.StartSleepSequence(beat, alt);
MonkeySleep(beat);
Mako.StartSleepSequence(beat, alt, action);
MonkeySleep(beat, action);
if (doSound)
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound("pajamaParty/siesta1", beat),
@ -330,13 +337,13 @@ namespace HeavenStudio.Games
}
}
public void MonkeySleep(float beat)
public void MonkeySleep(float beat, int action)
{
foreach (CtrPillowMonkey monkey in monkeys)
{
if (monkey != null)
{
monkey.ReadySleep(beat);
monkey.ReadySleep(beat, action);
}
}
}