bopping

Assets/Resources/Games/flockstep.prefab

@@ -136,6 +136,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   SoundSequences: []
   scheduledInputs: []
+  allThemOtherBirbs:
+  - {fileID: 3213417323593128603}
+  - {fileID: 8743976104748905334}
+  - {fileID: 2532123414184929096}
+  birbPlayer: {fileID: 9197776188909626724}
 --- !u!1 &5652163237492373506
 GameObject:
   m_ObjectHideFlags: 0
@@ -209,7 +214,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 4
-  m_Sprite: {fileID: 21300000, guid: df3b81a9d3e42ac41a1658d24e7d6c50, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 27b738ef3dc615042879218281cf0885, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 0.59607846}
   m_FlipX: 0
   m_FlipY: 0
@@ -321,7 +326,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7723710671965159540, guid: 30af0541f981c784594ccc782dfe60e0, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 30af0541f981c784594ccc782dfe60e0, type: 3}
@@ -330,6 +335,11 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 164626871870069446, guid: 30af0541f981c784594ccc782dfe60e0, type: 3}
   m_PrefabInstance: {fileID: 503777839742375442}
   m_PrefabAsset: {fileID: 0}
+--- !u!95 &8743976104748905334 stripped
+Animator:
+  m_CorrespondingSourceObject: {fileID: 9197776188909626724, guid: 30af0541f981c784594ccc782dfe60e0, type: 3}
+  m_PrefabInstance: {fileID: 503777839742375442}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1852510550479508249
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -695,14 +705,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7723710671965159540, guid: 30af0541f981c784594ccc782dfe60e0, type: 3}
       propertyPath: m_Name
-      value: stupid dumb bird (4)
+      value: stupid dumb bird 1
       objectReference: {fileID: 0}
     - target: {fileID: 7723710671965159540, guid: 30af0541f981c784594ccc782dfe60e0, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 30af0541f981c784594ccc782dfe60e0, type: 3}
+--- !u!95 &3213417323593128603 stripped
+Animator:
+  m_CorrespondingSourceObject: {fileID: 9197776188909626724, guid: 30af0541f981c784594ccc782dfe60e0, type: 3}
+  m_PrefabInstance: {fileID: 5998032406963814399}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &5869762570760971577 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 164626871870069446, guid: 30af0541f981c784594ccc782dfe60e0, type: 3}
@@ -777,10 +792,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7723710671965159540, guid: 30af0541f981c784594ccc782dfe60e0, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 30af0541f981c784594ccc782dfe60e0, type: 3}
+--- !u!95 &2532123414184929096 stripped
+Animator:
+  m_CorrespondingSourceObject: {fileID: 9197776188909626724, guid: 30af0541f981c784594ccc782dfe60e0, type: 3}
+  m_PrefabInstance: {fileID: 6667289399944806956}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &6831440732691929322 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 164626871870069446, guid: 30af0541f981c784594ccc782dfe60e0, type: 3}

Assets/Resources/Games/lockstep.prefab

@@ -1480,7 +1480,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &3601520192004155467
 Transform:
   m_ObjectHideFlags: 0
@@ -1489,7 +1489,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4936480110009519431}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -3.825, y: -3.48, z: 0}
+  m_LocalPosition: {x: 473.81, y: -3.48, z: 0}
   m_LocalScale: {x: 1.1, y: 1.1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

Assets/Resources/Prefabs/GameView/GameTex.renderTexture

@@ -14,8 +14,8 @@ RenderTexture:
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
   serializedVersion: 5
-  m_Width: 1101
+  m_Width: 974
-  m_Height: 619
+  m_Height: 548
   m_AntiAliasing: 2
   m_MipCount: -1
   m_DepthStencilFormat: 92

Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture

@@ -14,8 +14,8 @@ RenderTexture:
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
   serializedVersion: 5
-  m_Width: 1651
+  m_Width: 1461
-  m_Height: 928
+  m_Height: 822
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthStencilFormat: 92

Assets/Resources/Prefabs/Games/Flockstep/stupid dumb bird.prefab

@@ -109,9 +109,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5603819668666512380}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 1.28, y: -0.06, z: 0}
+  m_LocalPosition: {x: 1.272, y: -0.1, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.91, y: 0.91, z: 0.91}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 164626871870069446}
   m_RootOrder: 4
@@ -156,7 +156,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 3
+  m_SortingOrder: 4
   m_Sprite: {fileID: -1138167012, guid: 01d14edc8f1f8b141b2932da07ec0338, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -430,6 +430,7 @@ GameObject:
   m_Component:
   - component: {fileID: 164626871870069446}
   - component: {fileID: 2083661237789383229}
+  - component: {fileID: 9197776188909626724}
   m_Layer: 0
   m_Name: stupid dumb bird
   m_TagString: Untagged
@@ -475,6 +476,28 @@ MonoBehaviour:
   mainBody: {r: 1, g: 0.85882354, b: 0.33333334, a: 1}
   huebirdMaterial: {fileID: 0}
   hueBody: {fileID: 4607174671211195459}
+  hueWing: {fileID: 8867364968688881915}
+--- !u!95 &9197776188909626724
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7723710671965159540}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 078d492a0bd2d074b885898d81a1fd11, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &7768810164502874927
 GameObject:
   m_ObjectHideFlags: 0
@@ -584,7 +607,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8140567034056100355}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.795, y: -0.682, z: 0}
+  m_LocalPosition: {x: 0.795, y: -0.69, z: 0}
   m_LocalScale: {x: 0.95, y: 0.78, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -668,7 +691,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8652893823246211818}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.878, y: 0.14499998, z: 0}
