diff --git a/Assets/Code/Tablet/Interact/TabletWarpPoint.cs b/Assets/Code/Tablet/Interact/TabletWarpPoint.cs index 89e60c9..61d3211 100644 --- a/Assets/Code/Tablet/Interact/TabletWarpPoint.cs +++ b/Assets/Code/Tablet/Interact/TabletWarpPoint.cs @@ -36,9 +36,12 @@ public enum ConnectionState { [NonSerialized] public ConnectionState IsConnected; [NonSerialized] public BitSet32 AllowedConnections = new BitSet32(Bits.AllU32); + [NonSerialized] public GameObject Visuals; + private void Awake() { this.CacheComponent(ref Highlightable); Highlightable.HighlightCollider.enabled = false; + Visuals = transform.GetChild(0).gameObject; } [LeafMember("SetWarpActive")] @@ -95,6 +98,7 @@ public enum TabletWarpPointGroup { static public class TabletWarpUtility { static public void UpdateWarpActivation(TabletWarpPoint warpPoint) { warpPoint.Highlightable.HighlightCollider.enabled = warpPoint.CanWarp && warpPoint.IsConnected == TabletWarpPoint.ConnectionState.Connected; + warpPoint.Visuals.SetActive(warpPoint.Highlightable.HighlightCollider.enabled); } } } \ No newline at end of file diff --git a/Assets/Scenes/ExteriorScene.unity b/Assets/Scenes/ExteriorScene.unity index 2c26dab..bfbe3c6 100644 --- a/Assets/Scenes/ExteriorScene.unity +++ b/Assets/Scenes/ExteriorScene.unity @@ -12402,6 +12402,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 123300934966727580, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: 572856652932118793, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 108.77301 @@ -12418,6 +12422,26 @@ PrefabInstance: propertyPath: m_StaticShadowCaster value: 1 objectReference: {fileID: 0} + - target: {fileID: 2720031147261870511, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalPosition.y + value: 0.189 + objectReference: {fileID: 0} + - target: {fileID: 2720031147261870511, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalPosition.z + value: -0.15899 + objectReference: {fileID: 0} + - target: {fileID: 2720031147261870511, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9962857 + objectReference: {fileID: 0} + - target: {fileID: 2720031147261870511, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalRotation.y + value: 0.086109705 + objectReference: {fileID: 0} + - target: {fileID: 2720031147261870511, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 9.87968 + objectReference: {fileID: 0} - target: {fileID: 2979857795312976314, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} propertyPath: m_LocalPosition.x value: -0 @@ -12470,6 +12494,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: 180 objectReference: {fileID: 0} + - target: {fileID: 4949455848620837871, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5965893825517049101, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -12482,6 +12510,30 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6941728528763666768, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalPosition.x + value: -0.419 + objectReference: {fileID: 0} + - target: {fileID: 6941728528763666768, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalPosition.y + value: 0.202 + objectReference: {fileID: 0} + - target: {fileID: 6941728528763666768, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalPosition.z + value: -0.1609 + objectReference: {fileID: 0} + - target: {fileID: 6941728528763666768, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalRotation.w + value: 0.99628574 + objectReference: {fileID: 0} + - target: {fileID: 6941728528763666768, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalRotation.y + value: 0.08610896 + objectReference: {fileID: 0} + - target: {fileID: 6941728528763666768, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 9.8796 + objectReference: {fileID: 0} - target: {fileID: 6978236146479966051, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} propertyPath: Radius value: 0.7 @@ -12562,6 +12614,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.x value: 107.14 objectReference: {fileID: 0} + - target: {fileID: 8209155609472952416, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8544159852637039925, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} propertyPath: m_LocalPosition.y value: 1.686 @@ -12578,6 +12634,30 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9221516506141850943, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalPosition.x + value: 0.4199 + objectReference: {fileID: 0} + - target: {fileID: 9221516506141850943, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalPosition.y + value: 0.18999 + objectReference: {fileID: 0} + - target: {fileID: 9221516506141850943, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalPosition.z + value: -0.1589 + objectReference: {fileID: 0} + - target: {fileID: 9221516506141850943, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9962857 + objectReference: {fileID: 0} + - target: {fileID: 9221516506141850943, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalRotation.y + value: 0.086109705 + objectReference: {fileID: 0} + - target: {fileID: 9221516506141850943, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 9.87968 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5163386019926680195, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} - {fileID: 3665020790509402093, guid: 5ea042e3b4ca1d44a9fc01c98b17dfdc, type: 3} @@ -16424,6 +16504,10 @@ PrefabInstance: propertyPath: Connections.Array.data[6] value: objectReference: {fileID: 1308555246} + - target: {fileID: 6242734612256736462, guid: 8845031c8df5d7741a16214bb425248d, type: 3} + propertyPath: Connections.Array.data[7] + value: + objectReference: {fileID: 1308555246} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -17170,7 +17254,7 @@ Light: m_RenderMode: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 2150635519 + m_Bits: 4096 m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 @@ -22377,13 +22461,17 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -0.074 objectReference: {fileID: 0} + - target: {fileID: 596762855704421168, guid: 8845031c8df5d7741a16214bb425248d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1686406579663379329, guid: 8845031c8df5d7741a16214bb425248d, type: 3} propertyPath: m_Name value: WarpTarget-Bluff-Back objectReference: {fileID: 0} - target: {fileID: 1686406579663379329, guid: 8845031c8df5d7741a16214bb425248d, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2634337146786843516, guid: 8845031c8df5d7741a16214bb425248d, type: 3} propertyPath: m_LocalScale.y @@ -24631,6 +24719,46 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1533061434} m_Modifications: + - target: {fileID: 3088678066043432964, guid: 39adb779c10ec644c8b0d2c33bc515a8, type: 3} + propertyPath: m_LocalPosition.x + value: 0.006 + objectReference: {fileID: 0} + - target: {fileID: 3088678066043432964, guid: 39adb779c10ec644c8b0d2c33bc515a8, type: 3} + propertyPath: m_LocalPosition.y + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 3088678066043432964, guid: 39adb779c10ec644c8b0d2c33bc515a8, type: 3} + propertyPath: m_LocalPosition.z + value: -0.001 + objectReference: {fileID: 0} + - target: {fileID: 3088678066043432964, guid: 39adb779c10ec644c8b0d2c33bc515a8, type: 3} + propertyPath: m_LocalRotation.w + value: -0.5178033 + objectReference: {fileID: 0} + - target: {fileID: 3088678066043432964, guid: 39adb779c10ec644c8b0d2c33bc515a8, type: 3} + propertyPath: m_LocalRotation.x + value: 0.04180197 + objectReference: {fileID: 0} + - target: {fileID: 3088678066043432964, guid: 39adb779c10ec644c8b0d2c33bc515a8, type: 3} + propertyPath: m_LocalRotation.y + value: -0.8511629 + objectReference: {fileID: 0} + - target: {fileID: 3088678066043432964, guid: 39adb779c10ec644c8b0d2c33bc515a8, type: 3} + propertyPath: m_LocalRotation.z + value: 0.0751941 + objectReference: {fileID: 0} + - target: {fileID: 3088678066043432964, guid: 39adb779c10ec644c8b0d2c33bc515a8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 4.8596 + objectReference: {fileID: 0} + - target: {fileID: 3088678066043432964, guid: 39adb779c10ec644c8b0d2c33bc515a8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 117.006 + objectReference: {fileID: 0} + - target: {fileID: 3088678066043432964, guid: 39adb779c10ec644c8b0d2c33bc515a8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 351.398 + objectReference: {fileID: 0} - target: {fileID: 5068428990202231474, guid: 39adb779c10ec644c8b0d2c33bc515a8, type: 3} propertyPath: m_LocalScale.x value: 0.86565 @@ -39798,6 +39926,10 @@ PrefabInstance: propertyPath: TabletCaseLocation value: objectReference: {fileID: 354119139} + - target: {fileID: 6242734612256736462, guid: 8845031c8df5d7741a16214bb425248d, type: 3} + propertyPath: Connections.Array.size + value: 7 + objectReference: {fileID: 0} - target: {fileID: 6242734612256736462, guid: 8845031c8df5d7741a16214bb425248d, type: 3} propertyPath: Connections.Array.data[1] value: diff --git a/Assets/_Assets/Data/Scripts/Day1/Day1.leaf b/Assets/_Assets/Data/Scripts/Day1/Day1.leaf index 4983669..82da2d7 100644 --- a/Assets/_Assets/Data/Scripts/Day1/Day1.leaf +++ b/Assets/_Assets/Data/Scripts/Day1/Day1.leaf @@ -4,18 +4,19 @@ @function ScenePrepare $call PlaceAndRotatePlayerAt(WarpDesk, true) $call SetAllWarpsActive(false) +$call FadeIn(2.0) :: StartGame @trigger SceneReady @who Player @once -$set global:level = 1 - $call Wait(2) -{@Player} Wow, I can't believe I'm finally here! $[Day1/Tent/Player_1] +$call SetWarpActive(WarpBluff, true) +$call CreateGoal("day1_outside", Warp outside) +{@Player} Wow, I can't believe I'm finally here! $[Day1/Tent/Player_1] {@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] @@ -47,13 +48,12 @@ $set chapter:hasTalkedToMargo = true {@Margo} Couldja peek out the front door with me? I can't wait to see who's here! $[Day1/Tent/Margo_12] {@Margo} Let's skedaddle! Use "Warp" to find the waypoint outside! $[Day1/Tent/Margo_13] -$call CreateGoal("day1_outside", Warp outside) -$call SetWarpActive(WarpBluff, true) :: WarpedOutsideTent @trigger AtWarpPoint @who Player @when targetObject == "WarpTarget-Bluff" +@interrupt @once $call TentDoor->Close() @@ -90,7 +90,6 @@ $call SetWarpGroupActive(Rookery, true) $call CreateGoal("day1_rookery", Warp inside rookery) - :: WarpedToRookery @trigger AtWarpPoint @who Player @@ -130,7 +129,16 @@ $call CreateGoal("band_purple", Scan penguin with purple band) :: OnPenguinIdentified @function TabletIdentified @when objectType == "BandedPenguin" +@interrupt + $set chapter:identifiedCount + 1 +$if chapter:identifiedCount >= 5 + $set chapter:allIdentified = true + $call SetWarpActive(WarpBluffBack, true) + $set chapter:finishedObservations = true + $call ClearGoals() + $call CreateGoal("day1_return", Return to tent) +$endif $if local:objectId == "RedAdelie" $call CompleteGoal("band_red") @@ -158,35 +166,19 @@ $elseif local:objectId == "PurpleAdelie" $endif $if chapter:identifiedCount >= 5 - $set chapter:allIdentified = true {@Margo} Great work kid! You've got your 5 penguins, $[Day1/Rookery/1rm20] {@Player} Awesome. The Fantastic Five! $[Day1/Rookery/1rs10] {@Player} Or . . . the Fintastic Five. Los Cinco Fintasticos? $[Day1/Rookery/1rs11] {@Margo} Yikes. You are new, huh? Penguins have flippers, not fins. $[Day1/Rookery/1rm21] {@Player} Let's head back. It's freezing out here! $[Day1/Rookery/1rs12] - $call TriggerResponse(ObjectiveCompleted) $endif -:: ObjectiveCompleted -@trigger ObjectiveCompleted -@who Player -@once -@interrupt - -$set chapter:finishedObservations = true -$call ClearGoals() - -$call Wait(0.3) -$call WarpBluffBack->Activate() -$call SetWarpActive(WarpBluffBack, true) - -$call CreateGoal("day1_return", Return to tent) - :: WarpedBackToTent @trigger AtWarpPoint @who Player @when chapter:finishedObservations, targetObject == "WarpTarget-Bluff-Back" @once +@interrupt $call Wait(1) $call TentDoor->Open() @@ -202,6 +194,7 @@ $call CreateGoal("day1_upload", Dock Margo to upload data) @when chapter:finishedObservations, targetObject == "WarpTarget-Desk" @interrupt +$call TentDoor->Close() $call CompleteGoal("day1_return") $call Wait(1) $call SetWarpActive(WarpDesk, true) @@ -231,7 +224,7 @@ $call CompleteGoal("day1_upload") {@Margo} Yep. Pro tip: invest in a good sleep mask. $[Day1/Tent/1tm26] {@Margo} See ya tomorrow, kid! $[Day1/Tent/1tm27] -$call FadeOut(1.0) +//$call FadeOut(1.0) $call Wait(2) $call LoadNextDay() diff --git a/Assets/_Assets/Data/Scripts/Day2/Day2.leaf b/Assets/_Assets/Data/Scripts/Day2/Day2.leaf index b4706ab..0c38e15 100644 --- a/Assets/_Assets/Data/Scripts/Day2/Day2.leaf +++ b/Assets/_Assets/Data/Scripts/Day2/Day2.leaf @@ -10,7 +10,7 @@ $call PlaceAndRotatePlayerAt(WarpDesk, true) $call SetAllWarpsActive(false) $call DayHeader->SetText(Nov 16) $call GPSTrackerPlate->Activate() -$call FadeIn(1.0) +$call FadeIn(2.0) $call Wait(2) :: StartGame @@ -18,6 +18,9 @@ $call Wait(2) @who Player @once +$call CreateGoal("Day2_outside", Warp outside) +$call SetWarpActive(WarpBluff, true) + {@Margo} Mornin', kiddo! $[Day2/Tent/2tm01] {@Margo} Jeepers... you look exhausted. $[Day2/Tent/2tm02] {@Player} I couldn't sleep. I tried counting sheep, counting penguins, stress-eating candy bars . . . $[Day2/Tent/Player_2] @@ -31,16 +34,12 @@ $call Wait(2) $call Wait(1) -$call SetWarpActive(WarpBluff, true) - {@Player} Sounds good to me. Let's get out there! $[Day2/Tent/Player_3] {@Margo} Got your cold weather gear on? $[Day2/Tent/2tm06] {@Player} All five layers of it. Plus some extra hand warmers. $[Day2/Tent/Player_4] {@Margo} Well, okey dokey, then. Looks like somebody's learnin'. $[Day2/Tent/2tm08] {@Margo} Whenever you're ready, point me at the door, and we'll head out to the Bluff! $[Day2/Tent/2tm09] -$call CreateGoal("Day2_outside", Warp outside) -$call SetWarpActive(WarpBluff, true) :: WarpedOutsideTent2 @trigger AtWarpPoint @@ -57,13 +56,13 @@ $call SetWarpActive(WarpBluff, false) $call TentDoor->Close() +$call PenguinCount->ActivateCount(12) + {@Player} Wow, look at them all! $[Day2/Bluff/Player_1] {@Margo} Yep, seems we've got some new arrivals. We'll need a new population count. $[Day2/Bluff/2bm01] {@Margo} You’ll also have two tasks down at the Rookery: retrieve your penguins’ GPS trackers, and see if they’ve paired up with a mate. $[Day2/Bluff/2bm02] {@Player} Hmmm, Maybe we should get a head count. $[Day2/Bluff/Player_3] -$call PenguinCount->ActivateCount(12) - $call CreateGoal("Day2_count", Count the penguin population) :: ScannedFromBluff2 @@ -75,6 +74,7 @@ $call CreateGoal("Day2_count", Count the penguin population) $call CompleteGoal("Day2_count") {@Margo} Great job, kid! We’ve got a new population count. $[Day2/Bluff/2bm04] + $call SetWarpGroupActive(Rookery, true) $call CreateGoal("Day2_rookery", Warp inside rookery) @@ -84,14 +84,12 @@ $call CreateGoal("Day2_rookery", Warp inside rookery) @when targetObject == "WarpTarget-Rookery" @once -$call CompleteGoal("Day2_rookery") - -$call Wait(1) - $call ClearGoals() - +$call CreateGoal("Day2_trackers", Retrieve 3 gps trackers from penguins) $call CreateGoal("Day2_mates", Identify the mates of the banded penguins) +$call Wait(1) + :: WarpedToRookeryMiddle2 @trigger AtWarpPoint @who Player @@ -100,13 +98,6 @@ $call CreateGoal("Day2_mates", Identify the mates of the banded penguins) $call Wait(2) -{@Margo} Okey dokey. Time to track down the Funtastic Five $[Day2/Rookery/2rm01] -{@Player} The Fliptastic Five. $[Day2/Rookery/Player_1] -{@Margo} And get an ID on their mates. $[Day2/Rookery/2rm02] -{@Player} How can I tell who their mates are? $[Day2/Rookery/Player_2] -{@Margo} You will need to look for the mating dances. $[Day2/Rookery/2rm03] -{@Player} Oh. Right. Got it. $[Day2/Rookery/Player_3] - $call ClearGoals() $call Daisy->SetInteractable(true) @@ -127,11 +118,20 @@ $call CreateGoal("id_fuzz", ID Fuzz's Mate) $call CreateGoal("id_winston", ID Winston's Mate) $call CreateGoal("id_polo", ID Polo's Mate) +{@Margo} Okey dokey. Time to track down the Funtastic Five $[Day2/Rookery/2rm01] +{@Player} The Fliptastic Five. $[Day2/Rookery/Player_1] +{@Margo} And get an ID on their mates. $[Day2/Rookery/2rm02] +{@Player} How can I tell who their mates are? $[Day2/Rookery/Player_2] +{@Margo} You will need to look for the mating dances. $[Day2/Rookery/2rm03] +{@Player} Oh. Right. Got it. $[Day2/Rookery/Player_3] + :: OnBillyIdentified @trigger TabletIdentified @when objectId == "Billy" -$set chapter:identifiedCount + 1 +@once +@interrupt +$set chapter:identifiedCount + 1 $call CompleteGoal("id_millie") {@Player} Looks like Millie paired up with her same mate from last year! $[Day2/Rookery/Player_4] @@ -143,8 +143,10 @@ $goto Day2.CheckAllMatesIdentified :: OnMeatballIdentified @function TabletIdentified @when objectId == "Meatball" -$set chapter:identifiedCount + 1 +@once +@interrupt +$set chapter:identifiedCount + 1 $call CompleteGoal("id_alfredo") {@Margo} Hmmm. Alfredo’s mate doesn’t have a tag. Looks like a newbie. $[Day2/Rookery/2rm04] @@ -155,12 +157,13 @@ $call CompleteGoal("id_alfredo") $goto Day2.CheckAllMatesIdentified - :: OnDaisyIdentified @function TabletIdentified @when objectId == "Daisy" -$set chapter:identifiedCount + 1 +@once +@interrupt +$set chapter:identifiedCount + 1 $call CompleteGoal("id_fuzz") {@Margo} Hmm. Fuzz and Daisy. Interesting. $[Day2/Rookery/2rm07] @@ -176,8 +179,10 @@ $goto Day2.CheckAllMatesIdentified :: OnWendyIdentified @function TabletIdentified @when objectId == "Wendy" -$set chapter:identifiedCount + 1 +@once +@interrupt +$set chapter:identifiedCount + 1 $call CompleteGoal("id_winston") {@Margo} Aw, Winston and Wendy! I was hopin' they'd find each other again. $[Day2/Rookery/2rm11] @@ -188,8 +193,10 @@ $goto Day2.CheckAllMatesIdentified :: OnBenniIdentified @function TabletIdentified @when objectId == "Benni" -$set chapter:identifiedCount + 1 +@once +@interrupt +$set chapter:identifiedCount + 1 $call CompleteGoal("id_polo") {@Margo} Ooh, Benni and Polo! What a good match. $[Day2/Rookery/2rm13] @@ -202,22 +209,17 @@ $goto Day2.CheckAllMatesIdentified $if chapter:finishedObservations == true, chapter:finishedTrackers == true {@Margo} Okay, that’s all the data we need! $[Day2/Rookery/2rm25] {@Margo} When you're ready we can head back to the research tent and analyze our data. $[Day2/Rookery/2rm26] - $call WarpBluffBack->Activate() $call SetWarpActive(WarpBluffBack, true) $set chapter:finishedAllObservations = true - $call CreateGoal("Day2_trackers", Retrieve 3 gps trackers from penguins) - $call CreateGoal("Day2_mates", Identify the mates of the banded penguins) - $call CompleteGoal("Day2_mates") - $call CompleteGoal("Day2_trackers") $call CreateGoal("Day2_return", Return to tent) $elseif chapter:finishedObservations == true, chapter:finishedTrackers == false $call CreateGoal("Day2_trackers", Retrieve 3 gps trackers from penguins) $call CreateGoal("Day2_mates", Identify the mates of the banded penguins) $call CompleteGoal("Day2_mates") $elseif chapter:finishedObservations == false, chapter:finishedTrackers == true - $call CreateGoal("Day2_mates", Identify the mates of the banded penguins) $call CreateGoal("Day2_trackers", Retrieve 3 gps trackers from penguins) $call CompleteGoal("Day2_trackers") + $call CreateGoal("Day2_mates", Identify the mates of the banded penguins) $endif :: CheckAllMatesIdentified @@ -234,12 +236,8 @@ $endif @when targetObject == "WarpTarget-RookeryFar" @once -$call CompleteGoal("Day2_warp_far") - $call Wait(2) -$call CreateGoal("Day2_trackers", Retrieve 3 gps trackers from penguins) - $call FuzzLegTracker->Activate() $call AlfredoLegTracker->Activate() $call WinstonLegTracker->Activate() @@ -321,6 +319,7 @@ $call CreateGoal("Day2_upload", Dock Margo to upload data) @when chapter:finishedAllObservations, targetObject == "WarpTarget-Desk" @interrupt +$call TentDoor->Close() $call CompleteGoal("Day2_return") $call Wait(1) $call SetWarpActive(WarpDesk, true) @@ -350,7 +349,7 @@ $call CompleteGoal("Day2_upload") {@Margo} Yeah, ya got that right. $[Day2/Tent/2tm18] {@Margo} You better stock up on more candy... I don't think you'll be gettin' much sleep tonight. $[Day2/Tent/2tm19] -$call FadeOut(1.0) +//$call FadeOut(1.0) $call Wait(2) $call LoadNextDay() \ No newline at end of file diff --git a/Assets/_Assets/Data/Scripts/Day3/Day3.leaf b/Assets/_Assets/Data/Scripts/Day3/Day3.leaf index 7d757e0..6b78192 100644 --- a/Assets/_Assets/Data/Scripts/Day3/Day3.leaf +++ b/Assets/_Assets/Data/Scripts/Day3/Day3.leaf @@ -13,7 +13,7 @@ $call GPSTrackerPlate->Deactivate() $call DataLoggerPlate->Activate() $call Clouds->Activate() $call Skuas->Activate() -$call FadeIn(1.0) +$call FadeIn(2.0) $call Wait(2) :: StartGame @@ -23,8 +23,10 @@ $call Wait(2) $call Wait(2) -{@Margo} Mornin’, kiddo! You’re up awfully early. $[Day3/Tent/3tm01] +$call CreateGoal("Day3_outside", Warp outside) +$call SetWarpActive(WarpBluff, true) +{@Margo} Mornin’, kiddo! You’re up awfully early. $[Day3/Tent/3tm01] {@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] @@ -34,16 +36,12 @@ $call Wait(2) {@Margo} Ha. Relax, kiddo, I’m teasin’. $[Day3/Tent/3tm03] {@Margo} Let’s get out there and see how your Fabulous Five are doin’. $[Day3/Tent/3tm04] -$call Wait(1) - -$call CreateGoal("Day3_outside", Warp outside) -$call SetWarpActive(WarpBluff, true) - :: WarpedOutsideTent @trigger AtWarpPoint @who Player @when targetId == "WarpBluff" @once +@interrupt $call TentDoor->Close() $call CompleteGoal("Day3_outside") @@ -52,20 +50,19 @@ $call Wait(1) $call SetWarpActive(WarpBluff, false) +$call CreateGoal("Day3_rookery", Warp inside rookery) +$call SetWarpGroupActive(Rookery, true) + {@Player} What’s on our list for today? $[Day3/Bluff/Player_1] {@Margo} We need to get some data on those chicks, and see how the parents are doin'. $[Day3/Bluff/3bm01] {@Margo} Let’s head down to the Rookery. Looks like Penny is already there. $[Day3/Bluff/3bm02] -$call CreateGoal("Day3_rookery", Warp inside rookery) -$call SetWarpGroupActive(Rookery, true) - :: WarpedToRookery @trigger AtWarpPoint @who Player @when targetId == "WarpRookery" @once - -$call SetWarpGroupActive(Rookery, false) +@interrupt $call FuzzEgg->Activate() $call AlfredoEgg->Activate() @@ -78,6 +75,11 @@ $call CompleteGoal("Day3_rookery") $call Wait(1) $call ClearGoals() +$call SetWarpGroupActive(Rookery, true) + +$call CreateGoal("day3_regurg", Observe a penguin feeding their chick for diet data) +$call CreateGoal("day3_back_trackers", Place trackers on 3 penguin backs) +$call CreateGoal("day3_scan", Scan nests eggs and chicks) {@Player} Oh. My. God. They’re amazing! $[Day3/Rookery/Player_1] {@Partner} Hey there, new kid. $[Day3/Rookery/Partner_1] @@ -98,17 +100,12 @@ $call ClearGoals() {@Partner} Oh… and you don’t know what happened to the last slice of pumpkin pie, do you? $[Day3/Rookery/Partner_11] {@Player} Oh, uh… sorry. do you want some of my champurrado? $[Day3/Rookery/Player_7] -$call SetWarpGroupActive(Rookery, true) - -$call CreateGoal("day3_regurg", Observe a penguin feeding their chick for diet data) -$call CreateGoal("day3_back_trackers", Place trackers on 3 penguin backs) -$call CreateGoal("day3_scan", Scan nests, eggs, and chicks) - :: WarpedToRookeryMiddle @trigger AtWarpPoint @who Player @when targetId == "WarpRookeryMiddle" @once +@interrupt $call AlfredoEgg->Activate() $call FuzzEgg->Activate() @@ -136,8 +133,10 @@ $call CreateGoal("id_polo_nest", Scan Polo's Nest) :: OnMillieBillyIdentified @function TabletIdentified @when objectId == "MillieBillyChick" -$set chapter:identifiedCount + 1 +@once +@interrupt +$set chapter:identifiedCount + 1 $call CompleteGoal("id_millie_nest") {@Player} Yes! Millie and Billy have hatched a healthy chick! $[Day3/Rookery/Player_8] @@ -148,8 +147,10 @@ $goto Day3.CheckAllNestsIdentified :: OnAlfredoEggIdentified @function TabletIdentified @when objectId == "AlfredoEgg" -$set chapter:identifiedCount + 1 +@once +@interrupt +$set chapter:identifiedCount + 1 //play egg hatching animation $call AlfredoEgg->Hatch() $call CompleteGoal("id_alfredo_nest") @@ -160,12 +161,13 @@ $call CompleteGoal("id_alfredo_nest") $goto Day3.CheckAllNestsIdentified - :: OnFuzzEggIdentified @function TabletIdentified @when objectId == "FuzzEgg" -$set chapter:identifiedCount + 1 +@once +@interrupt +$set chapter:identifiedCount + 1 $call CompleteGoal("id_fuzz_nest") {@Player} Uh oh. Something’s not right here. $[Day3/Rookery/Player_10] @@ -181,8 +183,10 @@ $goto Day3.CheckAllNestsIdentified :: OnWinstonWendyIdentified @function TabletIdentified @when objectId == "WinstonWendyChick" -$set chapter:identifiedCount + 1 +@once +@interrupt +$set chapter:identifiedCount + 1 $call CompleteGoal("id_winston_nest") {@Player} Nice. A new chick for Winston and Wendy! $[Day3/Rookery/Player_13] @@ -195,8 +199,10 @@ $goto Day3.CheckAllNestsIdentified :: OnPoloNestIdentified @function TabletIdentified @when objectId == "PoloNest" -$set chapter:identifiedCount + 1 +@once +@interrupt +$set chapter:identifiedCount + 1 $call CompleteGoal("id_polo_nest") {@Player} Whoa, wait a second. Weren’t there an egg here yesterday? $[Day3/Rookery/Player_15] @@ -220,6 +226,7 @@ $endif @who Player @when targetId == "WarpRookeryBack" @once +@interrupt {@Margo} We need to get some data on what the parents are feeding their young. $[Day3/Rookery/3rm14] {@Margo} See if you can get some pictures of them feeding. I’ll let you know when we’ve got enough data. $[Day3/Rookery/3rm15] @@ -239,6 +246,7 @@ $endif @trigger TabletIdentified @when objectId == "GreenAdelie" @once +@interrupt {@Player} Wow… that’s slightly disgusting. $[Day3/Rookery/Player_18] {@Margo} Says the guy with pumpkin pie on his face. $[Day3/Rookery/3rm16] @@ -255,6 +263,7 @@ $goto Day3.CheckAllComplete @who Player @when targetId == "WarpRookerySide" @once +@interrupt $call DataTracker1->Activate() $call DataTracker2->Activate() @@ -273,6 +282,8 @@ $call SocketObjectTo(DataTracker3, GPSSocketLeft) @trigger ObjectSocketed @who Player @when objectType == "DataTracker", socketType == "DataSocketPenguin" +@interrupt + $set chapter:trackerSocketedCount + 1 $if chapter:trackerSocketedCount == 1 @@ -300,12 +311,11 @@ $call ClearGoals() $call Wait(0.3) $call CreateGoal("day3_regurg", Observe a penguin feeding their chick for diet data) $call CreateGoal("day3_back_trackers", Place trackers on 3 penguin backs) -$call CreateGoal("day3_scan", Scan nests, eggs, and chicks) +$call CreateGoal("day3_scan", Scan nests eggs and chicks) $call CompleteGoal("day3_regurg") $call CompleteGoal("day3_back_trackers") $call CompleteGoal("day3_scan") $call CreateGoal("Day3_return", Return to tent) -$call WarpBluffBack->Activate() $call SetWarpActive(WarpBluffBack, true) {@Player} Okay. Is that everything for today? $[Day3/Rookery/Player_20] {@Margo} Yep, looks like we've got all the data we need! $[Day3/Rookery/3rm24] @@ -317,11 +327,11 @@ $else $call ClearGoals() $call CreateGoal("day3_regurg", Observe a penguin feeding their chick for diet data) $call CreateGoal("day3_back_trackers", Place trackers on 3 penguin backs) -$call CreateGoal("day3_scan", Scan nests, eggs, and chicks) +$call CreateGoal("day3_scan", Scan nests eggs and chicks) $if chapter:trackersSocketed == true $call CompleteGoal("day3_back_trackers") $endif -$if chapter:regurgDone == false +$if chapter:regurgDone == true $call CompleteGoal("day3_regurg") $endif $if chapter:finishedObservations == true @@ -376,7 +386,7 @@ $call CompleteGoal("Day3_upload") {@Margo} Assuming the skua don't get to 'em first. $[Day3/Tent/3tm14] {@Margo} Nice work, kid. Another good day's work! $[Day3/Tent/3tm15] -$call FadeOut(1.0) +//$call FadeOut(1.0) $call Wait(2) $call LoadNextDay() diff --git a/Assets/_Assets/Data/Scripts/Day4/Day4.leaf b/Assets/_Assets/Data/Scripts/Day4/Day4.leaf index 9e2f367..0e92e21 100644 --- a/Assets/_Assets/Data/Scripts/Day4/Day4.leaf +++ b/Assets/_Assets/Data/Scripts/Day4/Day4.leaf @@ -8,10 +8,10 @@ $call ClearGoals() $call PlaceAndRotatePlayerAt(WarpDesk, true) $call SetAllWarpsActive(false) $call CorralChicks->Activate() -$call DataLoggerPlate->Activate() -$call ChickBandPlate->Activate() + + $call DayHeader->SetText(Dec 18) -$call FadeIn(1.0) +$call FadeIn(2.0) $call Wait(2) :: StartGame @@ -20,6 +20,7 @@ $call Wait(2) @once $call SetWarpActive(WarpBluff, true) +$call CreateGoal("Day4_outside", Warp outside) {@Margo} Mornin', kiddo. $[Day4/Tent/4tm01] {@Player} Whoa… what’s all this? $[Day4/Tent/Player_1] @@ -39,8 +40,6 @@ $call SetWarpActive(WarpBluff, true) $call Wait(1) -$call CreateGoal("Day4_outside", Warp outside) - :: WarpedOutsideTent @trigger AtWarpPoint @who Player @@ -68,9 +67,12 @@ $call CompleteGoal("Day4_rookery") $call Wait(1) -$call SetWarpGroupActive(Rookery, false) +$call SetWarpGroupActive(Rookery, true) $call ClearGoals() +$call CreateGoal("day4_gate", Scan the Weigh Gate) +$call CreateGoal("day4_loggers", Collect 3 Data Loggers) +$call CreateGoal("day4_band", Band 3 Chicks) {@Player} Whoa… look at them! I keep forgetting how funny the chicks look these days. $[Day4/Rookery/Player_1] {@Partner} Isn’t it great? We call this their awkward-teenager stage. $[Day4/Rookery/Partner_1] @@ -88,18 +90,12 @@ $call ClearGoals() {@Margo} And we’ll need to band 3 of the chicks. $[Day4/Rookery/4rm04] {@Player} Got it. Let’s get to work. $[Day4/Rookery/Player_7] -$call SetWarpGroupActive(Rookery, true) - -$call ClearGoals() -$call CreateGoal("day4_gate", Scan the Weigh Gate) -$call CreateGoal("day4_loggers", Collect 3 Data Loggers) -$call CreateGoal("day4_band", Band 3 Chicks) - :: WarpedToRookeryGate @trigger AtWarpPoint @who Player @when targetObject == "WarpTarget-RookeryFar" @once +@interrupt $call WeighGate->SetInteractable(true) @@ -122,7 +118,19 @@ $goto Day4.CheckCompletedTasks @trigger AtWarpPoint @who Player @when targetObject == "WarpTarget-RookeryMiddle" -@once +@interrupt + +$call DataLoggerPlate->Activate() +$call GPSSocketRight->Activate() +$call GPSSocketMiddle->Activate() +$call GPSSocketLeft->Activate() +$call ChickBandPlate->Deactivate() +$call BandSocketRight->Deactivate() +$call BandSocketMiddle->Deactivate() +$call BandSocketLeft->Deactivate() +$call WingBand1->Deactivate() +$call WingBand2->Deactivate() +$call WingBand3->Deactivate() $call SocketObjectTo(DataTrackerBack1, DataSocketBack1) $call SocketObjectTo(DataTrackerBack2, DataSocketBack2) @@ -161,7 +169,22 @@ $endif @trigger AtWarpPoint @who Player @when targetObject == "WarpTarget-RookeryCorral" -@once +@interrupt + +$call DataLoggerPlate->Deactivate() +$call GPSSocketRight->Deactivate() +$call GPSSocketMiddle->Deactivate() +$call GPSSocketLeft->Deactivate() +$call DataTrackerBack1->SetMeshEnabled(false) +$call DataTrackerBack2->SetMeshEnabled(false) +$call DataTrackerBack3->SetMeshEnabled(false) +$call DataTrackerBack4->SetMeshEnabled(false) +$call DataTrackerBack5->SetMeshEnabled(false) + +$call ChickBandPlate->Activate() +$call BandSocketRight->Activate() +$call BandSocketMiddle->Activate() +$call BandSocketLeft->Activate() $call WingBand1->Activate() $call WingBand2->Activate() @@ -171,6 +194,8 @@ $call SocketObjectTo(WingBand1, BandSocketRight) $call SocketObjectTo(WingBand2, BandSocketMiddle) $call SocketObjectTo(WingBand3, BandSocketLeft) +$set chapter:wingCount = 0 + {@Margo} Okay, kiddo. Time to band the chicks. $[Day4/Rookery/4rm14] {@Margo} Fair warning… This job isn’t for the faint of heart. $[Day4/Rookery/4rm15] {@Player} Oh, come on. They're, like, half the size of the grown-ups. How hard can it be? $[Day4/Rookery/Player_9] @@ -239,7 +264,7 @@ $set chapter:finishedObservations = true $call ClearGoals() $call Wait(0.3) $call CreateGoal("Day4_return", Warp inside) -$call WarpBluffBack->Activate() + $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] @@ -264,6 +289,7 @@ $endif @who Player @when chapter:finishedObservations, targetObject == "WarpTarget-Bluff-Back" @once +@interrupt $call Wait(1) $call TentDoor->Open() @@ -277,6 +303,7 @@ $call SetWarpActive(WarpDesk, true) @when chapter:finishedObservations, targetObject == "WarpTarget-Desk" @interrupt +$call TentDoor->Close() $call CreateGoal("Day4_upload", Dock Margo to upload data) $call CompleteGoal("Day4_return") $call Wait(1) @@ -311,7 +338,7 @@ $call CompleteGoal("Day4_upload") {@Player} Claro que si! $[Day4/Tent/Player_13] {@Player} Are you ready for the grand tour? I’ve got these five new friends I think you’re going to love. $[Day4/Tent/Player_14] -$call FadeOut(1.0) +//$call FadeOut(1.0) $call Wait(2) $call LoadNextDay() \ No newline at end of file diff --git a/Assets/_Assets/Data/Scripts/Day5/Day5.leaf b/Assets/_Assets/Data/Scripts/Day5/Day5.leaf index 1fd7225..2338fcb 100644 --- a/Assets/_Assets/Data/Scripts/Day5/Day5.leaf +++ b/Assets/_Assets/Data/Scripts/Day5/Day5.leaf @@ -10,7 +10,7 @@ $call DayHeader->SetText(Feb 22) $call GPSTrackerPlate->Activate() $call DataLoggerPlate->Deactivate() $call ChickBandPlate->Deactivate() -$call FadeIn(1.0) +$call FadeIn(2.0) $call Wait(2) :: StartGame @@ -18,6 +18,9 @@ $call Wait(2) @who Player @once +$call CreateGoal("Day5_outside", Warp outside) +$call SetWarpActive(WarpBluff, true) + {@Margo} Mornin', kiddo! $[Day5/Tent/5tm01] {@Margo} This is it. Just think… this time tomorrow you’ll be back in Wisconsin. $[Day5/Tent/5tm02] {@Margo} Aw, what’s the matter? I thought you’d be happy. $[Day5/Tent/5tm03] @@ -41,33 +44,31 @@ $call Wait(2) {@Margo} We’ve still got a few more tasks left to wrap things up. $[Day5/Tent/5tm15] {@Margo} Whenever you’re ready, let’s head out to the Bluff. $[Day5/Tent/5tm16] -$call CreateGoal("Day5_outside", Warp outside) -$call SetWarpActive(WarpBluff, true) :: WarpedOutsideTent @trigger AtWarpPoint @who Player @when targetObject == "WarpTarget-Bluff" @once +@interrupt $call TentDoor->Close() $call CompleteGoal("Day5_outside") $call Wait(1) -$call SetWarpActive(WarpBluff, false) +$call SetWarpGroupActive(Rookery, true) +$call CreateGoal("Day5_rookery", Warp inside rookery) {@Margo} Okay, kiddo. Just one task down at the Rookery today. $[Day5/Bluff/5bm01] {@Margo} We need to put trackers on the penguins who had chicks this year. $[Day5/Bluff/5bm02] -$call SetWarpGroupActive(Rookery, true) -$call CreateGoal("Day5_rookery", Warp inside rookery) - :: WarpedToRookery @trigger AtWarpPoint @who Player @when targetObject == "WarpTarget-Rookery" @once +@interrupt $call CompleteGoal("Day5_rookery") @@ -142,7 +143,6 @@ $call CompleteGoal("Day5_band") {@Margo} Not so fast. Just one more job. $[Day5/Rookery/5rm12] {@Margo} Let’s head back up to the Bluff. $[Day5/Rookery/5rm13] -$call WarpBluffBack->Activate() $call SetWarpActive(WarpBluffBack, true) $call CreateGoal("Day5_bluff_back", Warp inside) diff --git a/Assets/_Assets/Prefabs/Penguins/Chick Variations/Adelie_Chick_Small.prefab b/Assets/_Assets/Prefabs/Penguins/Chick Variations/Adelie_Chick_Small.prefab index 7dd2c51..4e530a2 100644 --- a/Assets/_Assets/Prefabs/Penguins/Chick Variations/Adelie_Chick_Small.prefab +++ b/Assets/_Assets/Prefabs/Penguins/Chick Variations/Adelie_Chick_Small.prefab @@ -220,8 +220,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6657678064638299051} serializedVersion: 2 - m_LocalRotation: {x: -0.00995338, y: 0.6230884, z: -0.18326652, w: 0.7603126} - m_LocalPosition: {x: -0.0065, y: 0.1048, z: 0} + m_LocalRotation: {x: 0.04180197, y: -0.8511629, z: 0.0751941, w: -0.5178033} + m_LocalPosition: {x: 0.006, y: 0.05, z: -0.001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -451,7 +451,7 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: fe1be030b69c8184a9d208450963d59e, type: 2} - target: {fileID: 919132149155446097, guid: 6bf676f29957f574ca81f6dcda9ad7bb, type: 3} propertyPath: m_Name - value: Adelie_Chick + value: Adelie_Chick_Small objectReference: {fileID: 0} - target: {fileID: 5094545056451183733, guid: 6bf676f29957f574ca81f6dcda9ad7bb, type: 3} propertyPath: m_LocalScale.x