Organization refactor

This commit is contained in:
Jenny Crowe 2022-03-11 21:10:13 -07:00
parent 42c2d4cd3e
commit fd037c4436
49 changed files with 80 additions and 65 deletions

View file

@ -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

View file

@ -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
{

View file

@ -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

View file

@ -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 }

View file

@ -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;

View file

@ -4,7 +4,7 @@ using UnityEngine;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.ClappyTrio
namespace RhythmHeavenMania.Games.Scripts_ClappyTrio
{
public class ClappyTrioPlayer : PlayerActionObject
{

View file

@ -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;

View file

@ -4,7 +4,7 @@ using UnityEngine;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.CropStomp
namespace RhythmHeavenMania.Games.Scripts_CropStomp
{
public class Farmer : PlayerActionObject
{

View file

@ -6,7 +6,7 @@ using DG.Tweening;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.CropStomp
namespace RhythmHeavenMania.Games.Scripts_CropStomp
{
public class Veggie : PlayerActionObject
{

View file

@ -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

View file

@ -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
{

View file

@ -6,7 +6,7 @@ using Starpelly;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.DrummingPractice
namespace RhythmHeavenMania.Games.Scripts_DrummingPractice
{
public class Drummer : MonoBehaviour
{

View file

@ -4,7 +4,7 @@ using UnityEngine;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.DrummingPractice
namespace RhythmHeavenMania.Games.Scripts_DrummingPractice
{
public class DrummerHit : PlayerActionObject
{

View file

@ -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

View file

@ -6,8 +6,10 @@ using RhythmHeavenMania.Util;
using DG.Tweening;
namespace RhythmHeavenMania.Games.ForkLifter
namespace RhythmHeavenMania.Games
{
using Scripts_ForkLifter;
public class ForkLifter : Minigame
{

View file

@ -5,7 +5,7 @@ using UnityEngine;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.ForkLifter
namespace RhythmHeavenMania.Games.Scripts_ForkLifter
{
public class ForkLifterHand : MonoBehaviour
{

View file

@ -6,7 +6,7 @@ using DG.Tweening;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.ForkLifter
namespace RhythmHeavenMania.Games.Scripts_ForkLifter
{
public class ForkLifterPlayer : MonoBehaviour
{

View file

@ -6,7 +6,7 @@ using RhythmHeavenMania.Util;
using DG.Tweening;
namespace RhythmHeavenMania.Games.ForkLifter
namespace RhythmHeavenMania.Games.Scripts_ForkLifter
{
public class Pea : PlayerActionObject
{

View file

@ -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

View file

@ -4,7 +4,7 @@ using UnityEngine;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.KarateMan
namespace RhythmHeavenMania.Games.Scripts_KarateMan
{
public class Bomb : PlayerActionObject
{

View file

@ -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

View file

@ -4,7 +4,7 @@ using UnityEngine;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.KarateMan
namespace RhythmHeavenMania.Games.Scripts_KarateMan
{
public class KarateJoe : MonoBehaviour
{

View file

@ -4,8 +4,10 @@ using UnityEngine;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.KarateMan
namespace RhythmHeavenMania.Games
{
using Scripts_KarateMan;
public class KarateMan : Minigame
{

View file

@ -4,7 +4,7 @@ using UnityEngine;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.KarateMan
namespace RhythmHeavenMania.Games.Scripts_KarateMan
{
public class Pot : PlayerActionObject
{

View file

@ -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")]

View file

@ -6,7 +6,7 @@ using Starpelly;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.MrUpbeat
namespace RhythmHeavenMania.Games.Scripts_MrUpbeat
{
public class UpbeatMan : MonoBehaviour
{

View file

@ -6,7 +6,7 @@ using Starpelly;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.MrUpbeat
namespace RhythmHeavenMania.Games.Scripts_MrUpbeat
{
public class UpbeatStep : PlayerActionObject
{

View file

@ -6,7 +6,7 @@ using DG.Tweening;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.RhythmRally
namespace RhythmHeavenMania.Games.Scripts_RhythmRally
{
public class Paddlers : PlayerActionObject
{

View file

@ -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 }

View file

@ -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
{

View file

@ -4,7 +4,7 @@ using UnityEngine;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.RhythmTweezers
namespace RhythmHeavenMania.Games.Scripts_RhythmTweezers
{
public class LongHair : PlayerActionObject
{

View file

@ -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

View file

@ -5,7 +5,7 @@ using System;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.RhythmTweezers
namespace RhythmHeavenMania.Games.Scripts_RhythmTweezers
{
public class Tweezers : MonoBehaviour
{

View file

@ -5,7 +5,7 @@ using UnityEngine;
using NaughtyBezierCurves;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.SpaceSoccer
namespace RhythmHeavenMania.Games.Scripts_SpaceSoccer
{
public class Ball : MonoBehaviour
{

View file

@ -4,7 +4,7 @@ using UnityEngine;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.SpaceSoccer
namespace RhythmHeavenMania.Games.Scripts_SpaceSoccer
{
public class Kicker : PlayerActionObject
{

View file

@ -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")]

View file

@ -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
{

View file

@ -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 {

View file

@ -6,7 +6,7 @@ using RhythmHeavenMania.Util;
using DG.Tweening;
namespace RhythmHeavenMania.Games.Spaceball
namespace RhythmHeavenMania.Games.Scripts_Spaceball
{
public class SpaceballBall : PlayerActionObject
{

View file

@ -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
{

View file

@ -4,7 +4,7 @@ using UnityEngine;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.TapTrial
namespace RhythmHeavenMania.Games.Scripts_TapTrial
{
public class Tap : PlayerActionObject
{

View file

@ -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")]

View file

@ -2,7 +2,7 @@ using UnityEngine;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.TapTrial
namespace RhythmHeavenMania.Games.Scripts_TapTrial
{
public class TapTrialPlayer : MonoBehaviour
{

View file

@ -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
{

View file

@ -4,7 +4,7 @@ using UnityEngine;
using RhythmHeavenMania.Util;
using System;
namespace RhythmHeavenMania.Games.WizardsWaltz
namespace RhythmHeavenMania.Games.Scripts_WizardsWaltz
{
public class MagicFX : MonoBehaviour
{

View file

@ -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
{

View file

@ -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
{

View file

@ -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")]

View file

@ -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),