+  m_LocalPosition: {x: 0.878, y: 0.145, z: 0}
   m_LocalScale: {x: 0.95, y: 0.95, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -715,7 +738,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 2
+  m_SortingOrder: 3
   m_Sprite: {fileID: 118601622, guid: 01d14edc8f1f8b141b2932da07ec0338, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

Assets/Resources/Sprites/Games/Flockstep/bop.anim

@@ -708,7 +708,7 @@ AnimationClip:
     m_Level: 0
     m_CycleOffset: 0
     m_HasAdditiveReferencePose: 0
-    m_LoopTime: 1
+    m_LoopTime: 0
     m_LoopBlend: 0
     m_LoopBlendOrientation: 0
     m_LoopBlendPositionY: 0

Assets/Resources/Sprites/Games/Flockstep/startStep.anim.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: d59c9d9b545fa8c41b75d365462af890
+guid: cad346e4712898f4ab6501ad535e1c63
-folderAsset: yes
+NativeFormatImporter:
-DefaultImporter:
   externalObjects: {}
+  mainObjectFileID: 7400000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Resources/Sprites/Games/Flockstep/stupid dumb bird.controller

@@ -48,6 +48,32 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1102 &655098313243049790
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: startStep
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: cad346e4712898f4ab6501ad535e1c63, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1107 &6628066711433480843
 AnimatorStateMachine:
   serializedVersion: 6
@@ -63,6 +89,9 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: -1908173621020496421}
     m_Position: {x: 235, y: 65, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 655098313243049790}
+    m_Position: {x: 270, y: 130, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

Assets/Scenes/Editor.unity

@@ -8906,7 +8906,7 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 9.65
+  m_fontSize: 12.8
   m_fontSizeBase: 14.3
   m_fontWeight: 400
   m_enableAutoSizing: 1
@@ -14029,7 +14029,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 171581557}
   m_HandleRect: {fileID: 171581556}
   m_Direction: 2
-  m_Value: 0
+  m_Value: 1
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -26850,8 +26850,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1589389272}
   m_HandleRect: {fileID: 1589389271}
   m_Direction: 2
-  m_Value: 0
+  m_Value: 1
-  m_Size: 0.99947643
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -32707,7 +32707,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: 89.2653}
+  m_AnchoredPosition: {x: 0, y: 90.48979}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1154875945
@@ -43456,7 +43456,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1220118244}
   m_Direction: 2
   m_Value: 1.0000002
-  m_Size: 0.34134114
+  m_Size: 0.35148686
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:

Assets/Scripts/Games/Flockstep/Flockstep.cs

@@ -75,12 +75,48 @@ namespace HeavenStudio.Games
     /// Minigame inherits directly from MonoBehaviour, and adds Heaven Studio specific methods to override.
     public class Flockstep : Minigame
     {
-    public static Flockstep instance;
+        public static Flockstep instance;
-    public GameEvent bop = new GameEvent();
+        bool goBop;
-    public void Bop(double beat, float length, bool bop, bool autoBop)
+        public GameEvent bop = new GameEvent();
-    {
 
-    }
+        [SerializeField] Animator[] allThemOtherBirbs;
+
+        [SerializeField] Animator birbPlayer;
+    
+        public override void OnBeatPulse(double beat)
+        {
+            if (goBop)
+            {
+                PlayBirbAnim("bop", true, 0.5f);
+            }
+        }
+        void PlayBirbAnim(string animName, bool player, float timescale = 1f, float startpos = 0f, int layer = -1)
+        {
+            if (player) birbPlayer.DoScaledAnimationAsync(animName, timescale, startpos, layer);
+
+            foreach(Animator birb in allThemOtherBirbs)
+            {
+                birb.DoScaledAnimationAsync(animName, timescale, startpos, layer);
+            }
+        }
+
+        public void Bop(double beat, float length, bool shouldBop, bool autoBop)
+        {
+            goBop = autoBop;
+            if (shouldBop)
+            {
+                for (int i = 0; i < length; i++)
+                {
+                    BeatAction.New(instance, new List<BeatAction.Action>()
+                    {
+                        new BeatAction.Action(beat + i, delegate
+                        {
+                            PlayBirbAnim("bop", true, 0.5f);
+                        })
+                    });
+                }
+            }
+        }
     
         // Start is called before the first frame update
         void Awake()

Assets/Scripts/Games/Flockstep/birb.cs

@@ -7,6 +7,7 @@ public class birb : MonoBehaviour
     public Color mainBody;
     [SerializeField]Material huebirdMaterial;
     [SerializeField]SpriteRenderer hueBody;
+    [SerializeField]SpriteRenderer hueWing;
 
     void Start()
     {
@@ -16,6 +17,8 @@ public class birb : MonoBehaviour
     {
         huebirdMaterial = hueBody.material;
         huebirdMaterial.SetColor("_ColorAlpha", mainBody);
+        huebirdMaterial = hueWing.material;
+        huebirdMaterial.SetColor("_ColorAlpha", mainBody);
     }
 
     // // Start is called before the first frame update

ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset

@@ -17,8 +17,6 @@ MonoBehaviour:
   DenseViewWidthThreshold: 512
   _disableAutoReloadInBackground: 0
   ImportedScriptPaths:
-  - Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
+  - Assets/Scripts/Games/Flockstep/Flockstep.cs
-  - Assets/Scripts/Games/BuiltToScaleWii/BuiltToScaleWii.cs
-  - Assets/Scripts/Flockstep/Flockstep.cs
   PathsToSkipImportEvent: []
   PathsToIgnoreOverwriteSettingOnAttribute: []