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

Boom (#319)

Browse Source
This commit is contained in:
Rapandrasmus
2023-02-27 04:05:40 +01:00
committed by GitHub
parent 06e4db40ec
commit 31da780d3d
3 changed files with 89 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Assets/Scripts/Games/Fireworks/Fireworks.cs
View File

@ -15,25 +15,27 @@ namespace HeavenStudio.Games.Loaders
{
new GameAction("firework", "Firework")
{
preFunction = delegate {var e = eventCaller.currentEntity; Fireworks.PreSpawnFirework(e.beat, false, e["whereToSpawn"], e["toggle"], e["explosionType"], e["applause"]); },
preFunction = delegate {var e = eventCaller.currentEntity; Fireworks.PreSpawnFirework(e.beat, false, e["whereToSpawn"], e["toggle"], e["explosionType"], e["applause"], e["offSet"]); },
defaultLength = 4f,
parameters = new List<Param>()
{
new Param("whereToSpawn", Fireworks.WhereToSpawn.Middle, "Where to spawn?", "Where should the firework spawn?"),
new Param("explosionType", Fireworks.ExplosionType.MixedCircular, "Explosion Pattern", "What pattern should the firework explode with?"),
new Param("applause", false, "Applause", "Should an applause play after successfully hitting this cue?"),
new Param("offSet", new EntityTypes.Float(0, 4, 0), "Vertical Offset", "What vertical Offset should the rocket have?"),
new Param("toggle", false, "Practice Count-In", "Should the count-in from the fireworks practice play?")
}
},
new GameAction("sparkler", "Sparkler")
{
preFunction = delegate {var e = eventCaller.currentEntity; Fireworks.PreSpawnFirework(e.beat, true, e["whereToSpawn"], e["toggle"], e["explosionType"], e["applause"]); },
preFunction = delegate {var e = eventCaller.currentEntity; Fireworks.PreSpawnFirework(e.beat, true, e["whereToSpawn"], e["toggle"], e["explosionType"], e["applause"], e["offSet"]); },
defaultLength = 2f,
parameters = new List<Param>()
{
new Param("whereToSpawn", Fireworks.WhereToSpawn.Middle, "Where to spawn?", "Where should the firework spawn?"),
new Param("explosionType", Fireworks.ExplosionType.MixedCircular, "Explosion Pattern", "What pattern should the firework explode with?"),
new Param("applause", false, "Applause", "Should an applause play after successfully hitting this cue?"),
new Param("offSet", new EntityTypes.Float(0, 4, 0), "Vertical Offset", "What vertical Offset should the rocket have?"),
new Param("toggle", false, "Practice Count-In", "Should the count-in from the fireworks practice play?")
}
},
@ -91,6 +93,7 @@ namespace HeavenStudio.Games
public bool practice;
public int explosionType;
public bool applause;
public float verticalOffset;
}
public enum WhereToSpawn
{
@ -142,7 +145,7 @@ namespace HeavenStudio.Games
{
foreach (var firework in queuedFireworks)
{
SpawnFirework(firework.beat, firework.isSparkler, firework.whereToSpawn, firework.practice, firework.explosionType, firework.applause);
SpawnFirework(firework.beat, firework.isSparkler, firework.whereToSpawn, firework.practice, firework.explosionType, firework.applause, firework.verticalOffset);
}
queuedFireworks.Clear();
}
@ -186,7 +189,7 @@ namespace HeavenStudio.Games
}
}
public static void PreSpawnFirework(float beat, bool isSparkler, int whereToSpawn, bool practice, int explosionType, bool applause)
public static void PreSpawnFirework(float beat, bool isSparkler, int whereToSpawn, bool practice, int explosionType, bool applause, float verticalOffset)
{
if (isSparkler)
{
@ -208,18 +211,18 @@ namespace HeavenStudio.Games
{
new BeatAction.Action(beat, delegate
{
Fireworks.instance.SpawnFirework(beat, isSparkler, whereToSpawn, practice, explosionType, applause);
Fireworks.instance.SpawnFirework(beat, isSparkler, whereToSpawn, practice, explosionType, applause, verticalOffset);
})
});
}
else
{
queuedFireworks.Add(new QueuedFirework { beat = beat, isSparkler = isSparkler, whereToSpawn = whereToSpawn, practice = practice, explosionType = explosionType, applause = applause });
queuedFireworks.Add(new QueuedFirework { beat = beat, isSparkler = isSparkler, whereToSpawn = whereToSpawn, practice = practice, explosionType = explosionType, applause = applause, verticalOffset = verticalOffset });
}
}
void SpawnFirework(float beat, bool isSparkler, int whereToSpawn, bool practice, int explosionType, bool applause)
void SpawnFirework(float beat, bool isSparkler, int whereToSpawn, bool practice, int explosionType, bool applause, float verticalOffset)
{
if (isSparkler && practice)
{
@ -254,6 +257,7 @@ namespace HeavenStudio.Games
}
Rocket spawnedRocket = Instantiate(firework, spawnPoint, false);
spawnedRocket.isSparkler = isSparkler;
spawnedRocket.offSet = verticalOffset;
spawnedRocket.applause = applause;
spawnedRocket.Init(beat, explosionType);
}

