Twiddling my Thumbs

Random, Insignificant changes to random things in the code

Assets/Resources/Games/sumoBrothers.prefab

@@ -1054,13 +1054,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3190431508682864428}
-  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956}
-  m_LocalPosition: {x: 0, y: 0, z: -5}
+  m_LocalPosition: {x: 0, y: -20, z: 20}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7621216590368296269}
   m_RootOrder: 12
-  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!212 &5681035325528858982
 SpriteRenderer:
   m_ObjectHideFlags: 0

Assets/Resources/Sfx/games/sumoBrothers/posesignal.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: bacc6dc7d41f0f0468cb93c47007669a
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Games/SumoBrothers/YaseiNoIkiG3M4.png.meta

@@ -65,7 +65,7 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 4096
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 2
@@ -77,7 +77,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Standalone
-    maxTextureSize: 2048
+    maxTextureSize: 4096
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 2

Assets/Scenes/Editor.unity

@@ -18787,8 +18787,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1589389272}
   m_HandleRect: {fileID: 1589389271}
   m_Direction: 2
-  m_Value: 0
+  m_Value: 1
-  m_Size: 1
+  m_Size: 0.9995157
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -23702,7 +23702,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 130.06236}
+  m_AnchoredPosition: {x: 0, y: 130.0623}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &1154875944

Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs

