etc
/
HeavenStudioPlus
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26 from CarsonKompon/clappy-trio-variable-lions 

Added "Change Lion Count" event to Clappy Trio
This commit is contained in:
Jenny Crowe 2022-02-28 18:14:17 -07:00 committed by GitHub
parent b0e08acfd2 5d99596c67
commit 8f0614e05a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs
View File

@ -32,30 +32,24 @@ namespace RhythmHeavenMania.Games.ClappyTrio
private void Start()
{
float maxWidth = 9.2f;
float minus = 0;
float startPos = -3.066667f;
float maxWidth = 12.266668f;
float newSpacing = maxWidth / lionCount;
if (lionCount > 3)
for (int i = 0; i < lionCount; i++)
{
Lion[0].transform.localPosition = new Vector3(-1.5f, 0);
maxWidth = 6.2f;
minus = 1.5f;
}
GameObject lion;
if (i == 0)
lion = Lion[0];
else
lion = Instantiate(Lion[0], Lion[0].transform.parent);
for (int i = 1; i < lionCount; i++)
{
GameObject lion = Instantiate(Lion[0], Lion[0].transform.parent);
lion.transform.localPosition = new Vector3(startPos + ((maxWidth / (lionCount + 1)) * (i + 1)), 0);
// lion.transform.localPosition = new Vector3(Lion[0].transform.localPosition.x + (1.0333f * lionCount) - i, 0);
lion.transform.localPosition = new Vector3((newSpacing) * (i) - minus, 0);
Lion.Add(lion);
if (i > 0)
Lion.Add(lion);
if (i == lionCount - 1)
{
ClappyTrioPlayer = lion.AddComponent<ClappyTrioPlayer>();
}
}
}
@ -86,8 +80,7 @@ namespace RhythmHeavenMania.Games.ClappyTrio
isClapping = false;
currentClappingLength = 0;
ClappyTrioPlayer.clapStarted = false;
}
else
} else
{
SetFace(i, 4);
Lion[i].GetComponent<Animator>().Play("Clap", 0, 0);
@ -135,8 +128,7 @@ namespace RhythmHeavenMania.Games.ClappyTrio
{
SetFace(i, 1);
}
}
else
} else
{
var a = EventCaller.GetAllInGameManagerList("clappyTrio", new string[] { "clap" });
var b = a.FindAll(c => c.beat < beat);
@ -148,8 +140,7 @@ namespace RhythmHeavenMania.Games.ClappyTrio
if (i == Lion.Count - 1)
{
SetFace(i, 0);
}
else
} else
{
SetFace(i, 2);
}
@ -159,6 +150,19 @@ namespace RhythmHeavenMania.Games.ClappyTrio
PlayAnimationAll("Bop");
}
public void ChangeLionCount(int lions)
{
for(int i=1; i<lionCount; i++)
{
Destroy(Lion[i]);
}
Lion.RemoveRange(1, lionCount - 1);
lionCount = lions;
SetFace(0, 0);
Start();
PlayAnimationAll("Idle");
}
private void PlayAnimationAll(string anim)
{
for (int i = 0; i < Lion.Count; i++)

4
Assets/Scripts/Minigames.cs
View File

@ -211,6 +211,10 @@ namespace RhythmHeavenMania
new GameAction("bop", delegate { ClappyTrio.instance.Bop(eventCaller.currentEntity.beat); } ),
new GameAction("prepare", delegate { ClappyTrio.instance.Prepare(0); } ),
new GameAction("prepare_alt", delegate { ClappyTrio.instance.Prepare(3); } ),
new GameAction("change lion count", delegate { ClappyTrio.instance.ChangeLionCount((int)eventCaller.currentEntity.valA); }, 0.5f, false, new List<Param>()
{
new Param("valA", new EntityTypes.Integer(1, 8, 3), "Lion Count")
}),
}),
new Minigame("spaceball", "Spaceball", "00A518", false, false, new List<GameAction>()
{