endings and credits

320UnityProject/Assets/Scenes/Prototype scenes/LilypadLand.unity

@@ -741,6 +741,18 @@ MonoBehaviour:
   onInteract:
     m_PersistentCalls:
       m_Calls:
+      - m_Target: {fileID: 1373018627}
+        m_TargetAssemblyTypeName: FrogVilleSceneController, Assembly-CSharp
+        m_MethodName: GetClothes
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 1red_tree
+          m_BoolArgument: 0
+        m_CallState: 2
       - m_Target: {fileID: 8051805830699530867}
         m_TargetAssemblyTypeName: DialogueDisplay, Assembly-CSharp
         m_MethodName: ChoosePathString
@@ -3097,15 +3109,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
       propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.size
-      value: 2
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
       propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
-      value: 5
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
       propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
-      value: 2
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
+      propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[2].m_Mode
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
       propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -3115,6 +3131,10 @@ PrefabInstance:
       propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[1].m_Target
       value: 
       objectReference: {fileID: 8051805830699530867}
+    - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
+      propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[2].m_Target
+      value: 
+      objectReference: {fileID: 1373018627}
     - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
       propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
       value: 2
@@ -3123,13 +3143,21 @@ PrefabInstance:
       propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
+      propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[2].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
       propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
-      value: ChoosePathString
+      value: RegisterDialogue
       objectReference: {fileID: 0}
     - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
       propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
-      value: RegisterDialogue
+      value: ChoosePathString
+      objectReference: {fileID: 0}
+    - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
+      propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
+      value: HouseCounter
       objectReference: {fileID: 0}
     - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
       propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
@@ -3139,6 +3167,14 @@ PrefabInstance:
       propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
       value: DialogueDisplay, Assembly-CSharp
       objectReference: {fileID: 0}
+    - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
+      propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName
+      value: FrogVilleSceneController, Assembly-CSharp
+      objectReference: {fileID: 0}
+    - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
+      propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument
+      value: 
+      objectReference: {fileID: 4900000, guid: aa174c61e7007c649a4432f3e80f2f22, type: 3}
     - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
       propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
       value: 1poison
@@ -3151,13 +3187,25 @@ PrefabInstance:
       propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_StringArgument
       value: 1poison
       objectReference: {fileID: 0}
+    - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
+      propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgument
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
+      propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_StringArgument
+      value: 1poison
+      objectReference: {fileID: 0}
     - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
       propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
-      value: UnityEngine.Object, UnityEngine
+      value: UnityEngine.TextAsset, UnityEngine
       objectReference: {fileID: 0}
     - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
       propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
-      value: UnityEngine.TextAsset, UnityEngine
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
+    - target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
+      propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
       objectReference: {fileID: 0}
     - target: {fileID: 7356486725916629054, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
       propertyPath: m_Name
@@ -24773,7 +24821,7 @@ MonoBehaviour:
   fogWar: {fileID: 1351261697}
   autopsyScript: {fileID: 4900000, guid: 8a8d0b20cb235094e92e95810b84e855, type: 3}
   letterScript: {fileID: 4900000, guid: f1663b04fbd74a64bb7738cfba602f9f, type: 3}
-  doneScript: {fileID: 0}
+  doneScript: {fileID: 4900000, guid: 8a8d0b20cb235094e92e95810b84e855, type: 3}
   houseScripts:
   - {fileID: 4900000, guid: 5c807ef23a7ee144b820dc163a1dc041, type: 3}
   - {fileID: 4900000, guid: aa174c61e7007c649a4432f3e80f2f22, type: 3}
@@ -40492,6 +40540,7 @@ MonoBehaviour:
   pathChoice: -1
   playerScript: {fileID: 0}
   infoPanel: {fileID: 0}
+  lilypadLanding: {fileID: 4900000, guid: 8a8d0b20cb235094e92e95810b84e855, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0

320UnityProject/Assets/Scenes/Prototype scenes/VillageHouse1.unity

@@ -604,6 +604,10 @@ PrefabInstance:
       propertyPath: speakerSprite
       value: 
       objectReference: {fileID: 21300000, guid: 7134911e10d77f34dae802def749c6d7, type: 3}
+    - target: {fileID: 9016890536702456913, guid: 6790864b4f1ae054ca9f45a664bb8d02, type: 3}
+      propertyPath: lilypadLanding
+      value: 
+      objectReference: {fileID: 4900000, guid: 8a8d0b20cb235094e92e95810b84e855, type: 3}
     - target: {fileID: 9016890536702456913, guid: 6790864b4f1ae054ca9f45a664bb8d02, type: 3}
       propertyPath: noSpeakerSprite
       value: 
@@ -616,6 +620,38 @@ PrefabInstance:
       propertyPath: 'lines.Array.data[0]'
       value: 
       objectReference: {fileID: 0}
+    - target: {fileID: 9016890536702456913, guid: 6790864b4f1ae054ca9f45a664bb8d02, type: 3}
+      propertyPath: onEnd.m_PersistentCalls.m_Calls.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9016890536702456913, guid: 6790864b4f1ae054ca9f45a664bb8d02, type: 3}
+      propertyPath: onEnd.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 9016890536702456913, guid: 6790864b4f1ae054ca9f45a664bb8d02, type: 3}
+      propertyPath: onEnd.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 350973808}
+    - target: {fileID: 9016890536702456913, guid: 6790864b4f1ae054ca9f45a664bb8d02, type: 3}
+      propertyPath: onEnd.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 9016890536702456913, guid: 6790864b4f1ae054ca9f45a664bb8d02, type: 3}
+      propertyPath: onEnd.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: RegisterDialogue
+      objectReference: {fileID: 0}
+    - target: {fileID: 9016890536702456913, guid: 6790864b4f1ae054ca9f45a664bb8d02, type: 3}
+      propertyPath: onEnd.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: DialogueDisplay, Assembly-CSharp
+      objectReference: {fileID: 0}
+    - target: {fileID: 9016890536702456913, guid: 6790864b4f1ae054ca9f45a664bb8d02, type: 3}
+      propertyPath: onEnd.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument
+      value: 
+      objectReference: {fileID: 4900000, guid: 5c807ef23a7ee144b820dc163a1dc041, type: 3}
+    - target: {fileID: 9016890536702456913, guid: 6790864b4f1ae054ca9f45a664bb8d02, type: 3}
+      propertyPath: onEnd.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.TextAsset, UnityEngine
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

