From e5e25fa2ab58864fd468d8bc3fca399e44e226bd Mon Sep 17 00:00:00 2001 From: Jenny Crowe Date: Thu, 24 Feb 2022 07:12:19 -0700 Subject: [PATCH] Swing variable added to entities. --- Assets/Scripts/Beatmap.cs | 1 + Assets/Scripts/Games/SpaceSoccer/Kicker.cs | 2 +- Assets/Scripts/Minigames.cs | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Beatmap.cs b/Assets/Scripts/Beatmap.cs index 8ac906de..3e62aef8 100644 --- a/Assets/Scripts/Beatmap.cs +++ b/Assets/Scripts/Beatmap.cs @@ -30,6 +30,7 @@ namespace RhythmHeavenMania [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public Color colorA; [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public Color colorB; [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public Color colorC; + [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public float swing; public string datamodel; [JsonIgnore] public Editor.Track.TimelineEventObj eventObj; diff --git a/Assets/Scripts/Games/SpaceSoccer/Kicker.cs b/Assets/Scripts/Games/SpaceSoccer/Kicker.cs index ec456c9a..4a0165fa 100644 --- a/Assets/Scripts/Games/SpaceSoccer/Kicker.cs +++ b/Assets/Scripts/Games/SpaceSoccer/Kicker.cs @@ -203,7 +203,7 @@ namespace RhythmHeavenMania.Games.SpaceSoccer canKick = false; if (ball) - ball.highKickSwing = highKicks[i].valA; + ball.highKickSwing = highKicks[i].swing; break; } else diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index bf428dfe..e719f22f 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -182,7 +182,7 @@ namespace RhythmHeavenMania new GameAction("keep-up", delegate { }, 4f, true), new GameAction("high kick-toe!", delegate { }, 3f, false, new List() { - new Param("valA", new EntityTypes.Float(0, 1), "Swing") + new Param("swing", new EntityTypes.Float(0, 1), "Swing") }), }), new Minigame("djSchool", "DJ School \n[Non-Playable]", "008c97", false, false, new List()