From fd037c4436d554d9559580b4653f1484d7f946e9 Mon Sep 17 00:00:00 2001 From: Jenny Crowe Date: Fri, 11 Mar 2022 21:10:13 -0700 Subject: [PATCH] Organization refactor --- Assets/Scripts/Games/BlueBear/BlueBear.cs | 4 +++- .../Scripts/Games/BuiltToScaleDS/BTSPiece.cs | 2 +- Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs | 2 +- .../Games/BuiltToScaleDS/BuiltToScaleDS.cs | 4 +++- Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs | 4 +++- .../Games/ClappyTrio/ClappyTrioPlayer.cs | 2 +- Assets/Scripts/Games/CropStomp/CropStomp.cs | 4 +++- Assets/Scripts/Games/CropStomp/Farmer.cs | 2 +- Assets/Scripts/Games/CropStomp/Veggie.cs | 2 +- Assets/Scripts/Games/DJSchool/DJSchool.cs | 4 +++- Assets/Scripts/Games/DJSchool/Student.cs | 2 +- .../Scripts/Games/DrummingPractice/Drummer.cs | 2 +- .../Games/DrummingPractice/DrummerHit.cs | 2 +- .../Games/DrummingPractice/DrummingPractice.cs | 4 +++- Assets/Scripts/Games/ForkLifter/ForkLifter.cs | 4 +++- .../Scripts/Games/ForkLifter/ForkLifterHand.cs | 2 +- .../Games/ForkLifter/ForkLifterPlayer.cs | 2 +- Assets/Scripts/Games/ForkLifter/Pea.cs | 2 +- .../Games/KarateMan/BarrelDestroyEffect.cs | 2 +- Assets/Scripts/Games/KarateMan/Bomb.cs | 2 +- .../Games/KarateMan/CookingPotDestroyEffect.cs | 2 +- Assets/Scripts/Games/KarateMan/KarateJoe.cs | 2 +- Assets/Scripts/Games/KarateMan/KarateMan.cs | 4 +++- Assets/Scripts/Games/KarateMan/Pot.cs | 2 +- Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs | 4 +++- Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs | 2 +- Assets/Scripts/Games/MrUpbeat/UpbeatStep.cs | 2 +- Assets/Scripts/Games/RhythmRally/Paddlers.cs | 2 +- .../Scripts/Games/RhythmRally/RhythmRally.cs | 4 +++- Assets/Scripts/Games/RhythmTweezers/Hair.cs | 2 +- .../Scripts/Games/RhythmTweezers/LongHair.cs | 2 +- .../Games/RhythmTweezers/RhythmTweezers.cs | 5 +++-- .../Scripts/Games/RhythmTweezers/Tweezers.cs | 2 +- Assets/Scripts/Games/SpaceSoccer/Ball.cs | 2 +- Assets/Scripts/Games/SpaceSoccer/Kicker.cs | 2 +- .../Scripts/Games/SpaceSoccer/SpaceSoccer.cs | 4 +++- Assets/Scripts/Games/Spaceball/Alien.cs | 2 +- Assets/Scripts/Games/Spaceball/Spaceball.cs | 4 +++- .../Scripts/Games/Spaceball/SpaceballBall.cs | 2 +- .../Scripts/Games/Spaceball/SpaceballPlayer.cs | 2 +- Assets/Scripts/Games/TapTrial/Tap.cs | 2 +- Assets/Scripts/Games/TapTrial/TapTrial.cs | 4 +++- .../Scripts/Games/TapTrial/TapTrialPlayer.cs | 2 +- Assets/Scripts/Games/WizardsWaltz/Girl.cs | 2 +- Assets/Scripts/Games/WizardsWaltz/MagicFX.cs | 2 +- Assets/Scripts/Games/WizardsWaltz/Plant.cs | 2 +- Assets/Scripts/Games/WizardsWaltz/Wizard.cs | 2 +- .../Scripts/Games/WizardsWaltz/WizardsWaltz.cs | 4 +++- Assets/Scripts/Minigames.cs | 18 ++---------------- 49 files changed, 80 insertions(+), 65 deletions(-) diff --git a/Assets/Scripts/Games/BlueBear/BlueBear.cs b/Assets/Scripts/Games/BlueBear/BlueBear.cs index 94e57473..80cd49d2 100644 --- a/Assets/Scripts/Games/BlueBear/BlueBear.cs +++ b/Assets/Scripts/Games/BlueBear/BlueBear.cs @@ -5,8 +5,10 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace RhythmHeavenMania.Games.BlueBear +namespace RhythmHeavenMania.Games { + // using Scripts_BlueBear; -No scripts under this namespace yet. + public class BlueBear : Minigame { // Start is called before the first frame update diff --git a/Assets/Scripts/Games/BuiltToScaleDS/BTSPiece.cs b/Assets/Scripts/Games/BuiltToScaleDS/BTSPiece.cs index a85b11ab..23b77525 100644 --- a/Assets/Scripts/Games/BuiltToScaleDS/BTSPiece.cs +++ b/Assets/Scripts/Games/BuiltToScaleDS/BTSPiece.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.BuiltToScaleDS +namespace RhythmHeavenMania.Games.Scripts_BuiltToScaleDS { public class BTSPiece : MonoBehaviour { diff --git a/Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs b/Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs index fb31fe18..3e6fb4b0 100644 --- a/Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs +++ b/Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using System; -namespace RhythmHeavenMania.Games.BuiltToScaleDS +namespace RhythmHeavenMania.Games.Scripts_BuiltToScaleDS { using RhythmHeavenMania.Util; public class Blocks : PlayerActionObject diff --git a/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs b/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs index 2eda015c..6613e9dd 100644 --- a/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs +++ b/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs @@ -6,8 +6,10 @@ using DG.Tweening; using System; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.BuiltToScaleDS +namespace RhythmHeavenMania.Games { + using Scripts_BuiltToScaleDS; + public class BuiltToScaleDS : Minigame { public enum BTSObject { HitPieces, MissPieces, FlyingRod } diff --git a/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs b/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs index 1d236c83..6c9e7456 100644 --- a/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs +++ b/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs @@ -4,8 +4,10 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.ClappyTrio +namespace RhythmHeavenMania.Games { + using Scripts_ClappyTrio; + public class ClappyTrio : Minigame { public int lionCount = 3; diff --git a/Assets/Scripts/Games/ClappyTrio/ClappyTrioPlayer.cs b/Assets/Scripts/Games/ClappyTrio/ClappyTrioPlayer.cs index 2e0f4479..d128bb57 100644 --- a/Assets/Scripts/Games/ClappyTrio/ClappyTrioPlayer.cs +++ b/Assets/Scripts/Games/ClappyTrio/ClappyTrioPlayer.cs @@ -4,7 +4,7 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.ClappyTrio +namespace RhythmHeavenMania.Games.Scripts_ClappyTrio { public class ClappyTrioPlayer : PlayerActionObject { diff --git a/Assets/Scripts/Games/CropStomp/CropStomp.cs b/Assets/Scripts/Games/CropStomp/CropStomp.cs index 1383a5f7..65af90ad 100644 --- a/Assets/Scripts/Games/CropStomp/CropStomp.cs +++ b/Assets/Scripts/Games/CropStomp/CropStomp.cs @@ -5,8 +5,10 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace RhythmHeavenMania.Games.CropStomp +namespace RhythmHeavenMania.Games { + using Scripts_CropStomp; + public class CropStomp : Minigame { const float stepDistance = 2.115f; diff --git a/Assets/Scripts/Games/CropStomp/Farmer.cs b/Assets/Scripts/Games/CropStomp/Farmer.cs index 47f0e7f0..4ce6a94c 100644 --- a/Assets/Scripts/Games/CropStomp/Farmer.cs +++ b/Assets/Scripts/Games/CropStomp/Farmer.cs @@ -4,7 +4,7 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.CropStomp +namespace RhythmHeavenMania.Games.Scripts_CropStomp { public class Farmer : PlayerActionObject { diff --git a/Assets/Scripts/Games/CropStomp/Veggie.cs b/Assets/Scripts/Games/CropStomp/Veggie.cs index ade62bad..7e372426 100644 --- a/Assets/Scripts/Games/CropStomp/Veggie.cs +++ b/Assets/Scripts/Games/CropStomp/Veggie.cs @@ -6,7 +6,7 @@ using DG.Tweening; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.CropStomp +namespace RhythmHeavenMania.Games.Scripts_CropStomp { public class Veggie : PlayerActionObject { diff --git a/Assets/Scripts/Games/DJSchool/DJSchool.cs b/Assets/Scripts/Games/DJSchool/DJSchool.cs index 3976eb71..8892c278 100644 --- a/Assets/Scripts/Games/DJSchool/DJSchool.cs +++ b/Assets/Scripts/Games/DJSchool/DJSchool.cs @@ -3,8 +3,10 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.DJSchool +namespace RhythmHeavenMania.Games { + using Scripts_DJSchool; + public class DJSchool : Minigame { public enum DJVoice diff --git a/Assets/Scripts/Games/DJSchool/Student.cs b/Assets/Scripts/Games/DJSchool/Student.cs index 79d925fc..413e1ced 100644 --- a/Assets/Scripts/Games/DJSchool/Student.cs +++ b/Assets/Scripts/Games/DJSchool/Student.cs @@ -6,7 +6,7 @@ using DG.Tweening; using RhythmHeavenMania.Util; using Starpelly; -namespace RhythmHeavenMania.Games.DJSchool +namespace RhythmHeavenMania.Games.Scripts_DJSchool { public class Student : PlayerActionObject { diff --git a/Assets/Scripts/Games/DrummingPractice/Drummer.cs b/Assets/Scripts/Games/DrummingPractice/Drummer.cs index 01d344c3..1a96e4a9 100644 --- a/Assets/Scripts/Games/DrummingPractice/Drummer.cs +++ b/Assets/Scripts/Games/DrummingPractice/Drummer.cs @@ -6,7 +6,7 @@ using Starpelly; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.DrummingPractice +namespace RhythmHeavenMania.Games.Scripts_DrummingPractice { public class Drummer : MonoBehaviour { diff --git a/Assets/Scripts/Games/DrummingPractice/DrummerHit.cs b/Assets/Scripts/Games/DrummingPractice/DrummerHit.cs index f2c957ac..a4f96a6b 100644 --- a/Assets/Scripts/Games/DrummingPractice/DrummerHit.cs +++ b/Assets/Scripts/Games/DrummingPractice/DrummerHit.cs @@ -4,7 +4,7 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.DrummingPractice +namespace RhythmHeavenMania.Games.Scripts_DrummingPractice { public class DrummerHit : PlayerActionObject { diff --git a/Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs b/Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs index ec2623b3..f59cbb75 100644 --- a/Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs +++ b/Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs @@ -6,8 +6,10 @@ using Starpelly; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.DrummingPractice +namespace RhythmHeavenMania.Games { + using Scripts_DrummingPractice; + public class DrummingPractice : Minigame { public enum MiiType diff --git a/Assets/Scripts/Games/ForkLifter/ForkLifter.cs b/Assets/Scripts/Games/ForkLifter/ForkLifter.cs index 310df41f..ec801cfa 100644 --- a/Assets/Scripts/Games/ForkLifter/ForkLifter.cs +++ b/Assets/Scripts/Games/ForkLifter/ForkLifter.cs @@ -6,8 +6,10 @@ using RhythmHeavenMania.Util; using DG.Tweening; -namespace RhythmHeavenMania.Games.ForkLifter +namespace RhythmHeavenMania.Games { + using Scripts_ForkLifter; + public class ForkLifter : Minigame { diff --git a/Assets/Scripts/Games/ForkLifter/ForkLifterHand.cs b/Assets/Scripts/Games/ForkLifter/ForkLifterHand.cs index acce8420..ab3bc3a5 100644 --- a/Assets/Scripts/Games/ForkLifter/ForkLifterHand.cs +++ b/Assets/Scripts/Games/ForkLifter/ForkLifterHand.cs @@ -5,7 +5,7 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.ForkLifter +namespace RhythmHeavenMania.Games.Scripts_ForkLifter { public class ForkLifterHand : MonoBehaviour { diff --git a/Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs b/Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs index 341e85ee..8af85702 100644 --- a/Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs +++ b/Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs @@ -6,7 +6,7 @@ using DG.Tweening; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.ForkLifter +namespace RhythmHeavenMania.Games.Scripts_ForkLifter { public class ForkLifterPlayer : MonoBehaviour { diff --git a/Assets/Scripts/Games/ForkLifter/Pea.cs b/Assets/Scripts/Games/ForkLifter/Pea.cs index c109c3b1..d2eaaf87 100644 --- a/Assets/Scripts/Games/ForkLifter/Pea.cs +++ b/Assets/Scripts/Games/ForkLifter/Pea.cs @@ -6,7 +6,7 @@ using RhythmHeavenMania.Util; using DG.Tweening; -namespace RhythmHeavenMania.Games.ForkLifter +namespace RhythmHeavenMania.Games.Scripts_ForkLifter { public class Pea : PlayerActionObject { diff --git a/Assets/Scripts/Games/KarateMan/BarrelDestroyEffect.cs b/Assets/Scripts/Games/KarateMan/BarrelDestroyEffect.cs index f0089ddd..92976c09 100644 --- a/Assets/Scripts/Games/KarateMan/BarrelDestroyEffect.cs +++ b/Assets/Scripts/Games/KarateMan/BarrelDestroyEffect.cs @@ -4,7 +4,7 @@ using UnityEngine; using DG.Tweening; -namespace RhythmHeavenMania.Games.KarateMan +namespace RhythmHeavenMania.Games.Scripts_KarateMan { // Physics in Rhythm Heaven Mania? nah im just fuckin lazy public class BarrelDestroyEffect : MonoBehaviour diff --git a/Assets/Scripts/Games/KarateMan/Bomb.cs b/Assets/Scripts/Games/KarateMan/Bomb.cs index 7d3962f7..b63b7cdf 100644 --- a/Assets/Scripts/Games/KarateMan/Bomb.cs +++ b/Assets/Scripts/Games/KarateMan/Bomb.cs @@ -4,7 +4,7 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.KarateMan +namespace RhythmHeavenMania.Games.Scripts_KarateMan { public class Bomb : PlayerActionObject { diff --git a/Assets/Scripts/Games/KarateMan/CookingPotDestroyEffect.cs b/Assets/Scripts/Games/KarateMan/CookingPotDestroyEffect.cs index e8e34749..d4db7ffe 100644 --- a/Assets/Scripts/Games/KarateMan/CookingPotDestroyEffect.cs +++ b/Assets/Scripts/Games/KarateMan/CookingPotDestroyEffect.cs @@ -4,7 +4,7 @@ using UnityEngine; using DG.Tweening; -namespace RhythmHeavenMania.Games.KarateMan +namespace RhythmHeavenMania.Games.Scripts_KarateMan { // Physics in Rhythm Heaven Mania? nah im just fuckin lazy public class CookingPotDestroyEffect : MonoBehaviour diff --git a/Assets/Scripts/Games/KarateMan/KarateJoe.cs b/Assets/Scripts/Games/KarateMan/KarateJoe.cs index 6db0c094..3d138239 100644 --- a/Assets/Scripts/Games/KarateMan/KarateJoe.cs +++ b/Assets/Scripts/Games/KarateMan/KarateJoe.cs @@ -4,7 +4,7 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.KarateMan +namespace RhythmHeavenMania.Games.Scripts_KarateMan { public class KarateJoe : MonoBehaviour { diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs index 95a23f59..0a4b08ee 100644 --- a/Assets/Scripts/Games/KarateMan/KarateMan.cs +++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs @@ -4,8 +4,10 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.KarateMan +namespace RhythmHeavenMania.Games { + using Scripts_KarateMan; + public class KarateMan : Minigame { diff --git a/Assets/Scripts/Games/KarateMan/Pot.cs b/Assets/Scripts/Games/KarateMan/Pot.cs index c8aa4e31..b54022d2 100644 --- a/Assets/Scripts/Games/KarateMan/Pot.cs +++ b/Assets/Scripts/Games/KarateMan/Pot.cs @@ -4,7 +4,7 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.KarateMan +namespace RhythmHeavenMania.Games.Scripts_KarateMan { public class Pot : PlayerActionObject { diff --git a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs index 233954e8..1aea99ae 100644 --- a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs +++ b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs @@ -7,8 +7,10 @@ using Starpelly; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.MrUpbeat +namespace RhythmHeavenMania.Games { + using Scripts_MrUpbeat; + public class MrUpbeat : Minigame { [Header("References")] diff --git a/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs b/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs index bc0b537a..edb5444c 100644 --- a/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs +++ b/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs @@ -6,7 +6,7 @@ using Starpelly; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.MrUpbeat +namespace RhythmHeavenMania.Games.Scripts_MrUpbeat { public class UpbeatMan : MonoBehaviour { diff --git a/Assets/Scripts/Games/MrUpbeat/UpbeatStep.cs b/Assets/Scripts/Games/MrUpbeat/UpbeatStep.cs index f6591ebc..a94df57a 100644 --- a/Assets/Scripts/Games/MrUpbeat/UpbeatStep.cs +++ b/Assets/Scripts/Games/MrUpbeat/UpbeatStep.cs @@ -6,7 +6,7 @@ using Starpelly; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.MrUpbeat +namespace RhythmHeavenMania.Games.Scripts_MrUpbeat { public class UpbeatStep : PlayerActionObject { diff --git a/Assets/Scripts/Games/RhythmRally/Paddlers.cs b/Assets/Scripts/Games/RhythmRally/Paddlers.cs index 43ada4d0..b631e158 100644 --- a/Assets/Scripts/Games/RhythmRally/Paddlers.cs +++ b/Assets/Scripts/Games/RhythmRally/Paddlers.cs @@ -6,7 +6,7 @@ using DG.Tweening; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.RhythmRally +namespace RhythmHeavenMania.Games.Scripts_RhythmRally { public class Paddlers : PlayerActionObject { diff --git a/Assets/Scripts/Games/RhythmRally/RhythmRally.cs b/Assets/Scripts/Games/RhythmRally/RhythmRally.cs index 45e2adb1..dff3824a 100644 --- a/Assets/Scripts/Games/RhythmRally/RhythmRally.cs +++ b/Assets/Scripts/Games/RhythmRally/RhythmRally.cs @@ -5,8 +5,10 @@ using NaughtyBezierCurves; using DG.Tweening; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.RhythmRally +namespace RhythmHeavenMania.Games { + using Scripts_RhythmRally; + public class RhythmRally : Minigame { public enum RallySpeed { Slow, Normal, Fast, SuperFast } diff --git a/Assets/Scripts/Games/RhythmTweezers/Hair.cs b/Assets/Scripts/Games/RhythmTweezers/Hair.cs index 1abd7409..a2fca474 100644 --- a/Assets/Scripts/Games/RhythmTweezers/Hair.cs +++ b/Assets/Scripts/Games/RhythmTweezers/Hair.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using System; -namespace RhythmHeavenMania.Games.RhythmTweezers +namespace RhythmHeavenMania.Games.Scripts_RhythmTweezers { public class Hair : PlayerActionObject { diff --git a/Assets/Scripts/Games/RhythmTweezers/LongHair.cs b/Assets/Scripts/Games/RhythmTweezers/LongHair.cs index ee7ac149..a2489737 100644 --- a/Assets/Scripts/Games/RhythmTweezers/LongHair.cs +++ b/Assets/Scripts/Games/RhythmTweezers/LongHair.cs @@ -4,7 +4,7 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.RhythmTweezers +namespace RhythmHeavenMania.Games.Scripts_RhythmTweezers { public class LongHair : PlayerActionObject { diff --git a/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs b/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs index 196c39e8..766da4fd 100644 --- a/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs +++ b/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs @@ -7,9 +7,10 @@ using DG.Tweening; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.RhythmTweezers +namespace RhythmHeavenMania.Games { - // use PlayerActionObject for the actual tweezers but this isn't playable rn so IDC + using Scripts_RhythmTweezers; + public class RhythmTweezers : Minigame { public enum VegetableType diff --git a/Assets/Scripts/Games/RhythmTweezers/Tweezers.cs b/Assets/Scripts/Games/RhythmTweezers/Tweezers.cs index da87da1f..13cea87a 100644 --- a/Assets/Scripts/Games/RhythmTweezers/Tweezers.cs +++ b/Assets/Scripts/Games/RhythmTweezers/Tweezers.cs @@ -5,7 +5,7 @@ using System; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.RhythmTweezers +namespace RhythmHeavenMania.Games.Scripts_RhythmTweezers { public class Tweezers : MonoBehaviour { diff --git a/Assets/Scripts/Games/SpaceSoccer/Ball.cs b/Assets/Scripts/Games/SpaceSoccer/Ball.cs index 33c39a53..7cdf2532 100644 --- a/Assets/Scripts/Games/SpaceSoccer/Ball.cs +++ b/Assets/Scripts/Games/SpaceSoccer/Ball.cs @@ -5,7 +5,7 @@ using UnityEngine; using NaughtyBezierCurves; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.SpaceSoccer +namespace RhythmHeavenMania.Games.Scripts_SpaceSoccer { public class Ball : MonoBehaviour { diff --git a/Assets/Scripts/Games/SpaceSoccer/Kicker.cs b/Assets/Scripts/Games/SpaceSoccer/Kicker.cs index 93408070..30a1e9f7 100644 --- a/Assets/Scripts/Games/SpaceSoccer/Kicker.cs +++ b/Assets/Scripts/Games/SpaceSoccer/Kicker.cs @@ -4,7 +4,7 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.SpaceSoccer +namespace RhythmHeavenMania.Games.Scripts_SpaceSoccer { public class Kicker : PlayerActionObject { diff --git a/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs b/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs index 457139d5..fc5edb55 100644 --- a/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs +++ b/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs @@ -4,8 +4,10 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.SpaceSoccer +namespace RhythmHeavenMania.Games { + using Scripts_SpaceSoccer; + public class SpaceSoccer : Minigame { [Header("Components")] diff --git a/Assets/Scripts/Games/Spaceball/Alien.cs b/Assets/Scripts/Games/Spaceball/Alien.cs index 5f577e91..6103fd35 100644 --- a/Assets/Scripts/Games/Spaceball/Alien.cs +++ b/Assets/Scripts/Games/Spaceball/Alien.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace RhythmHeavenMania.Games.Spaceball +namespace RhythmHeavenMania.Games.Scripts_Spaceball { public class Alien : MonoBehaviour { diff --git a/Assets/Scripts/Games/Spaceball/Spaceball.cs b/Assets/Scripts/Games/Spaceball/Spaceball.cs index fd7d7a10..dd5e15bf 100644 --- a/Assets/Scripts/Games/Spaceball/Spaceball.cs +++ b/Assets/Scripts/Games/Spaceball/Spaceball.cs @@ -4,8 +4,10 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.Spaceball +namespace RhythmHeavenMania.Games { + using Scripts_Spaceball; + public class Spaceball : Minigame { public enum CostumeType { diff --git a/Assets/Scripts/Games/Spaceball/SpaceballBall.cs b/Assets/Scripts/Games/Spaceball/SpaceballBall.cs index 105412f6..4d01835b 100644 --- a/Assets/Scripts/Games/Spaceball/SpaceballBall.cs +++ b/Assets/Scripts/Games/Spaceball/SpaceballBall.cs @@ -6,7 +6,7 @@ using RhythmHeavenMania.Util; using DG.Tweening; -namespace RhythmHeavenMania.Games.Spaceball +namespace RhythmHeavenMania.Games.Scripts_Spaceball { public class SpaceballBall : PlayerActionObject { diff --git a/Assets/Scripts/Games/Spaceball/SpaceballPlayer.cs b/Assets/Scripts/Games/Spaceball/SpaceballPlayer.cs index 6ca25fcd..25217a16 100644 --- a/Assets/Scripts/Games/Spaceball/SpaceballPlayer.cs +++ b/Assets/Scripts/Games/Spaceball/SpaceballPlayer.cs @@ -5,7 +5,7 @@ using UnityEngine; using DG.Tweening; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.Spaceball +namespace RhythmHeavenMania.Games.Scripts_Spaceball { public class SpaceballPlayer : MonoBehaviour { diff --git a/Assets/Scripts/Games/TapTrial/Tap.cs b/Assets/Scripts/Games/TapTrial/Tap.cs index 66535026..d871720e 100644 --- a/Assets/Scripts/Games/TapTrial/Tap.cs +++ b/Assets/Scripts/Games/TapTrial/Tap.cs @@ -4,7 +4,7 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.TapTrial +namespace RhythmHeavenMania.Games.Scripts_TapTrial { public class Tap : PlayerActionObject { diff --git a/Assets/Scripts/Games/TapTrial/TapTrial.cs b/Assets/Scripts/Games/TapTrial/TapTrial.cs index b3755991..412bb336 100644 --- a/Assets/Scripts/Games/TapTrial/TapTrial.cs +++ b/Assets/Scripts/Games/TapTrial/TapTrial.cs @@ -4,8 +4,10 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.TapTrial +namespace RhythmHeavenMania.Games { + using Scripts_TapTrial; + public class TapTrial : Minigame { [Header("References")] diff --git a/Assets/Scripts/Games/TapTrial/TapTrialPlayer.cs b/Assets/Scripts/Games/TapTrial/TapTrialPlayer.cs index 14297301..ec8df1bc 100644 --- a/Assets/Scripts/Games/TapTrial/TapTrialPlayer.cs +++ b/Assets/Scripts/Games/TapTrial/TapTrialPlayer.cs @@ -2,7 +2,7 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.TapTrial +namespace RhythmHeavenMania.Games.Scripts_TapTrial { public class TapTrialPlayer : MonoBehaviour { diff --git a/Assets/Scripts/Games/WizardsWaltz/Girl.cs b/Assets/Scripts/Games/WizardsWaltz/Girl.cs index 7d95aea9..987d4223 100644 --- a/Assets/Scripts/Games/WizardsWaltz/Girl.cs +++ b/Assets/Scripts/Games/WizardsWaltz/Girl.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace RhythmHeavenMania.Games.WizardsWaltz +namespace RhythmHeavenMania.Games.Scripts_WizardsWaltz { public class Girl : MonoBehaviour { diff --git a/Assets/Scripts/Games/WizardsWaltz/MagicFX.cs b/Assets/Scripts/Games/WizardsWaltz/MagicFX.cs index fb38c2a9..cee7f519 100644 --- a/Assets/Scripts/Games/WizardsWaltz/MagicFX.cs +++ b/Assets/Scripts/Games/WizardsWaltz/MagicFX.cs @@ -4,7 +4,7 @@ using UnityEngine; using RhythmHeavenMania.Util; using System; -namespace RhythmHeavenMania.Games.WizardsWaltz +namespace RhythmHeavenMania.Games.Scripts_WizardsWaltz { public class MagicFX : MonoBehaviour { diff --git a/Assets/Scripts/Games/WizardsWaltz/Plant.cs b/Assets/Scripts/Games/WizardsWaltz/Plant.cs index 23473308..de2abb50 100644 --- a/Assets/Scripts/Games/WizardsWaltz/Plant.cs +++ b/Assets/Scripts/Games/WizardsWaltz/Plant.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using System; -namespace RhythmHeavenMania.Games.WizardsWaltz +namespace RhythmHeavenMania.Games.Scripts_WizardsWaltz { public class Plant : PlayerActionObject { diff --git a/Assets/Scripts/Games/WizardsWaltz/Wizard.cs b/Assets/Scripts/Games/WizardsWaltz/Wizard.cs index f3740f04..8b0465f9 100644 --- a/Assets/Scripts/Games/WizardsWaltz/Wizard.cs +++ b/Assets/Scripts/Games/WizardsWaltz/Wizard.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.WizardsWaltz +namespace RhythmHeavenMania.Games.Scripts_WizardsWaltz { public class Wizard : MonoBehaviour { diff --git a/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs index 29fce381..e859e0b2 100644 --- a/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs +++ b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs @@ -7,8 +7,10 @@ using Starpelly; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.WizardsWaltz +namespace RhythmHeavenMania.Games { + using Scripts_WizardsWaltz; + public class WizardsWaltz : Minigame { [Header("References")] diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 9f217b1d..10e3f63d 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -5,21 +5,7 @@ using DG.Tweening; using RhythmHeavenMania.Util; -using RhythmHeavenMania.Games.ForkLifter; -using RhythmHeavenMania.Games.ClappyTrio; -using RhythmHeavenMania.Games.Spaceball; -using RhythmHeavenMania.Games.KarateMan; -using RhythmHeavenMania.Games.SpaceSoccer; -using RhythmHeavenMania.Games.DJSchool; -using RhythmHeavenMania.Games.RhythmTweezers; -using RhythmHeavenMania.Games.RhythmRally; -using RhythmHeavenMania.Games.BuiltToScaleDS; -using RhythmHeavenMania.Games.TapTrial; -using RhythmHeavenMania.Games.CropStomp; -using RhythmHeavenMania.Games.WizardsWaltz; -using RhythmHeavenMania.Games.MrUpbeat; -using RhythmHeavenMania.Games.DrummingPractice; -using RhythmHeavenMania.Games.BlueBear; +using RhythmHeavenMania.Games; namespace RhythmHeavenMania { @@ -186,7 +172,7 @@ namespace RhythmHeavenMania new Param("type", ForkLifter.FlickType.Pea, "Object", "The object to be flicked") }), new GameAction("prepare", delegate { ForkLifter.instance.ForkLifterHand.Prepare(); }, 0.5f), - new GameAction("gulp", delegate { ForkLifterPlayer.instance.Eat(); }), + new GameAction("gulp", delegate { Games.Scripts_ForkLifter.ForkLifterPlayer.instance.Eat(); }), new GameAction("sigh", delegate { Jukebox.PlayOneShot("games/forkLifter/sigh"); }), // These are still here for backwards-compatibility but are hidden in the editor new GameAction("pea", delegate { ForkLifter.instance.Flick(eventCaller.currentEntity.beat, 0); }, 3, hidden: true),