43
Assets/Scripts/Games/Fireworks/Rocket.cs
View File

@ -18,16 +18,55 @@ namespace HeavenStudio.Games.Scripts_Fireworks
public bool applause;
private bool exploded;
private float startY;
public float offSet;
[SerializeField] List<ParticleSystem> mixedCircularPS = new List<ParticleSystem>();
[SerializeField] Sprite GreenOne;
[SerializeField] Sprite GreenTwo;
[SerializeField] Sprite BlueOne;
[SerializeField] Sprite BlueTwo;
[SerializeField] Sprite RedOne;
[SerializeField] Sprite RedTwo;
void Awake()
{
game = Fireworks.instance;
startY = transform.position.y;
List<string> colors = new List<string>()
{
"Green",
"Red",
"Blue"
};
for (int i = 0; i < mixedCircularPS.Count; i++)
{
var ts = mixedCircularPS[i].textureSheetAnimation;
var pickedColor = colors[UnityEngine.Random.Range(0, colors.Count)];
switch (pickedColor)
{
case "Green":
ts.AddSprite(GreenOne);
ts.AddSprite(GreenTwo);
break;
case "Red":
ts.AddSprite(RedOne);
ts.AddSprite(RedTwo);
break;
case "Blue":
ts.AddSprite(BlueOne);
ts.AddSprite(BlueTwo);
break;
default:
ts.AddSprite(GreenOne);
ts.AddSprite(GreenTwo);
break;
}
colors.Remove(pickedColor);
}
}
public void Init(float beat, int explosionToChoose)
{
startBeat = beat;
startY = transform.position.y - offSet;
game.ScheduleInput(beat, isSparkler ? 1f : 3f, InputType.STANDARD_DOWN, Just, Out, Out);
anim.DoScaledAnimationAsync(isSparkler ? "Sparkler" : "Rocket", isSparkler ? 1f : 0.5f);
selectedParticleEffect = particleEffects[explosionToChoose];
@ -40,7 +79,7 @@ namespace HeavenStudio.Games.Scripts_Fireworks
if (!exploded && cond.isPlaying && !cond.isPaused)
{
EasingFunction.Function func = EasingFunction.GetEasingFunction(EasingFunction.Ease.Linear);
float newPosY = func(startY, 7f, normalizedBeat * (isSparkler ? 0.5f : 0.4f));
float newPosY = func(startY, 7f - offSet, normalizedBeat * (isSparkler ? 0.5f : 0.4f));
transform.position = new Vector3(transform.position.x, newPosY, transform.position.z);
}
if (normalizedBeat > 3f && !selectedParticleEffect.isPlaying) Destroy(gameObject);