Fixes to days 4 and 5

fielddaylab · Nov 22, 2024 · a5fd440 · a5fd440
1 parent e5cd141
commit a5fd440
Show file tree

Hide file tree

Showing 11 changed files with 210 additions and 68 deletions.
diff --git a/Assets/Scenes/ExteriorScene.unity b/Assets/Scenes/ExteriorScene.unity
@@ -14647,10 +14647,6 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: -0.11368506
       objectReference: {fileID: 0}
-    - target: {fileID: 3521140761025887371, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
-      propertyPath: Interactable
-      value: 
-      objectReference: {fileID: 1343413673}
     - target: {fileID: 4428655853343178598, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
       propertyPath: m_LocalRotation.y
       value: -0.0567863
@@ -14683,6 +14679,10 @@ PrefabInstance:
       propertyPath: m_LocalRotation.y
       value: 0.04187533
       objectReference: {fileID: 0}
+    - target: {fileID: 6129722569293967429, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -115
+      objectReference: {fileID: 0}
     - target: {fileID: 6240824283067790500, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
       propertyPath: m_BlendShapeWeights.Array.data[0]
       value: 100
@@ -17834,27 +17834,27 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Size.x
-      value: 0.44582236
+      value: 0.6177906
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Size.y
-      value: 0.724454
+      value: 1.1124674
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Size.z
-      value: 0.45829365
+      value: 0.47641638
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Center.x
-      value: 0.0056597358
+      value: 0.0916443
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Center.y
-      value: -0.1377728
+      value: 0.05623395
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Center.z
-      value: 0.14181136
+      value: -0.15338644
       objectReference: {fileID: 0}
     - target: {fileID: 7790958944598185306, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Name
@@ -18125,10 +18125,6 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: -0.11368506
       objectReference: {fileID: 0}
-    - target: {fileID: 3521140761025887371, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
-      propertyPath: Interactable
-      value: 
-      objectReference: {fileID: 1343413673}
     - target: {fileID: 4428655853343178598, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
       propertyPath: m_LocalRotation.y
       value: -0.0567863
@@ -19365,10 +19361,6 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: -0.11368506
       objectReference: {fileID: 0}
-    - target: {fileID: 3521140761025887371, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
-      propertyPath: Interactable
-      value: 
-      objectReference: {fileID: 1166507861}
     - target: {fileID: 4428655853343178598, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
       propertyPath: m_LocalRotation.y
       value: -0.0567863
@@ -21003,10 +20995,6 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: -0.11368506
       objectReference: {fileID: 0}
-    - target: {fileID: 3521140761025887371, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
-      propertyPath: Interactable
-      value: 
-      objectReference: {fileID: 1343413673}
     - target: {fileID: 4428655853343178598, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
       propertyPath: m_LocalRotation.y
       value: -0.0567863
@@ -22732,27 +22720,27 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Size.x
-      value: 0.4925349
+      value: 0.63043505
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Size.y
-      value: 0.724454
+      value: 1.1131016
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Size.z
-      value: 0.45829365
+      value: 0.5831368
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Center.x
-      value: 0.0056597358
+      value: 0.1195376
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Center.y
-      value: -0.1377728
+      value: 0.056551047
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Center.z
-      value: 0.14181136
+      value: 0.16265821
       objectReference: {fileID: 0}
     - target: {fileID: 7790958944598185306, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Name
@@ -23453,10 +23441,6 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: -0.11368506
       objectReference: {fileID: 0}
-    - target: {fileID: 3521140761025887371, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
-      propertyPath: Interactable
-      value: 
-      objectReference: {fileID: 1343413673}
     - target: {fileID: 4428655853343178598, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
       propertyPath: m_LocalRotation.y
       value: -0.0567863
@@ -23489,6 +23473,18 @@ PrefabInstance:
       propertyPath: m_LocalRotation.y
       value: 0.04187533
       objectReference: {fileID: 0}
+    - target: {fileID: 6129722569293967429, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6129722569293967429, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.336
+      objectReference: {fileID: 0}
+    - target: {fileID: 6129722569293967429, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.031
+      objectReference: {fileID: 0}
     - target: {fileID: 6240824283067790500, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
       propertyPath: m_BlendShapeWeights.Array.data[0]
       value: 100
@@ -24193,27 +24189,27 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Size.x
-      value: 0.4463607
+      value: 0.6288117
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Size.y
-      value: 0.724454
+      value: 1.0840145
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Size.z
       value: 0.5513256
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Center.x
-      value: 0.0056597358
+      value: 0.09688547
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Center.y
-      value: -0.1377728
+      value: 0.042007513
       objectReference: {fileID: 0}
     - target: {fileID: 7526956675130423219, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Center.z
-      value: 0.14181136
+      value: 0.14181137
       objectReference: {fileID: 0}
     - target: {fileID: 7790958944598185306, guid: 2042cdecad2ca3b46aa4e83bbb804ebc, type: 3}
       propertyPath: m_Name
@@ -32882,6 +32878,10 @@ PrefabInstance:
       propertyPath: Group
       value: 
       objectReference: {fileID: 1767987462}
+    - target: {fileID: 2036201704844791693, guid: a89c8dfdd21a94344ae5eb6f314a1685, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 2293835542313388820, guid: a89c8dfdd21a94344ae5eb6f314a1685, type: 3}
       propertyPath: m_LocalRotation.w
       value: 0.57928956
@@ -36234,10 +36234,26 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: -0.0023628257
       objectReference: {fileID: 0}
+    - target: {fileID: 6731110027708985846, guid: a6f24c04e572af542ad0e8ff5723fce3, type: 3}
+      propertyPath: m_ClassName.m_Source
+      value: LegSocketPolo
+      objectReference: {fileID: 0}
+    - target: {fileID: 6731110027708985846, guid: a6f24c04e572af542ad0e8ff5723fce3, type: 3}
+      propertyPath: m_ClassName.m_HashValue
+      value: 163117090
+      objectReference: {fileID: 0}
     - target: {fileID: 7767585136232926980, guid: a6f24c04e572af542ad0e8ff5723fce3, type: 3}
       propertyPath: Mate
       value: 
       objectReference: {fileID: 0}
+    - target: {fileID: 7888648229434349255, guid: a6f24c04e572af542ad0e8ff5723fce3, type: 3}
+      propertyPath: m_ClassName.m_Source
+      value: LegSocketPolo
+      objectReference: {fileID: 0}
+    - target: {fileID: 7888648229434349255, guid: a6f24c04e572af542ad0e8ff5723fce3, type: 3}
+      propertyPath: m_ClassName.m_HashValue
+      value: 163117090
+      objectReference: {fileID: 0}
     - target: {fileID: 7986292199147148808, guid: a6f24c04e572af542ad0e8ff5723fce3, type: 3}
       propertyPath: m_LocalRotation.x
       value: 0.097012244
@@ -36369,6 +36385,10 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: -0.0023628257
       objectReference: {fileID: 0}
+    - target: {fileID: 4207027970574075507, guid: acdc837baafe7fe43b724a46199e72dd, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5180792058877666255, guid: acdc837baafe7fe43b724a46199e72dd, type: 3}
       propertyPath: m_LocalRotation.y
       value: -0.0567863
@@ -36807,10 +36827,6 @@ PrefabInstance:
       propertyPath: m_Id.m_HashValue
       value: 2059920595
       objectReference: {fileID: 0}
-    - target: {fileID: 3521140761025887371, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
-      propertyPath: Interactable
-      value: 
-      objectReference: {fileID: 1343413673}
     - target: {fileID: 4428655853343178598, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
       propertyPath: m_LocalRotation.y
       value: -0.0567863
@@ -37552,6 +37568,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 40.55884
       objectReference: {fileID: 0}
+    - target: {fileID: 1578050619069278830, guid: f5dcd8a3a32e6d944aee725f65882c59, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1617075120283938551, guid: f5dcd8a3a32e6d944aee725f65882c59, type: 3}
       propertyPath: m_LocalRotation.w
       value: 0.57928956

diff --git a/Assets/_Assets/Data/Scripts/Day1/Day1.leaf b/Assets/_Assets/Data/Scripts/Day1/Day1.leaf
@@ -16,9 +16,6 @@ $call Wait(2)
 
 {@Player}   Wow, I can't believe I'm finally here!  $[Day1/Tent/Player_1]
 
-//$call LoadNextDay()
-//$stop
-
 {@Player}   Brr. Lola was right though... I should've packed an extra sweater.   $[Day1/Tent/Player_2]
 {@Player}   Alright, time to get focused. Those penguins aren’t gonna research themselves. $[Day1/Tent/Player_3]
 {@Player}   Step one: Find research tent. Check.    $[Day1/Tent/Player_4]

diff --git a/Assets/_Assets/Data/Scripts/Day2/Day2.leaf b/Assets/_Assets/Data/Scripts/Day2/Day2.leaf
@@ -19,9 +19,6 @@ $call Wait(2)
 
 {@Margo}   Mornin', kiddo!   $[Day2/Tent/2tm01]
 
-//$call LoadNextDay()
-//$stop
-
 {@Margo}   Jeepers... you look exhausted.   $[Day2/Tent/2tm02]
 {@Player}   Ugh. Is it that obvious?  $[Day2/Tent/Player_1]
 {@Player}   I couldn't sleep. I tried counting sheep, counting penguins, stress-eating candy bars . . .   $[Day2/Tent/Player_2]

diff --git a/Assets/_Assets/Data/Scripts/Day3/Day3.leaf b/Assets/_Assets/Data/Scripts/Day3/Day3.leaf
@@ -20,9 +20,6 @@ $call Wait(2)
 
 {@Margo}   Mornin’, kiddo! You’re up awfully early.   $[Day3/Tent/3tm01]
 
-//$call LoadNextDay()
-//$stop
-
 {@Player}   I was too excited to sleep.   $[Day3/Tent/Player_1]
 {@Player}   Some of the eggs have probably already hatched!  $[Day3/Tent/Player_2]
 {@Player}   I hope Alfredo’s doing okay. $[Day3/Tent/Player_3]

diff --git a/Assets/_Assets/Data/Scripts/Day4/Day4.leaf b/Assets/_Assets/Data/Scripts/Day4/Day4.leaf
@@ -17,10 +17,6 @@ $call Wait(2)
 @once
 
 {@Margo}   Mornin', kiddo.   $[Day4/Tent/4tm01]
-
-//$call LoadNextDay()
-//$stop
-
 {@Player}   Whoa… what’s all this?   $[Day4/Tent/Player_1]
 {@Margo}   Penny got up early to decorate. It’s one week til Christmas!  $[Day4/Tent/4tm02]
 {@Margo}    Sorry, no presents yet…. Santa usually shows up a little late here. $[Day4/Tent/4tm03]
@@ -204,6 +200,8 @@ $elseif chapter:wingCount == 2
 {@Margo}    No sweat, huh, kiddo?   $[Day4/Rookery/4rm21]
 {@Player}   Okay, okay . . . maybe a little sweat.  $[Day4/Rookery/Player_17]
 $elseif chapter:wingCount == 3
+$call CompleteGoal("day4_band")
+$set chapter:finishedBands = true
 {@Margo}   Okey dokey, that’s everything we need!    $[Day4/Rookery/4rm22]
 {@Partner}  Nice work, new kid. $[Day4/Rookery/Partner_5]
 {@Partner}  If these penguins come back as adults, the tags will tell us who they are and when they were born. $[Day4/Rookery/Partner_6]
@@ -227,8 +225,6 @@ $elseif chapter:wingCount == 3
 {@Player}   Yeah. You’re right. $[Day4/Rookery/Player_24]
 {@Player}   But I still wish there was more I could do. $[Day4/Rookery/Player_25]
 {@Partner}  Aw, don’t look so down, new kid.    $[Day4/Rookery/Partner_19]
-$call CompleteGoal("day4_band")
-$set chapter:finishedBands = true
 $goto Day4.CheckCompletedTasks
 $endif
 
@@ -241,6 +237,7 @@ $set chapter:finishedObservations = true
 $call ClearGoals()
 $call Wait(0.3)
 $call CreateGoal("Day4_return", Return to tent)
+$call SetWarpActive(WarpBluffBack, true)
 {@Partner}  Why don’t you head back to the tent?    $[Day4/Rookery/Partner_20]
 {@Partner}  You and Margo need to analyze your data. And then we’ve got a little surprise for you.  $[Day4/Rookery/Partner_21]
 $else