Merge branch 'master' into game-ntrIdol

This commit is contained in:
minenice55
2022-03-14 10:35:33 -04:00
139 changed files with 296 additions and 186 deletions

View File

@ -1,11 +1,11 @@
using DG.Tweening;
using NaughtyBezierCurves;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
using System;
using System.Collections.Generic;
using UnityEngine;
namespace RhythmHeavenMania.Games
namespace HeavenStudio.Games
{
using Scripts_BlueBear;
public class BlueBear : Minigame

View File

@ -4,9 +4,9 @@ using System;
using UnityEngine;
using NaughtyBezierCurves;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_BlueBear
namespace HeavenStudio.Games.Scripts_BlueBear
{
public class Treat : PlayerActionObject
{

View File

@ -2,8 +2,8 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.Scripts_BuiltToScaleDS
using HeavenStudio.Util;
namespace HeavenStudio.Games.Scripts_BuiltToScaleDS
{
public class BTSPiece : MonoBehaviour
{

View File

@ -3,9 +3,9 @@ using System.Collections.Generic;
using UnityEngine;
using System;
namespace RhythmHeavenMania.Games.Scripts_BuiltToScaleDS
namespace HeavenStudio.Games.Scripts_BuiltToScaleDS
{
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
public class Blocks : PlayerActionObject
{
public float createBeat;

View File

@ -5,8 +5,8 @@ using NaughtyBezierCurves;
using DG.Tweening;
using System;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games
using HeavenStudio.Util;
namespace HeavenStudio.Games
{
using Scripts_BuiltToScaleDS;

View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games
namespace HeavenStudio.Games
{
using Scripts_ClappyTrio;

View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_ClappyTrio
namespace HeavenStudio.Games.Scripts_ClappyTrio
{
public class ClappyTrioPlayer : PlayerActionObject
{

View File

@ -1,11 +1,11 @@
using DG.Tweening;
using NaughtyBezierCurves;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
using System;
using System.Collections.Generic;
using UnityEngine;
namespace RhythmHeavenMania.Games
namespace HeavenStudio.Games
{
using Scripts_CropStomp;

View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_CropStomp
namespace HeavenStudio.Games.Scripts_CropStomp
{
public class Farmer : PlayerActionObject
{

View File

@ -4,9 +4,9 @@ using UnityEngine;
using NaughtyBezierCurves;
using DG.Tweening;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_CropStomp
namespace HeavenStudio.Games.Scripts_CropStomp
{
public class Veggie : PlayerActionObject
{

View File

@ -1,9 +1,9 @@
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games
namespace HeavenStudio.Games
{
using Scripts_DJSchool;

View File

@ -3,10 +3,10 @@ using System.Collections.Generic;
using UnityEngine;
using DG.Tweening;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
using Starpelly;
namespace RhythmHeavenMania.Games.Scripts_DJSchool
namespace HeavenStudio.Games.Scripts_DJSchool
{
public class Student : PlayerActionObject
{

View File

@ -4,9 +4,9 @@ using UnityEngine;
using System;
using Starpelly;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_DrummingPractice
namespace HeavenStudio.Games.Scripts_DrummingPractice
{
public class Drummer : MonoBehaviour
{

View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_DrummingPractice
namespace HeavenStudio.Games.Scripts_DrummingPractice
{
public class DrummerHit : PlayerActionObject
{

View File

@ -4,9 +4,9 @@ using UnityEngine;
using System;
using Starpelly;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games
namespace HeavenStudio.Games
{
using Scripts_DrummingPractice;

View File

@ -1,9 +1,9 @@
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
using System;
using System.Collections.Generic;
using UnityEngine;
namespace RhythmHeavenMania.Games
namespace HeavenStudio.Games
{
using Scripts_Fireworks;
public class Fireworks : Minigame

View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_Fireworks
namespace HeavenStudio.Games.Scripts_Fireworks
{
public class Rocket : PlayerActionObject
{

View File

@ -2,11 +2,11 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
using DG.Tweening;
namespace RhythmHeavenMania.Games
namespace HeavenStudio.Games
{
using Scripts_ForkLifter;

View File

@ -3,9 +3,9 @@ using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_ForkLifter
namespace HeavenStudio.Games.Scripts_ForkLifter
{
public class ForkLifterHand : MonoBehaviour
{

View File

@ -4,9 +4,9 @@ using UnityEngine;
using DG.Tweening;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_ForkLifter
namespace HeavenStudio.Games.Scripts_ForkLifter
{
public class ForkLifterPlayer : MonoBehaviour
{

View File

@ -2,11 +2,11 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
using DG.Tweening;
namespace RhythmHeavenMania.Games.Scripts_ForkLifter
namespace HeavenStudio.Games.Scripts_ForkLifter
{
public class Pea : PlayerActionObject
{

View File

@ -2,10 +2,10 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
using System.Linq;
namespace RhythmHeavenMania.Games.Global
namespace HeavenStudio.Games.Global
{
public class Flash : MonoBehaviour
{

View File

@ -4,7 +4,7 @@ using UnityEngine;
using DG.Tweening;
namespace RhythmHeavenMania.Games.Scripts_KarateMan
namespace HeavenStudio.Games.Scripts_KarateMan
{
// Physics in Rhythm Heaven Mania? nah im just fuckin lazy
public class BarrelDestroyEffect : MonoBehaviour

View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_KarateMan
namespace HeavenStudio.Games.Scripts_KarateMan
{
public class Bomb : PlayerActionObject
{

View File

@ -4,7 +4,7 @@ using UnityEngine;
using DG.Tweening;
namespace RhythmHeavenMania.Games.Scripts_KarateMan
namespace HeavenStudio.Games.Scripts_KarateMan
{
// Physics in Rhythm Heaven Mania? nah im just fuckin lazy
public class CookingPotDestroyEffect : MonoBehaviour

View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_KarateMan
namespace HeavenStudio.Games.Scripts_KarateMan
{
public class KarateJoe : MonoBehaviour
{

View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games
namespace HeavenStudio.Games
{
using Scripts_KarateMan;

View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_KarateMan
namespace HeavenStudio.Games.Scripts_KarateMan
{
public class Pot : PlayerActionObject
{

View File

@ -2,7 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace RhythmHeavenMania.Games
namespace HeavenStudio.Games
{
public class Minigame : MonoBehaviour
{

View File

@ -5,9 +5,9 @@ using UnityEngine;
using System;
using Starpelly;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games
namespace HeavenStudio.Games
{
using Scripts_MrUpbeat;

View File

@ -4,9 +4,9 @@ using UnityEngine;
using System;
using Starpelly;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_MrUpbeat
namespace HeavenStudio.Games.Scripts_MrUpbeat
{
public class UpbeatMan : MonoBehaviour
{

View File

@ -4,9 +4,9 @@ using UnityEngine;
using System;
using Starpelly;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_MrUpbeat
namespace HeavenStudio.Games.Scripts_MrUpbeat
{
public class UpbeatStep : PlayerActionObject
{

View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Editor.Track;
using HeavenStudio.Editor.Track;
namespace RhythmHeavenMania.Games
namespace HeavenStudio.Games
{
public class PlayerActionObject : MonoBehaviour
{

View File

@ -4,9 +4,9 @@ using UnityEngine;
using DG.Tweening;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_RhythmRally
namespace HeavenStudio.Games.Scripts_RhythmRally
{
public class Paddlers : PlayerActionObject
{

View File

@ -4,8 +4,8 @@ using UnityEngine;
using NaughtyBezierCurves;
using DG.Tweening;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games
using HeavenStudio.Util;
namespace HeavenStudio.Games
{
using Scripts_RhythmRally;

View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using UnityEngine;
using System;
namespace RhythmHeavenMania.Games.Scripts_RhythmTweezers
namespace HeavenStudio.Games.Scripts_RhythmTweezers
{
public class Hair : PlayerActionObject
{

View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_RhythmTweezers
namespace HeavenStudio.Games.Scripts_RhythmTweezers
{
public class LongHair : PlayerActionObject
{

View File

@ -5,9 +5,9 @@ using System;
using Starpelly;
using DG.Tweening;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games
namespace HeavenStudio.Games
{
using Scripts_RhythmTweezers;

View File

@ -3,9 +3,9 @@ using System.Collections.Generic;
using UnityEngine;
using System;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_RhythmTweezers
namespace HeavenStudio.Games.Scripts_RhythmTweezers
{
public class Tweezers : MonoBehaviour
{

View File

@ -3,9 +3,9 @@ using System.Collections.Generic;
using UnityEngine;
using NaughtyBezierCurves;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_SpaceSoccer
namespace HeavenStudio.Games.Scripts_SpaceSoccer
{
public class Ball : MonoBehaviour
{

View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_SpaceSoccer
namespace HeavenStudio.Games.Scripts_SpaceSoccer
{
public class Kicker : PlayerActionObject
{

View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games
namespace HeavenStudio.Games
{
using Scripts_SpaceSoccer;

View File

@ -2,7 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace RhythmHeavenMania.Games.Scripts_Spaceball
namespace HeavenStudio.Games.Scripts_Spaceball
{
public class Alien : MonoBehaviour
{

View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games
namespace HeavenStudio.Games
{
using Scripts_Spaceball;

View File

@ -2,11 +2,11 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
using DG.Tweening;
namespace RhythmHeavenMania.Games.Scripts_Spaceball
namespace HeavenStudio.Games.Scripts_Spaceball
{
public class SpaceballBall : PlayerActionObject
{

View File

@ -3,9 +3,9 @@ using System.Collections.Generic;
using UnityEngine;
using DG.Tweening;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_Spaceball
namespace HeavenStudio.Games.Scripts_Spaceball
{
public class SpaceballPlayer : MonoBehaviour
{

View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_TapTrial
namespace HeavenStudio.Games.Scripts_TapTrial
{
public class Tap : PlayerActionObject
{

View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games
namespace HeavenStudio.Games
{
using Scripts_TapTrial;

View File

@ -1,8 +1,8 @@
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_TapTrial
namespace HeavenStudio.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.Scripts_WizardsWaltz
namespace HeavenStudio.Games.Scripts_WizardsWaltz
{
public class Girl : MonoBehaviour
{

View File

@ -1,10 +1,10 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
using System;
namespace RhythmHeavenMania.Games.Scripts_WizardsWaltz
namespace HeavenStudio.Games.Scripts_WizardsWaltz
{
public class MagicFX : MonoBehaviour
{

View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using UnityEngine;
using System;
namespace RhythmHeavenMania.Games.Scripts_WizardsWaltz
namespace HeavenStudio.Games.Scripts_WizardsWaltz
{
public class Plant : PlayerActionObject
{

View File

@ -1,9 +1,9 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games.Scripts_WizardsWaltz
namespace HeavenStudio.Games.Scripts_WizardsWaltz
{
public class Wizard : MonoBehaviour
{

View File

@ -5,9 +5,9 @@ using UnityEngine;
using System;
using Starpelly;
using RhythmHeavenMania.Util;
using HeavenStudio.Util;
namespace RhythmHeavenMania.Games
namespace HeavenStudio.Games
{
using Scripts_WizardsWaltz;