From e87e0d9ec607118e85ad26673f2ebdac9e375a81 Mon Sep 17 00:00:00 2001
From: ThePurpleAnon <100617766+ThePurpleAnon@users.noreply.github.com>
Date: Mon, 4 Mar 2024 04:02:33 -0600
Subject: [PATCH] hjgdf
stuff
---
.../Resources/Fonts/FOT-SlumpStd-DB SDF.asset | 6 +-
Assets/Resources/Games/chargingChicken.prefab | 2 +-
.../Games/ChargingChicken/Island.prefab | 8 +-
Assets/Scenes/Editor.unity | 294 +++++++++---------
.../Games/ChargingChicken/ChargingChicken.cs | 126 ++++++--
.../Scripts/Games/ChargingChicken/Island.cs | 13 +-
6 files changed, 259 insertions(+), 190 deletions(-)
diff --git a/Assets/Resources/Fonts/FOT-SlumpStd-DB SDF.asset b/Assets/Resources/Fonts/FOT-SlumpStd-DB SDF.asset
index be53f316f..af59ab213 100644
--- a/Assets/Resources/Fonts/FOT-SlumpStd-DB SDF.asset
+++ b/Assets/Resources/Fonts/FOT-SlumpStd-DB SDF.asset
@@ -425,9 +425,9 @@ MonoBehaviour:
m_Metrics:
m_Width: 19.9375
m_Height: 47.265625
- m_HorizontalBearingX: 8.5
+ m_HorizontalBearingX: 4
m_HorizontalBearingY: 46.734375
- m_HorizontalAdvance: 41.296875
+ m_HorizontalAdvance: 30
m_GlyphRect:
m_X: 323
m_Y: 65
@@ -440,7 +440,7 @@ MonoBehaviour:
m_Metrics:
m_Width: 35.34375
m_Height: 47.375
- m_HorizontalBearingX: 3.125
+ m_HorizontalBearingX: 3
m_HorizontalBearingY: 47.375
m_HorizontalAdvance: 41.296875
m_GlyphRect:
diff --git a/Assets/Resources/Games/chargingChicken.prefab b/Assets/Resources/Games/chargingChicken.prefab
index cf1e689ec..a779f5cdc 100644
--- a/Assets/Resources/Games/chargingChicken.prefab
+++ b/Assets/Resources/Games/chargingChicken.prefab
@@ -1818,7 +1818,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.063, y: -0.011}
- m_SizeDelta: {x: 1.9691, y: 3.44}
+ m_SizeDelta: {x: 1.7, y: 3.44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!23 &8218293715540637448
MeshRenderer:
diff --git a/Assets/Resources/Prefabs/Games/ChargingChicken/Island.prefab b/Assets/Resources/Prefabs/Games/ChargingChicken/Island.prefab
index 526722d1b..f5d821e25 100644
--- a/Assets/Resources/Prefabs/Games/ChargingChicken/Island.prefab
+++ b/Assets/Resources/Prefabs/Games/ChargingChicken/Island.prefab
@@ -393,7 +393,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 1
+ m_SortingOrder: 2
m_Sprite: {fileID: -1128882636, guid: 3ac0eae7763e7cc4ab4d8c48e0be1115, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1213,7 +1213,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 0
+ m_SortingOrder: 1
m_Sprite: {fileID: 62603071, guid: 3ac0eae7763e7cc4ab4d8c48e0be1115, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1381,7 +1381,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 1
+ m_SortingOrder: 2
m_Sprite: {fileID: -674752916, guid: 3ac0eae7763e7cc4ab4d8c48e0be1115, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -2125,7 +2125,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 0
+ m_SortingOrder: 1
m_Sprite: {fileID: -1484318784, guid: 3ac0eae7763e7cc4ab4d8c48e0be1115, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity
index 6b0f930d2..6bfa99b16 100644
--- a/Assets/Scenes/Editor.unity
+++ b/Assets/Scenes/Editor.unity
@@ -551,9 +551,9 @@ RectTransform:
m_Father: {fileID: 574002313}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 0, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &9435782
@@ -1957,10 +1957,10 @@ RectTransform:
m_Father: {fileID: 1110073995}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 151.95746, y: -101.510216}
+ m_SizeDelta: {x: 303.91492, y: 203.02043}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &55605604
MonoBehaviour:
@@ -4172,9 +4172,9 @@ RectTransform:
m_Father: {fileID: 539838476}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 32, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &121871281
@@ -4396,9 +4396,9 @@ RectTransform:
m_Father: {fileID: 539838476}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 72, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &129013734
@@ -4532,9 +4532,9 @@ RectTransform:
m_Father: {fileID: 539838476}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 112, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &151246938
@@ -7543,9 +7543,9 @@ RectTransform:
m_Father: {fileID: 156962254}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 7.799999, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &270008766
@@ -8091,9 +8091,9 @@ RectTransform:
m_Father: {fileID: 156962254}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 198.2, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &285739500
@@ -9246,9 +9246,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 617.045, y: -20.0725}
m_SizeDelta: {x: 92.09, y: 28}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &320483642
@@ -9946,9 +9946,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 745.08997, y: -20.0725}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &345154594
@@ -10881,10 +10881,10 @@ RectTransform:
m_Father: {fileID: 1244621692}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 476.00003, y: -128.51022}
+ m_SizeDelta: {x: 944.00006, y: 249.02043}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &374760606
MonoBehaviour:
@@ -12392,9 +12392,9 @@ RectTransform:
m_Father: {fileID: 156962254}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 55.399998, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &456434811
@@ -13128,9 +13128,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 372, y: -20.0725}
m_SizeDelta: {x: 185, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &470814200
@@ -15664,10 +15664,10 @@ RectTransform:
m_Father: {fileID: 1004641245}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 343.00003, y: -119.48982}
+ m_SizeDelta: {x: 686.00006, y: 238.97964}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &538158678
MonoBehaviour:
@@ -17680,9 +17680,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 121, y: -20.0725}
m_SizeDelta: {x: 2, y: 28}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &606561852
@@ -17923,9 +17923,9 @@ RectTransform:
m_Father: {fileID: 2098678240}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 910.00006, y: -20.0725}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &619618400
@@ -19757,9 +19757,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 82, y: -20.0725}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &678553526
@@ -20042,9 +20042,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 669.08997, y: -20.0725}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &683785375
@@ -20413,9 +20413,9 @@ RectTransform:
m_Father: {fileID: 156962254}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 103, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &689781278
@@ -20635,9 +20635,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 564, y: -20.0725}
m_SizeDelta: {x: 2, y: 28}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &692958308
@@ -25244,7 +25244,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: -14.000054, y: 0}
+ m_SizeDelta: {x: -14.000054, y: 20}
m_Pivot: {x: 0, y: 1}
--- !u!114 &830452353
MonoBehaviour:
@@ -26851,7 +26851,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1589389271}
m_Direction: 2
m_Value: 1
- m_Size: 0.9979376
+ m_Size: 0.9836725
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -29635,9 +29635,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 205, y: -20.0725}
m_SizeDelta: {x: 2, y: 28}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1021603965
@@ -29942,9 +29942,9 @@ RectTransform:
m_Father: {fileID: 2098678240}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 948.00006, y: -20.0725}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1026436412
@@ -30550,10 +30550,10 @@ RectTransform:
m_Father: {fileID: 374760605}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 746.9575, y: -124.510216}
+ m_SizeDelta: {x: 394.08514, y: 249.02043}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1050802357
MonoBehaviour:
@@ -30611,9 +30611,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 334, y: -20.0725}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1055877579
@@ -31669,10 +31669,10 @@ RectTransform:
m_Father: {fileID: 374760605}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 151.95746, y: -124.510216}
+ m_SizeDelta: {x: 303.91492, y: 249.02043}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1110073996
MonoBehaviour:
@@ -32707,8 +32707,8 @@ 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: 101.51022}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 101.50671}
+ m_SizeDelta: {x: 0, y: 5}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154875945
CanvasRenderer:
@@ -32817,9 +32817,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 250, y: -20.0725}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1158103139
@@ -34845,9 +34845,9 @@ RectTransform:
m_Father: {fileID: 1871675778}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 147.5, y: -19}
m_SizeDelta: {x: 28, y: 28}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1260206132
@@ -37250,9 +37250,9 @@ RectTransform:
m_Father: {fileID: 574002313}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 40, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1345846031
@@ -38161,9 +38161,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 212, y: -20.0725}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1388945886
@@ -38751,9 +38751,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 707.08997, y: -20.0725}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1436105795
@@ -39819,9 +39819,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 296, y: -20.0725}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1478799966
@@ -43407,10 +43407,10 @@ RectTransform:
m_Father: {fileID: 1004641245}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 714.00006, y: -238.97964}
+ m_SizeDelta: {x: 24, y: 238.97964}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1610635822
MonoBehaviour:
@@ -43643,9 +43643,9 @@ RectTransform:
m_Father: {fileID: 1871675778}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 79.5, y: -19}
m_SizeDelta: {x: 28, y: 28}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1627244368
@@ -44368,9 +44368,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 44, y: -20.0725}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1665554291
@@ -44669,9 +44669,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 6, y: -20.0725}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1683100750
@@ -45312,10 +45312,10 @@ RectTransform:
m_Father: {fileID: 1110073995}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 151.95746, y: -249.02043}
+ m_SizeDelta: {x: 303.91492, y: 42}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &1709317945
MonoBehaviour:
@@ -45692,10 +45692,10 @@ RectTransform:
m_Father: {fileID: 1244621692}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 476.00003, y: -395.51025}
+ m_SizeDelta: {x: 944.00006, y: 276.97964}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1727860597
MonoBehaviour:
@@ -45964,9 +45964,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 128, y: -20.0725}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1747099763
@@ -46876,9 +46876,9 @@ RectTransform:
m_Father: {fileID: 574002313}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 80, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1783491359
@@ -47741,9 +47741,9 @@ RectTransform:
m_Father: {fileID: 1871675778}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 45.5, y: -19}
m_SizeDelta: {x: 28, y: 28}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1832891384
@@ -50227,9 +50227,9 @@ RectTransform:
m_Father: {fileID: 1871675778}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 113.5, y: -19}
m_SizeDelta: {x: 28, y: 28}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1912889635
@@ -51268,9 +51268,9 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_SizeDelta: {x: -17, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1969940938
MonoBehaviour:
@@ -54552,9 +54552,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 289, y: -20.0725}
m_SizeDelta: {x: 2, y: 28}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2085708746
@@ -55044,10 +55044,10 @@ RectTransform:
m_Father: {fileID: 374760605}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 426.91492, y: -124.510216}
+ m_SizeDelta: {x: 238, y: 249.02043}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2107887120
MonoBehaviour:
@@ -55106,9 +55106,9 @@ RectTransform:
m_Father: {fileID: 156962254}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 150.59999, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &2125404437
@@ -55407,9 +55407,9 @@ RectTransform:
m_Father: {fileID: 202724642}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 166, y: -20.0725}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &2131880462
diff --git a/Assets/Scripts/Games/ChargingChicken/ChargingChicken.cs b/Assets/Scripts/Games/ChargingChicken/ChargingChicken.cs
index 046f8112a..8513adf41 100644
--- a/Assets/Scripts/Games/ChargingChicken/ChargingChicken.cs
+++ b/Assets/Scripts/Games/ChargingChicken/ChargingChicken.cs
@@ -22,30 +22,29 @@ namespace HeavenStudio.Games.Loaders
preFunction = delegate {
var e = eventCaller.currentEntity;
if (eventCaller.gameManager.minigameObj.TryGetComponent(out ChargingChicken instance)) {
- instance.ChargeUp(e.beat, e.length, e["forceHold"], e["drumbeat"], e["bubble"], e["endText"], e["textLength"], e["success"], e["fail"], e["destination"], e["customDestination"]);
+ instance.ChargeUp(e.beat, e.length, 4 /*e["forceHold"]*/, e["drumbeat"], e["bubble"], e["endText"], e["textLength"], e["success"], e["fail"], e["destination"], e["customDestination"]);
}
ChargingChicken.CountIn(e.beat);
},
parameters = new List()
{
- new Param("forceHold", false, "Force Hold", "THIS DOESN'T DO SHIT YET"),
new Param("drumbeat", ChargingChicken.DrumLoopList.Straight, "Drum Beat", "Choose which drum beat to play while filling."),
new Param("bubble", false, "Countdown Bubble", "Choose whether the counting bubble will spawn for this input."),
//ending text
- new Param("endText", ChargingChicken.TextOptions.None, "Ending Text", "fill this dicsription later", new() {
+ new Param("endText", ChargingChicken.TextOptions.None, "Ending Text", "What text will appear once the ending platform is reached.", new() {
new Param.CollapseParam((x, _) => (int)x != (int)0, new[] { "textLength" }),
new Param.CollapseParam((x, _) => (int)x == (int)1, new[] { "success", "fail" }),
new Param.CollapseParam((x, _) => (int)x == (int)2, new[] { "destination" }),
}),
- new Param("textLength", new EntityTypes.Integer(1, 16, 4), "Text Stay Length", "fill this dicsription later"),
+ new Param("textLength", new EntityTypes.Integer(1, 16, 4), "Text Stay Length", "How long the text will stay after the ending platform is reached."),
//praise
- new Param("success", "Well Done!", "Success Text", "fill this dicsription later"),
- new Param("fail", "Too bad...", "Fail Text", "fill this dicsription later"),
+ new Param("success", "Well Done!", "Success Text", "Text to display if the input is hit."),
+ new Param("fail", "Too bad...", "Fail Text", "Text to display if the input is missed."),
//destination
- new Param("destination", ChargingChicken.Destinations.Seattle, "Destination", "fill this dicsription later", new() {
+ new Param("destination", ChargingChicken.Destinations.Seattle, "Destination", "Which destination will be reached once the ending platform is reached.", new() {
new Param.CollapseParam((x, _) => (int)x == (int)0, new[] { "customDestination" }),
}),
- new Param("customDestination", "You arrived in The Backrooms!", "Custom Destination", "fill this dicsription later"),
+ new Param("customDestination", "You arrived in The Backrooms!", "Custom Destination", "Custom text to display once the ending platform is reached."),
},
defaultLength = 8,
resizable = true,
@@ -529,8 +528,7 @@ namespace HeavenStudio.Games
}
//chicken/water movement speed
- float newAnimScale = Util.EasingFunction.EaseOutQuad(1, 0, nextIsland.value1);
- if (nextIsland.isMoving) ChickenAnim.SetScaledAnimationSpeed((newAnimScale * 0.8f) + 0.4f);
+ if (nextIsland.isMoving) ChickenAnim.SetScaledAnimationSpeed((nextIsland.speed1 / 60) + 0.2f);
float waterFlowSpeed = (nextIsland.speed1 / 5.83f) + ((1f / Conductor.instance.pitchedSecPerBeat) * 0.2f);
if ((-waterFlowSpeed) - ((1f / Conductor.instance.pitchedSecPerBeat) * 0.4f) < 0)
{
@@ -599,6 +597,25 @@ namespace HeavenStudio.Games
public override void OnGameSwitch(double beat)
{
PersistThings(beat);
+
+ foreach(var entity in GameManager.instance.Beatmap.Entities)
+ {
+ if(entity.beat > beat + 4)
+ {
+ break;
+ }
+ if((entity.datamodel != "chargingChicken/input") || entity.beat + entity.length < beat) //check for charge that happen right before the switch
+ {
+ continue;
+ }
+
+ if(entity.datamodel == "chargingChicken/input")
+ {
+ var e = entity;
+ double lateness = entity.beat - beat;
+ ChargeUp(e.beat, e.length, lateness /*e["forceHold"]*/, e["drumbeat"], e["bubble"], e["endText"], e["textLength"], e["success"], e["fail"], e["destination"], e["customDestination"]);
+ }
+ }
}
private void Awake()
@@ -635,46 +652,96 @@ namespace HeavenStudio.Games
}, forcePlay: true);
}
- public void ChargeUp(double beat, double actualLength, bool forceHold, int whichDrum, bool bubble = false, int endText = 0, int textLength = 4, string successText = "", string failText = "", int destination = 1, string customDestination = "You arrived in The Backrooms!")
+ public void ChargeUp(double beat, double actualLength, double lateness, int whichDrum, bool bubble = false, int endText = 0, int textLength = 4, string successText = "", string failText = "", int destination = 1, string customDestination = "You arrived in The Backrooms!")
{
- //convert length to an integer, which is at least 2
+ //convert length to an integer, which is at least 4
double length = Math.Ceiling(actualLength);
if (length < 4) length = 4;
+ yardsTextLength = length;
+ double journeyBeat = beat + yardsTextLength;
+
//hose count animation
- nextIsland.ChargerArmCountIn(beat);
+ nextIsland.ChargerArmCountIn(beat, lateness);
//cancel previous success animation if needed
successAnimationKillOnBeat = beat - 1;
+ //emergency spawnjourney so game switch inputs don't break
+ if (lateness < 1) SpawnJourney(journeyBeat, yardsTextLength - 1);
+
//input
- switch(whichDrum)
+ if (lateness > 0)
{
- case 0: ScheduleInput(beat - 1, 1, InputAction_BasicPress, StartChargingJust, StartChargingMiss, Nothing); break;
- case 5: ScheduleInput(beat - 1, 1, InputAction_BasicPress, StartChargingJustBreak, StartChargingMiss, Nothing); break;
- default: ScheduleInput(beat - 1, 1, InputAction_BasicPress, StartChargingJustMusic, StartChargingMiss, Nothing); break;
+ switch(whichDrum)
+ {
+ case 0: ScheduleInput(beat - 1, 1, InputAction_BasicPress, StartChargingJust, StartChargingMiss, Nothing); break;
+ case 5: ScheduleInput(beat - 1, 1, InputAction_BasicPress, StartChargingJustBreak, StartChargingMiss, Nothing); break;
+ default: ScheduleInput(beat - 1, 1, InputAction_BasicPress, StartChargingJustMusic, StartChargingMiss, Nothing); break;
+ }
}
- ScheduleInput(beat, length, InputAction_BasicRelease, EndChargingJust, EndChargingMiss, Nothing);
+ else
+ {
+ if (PlayerInput.GetIsAction(InputAction_BasicPressing) || GameManager.instance.autoplay)
+ {
+ //sound
+ if (lateness == 0)
+ {
+ switch(whichDrum)
+ {
+ case 5:
+ {
+ SoundByte.PlayOneShotGame("chargingChicken/AMEN1");
+ break;
+ }
+ default:
+ {
+ SoundByte.PlayOneShotGame("chargingChicken/kick");
+ SoundByte.PlayOneShotGame("chargingChicken/hihat");
+ break;
+ }
+ }
+ }
+ isInputting = true; //starts the drums
+
+ //chicken animation
+ ChickenAnim.DoScaledAnimationAsync("Charge", 0.5f);
+
+ //hose animation
+ currentIsland.ChargingAnimation();
+ if (lateness > -1) canBlastOff = false;
+ else canBlastOff = true;
+ }
+ else
+ {
+ currentIsland.ChargerAnim.DoScaledAnimationAsync("Idle", 0.5f);
+ }
+ }
+
+ var releaseInput = ScheduleInput(beat, length, InputAction_BasicRelease, EndChargingJust, EndChargingMiss, Nothing);
+
+ releaseInput.IsHittable = () => {
+ return isInputting;
+ };
//set up the big beataction
var actions = new List();
//"X yards to goal" text, spawn the journey
- yardsTextLength = length;
- double journeyBeat = beat + yardsTextLength;
actions.Add(new(beat - 2, delegate {
string yardsTextStringTemp = yardsTextString.Replace("%", $"{yardsTextLength}");
yardsText.text = yardsTextStringTemp;
yardsTextIsEditable = true;
- SpawnStones(journeyBeat, yardsTextLength - 1);
+ SpawnStones(journeyBeat, yardsTextLength - 1, lateness < 2);
}));
//chicken ducks into the car window, and the bubble text is set up, and the platform noise plays, and next island spawns
actions.Add(new(beat - 1, delegate {
- ChickenAnim.DoScaledAnimationAsync("Prepare", 0.5f);
+ if (lateness >= 1) ChickenAnim.DoScaledAnimationAsync("Prepare", 0.5f);
+ if (lateness > 0 && lateness < 1) ChickenAnim.DoScaledAnimationAsync("Idle", 0.5f);
bubbleEndCount = beat + length;
- SoundByte.PlayOneShotGame("chargingChicken/SE_CHIKEN_BLOCK_SET");
- SpawnJourney(journeyBeat, yardsTextLength - 1);
+ if (lateness >= 2) SoundByte.PlayOneShotGame("chargingChicken/SE_CHIKEN_BLOCK_SET");
+ if (lateness >= 1) SpawnJourney(journeyBeat, yardsTextLength - 1);
}));
//spawns the countdown bubble, allows stones to fall, resets the success anim killer
@@ -791,6 +858,7 @@ namespace HeavenStudio.Games
public List PlayDrumLoop(double beat, int whichDrum, double length)
{
+
//create the beat action
var actions = new List();
@@ -808,7 +876,7 @@ namespace HeavenStudio.Games
if (length > drumLoop.timing)
{
actions.Add(new(beat + drumLoop.timing, delegate {
- PlayDrum(drumTypeInterpreted, drumLoop.volume);
+ PlayDrum(drumTypeInterpreted, drumLoop.volume, beat + drumLoop.timing);
}));
}
}
@@ -817,9 +885,9 @@ namespace HeavenStudio.Games
return actions;
}
- public void PlayDrum(string whichDrum, float drumVolumeThis)
+ public void PlayDrum(string whichDrum, float drumVolumeThis, double lateness)
{
- if (isInputting) SoundByte.PlayOneShotGame(whichDrum, volume: drumVolumeThis * drumVolume);
+ if (isInputting && (lateness == (Math.Floor(Conductor.instance.songPositionInBeatsAsDouble * 4) / 4))) SoundByte.PlayOneShotGame(whichDrum, volume: drumVolumeThis * drumVolume);
}
public void PumpBeat()
@@ -865,7 +933,7 @@ namespace HeavenStudio.Games
});
}
- public void SpawnStones(double beat, double length)
+ public void SpawnStones(double beat, double length, bool tooLate)
{
stonePlatformJourney = new StonePlatform[(int)(length * 4 - 1)];
for ( int i = 0; i < length * 4 - 1; i++ )
@@ -879,7 +947,7 @@ namespace HeavenStudio.Games
stone = a.thisPlatform;
stone.transform.localPosition = new Vector3((float)(((a.stoneNumber + 1) * platformDistanceConstant) + (platformDistanceConstant / 2)), 0, 0);
stone.BecomeStonePlatform(a.stoneNumber);
- stone.StoneFall(a.stoneNumber);
+ stone.StoneFall(a.stoneNumber, tooLate);
stone.isBeingSet = true;
stone.journeySave = length * platformDistanceConstant * platformsPerBeat + (platformDistanceConstant / 2);
diff --git a/Assets/Scripts/Games/ChargingChicken/Island.cs b/Assets/Scripts/Games/ChargingChicken/Island.cs
index 6c9aa7f2d..899f9c812 100644
--- a/Assets/Scripts/Games/ChargingChicken/Island.cs
+++ b/Assets/Scripts/Games/ChargingChicken/Island.cs
@@ -89,14 +89,14 @@ namespace HeavenStudio.Games.Scripts_ChargingChicken
//island methods
#region Island Methods
- public void ChargerArmCountIn(double beat)
+ public void ChargerArmCountIn(double beat, double lateness)
{
BeatAction.New(GameManager.instance, new List()
{
- new BeatAction.Action(beat - 4, delegate { this.ChargerAnim.DoScaledAnimationAsync("Prep1", 0.5f); }),
- new BeatAction.Action(beat - 3, delegate { this.ChargerAnim.DoScaledAnimationAsync("Prep2", 0.5f); }),
- new BeatAction.Action(beat - 2, delegate { this.ChargerAnim.DoScaledAnimationAsync("Prep3", 0.5f); }),
- new BeatAction.Action(beat - 1, delegate { this.ChargerAnim.DoScaledAnimationAsync("Prep4", 0.5f); }),
+ new BeatAction.Action(beat - 4, delegate { if (lateness > 3) ChargerAnim.DoScaledAnimationAsync("Prep1", 0.5f); }),
+ new BeatAction.Action(beat - 3, delegate { if (lateness > 2) ChargerAnim.DoScaledAnimationAsync("Prep2", 0.5f); }),
+ new BeatAction.Action(beat - 2, delegate { if (lateness > 1) ChargerAnim.DoScaledAnimationAsync("Prep3", 0.5f); }),
+ new BeatAction.Action(beat - 1, delegate { if (lateness > 0) ChargerAnim.DoScaledAnimationAsync("Prep4", 0.5f); }),
});
}
@@ -156,8 +156,9 @@ namespace HeavenStudio.Games.Scripts_ChargingChicken
}
- public void StoneFall(int offset)
+ public void StoneFall(int offset, bool tooLate)
{
+ if (tooLate) return;
PlatformAnim.DoScaledAnimation("Set", Conductor.instance.songPositionInBeatsAsDouble + ((double)offset / 64), 0.5f);
PlatformAnim.speed = (1f / Conductor.instance.pitchedSecPerBeat) * 0.5f;
}