320UnityProject/Assets/Scenes/Prototype scenes/VillageHouse3.unity

@@ -1256,15 +1256,27 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   canPickup: 0
   destroyOnPickup: 0
-  isEndpoint: 1
+  isEndpoint: 0
   endpointDialogue: There is a birthday letter from "Erica" to "Bale", and shirts
     of the same design as the bloodied one in your inventory
   isDialogue: 0
   dialogue: 
-  isEvent: 0
+  isEvent: 1
   onInteract:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 1647768958}
+        m_TargetAssemblyTypeName: DialogueDisplay, Assembly-CSharp
+        m_MethodName: ChoosePathString
+        m_Mode: 5
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 1clothes
+          m_BoolArgument: 0
+        m_CallState: 2
   isEndpointEvent: 1
   onEndpoint:
     m_PersistentCalls:

320UnityProject/Assets/Scripts/DialogueDisplay.cs

@@ -117,6 +117,8 @@ public class DialogueDisplay : MonoBehaviour
     float size0;
     bool autoSize0;
 
+    [SerializeField] TextAsset lilypadLanding;
+
     // Start is called before the first frame update
     void Start()
     {
@@ -186,6 +188,7 @@ public void SkipDialogue(InputAction.CallbackContext context)
         if (inkStory.currentChoices.Count > 0)
             line = inkStory.currentText;
         NextLine(line);
+        gameManager.RegisterDialogue(inkScript, seeing);
     }
 
     void NextLine(string lineText = null)
@@ -443,6 +446,10 @@ public void RegisterDialogue(TextAsset script = null)
         TextAsset registerScript = script;
         if (script == null)
             registerScript = inkScript;
-        gameManager.RegisterDialogue(registerScript, gameManager.ContainsDialogue(registerScript) + 1);
+
+        if (script == lilypadLanding)
+            return;
+
+        gameManager.RegisterDialogue(registerScript, 1);
     }
 }

320UnityProject/Assets/Scripts/EndCredits.cs

@@ -0,0 +1,24 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class EndCredits : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+
+    }
+
+    public void NewGame()
+    {
+        SceneManager.LoadScene("StartScreen");
+    }
+}

320UnityProject/Assets/Scripts/GameManager.cs

@@ -31,6 +31,8 @@ public class GameManager : MonoBehaviour
     public GameObject pauseMenu;
     private bool pauseMenuActive = false;
 
+    public bool gotClothes = false;
+
     private void Awake()
     {
         if (instance == null)

320UnityProject/Assets/Scripts/SceneControllers/AgencySceneController.cs

@@ -54,6 +54,7 @@ private void Awake()
             camera.GetComponent<sSimpleCamera>().player = playerInstance.transform;
         }
 
+        gameManager.player = playerInstance.GetComponent<Player>();
 
         // Find the persistent canvas
         canvas = GameObject.Find("Canvas")?.GetComponent<Canvas>();

320UnityProject/Assets/Scripts/SceneControllers/FrogVilleSceneController.cs

