Day4 work in progress

Assets/Code/Scripting/Actors/ScriptTabletHighlightable.cs

@@ -18,7 +18,7 @@ namespace Pennycook {
     public class ScriptTabletHighlightable : ScriptActorComponent {
 
         #region Inspector
-
+		public TabletInteractable Interactable;
 
 		#endregion // Inspector
 
@@ -35,6 +35,13 @@ private void Awake() {
 		public void SetIdentified(bool id) {
 			m_Highlight.Identified = id;
 		}
+
+        [LeafMember("SetInteractable"), Preserve]
+        public void SetInteractable(bool i) {
+            if(Interactable != null) {
+                Interactable.CanInteract = i;
+            }
+        }
 
 		[LeafMember("IsIdentified"), Preserve]
 		static public bool IsIdentified(ScriptActor actor) {

Assets/Scenes/ExteriorScene.unity

@@ -10280,6 +10280,14 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1567301899}
     m_Modifications:
+    - target: {fileID: -8800313806723568105, guid: ecccbe51fb34f4f4db03e17ad053761b, type: 3}
+      propertyPath: m_Id.m_Source
+      value: WingBand1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8800313806723568105, guid: ecccbe51fb34f4f4db03e17ad053761b, type: 3}
+      propertyPath: m_Id.m_HashValue
+      value: 3889721392
+      objectReference: {fileID: 0}
     - target: {fileID: 34638191875404698, guid: ecccbe51fb34f4f4db03e17ad053761b, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0
@@ -22965,6 +22973,14 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1427998256}
     m_Modifications:
+    - target: {fileID: -8800313806723568105, guid: ecccbe51fb34f4f4db03e17ad053761b, type: 3}
+      propertyPath: m_Id.m_Source
+      value: WingBand2
+      objectReference: {fileID: 0}
+    - target: {fileID: -8800313806723568105, guid: ecccbe51fb34f4f4db03e17ad053761b, type: 3}
+      propertyPath: m_Id.m_HashValue
+      value: 3940054249
+      objectReference: {fileID: 0}
     - target: {fileID: 34638191875404698, guid: ecccbe51fb34f4f4db03e17ad053761b, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0
@@ -29144,6 +29160,14 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1047187413}
     m_Modifications:
+    - target: {fileID: -8800313806723568105, guid: ecccbe51fb34f4f4db03e17ad053761b, type: 3}
+      propertyPath: m_Id.m_Source
+      value: WingBand3
+      objectReference: {fileID: 0}
+    - target: {fileID: -8800313806723568105, guid: ecccbe51fb34f4f4db03e17ad053761b, type: 3}
+      propertyPath: m_Id.m_HashValue
+      value: 3923276630
+      objectReference: {fileID: 0}
     - target: {fileID: 34638191875404698, guid: ecccbe51fb34f4f4db03e17ad053761b, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0
@@ -31888,6 +31912,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 654570715}
     m_Modifications:
+    - target: {fileID: 984408207973377879, guid: 6e919503cfc8ac640bf61796ee8be69b, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1026275223637042126, guid: 6e919503cfc8ac640bf61796ee8be69b, type: 3}
       propertyPath: m_LocalRotation.w
       value: 0.57928956
@@ -31944,6 +31972,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1633028190057580162, guid: 6e919503cfc8ac640bf61796ee8be69b, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1817779319256799920, guid: 6e919503cfc8ac640bf61796ee8be69b, type: 3}
       propertyPath: m_LocalRotation.y
       value: 0.04187533
@@ -31984,6 +32016,14 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: -0.11368506
       objectReference: {fileID: 0}
+    - target: {fileID: 4890740504844590811, guid: 6e919503cfc8ac640bf61796ee8be69b, type: 3}
+      propertyPath: m_Id.m_Source
+      value: DataTrackerBack3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4890740504844590811, guid: 6e919503cfc8ac640bf61796ee8be69b, type: 3}
+      propertyPath: m_Id.m_HashValue
+      value: 2867327509
+      objectReference: {fileID: 0}
     - target: {fileID: 8083628485535941355, guid: 6e919503cfc8ac640bf61796ee8be69b, type: 3}
       propertyPath: m_LocalRotation.y
       value: -0.0567863
@@ -32952,6 +32992,14 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: -0.11368506
       objectReference: {fileID: 0}
