Fixed glass blocks ID saving and some GUI issues.

Droog71 · Sep 16, 2020 · df49f22 · df49f22
1 parent 7801e9e
commit df49f22
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 26 deletions.
diff --git a/ActionManager.cs b/ActionManager.cs
@@ -649,6 +649,12 @@ public void StartBuildMode()
                 playerController.inventoryOpen = false;
                 playerController.craftingGUIopen = false;
                 playerController.storageGUIopen = false;
+                if (playerController.paintGunActive == true)
+                {
+                    playerController.paintGun.SetActive(false);
+                    playerController.paintGunActive = false;
+                    playerController.paintColorSelected = false;
+                }
                 if (playerController.scannerActive == true)
                 {
                     playerController.scanner.SetActive(false);

diff --git a/CombinedMeshManager.cs b/CombinedMeshManager.cs
@@ -315,7 +315,7 @@ public void CombineBlocks()
                 {
                     ironCount++;
                 }
-                if (block.GetComponent<PhysicsHandler>().falling == false && block.GetComponent<PhysicsHandler>().fallingStack == false && block.GetComponent<PhysicsHandler>().needsSupportCheck == false)
+                if (block.GetComponent<PhysicsHandler>().IsSupported())
                 {
                     block.transform.parent = gameManager.ironBlocks[ironCount].transform;
                     if (gameManager.initIron == false)
@@ -340,7 +340,7 @@ public void CombineBlocks()
                     {
                         glassCount++;
                     }
-                    if (block.GetComponent<PhysicsHandler>().falling == false && block.GetComponent<PhysicsHandler>().fallingStack == false && block.GetComponent<PhysicsHandler>().needsSupportCheck == false)
+                    if (block.GetComponent<PhysicsHandler>().IsSupported())
                     {
                         block.transform.parent = gameManager.glass[glassCount].transform;
                         if (gameManager.initGlass == false)
@@ -366,7 +366,7 @@ public void CombineBlocks()
                     {
                         steelCount++;
                     }
-                    if (block.GetComponent<PhysicsHandler>().falling == false && block.GetComponent<PhysicsHandler>().fallingStack == false && block.GetComponent<PhysicsHandler>().needsSupportCheck == false)
+                    if (block.GetComponent<PhysicsHandler>().IsSupported())
                     {
                         block.transform.parent = gameManager.steel[steelCount].transform;
                         if (gameManager.initSteel == false)
@@ -392,7 +392,7 @@ public void CombineBlocks()
                     {
                         brickCount++;
                     }
-                    if (block.GetComponent<PhysicsHandler>().falling == false && block.GetComponent<PhysicsHandler>().fallingStack == false && block.GetComponent<PhysicsHandler>().needsSupportCheck == false)
+                    if (block.GetComponent<PhysicsHandler>().IsSupported())
                     {
                         block.transform.parent = gameManager.bricks[brickCount].transform;
                         if (gameManager.initBrick == false)
@@ -639,7 +639,6 @@ private IEnumerator CombineMeshCoroutine()
                 gameManager.clearGlassDummies = true;
                 FileBasedPrefs.SetBool(gameManager.GetComponent<StateManager>().WorldName + "initGlass", true);
             }
-            //Debug.Log("Finished mesh combine for glass at: " + System.DateTime.Now);
         }
 
         if (gameManager.steelMeshRequired == true)
@@ -703,7 +702,6 @@ private IEnumerator CombineMeshCoroutine()
                 gameManager.clearSteelDummies = true;
                 FileBasedPrefs.SetBool(gameManager.GetComponent<StateManager>().WorldName + "initSteel", true);
             }
-            //Debug.Log("Finished mesh combine for steel at: " + System.DateTime.Now);
         }
 
         if (gameManager.brickMeshRequired == true)

diff --git a/GuiCoordinates.cs b/GuiCoordinates.cs
@@ -237,6 +237,9 @@ public class GuiCoordinates
     public Rect marketMessageLabelRect;
     public Rect marketMessageButtonRect;
 
+    //PAINT COLOR
+    public Rect paintGunMenuBackgroundRect;
+
     public GuiCoordinates()
     {
         //ASPECT RATIO
@@ -551,5 +554,8 @@ public GuiCoordinates()
         marketMessageRect = new Rect(((ScreenWidth / 2) - 300), ((ScreenHeight / 2) - 200), 600, 400);
         marketMessageLabelRect = new Rect(((ScreenWidth / 2) - 175), ((ScreenHeight / 2) - 100), 400, 100);
         marketMessageButtonRect = new Rect(((ScreenWidth / 2) - (ScreenWidth * 0.07f)), ((ScreenHeight / 2) + 30), (ScreenWidth * 0.14f), (ScreenHeight * 0.05f));
+
+        //PAINT GUN COLOR SELECTION BACKGROUND
+         paintGunMenuBackgroundRect = new Rect((ScreenWidth * 0.4f), (ScreenHeight * 0.04f), (ScreenWidth * 0.2f), (ScreenHeight * 0.56f));
     }
 }
