The first update commit

jthecoder12 · jthecoder12 · commit 11577a222c36 · 2024-11-16T23:05:56.000-05:00
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+      "visualstudiotoolsforunity.vstuc"
+    ]
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,10 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Attach to Unity",
+            "type": "vstuc",
+            "request": "attach"
+        }
+     ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,55 @@
+{
+    "files.exclude": {
+        "**/.DS_Store": true,
+        "**/.git": true,
+        "**/.gitmodules": true,
+        "**/*.booproj": true,
+        "**/*.pidb": true,
+        "**/*.suo": true,
+        "**/*.user": true,
+        "**/*.userprefs": true,
+        "**/*.unityproj": true,
+        "**/*.dll": true,
+        "**/*.exe": true,
+        "**/*.pdf": true,
+        "**/*.mid": true,
+        "**/*.midi": true,
+        "**/*.wav": true,
+        "**/*.gif": true,
+        "**/*.ico": true,
+        "**/*.jpg": true,
+        "**/*.jpeg": true,
+        "**/*.png": true,
+        "**/*.psd": true,
+        "**/*.tga": true,
+        "**/*.tif": true,
+        "**/*.tiff": true,
+        "**/*.3ds": true,
+        "**/*.3DS": true,
+        "**/*.fbx": true,
+        "**/*.FBX": true,
+        "**/*.lxo": true,
+        "**/*.LXO": true,
+        "**/*.ma": true,
+        "**/*.MA": true,
+        "**/*.obj": true,
+        "**/*.OBJ": true,
+        "**/*.asset": true,
+        "**/*.cubemap": true,
+        "**/*.flare": true,
+        "**/*.mat": true,
+        "**/*.meta": true,
+        "**/*.prefab": true,
+        "**/*.unity": true,
+        "build/": true,
+        "Build/": true,
+        "Library/": true,
+        "library/": true,
+        "obj/": true,
+        "Obj/": true,
+        "ProjectSettings/": true,
+        "temp/": true,
+        "Temp/": true
+    },
+    "dotnet.defaultSolution": "MoonSwitch.sln"
+}
diff --git a/Assets/Scripts/BallTexture.cs b/Assets/Scripts/BallTexture.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
+// Most simple script in the entire game
 public class BallTexture : MonoBehaviour
 {
     void Update()
diff --git a/Assets/Scripts/CheckItemBought.cs b/Assets/Scripts/CheckItemBought.cs
@@ -3,6 +3,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
+// I forgot
 public class CheckItemBought : MonoBehaviour
 {
 	[SerializeField]
diff --git a/Assets/Scripts/Collectable.cs b/Assets/Scripts/Collectable.cs
@@ -3,6 +3,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
+// Moon rock item script
 public class Collectable : MonoBehaviour
 {
     private Text counterText;
diff --git a/Assets/Scripts/Customizer.cs b/Assets/Scripts/Customizer.cs
@@ -4,6 +4,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
+// Professional looking code
 public class Customizer : MonoBehaviour
 {
     [SerializeField]
diff --git a/Assets/Scripts/DeathScreen.cs b/Assets/Scripts/DeathScreen.cs
@@ -3,6 +3,7 @@
 using System.Text.RegularExpressions;
 using UnityEngine;
 
+// The death screen script
 public class DeathScreen : MonoBehaviour
 {
     [SerializeField]
diff --git a/Assets/Scripts/DestroyObject.cs b/Assets/Scripts/DestroyObject.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
+// The bullet script
 public class DestroyObject : MonoBehaviour
 {
     private void OnTriggerEnter2D(Collider2D collision)
diff --git a/Assets/Scripts/DevConsole.cs b/Assets/Scripts/DevConsole.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
+// Dev console. Press Z and M together at the same time in varius places such as the shop to open.
 public class DevConsole : MonoBehaviour
 {
     [SerializeField]
@@ -24,11 +25,12 @@ void Update()
             }
         }
 
+
         if(Input.GetKey(KeyCode.LeftControl) && Input.GetKey(KeyCode.RightShift) && Input.GetKeyDown(KeyCode.Q))
         {
             if(easterEgg is not null)
             {
-                if(easterEgg.active)
+                if(easterEgg.activeInHierarchy)
                 {
                     easterEgg.SetActive(false);
                 }
diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs
@@ -5,6 +5,7 @@
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
+// Most complicated class in the entire game
 public class GameManager : MonoBehaviour
 {
     // Variables
@@ -88,7 +89,7 @@ public class GameManager : MonoBehaviour
 
     private static byte currentEquipedBall;
 
-    // Do stuff in the beginning;
+    // Do stuff in the beginning
     private void Start()
     {
         // Set the static variable to the raw image
@@ -157,6 +158,7 @@ public void PlayButton()
 		SceneManager.LoadScene(1);
     }
 
+    // Name is obvious
     public void ShopButton()
     {
 		GlobalValues.musicPosition = 0;
@@ -193,6 +195,7 @@ public void BackToHome()
 		SceneManager.LoadScene(0);
     }
 
+    // Best function name ever
 	public void BackToHomeFromNonOriginalMusic()
 	{
 		Time.timeScale = 1;
@@ -376,14 +379,16 @@ public void downMove()
         } catch(MissingReferenceException) {}
     }
 
+    // For a future update
     public void SetDifficulty()
     {
         print(difficulty);
     }
 
+    // Name is obvious
 	public void TogglePause()
 	{
-		if(!loseScreen.active)
+		if(!loseScreen.activeInHierarchy)
 		{
 			if (Time.timeScale == 1)
 			{
@@ -441,9 +446,9 @@ private void Update()
     {
         if (CompareTag("MainCamera") && SceneManager.GetActiveScene().buildIndex == 1)
         {
-            if (!loseScreen.active && Input.GetKeyDown(KeyCode.Escape))
+            if (!loseScreen.activeInHierarchy && Input.GetKeyDown(KeyCode.Escape))
             {
-                if (pauseMenu.active)
+                if (pauseMenu.activeInHierarchy)
                 {
                     pauseMenu.SetActive(false);
 					GameObject.FindGameObjectWithTag("MainCamera").GetComponent<MoonRockScript>().enabled = true;
diff --git a/Assets/Scripts/GlobalValues.cs b/Assets/Scripts/GlobalValues.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
+// Score and music position
 public class GlobalValues : MonoBehaviour
 {
     public short score = 0;
diff --git a/Assets/Scripts/Lava.cs b/Assets/Scripts/Lava.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
+// Lava script
 public class Lava : MonoBehaviour
 {
     [SerializeField]
diff --git a/Assets/Scripts/MoonRockCounter.cs b/Assets/Scripts/MoonRockCounter.cs
@@ -3,6 +3,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
+// The counter for the moon rocks
 public class MoonRockCounter : MonoBehaviour
 {
     private void Awake()
diff --git a/Assets/Scripts/MoonRockScript.cs b/Assets/Scripts/MoonRockScript.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
+// Spawns moon rocks
 public class MoonRockScript : MonoBehaviour
 {
     [SerializeField]
diff --git a/Assets/Scripts/MouseOverConfiguration.cs b/Assets/Scripts/MouseOverConfiguration.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
+// For the mobile move buttons
 public class MouseOverConfiguration : MonoBehaviour
 {
     public static bool isOver = false;
diff --git a/Assets/Scripts/MovePlatform.cs b/Assets/Scripts/MovePlatform.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
+// The moving platforms
 public class MovePlatform : MonoBehaviour
 {
     [SerializeField]
diff --git a/Assets/Scripts/Movement.cs b/Assets/Scripts/Movement.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
+// Name is obvious
 public class Movement : MonoBehaviour
 {
     [Header("Ball configuration")]
@@ -50,36 +51,38 @@ private void Update()
             distanceCounter.color = Color.white;
         }
 
-        if (Input.GetMouseButton(0))
-        {
-            StartCoroutine(moveX());
-        } else
-        {
-            StopAllCoroutines();
-        }
+        if(Time.timeScale == 1) {
+            if (Input.GetMouseButton(0))
+            {
+                StartCoroutine(moveX());
+            } else
+            {
+                StopAllCoroutines();
+            }
 
-        if(Input.GetMouseButtonUp(0))
-        {
-            //print("Up");
-            GetComponent<AudioSource>().Stop();
-            StopAllCoroutines();
-        }
+            if(Input.GetMouseButtonUp(0))
+            {
+                //print("Up");
+                GetComponent<AudioSource>().Stop();
+                StopAllCoroutines();
+            }
 
-        if(Input.GetKey(KeyCode.LeftArrow) || Input.GetKey(KeyCode.A))
-        {
-            moveMobile(-1);
-        } else if(Input.GetKey(KeyCode.RightArrow) || Input.GetKey(KeyCode.D))
-        {
-            moveMobile(1);
-        } else if(Input.GetKey(KeyCode.DownArrow) || Input.GetKey(KeyCode.S))
-        {
-            moveDown();
+            if(Input.GetKey(KeyCode.LeftArrow) || Input.GetKey(KeyCode.A))
+            {
+                moveMobile(-1);
+            } else if(Input.GetKey(KeyCode.RightArrow) || Input.GetKey(KeyCode.D))
+            {
+                moveMobile(1);
+            } else if(Input.GetKey(KeyCode.DownArrow) || Input.GetKey(KeyCode.S))
+            {
+                moveDown();
+            }
         }
     }
 
     private void FixedUpdate()
     {
-        if(!MouseOverConfiguration.isOver && (Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space) || Input.GetKeyDown(KeyCode.UpArrow) || Input.GetKeyDown(KeyCode.W)))
+        if(!MouseOverConfiguration.isOver && (Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space) || Input.GetKeyDown(KeyCode.UpArrow) || Input.GetKeyDown(KeyCode.W)) && Time.timeScale == 1)
         { 
             if (rb.velocity.y < maxForce)
             {
@@ -115,15 +118,18 @@ private void Exert(int mul)
 
     public void moveMobile(short direction)
     {
+        if(Time.timeScale == 1) {
         try
         {
             transform.position += new Vector3(direction * movementForce, 0, 0);
         }
         catch (MissingReferenceException) {}
+        }
+        
     }
 
     public void moveDown()
     {
-        transform.position -= new Vector3(0, 0.05f, 0);
+        if(Time.timeScale == 1) transform.position -= new Vector3(0, 0.05f, 0);
     }
 }
diff --git a/Assets/Scripts/ProcessCollision.cs b/Assets/Scripts/ProcessCollision.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
+// Probably the second most complicated script in the game
 public class ProcessCollision : MonoBehaviour
 {
     public bool isEnabled = true;
diff --git a/Assets/Scripts/RandomColor.cs b/Assets/Scripts/RandomColor.cs
@@ -1,6 +1,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+
+// Picks a random color
 public class RandomColor : MonoBehaviour
 {
     [SerializeField]
diff --git a/Assets/Scripts/ShootDestroyer.cs b/Assets/Scripts/ShootDestroyer.cs
@@ -2,6 +2,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
+// Shoots the destroyer
 public class ShootDestroyer : MonoBehaviour
 {
     [SerializeField]
diff --git a/Assets/Scripts/ShopItem.cs b/Assets/Scripts/ShopItem.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
+// The shop is the most complicated part of the entire game
 public class ShopItem
 {
     private string itemName;
diff --git a/Assets/Scripts/StartMusicAtCurrentPosition.cs b/Assets/Scripts/StartMusicAtCurrentPosition.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
+// An entire script just to play the title screen music at the same position it was when you were in the other scene
 public class StartMusicAtCurrentPosition : MonoBehaviour
 {
     // Start is called before the first frame update
diff --git a/Packages/manifest.json b/Packages/manifest.json
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +    "recommendations": [
 +      "visualstudiotoolsforunity.vstuc"
 +    ]
 +}
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using UnityEngine;`
`4`	`4`
	`5`	`+// Most simple script in the entire game`
`5`	`6`	`public class BallTexture : MonoBehaviour`
`6`	`7`	`{`
`7`	`8`	`void Update()`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using UnityEngine;`
`4`	`4`	`using UnityEngine.UI;`
`5`	`5`
	`6`	`+// I forgot`
`6`	`7`	`public class CheckItemBought : MonoBehaviour`
`7`	`8`	`{`
`8`	`9`	`[SerializeField]`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using UnityEngine;`
`5`	`5`	`using UnityEngine.UI;`
`6`	`6`
	`7`	`+// Professional looking code`
`7`	`8`	`public class Customizer : MonoBehaviour`
`8`	`9`	`{`
`9`	`10`	`[SerializeField]`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Text.RegularExpressions;`
`4`	`4`	`using UnityEngine;`
`5`	`5`
	`6`	`+// The death screen script`
`6`	`7`	`public class DeathScreen : MonoBehaviour`
`7`	`8`	`{`
`8`	`9`	`[SerializeField]`