+    - target: {fileID: 5923427813922878977, guid: a89c8dfdd21a94344ae5eb6f314a1685, type: 3}
+      propertyPath: m_Id.m_Source
+      value: DataTrackerBack4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5923427813922878977, guid: a89c8dfdd21a94344ae5eb6f314a1685, type: 3}
+      propertyPath: m_Id.m_HashValue
+      value: 2749884176
+      objectReference: {fileID: 0}
     - target: {fileID: 7045188797909412401, guid: a89c8dfdd21a94344ae5eb6f314a1685, type: 3}
       propertyPath: m_LocalRotation.y
       value: -0.0567863
@@ -33167,6 +33215,9 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: 6611974773151322660, guid: cb3e800c66b617647bdab8fee3e55d68, type: 3}
       insertIndex: -1
       addedObject: {fileID: 4437052948603429534}
+    - targetCorrespondingSourceObject: {fileID: 6611974773151322660, guid: cb3e800c66b617647bdab8fee3e55d68, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4437052948603429539}
   m_SourcePrefab: {fileID: 100100000, guid: cb3e800c66b617647bdab8fee3e55d68, type: 3}
 --- !u!4 &4437052948603429531 stripped
 Transform:
@@ -33236,6 +33287,19 @@ MonoBehaviour:
   m_ClassName:
     m_Source: WeighGate
     m_HashValue: 278753744
+--- !u!114 &4437052948603429539
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4437052948603429533}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9b6ff410ae1af9f4db705e308b9d6fbc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Interactable: {fileID: 4437052948603429534}
 --- !u!33 &4497174835715185087
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -36167,6 +36231,14 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 654570715}
     m_Modifications:
+    - target: {fileID: 1228069274682295529, guid: a6f24c04e572af542ad0e8ff5723fce3, type: 3}
+      propertyPath: m_Id.m_Source
+      value: DataTrackerBack5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1228069274682295529, guid: a6f24c04e572af542ad0e8ff5723fce3, type: 3}
+      propertyPath: m_Id.m_HashValue
+      value: 2766661795
+      objectReference: {fileID: 0}
     - target: {fileID: 1309699854675606457, guid: a6f24c04e572af542ad0e8ff5723fce3, type: 3}
       propertyPath: m_LocalRotation.z
       value: -0.11368506
@@ -36422,6 +36494,14 @@ PrefabInstance:
       propertyPath: m_LocalRotation.y
       value: -0.0567863
       objectReference: {fileID: 0}
+    - target: {fileID: 8364426102607216639, guid: acdc837baafe7fe43b724a46199e72dd, type: 3}
+      propertyPath: m_Id.m_Source
+      value: DataTrackerBack2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8364426102607216639, guid: acdc837baafe7fe43b724a46199e72dd, type: 3}
+      propertyPath: m_Id.m_HashValue
+      value: 2850549890
+      objectReference: {fileID: 0}
     - target: {fileID: 8589048741149474991, guid: acdc837baafe7fe43b724a46199e72dd, type: 3}
       propertyPath: m_LocalRotation.z
       value: -0.11368506
@@ -36824,10 +36904,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.y
       value: 180
       objectReference: {fileID: 0}