diff --git a/InfoHUD.cs b/InfoHUD.cs
@@ -164,9 +164,12 @@ public void OnGUI()
                 Vector2 size = style.CalcSize(content);
                 Rect resourceInfoRect = new Rect((Screen.width / 2) - (size.x / 2), (Screen.height - 70) - (size.y / 2), size.x, size.y);
                 GUI.Label(resourceInfoRect, "Iron Block");
+                if (playerController.paintGunActive == false)
+                {
+                    GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
+                    GUI.Label(guiCoordinates.buildInfoRect, "Press F to remove blocks.\nPress B to add blocks.\nPress Q to stop building.");
+                }
                 GUI.skin.label.fontSize = f;
-                GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
-                GUI.Label(guiCoordinates.buildInfoRect, "Press F to remove blocks.\nPress B to add blocks.\nPress Q to stop building.");
             }
             else if (obj.GetComponent<Steel>() != null)
             {
@@ -178,9 +181,12 @@ public void OnGUI()
                 Vector2 size = style.CalcSize(content);
                 Rect resourceInfoRect = new Rect((Screen.width / 2) - (size.x / 2), (Screen.height - 70) - (size.y / 2), size.x, size.y);
                 GUI.Label(resourceInfoRect, "Steel Block");
+                if (playerController.paintGunActive == false)
+                {
+                    GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
+                    GUI.Label(guiCoordinates.buildInfoRect, "Press F to remove blocks.\nPress B to add blocks.\nPress Q to stop building.");
+                }
                 GUI.skin.label.fontSize = f;
-                GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
-                GUI.Label(guiCoordinates.buildInfoRect, "Press F to remove blocks.\nPress B to add blocks.\nPress Q to stop building.");
             }
             else if (obj.GetComponent<Glass>() != null)
             {
@@ -192,10 +198,12 @@ public void OnGUI()
                 Vector2 size = style.CalcSize(content);
                 Rect resourceInfoRect = new Rect((Screen.width / 2) - (size.x / 2), (Screen.height - 70) - (size.y / 2), size.x, size.y);
                 GUI.Label(resourceInfoRect, "Glass Block");
+                if (playerController.paintGunActive == false)
+                {
+                    GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
+                    GUI.Label(guiCoordinates.buildInfoRect, "Press F to remove blocks.\nPress B to add blocks.\nPress Q to stop building.");
+                }
                 GUI.skin.label.fontSize = f;
-                GUI.Label(resourceInfoRect, "Glass Block");
-                GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
-                GUI.Label(guiCoordinates.buildInfoRect, "Press F to remove blocks.\nPress B to add blocks.\nPress Q to stop building.");
             }
             else if (obj.GetComponent<Brick>() != null)
             {
@@ -207,10 +215,12 @@ public void OnGUI()
                 Vector2 size = style.CalcSize(content);
                 Rect resourceInfoRect = new Rect((Screen.width / 2) - (size.x / 2), (Screen.height - 70) - (size.y / 2), size.x, size.y);
                 GUI.Label(resourceInfoRect, "Brick Block");
+                if (playerController.paintGunActive == false)
+                {
+                    GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
+                    GUI.Label(guiCoordinates.buildInfoRect, "Press F to remove blocks.\nPress B to add blocks.\nPress Q to stop building.");
+                }
                 GUI.skin.label.fontSize = f;
-                GUI.Label(resourceInfoRect, "Brick Block");
-                GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
-                GUI.Label(guiCoordinates.buildInfoRect, "Press F to remove blocks.\nPress B to add blocks.\nPress Q to stop building.");
             }
             else if (obj.GetComponent<ElectricLight>() != null)
             {
@@ -698,7 +708,7 @@ public void OnGUI()
                     }
                 }
             }
