etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-23 10:05:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove the need to use Space Soccer "keep-up" entity

Browse source
This commit is contained in:
minenice55 2022-08-19 17:18:18 -04:00
parent 1c95c317b8
commit 86b34fbb52
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Assets/Scripts/Games/SpaceSoccer/Kicker.cs
View file

@ -9,7 +9,7 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
public class Kicker : PlayerActionObject public class Kicker : PlayerActionObject
{ {
[Header("Properties")] [Header("Properties")]
public bool canKick; public bool canKick = true; //why was this false by default???
public bool canHighKick; public bool canHighKick;
private bool kickPrepare = false; private bool kickPrepare = false;
public bool kickLeft; public bool kickLeft;
@ -168,21 +168,22 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
kickLeft = true; kickLeft = true;
} }
List<Beatmap.Entity> keepUps = GameManager.instance.Beatmap.entities.FindAll(c => c.datamodel == "spaceSoccer/keep-up"); // List<Beatmap.Entity> keepUps = GameManager.instance.Beatmap.entities.FindAll(c => c.datamodel == "spaceSoccer/keep-up");
// for (int i = 0; i < keepUps.Count; i++)
// {
// if ((keepUps[i].beat - 0.15f) <= Conductor.instance.songPositionInBeats && (keepUps[i].beat + keepUps[i].length) - 0.15f > Conductor.instance.songPositionInBeats)
// {
// canKick = true;
// canHighKick = false;
// break;
// }
// else
// {
// canKick = false;
// }
// }
List<Beatmap.Entity> highKicks = GameManager.instance.Beatmap.entities.FindAll(c => c.datamodel == "spaceSoccer/high kick-toe!"); List<Beatmap.Entity> highKicks = GameManager.instance.Beatmap.entities.FindAll(c => c.datamodel == "spaceSoccer/high kick-toe!");
for (int i = 0; i < keepUps.Count; i++)
{
if ((keepUps[i].beat - 0.15f) <= Conductor.instance.songPositionInBeats && (keepUps[i].beat + keepUps[i].length) - 0.15f > Conductor.instance.songPositionInBeats)
{
canKick = true;
canHighKick = false;
break;
}
else
{
canKick = false;
}
}
for (int i = 0; i < highKicks.Count; i++) for (int i = 0; i < highKicks.Count; i++)
{ {
if ((highKicks[i].beat - 0.15f) <= Conductor.instance.songPositionInBeats && highKicks[i].beat + 1f > Conductor.instance.songPositionInBeats) if ((highKicks[i].beat - 0.15f) <= Conductor.instance.songPositionInBeats && highKicks[i].beat + 1f > Conductor.instance.songPositionInBeats)
@ -200,6 +201,7 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
} }
else else
{ {
canKick = true;
canHighKick = false; canHighKick = false;
} }
} }

4
Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs
View file

@ -18,11 +18,11 @@ namespace HeavenStudio.Games.Loaders
new Param("toggle", false, "Disable Sound", "Disables the dispense sound") new Param("toggle", false, "Disable Sound", "Disables the dispense sound")
}, },
inactiveFunction: delegate { if (!eventCaller.currentEntity.toggle) { SpaceSoccer.DispenseSound(eventCaller.currentEntity.beat); } }), inactiveFunction: delegate { if (!eventCaller.currentEntity.toggle) { SpaceSoccer.DispenseSound(eventCaller.currentEntity.beat); } }),
new GameAction("keep-up", delegate { }, 4f, true),
new GameAction("high kick-toe!", delegate { }, 3f, false, new List<Param>() new GameAction("high kick-toe!", delegate { }, 3f, false, new List<Param>()
{ {
new Param("swing", new EntityTypes.Float(0, 1, 0.5f), "Swing", "The amount of swing") new Param("swing", new EntityTypes.Float(0, 1, 0.5f), "Swing", "The amount of swing")
}), }),
new GameAction("keep-up", delegate { }, 4f, true, hidden: true),
}); });
} }
} }
@ -102,6 +102,8 @@ namespace HeavenStudio.Games
{ {
DispenseSound(beat); DispenseSound(beat);
} }
kicker.canKick = true;
} }
} }