-    - target: {fileID: 4086999294478943614, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
-      propertyPath: Current
-      value: 
-      objectReference: {fileID: 8837472877730459910}
     - target: {fileID: 4428655853343178598, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
       propertyPath: m_LocalRotation.y
       value: -0.0567863
@@ -37342,17 +37418,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 233861031042836292, guid: 5a7f0770e42eb2d4db7b19ef4a8096c1, type: 3}
   m_PrefabInstance: {fileID: 1845250525081279007}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &8837472877730459910 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 503100512337222323, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
-  m_PrefabInstance: {fileID: 8516587578884099277}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5dafab9db04b59c4bb36e52c1514ad6b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!23 &8998383751316290114
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -37723,6 +37788,14 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: -21.019861
       objectReference: {fileID: 0}
+    - target: {fileID: 6597888019581015010, guid: f5dcd8a3a32e6d944aee725f65882c59, type: 3}
+      propertyPath: m_Id.m_Source
+      value: DataTrackerBack1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6597888019581015010, guid: f5dcd8a3a32e6d944aee725f65882c59, type: 3}
+      propertyPath: m_Id.m_HashValue
+      value: 2833772271
+      objectReference: {fileID: 0}
     - target: {fileID: 7058355408795854930, guid: f5dcd8a3a32e6d944aee725f65882c59, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: -89.98021

Assets/_Assets/Data/Scripts/Day4/Day4.leaf

@@ -1,23 +1,23 @@
 #basePath	Day4
 
-:: Day4Start
-@trigger    Day4Start
-@who        Player
-@once
-
-//:: Prepare
-//@function	ScenePrepare
-//$call PlaceAndRotatePlayerAt(WarpDesk, true)
-//$call SetAllWarpsActive(false)
-
-//:: StartGame
-//@trigger    SceneReady
+//:: Day4Start
+//@trigger    Day4Start
 //@who        Player
 //@once
 
+:: Prepare
+@function	ScenePrepare
 $call PlaceAndRotatePlayerAt(WarpDesk, true)
 $call SetAllWarpsActive(false)
 
+:: StartGame
+@trigger    SceneReady
+@who        Player
+@once
+
+//$call PlaceAndRotatePlayerAt(WarpDesk, true)
+//$call SetAllWarpsActive(false)
+
 $call Wait(2)
 $call DayHeader->SetText(Day 4)
 
@@ -90,12 +90,19 @@ $call ClearGoals()
 {@Margo}    And we’ll need to band 3 of the chicks. $[Day4/Rookery/Margo_4]
 {@Player}   Got it. Let’s get to work.  $[Day4/Rookery/Player_7]
 
+$call ClearGoals()
+$call CreateGoal("day4_gate", Scan the Weigh Gate)
+$call CreateGoal("day4_loggers", Collect Data Loggers)
+$call CreateGoal("day4_band", Band 3 Chicks)
+
 :: WarpedToRookeryGate
 @trigger    AtWarpPoint
 @who        Player
 @when       targetObject == "WarpTarget-RookeryFar"
 @once
 
+$call WeighGate->SetInteractable(true)
+
 {@Player}    Okay, Margo. How does this weigh bridge thing work, exactly? $[Day4/Rookery/Player_8]
 {@Margo}    Oh, it’s easy as pie!    $[Day4/Rookery/Margo_5]
 {@Margo}    The weigh bridge gathers data on what the penguins were up to when they were away from the colony.   $[Day4/Rookery/Margo_6]
@@ -106,6 +113,8 @@ $call ClearGoals()
 :: OnWeighGateIdentified
 @function	TabletIdentified
 @when		objectId == "WeighGate"
+
+$call CompleteGoal("day4_gate")
 $set	chapter:weighGate = true
 $goto Day4.CheckCompletedTasks
 
@@ -115,15 +124,18 @@ $goto Day4.CheckCompletedTasks
 @when       targetObject == "WarpTarget-RookeryMiddle"
 @once
 
+//these activates are just for testing - these will normally already be enabled.
+$call DataTrackerBack1->SetMeshEnabled(true)
+$call DataTrackerBack2->SetMeshEnabled(true)
+$call DataTrackerBack3->SetMeshEnabled(true)
+$call DataTrackerBack4->SetMeshEnabled(true)
+$call DataTrackerBack5->SetMeshEnabled(true)
+
 {@Margo}    Wahoo! Looks like all the penguins with data loggers have come back.    $[Day4/Rookery/Margo_10]
 {@Margo}    Now we’ll be able to get the stats on their swimming behaviors!     $[Day4/Rookery/Margo_11]
 {@Margo}    Just hold the penguin still with one hand and remove their trackers.    $[Day4/Rookery/Margo_12]
 {@Margo}    Then drop the tracker into the Pelican Case.    $[Day4/Rookery/Margo_13]
 
-:: OnUnsocketedTracker
-@trigger    ObjectUnsocketed
-@when   objectType == "DataTracker", socketType == "DataSocketPenguin"
-
 :: OnSocketedTracker
 @trigger    ObjectSocketed
 @when   objectType == "DataTracker", socketType == "TrackerSocket"
@@ -135,6 +147,7 @@ $goto Day4.CheckDataCount
 @who    Player
 
 $if chapter:dataCount >= 3
+$call CompleteGoal("day4_loggers")
 $set chapter:dataTrackersDone = true
 $goto Day4.CheckCompletedTasks
 $endif
@@ -145,6 +158,10 @@ $endif
 @when       targetObject == "WarpTarget-RookeryCorral"
 @once
 
+$call WingBand1->Activate()
+$call WingBand2->Activate()
+$call WingBand3->Activate()
+
 {@Margo}    Okay, kiddo. Time to band the chicks.   $[Day4/Rookery/Margo_14]
 {@Margo}    Fair warning… This job isn’t for the faint of heart.    $[Day4/Rookery/Margo_15]
 {@Player}    Oh, come on. They're, like, half the size of the grown-ups. How hard can it be?    $[Day4/Rookery/Player_9]
@@ -194,6 +211,7 @@ $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_bands")
 $set chapter:finishedBands = true
 $goto Day4.CheckCompletedTasks
 $endif