-            else if (playerController.lookingAtCombinedMesh == true && playerController.paintGunActive == false)
+            else if (playerController.lookingAtCombinedMesh == true)
             {
                 if (obj.name.Equals("ironHolder(Clone)"))
                 {
@@ -710,9 +720,12 @@ public void OnGUI()
                     Vector2 size = style.CalcSize(content);
                     Rect resourceInfoRect = new Rect((Screen.width / 2) - (size.x / 2), (Screen.height - 70) - (size.y / 2), size.x, size.y);
                     GUI.Label(resourceInfoRect, "Iron Structure");
+                    if (playerController.paintGunActive == false)
+                    {
+                        GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
+                        GUI.Label(guiCoordinates.buildInfoRect, "Press F to remove blocks.\nPress B to add blocks.\nPress Q to stop building.");
+                    }
                     GUI.skin.label.fontSize = f;
-                    GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
-                    GUI.Label(guiCoordinates.buildInfoRect, "Press F to remove blocks.\nPress B to add blocks.\nPress Q to stop building.");
                 }
                 if (obj.name.Equals("glassHolder(Clone)"))
                 {
@@ -724,9 +737,12 @@ public void OnGUI()
                     Vector2 size = style.CalcSize(content);
                     Rect resourceInfoRect = new Rect((Screen.width / 2) - (size.x / 2), (Screen.height - 70) - (size.y / 2), size.x, size.y);
                     GUI.Label(resourceInfoRect, "Glass Structure");
+                    if (playerController.paintGunActive == false)
+                    {
+                        GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
+                        GUI.Label(guiCoordinates.buildInfoRect, "Press F to remove blocks.\nPress B to add blocks.\nPress Q to stop building.");
+                    }
                     GUI.skin.label.fontSize = f;
-                    GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
-                    GUI.Label(guiCoordinates.buildInfoRect, "Press F to remove blocks.\nPress B to add blocks.\nPress Q to stop building.");
                 }
                 if (obj.name.Equals("steelHolder(Clone)"))
                 {
@@ -738,9 +754,12 @@ public void OnGUI()
                     Vector2 size = style.CalcSize(content);
                     Rect resourceInfoRect = new Rect((Screen.width / 2) - (size.x / 2), (Screen.height - 70) - (size.y / 2), size.x, size.y);
                     GUI.Label(resourceInfoRect, "Steel Structure");
+                    if (playerController.paintGunActive == false)
+                    {
+                        GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
+                        GUI.Label(guiCoordinates.buildInfoRect, "Press F to remove blocks.\nPress B to add blocks.\nPress Q to stop building.");
+                    }
                     GUI.skin.label.fontSize = f;
-                    GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
-                    GUI.Label(guiCoordinates.buildInfoRect, "Press F to remove blocks.\nPress B to add blocks.\nPress Q to stop building.");
                 }
                 if (obj.name.Equals("brickHolder(Clone)"))
                 {
@@ -752,9 +771,12 @@ public void OnGUI()
                     Vector2 size = style.CalcSize(content);
                     Rect resourceInfoRect = new Rect((Screen.width / 2) - (size.x / 2), (Screen.height - 70) - (size.y / 2), size.x, size.y);
                     GUI.Label(resourceInfoRect, "Brick Structure");
+                    if (playerController.paintGunActive == false)
+                    {
+                        GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
+                        GUI.Label(guiCoordinates.buildInfoRect, "Press F to remove blocks.\nPress B to add blocks.\nPress Q to stop building.");
+                    }
                     GUI.skin.label.fontSize = f;
-                    GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
-                    GUI.Label(guiCoordinates.buildInfoRect, "Press F to remove blocks.\nPress B to add blocks.\nPress Q to stop building.");
                 }
             }
         }

diff --git a/PhysicsHandler.cs b/PhysicsHandler.cs
@@ -421,6 +421,12 @@ private void CheckForSupport()
         needsSupportCheck = false;
     }
 
+    // Returns true if the block is not at risk of falling
+    public bool IsSupported()
+    {
+        return falling == false && fallingStack == false && needsSupportCheck == false;
+    }
+
     // Called by unity engine once per physics update for every collider that is touching the trigger
     public void OnTriggerStay(Collider other)
     {

diff --git a/PlayerGUI.cs b/PlayerGUI.cs
@@ -606,7 +606,10 @@ public void OnGUI()
             if (playerController.building == true && playerController.tabletOpen == false)
             {
                 GUI.DrawTexture(guiCoordinates.buildInfoRectBG, textureDictionary.dictionary["Interface Background"]);
+                int f = GUI.skin.label.fontSize;
+                GUI.skin.label.fontSize = 16;
                 GUI.Label(guiCoordinates.buildInfoRect, "Right click to place block.\nPress F to collect.\nPress R to rotate.\nPress Q to stop building.");
+                GUI.skin.label.fontSize = f;
                 GUI.DrawTexture(guiCoordinates.currentBuildItemTextureRect, textureDictionary.dictionary[playerController.buildType]);
                 int buildItemCount = 0;
                 foreach (InventorySlot slot in playerInventory.inventory)
@@ -631,7 +634,7 @@ public void OnGUI()
             {
                 if (playerController.paintColorSelected == false)
                 {
-                    GUI.DrawTexture(guiCoordinates.optionsMenuBackgroundRect, textureDictionary.dictionary["Menu Background"]);
+                    GUI.DrawTexture(guiCoordinates.paintGunMenuBackgroundRect, textureDictionary.dictionary["Menu Background"]);
                     GUI.Label(guiCoordinates.optionsButton1Rect, "        Paint  Gun");
                     GUI.Label(guiCoordinates.optionsButton2Rect, "       Select Color");
                     GUI.Label(guiCoordinates.sliderLabel1Rect, "Red");

diff --git a/SaveManager.cs b/SaveManager.cs
@@ -517,6 +517,7 @@ public IEnumerator SaveDataCoroutine()
                 }
                 if (T.gameObject.GetComponent<Glass>() != null)
                 {
+                    objectName = stateManager.WorldName + "Glass";
                     worldID = T.gameObject.GetComponent<Glass>().ID;
                     objectID = int.Parse(worldID.Substring(objectName.Length));
                     idList.Add(objectID);