@@ -14,22 +14,22 @@ namespace HeavenStudio.Games.Loaders
             {
                  new GameAction("bop", "Bop")
                 {
-                    function = delegate { var e = eventCaller.currentEntity; SumoBrothers.instance.Bop(e["inu"], e["sumo"]); },
+                    function = delegate { var e = eventCaller.currentEntity; SumoBrothers.instance.Bop(e["inuT"], e["sumoT"]); },
                     parameters = new List<Param>()
                     {
-                        new Param("inu", true, "Inu Bop", "Whether Inu Sensei bops or not."),
+                        new Param("inuT", true, "Inu Sensei", "Whether Inu Sensei bops or not."),
-                        new Param("sumo", true, "Brothers Bop", "Whether the Sumo Brothers bop or not."),
+                        new Param("sumoT", true, "Sumo Brothers", "Whether the Sumo Brothers bop or not."),
                     },
                     defaultLength = 0.5f
                 },
 
                  new GameAction("crouch", "Crouch")
                 {
-                    function = delegate { var e = eventCaller.currentEntity; SumoBrothers.instance.Crouch(e.beat, e.length, e["inu"], e["sumo"]); },
+                    function = delegate { var e = eventCaller.currentEntity; SumoBrothers.instance.Crouch(e.beat, e.length, e["inuT"], e["sumoT"]); },
                     parameters = new List<Param>()
                     {
-                        new Param("inu", true, "Inu Crouch", "Whether Inu Sensei crouches or not."),
+                        new Param("inuT", true, "Inu Sensei", "Whether Inu Sensei crouches or not."),
-                        new Param("sumo", true, "Brothers Crouch", "Whether the Sumo Brothers crouch or not.")
+                        new Param("sumoT", true, "Sumo Brothers", "Whether the Sumo Brothers crouch or not."),
                     },
                     defaultLength = 1f,
                     resizable = true
@@ -129,19 +129,43 @@ namespace HeavenStudio.Games
         // Update is called once per frame
         void Update()
         {
+            // This is cond
             var cond = Conductor.instance;
 
+            // Run once every beat
             if (cond.ReportBeat(ref lastReportedBeat))
             {
-                if (goBopInu && allowBopInu)
+                // Bop Code - Inu Sensei
+                if (allowBopInu)
                 {
-                    inuSensei.DoScaledAnimationAsync("InuBop", 0.5f);
+                    if (goBopInu)
+                    {
+                        // Bop
+                        inuSensei.DoScaledAnimationAsync("InuBop", 0.5f);
+                    }
+                    else
+                    {
+                        // Reset to Idle if Bop is off
+                        inuSensei.DoScaledAnimationAsync("InuIdle", 0.5f);
+                    }
 
                 }
-                if (goBopSumo && allowBopSumo)
+                // Bop Code - Sumo Brothers
+                if (allowBopSumo)
                 {
-                    sumoBrotherP.DoScaledAnimationAsync("SumoBop", 0.5f);
+                    if(goBopSumo)
-                    sumoBrotherG.DoScaledAnimationAsync("SumoBop", 0.5f);
+                    {
+                        // Bop
+                        sumoBrotherP.DoScaledAnimationAsync("SumoBop", 0.5f);
+                        sumoBrotherG.DoScaledAnimationAsync("SumoBop", 0.5f);
+                    }
+                    else
+                    {
+                        // Reset to Idle if Bop is off
+                        sumoBrotherP.DoScaledAnimationAsync("SumoIdle", 0.5f);
+                        sumoBrotherG.DoScaledAnimationAsync("SumoIdle", 0.5f);
+                    }
+                    
                 }
 
             }
@@ -193,19 +217,15 @@ namespace HeavenStudio.Games
                 allowBopSumo = false;
             }
             
-            
             BeatAction.New(instance.gameObject, new List<BeatAction.Action>() {
             new BeatAction.Action(beat, delegate { if (inu == true) inuSensei.DoScaledAnimationAsync("InuCrouch", 0.5f); }),
             new BeatAction.Action(beat, delegate { if (sumo == true) sumoBrotherP.DoScaledAnimationAsync("SumoCrouch", 0.5f); }),
             new BeatAction.Action(beat, delegate { if (sumo == true) sumoBrotherG.DoScaledAnimationAsync("SumoCrouch", 0.5f); }),
-            new BeatAction.Action(beat + length, delegate { allowBopInu = true; }),
+            new BeatAction.Action(beat + length - 0.001, delegate { allowBopInu = true; }),
-            new BeatAction.Action(beat + length, delegate { allowBopSumo = true; }),
+            new BeatAction.Action(beat + length - 0.001, delegate { allowBopSumo = true; }),
-            new BeatAction.Action(beat + length, delegate { if (goBopInu == false) inuSensei.DoScaledAnimationAsync("InuIdle", 0.5f); }),
-            new BeatAction.Action(beat + length, delegate { if (goBopInu == true) inuSensei.DoScaledAnimationAsync("InuBop", 0.5f); }),
-            new BeatAction.Action(beat + length, delegate { if (goBopSumo == false) sumoBrotherP.DoScaledAnimationAsync("SumoIdle", 0.5f); }),
-            new BeatAction.Action(beat + length, delegate { if (goBopSumo == false) sumoBrotherG.DoScaledAnimationAsync("SumoIdle", 0.5f); }),
             new BeatAction.Action(beat + length, delegate { if (goBopSumo == true) sumoBrotherP.DoScaledAnimationAsync("SumoBop", 0.5f); }),
-            new BeatAction.Action(beat + length, delegate { if (goBopSumo == true) sumoBrotherG.DoScaledAnimationAsync("SumoBop", 0.5f); })
+            new BeatAction.Action(beat + length, delegate { if (goBopSumo == true) sumoBrotherG.DoScaledAnimationAsync("SumoBop", 0.5f); }),
+            new BeatAction.Action(beat + length, delegate { if (goBopInu == true) inuSensei.DoScaledAnimationAsync("InuBop", 0.5f); })
             });
 
         }
@@ -213,8 +233,8 @@ namespace HeavenStudio.Games
         public void EndPose(float beat)
         {
             var cond = Conductor.instance;
-            #region Tweet
+            #region Old Goofy as Hell Tweet Code
-                var loopAmount = Math.Round((3 * cond.secPerBeat - 0.208) / 0.395);
+            /*    var loopAmount = Math.Round((3 * cond.secPerBeat - 0.208) / 0.395);
                 var beatsPerSecond = cond.songBpm / 60;
                 var soundBeatLength = beatsPerSecond * 0.395;
 
@@ -229,20 +249,20 @@ namespace HeavenStudio.Games
                 MultiSound.Play(sound.ToArray());
 
                 var tweetLength = (float)loopAmount * (float)soundBeatLength - (float)soundBeatLength + ((float)beatsPerSecond * 0.208f);
-                print(tweetLength);
+                print(tweetLength);*/
-                
+
             #endregion
 
             //SumoBrothers.instance.EndPoseCheck(beat);
 
-            
+            var tweet = Jukebox.PlayOneShotGame("sumoBrothers/posesignal", -1, 1f, 1f, true);
+            tweet.SetLoopParams(beat + 3, 0.05f);
 
             allowBopInu = false;
             inuSensei.DoScaledAnimationAsync("InuTweet", 0.5f);
 
             BeatAction.New(instance.gameObject, new List<BeatAction.Action>() {
                 new BeatAction.Action(beat + 3, delegate { allowBopInu = true; }),
-                new BeatAction.Action(beat + 3, delegate { if (goBopInu == false) inuSensei.DoScaledAnimationAsync("InuIdle", 0.5f); }),
                 new BeatAction.Action(beat + 3, delegate { if (goBopInu == true) inuSensei.DoScaledAnimationAsync("InuBop", 0.5f); })
             });