fix typo, allow saving through the menu, change sam's sprite a little

callistoAshley · Mar 15, 2022 · 0bdd822 · 0bdd822
1 parent 5e49bfa
commit 0bdd822
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 4 deletions.
diff --git a/Assets/scripts/HandyDandies.cs b/Assets/scripts/HandyDandies.cs
@@ -52,7 +52,7 @@ public string GetElapsedTimeString(TimeSpan time)
                     continue;
 
                 ret += $"{times[i]} {strings[i]}";
-                ret += times[i] > 1 ? "s " : "";
+                ret += times[i] > 1 ? "s" : "";
             }
 
             return ret;

diff --git a/Assets/scripts/InGameMenuManager.cs b/Assets/scripts/InGameMenuManager.cs
@@ -73,6 +73,17 @@ public static void ProcessMenuButton(string button)
                 case "settings":
                     break;
                 case "save":
+                    UI textbox2 = UIManager.instance.New(new Vector2(92, 94), new Vector2(484, 257));
+                    try
+                    {
+                        SaveLoadManager.instance.Save();
+                        textbox2.StartCoroutine(textbox2.PrintText("saved!", options: UI.PrintTextOptions.DestroyUIAfterCallback | UI.PrintTextOptions.CallbackAfterInput));
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.WriteLine($"exception while saving: {ex}");
+                        textbox2.StartCoroutine(textbox2.PrintText("an error was encountered while saving....... :(", options: UI.PrintTextOptions.DestroyUIAfterCallback | UI.PrintTextOptions.CallbackAfterInput));
+                    }
                     break;
                 // return to title screen
                 case "title":

diff --git a/Assets/scripts/SaveLoadManager.cs b/Assets/scripts/SaveLoadManager.cs
@@ -62,7 +62,7 @@ public void Load()
                     // double check the header first
                     if (!reader.VerifyHeader(out byte[] header))
                         throw new Exception($"couldn't verify file header of save data (ascii of first 13 bytes was {Encoding.ASCII.GetString(header)})");
-                    reader.GetVersion(false); // this is just to move position forward
+                    reader.GetVersion(false); // this is just to move the position forward
                     // then read the data into the dictionary
                     reader.ReadTheStuff();
 

diff --git a/Assets/sprites/npc/microwave man sam/idle.png b/Assets/sprites/npc/microwave man sam/idle.png
diff --git a/Assets/sprites/npc/microwave man sam/walk.png b/Assets/sprites/npc/microwave man sam/walk.png
diff --git a/Library/StateCache/Hierarchy/3a1511-mainStage.json b/Library/StateCache/Hierarchy/3a1511-mainStage.json
@@ -1 +1 @@
-{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-48088,-44126,-35752,-20564,-8276,-1174,-12,23518],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
+{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1174],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
diff --git a/Library/StateCache/SceneView/e4d1cd-mainStage.json b/Library/StateCache/SceneView/e4d1cd-mainStage.json
@@ -1 +1 @@
-{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":2.3313307762145998,"y":0.715118408203125,"z":-15.23046875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":21.127073287963868,"orthographic":true}
+{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":12.731040000915528,"y":-0.2480400800704956,"z":-56.926841735839847},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":2.2757554054260256,"orthographic":true}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-48088,-44126,-35752,-20564,-8276,-1174,-12,23518],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
		{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1174],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":2.3313307762145998,"y":0.715118408203125,"z":-15.23046875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":21.127073287963868,"orthographic":true}
		{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":12.731040000915528,"y":-0.2480400800704956,"z":-56.926841735839847},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":2.2757554054260256,"orthographic":true}