@@ -68,7 +68,8 @@ private void Awake()
             }
         }
         inventoryUI = FindAnyObjectByType<InventoryManager>();
-        playerInstance.GetComponent<Player>().inventoryUI = inventoryUI;
+        if (inventoryUI != null)
+            playerInstance.GetComponent<Player>().inventoryUI = inventoryUI;
         Debug.Log(playerInstance.name);
         if (camera.GetComponent<sCameraInterior>() != null)
         {
@@ -170,12 +171,15 @@ public void UnlockDoors()
 
     public void HouseCounter()
     {
+        Debug.Log("checking houses");
+
         int counter = 0;
         foreach (TextAsset house in houseScripts)
         {
             if (gameManager.ContainsDialogue(house) >= houseValue)
                 counter++;
         }
+        Debug.Log("counter: " + counter);
         if (counter >= houseScripts.Length)
             LockDoors();
         /* List<GameObject> inventory = playerInstance.GetComponent<Player>().GetInventory();
@@ -190,14 +194,19 @@ public void HouseCounter()
 
     private void LockDoors()
     {
+        Debug.Log("checking to lock doors");
         if (gameManager.ContainsDialogue(doneScript) >= doneValue)
             return;
 
+        Debug.Log("locking doors");
+
         gameManager.nextScenePath = "2report";
         DialogueDisplay dpDisplay = eventSystem.GetComponent<DialogueDisplay>();
         dpDisplay.pathChoice = 2;
         foreach (SceneWarpTrigger door in villageDoors)
             door.locked = true;
         dpDisplay.ChoosePathString("1finish");
     }
+
+    public void GetClothes() => gameManager.gotClothes = true;
 }

320UnityProject/Assets/Scripts/SceneControllers/VH1SceneController.cs

@@ -65,7 +65,7 @@ private void Awake()
         player.transform.GetChild(0).GetComponent<interactArea>().dialogueDisplay = dpDisplay;
         player.transform.position = playerSpawnPoint.transform.position;
 
-        if (ownedId >= 0 && disableIfOwned.Count > 0)
+        /* if (ownedId >= 0 && disableIfOwned.Count > 0)
         {
             List<GameObject> inventory = player.GetInventory();
             for (int i = 0; i < inventory.Count; i++)
@@ -76,6 +76,11 @@ private void Awake()
                         obj.SetActive(false);
                 }
             }
+        } */
+        if (disableIfOwned.Count > 0 && gameManager.gotClothes)
+        {
+            foreach (GameObject obj in disableIfOwned)
+                obj.SetActive(false);
         }
     }
 

320UnityProject/Assets/StoryDialogue/Ink/EndingBuffFrog.ink

@@ -1,2 +1,10 @@
->>lol there's nothing here sucks to suck I guess
-me>><i>(this is placeholder text)</i>
+>>Only a few weeks have passed, and we've already been getting so many new reports and requests!
+Well, I say "we", but I myself haven't been assigned to any of them for some reason...
+And Detective Toadshoe seems extremely stressed from all the new work.
+I wish I could help, but no one will talk to me or tell me what's going on.
+Surely this doesn't have anything to do with the case I worked on, right...?
+I mean, it <i>was</i> Buff Frog, wasn't it?
+I keep hearing rumors that the sudden increase in crime rate is because of Buff Frog's arrest, but those are just rumors...
+After all, <i>I</i> was the one who was actually there, right...?
+It's not like...<i>I'm</i> the reason for all this chaos...
+...right...?

320UnityProject/Assets/StoryDialogue/Ink/EndingBuffFrog.json

@@ -1 +1 @@
-{"inkVersion":21,"root":[["^>>lol there's nothing here sucks to suck I guess","\n","^me>><i>(this is placeholder text)</i>","\n",["done",{"#f":5,"#n":"g-0"}],null],"done",{"#f":1}],"listDefs":{}}
+{"inkVersion":21,"root":[["^>>Only a few weeks have passed, and we've already been getting so many new reports and requests!","\n","^Well, I say \"we\", but I myself haven't been assigned to any of them for some reason...","\n","^And Detective Toadshoe seems extremely stressed from all the new work.","\n","^I wish I could help, but no one will talk to me or tell me what's going on.","\n","^Surely this doesn't have anything to do with the case I worked on, right...?","\n","^I mean, it <i>was</i> Buff Frog, wasn't it?","\n","^I keep hearing rumors that the sudden increase in crime rate is because of Buff Frog's arrest, but those are just rumors...","\n","^After all, <i>I</i> was the one who was actually there, right...?","\n","^It's not like...<i>I'm</i> the reason for all this chaos...","\n","^...right...?","\n",["done",{"#f":5,"#n":"g-0"}],null],"done",{"#f":1}],"listDefs":{}}