Start revamping the item menus code

MyzTyn · Jun 19, 2022 · 6f3e907 · 6f3e907
1 parent b5a7238
commit 6f3e907
Show file tree

Hide file tree

Showing 15 changed files with 1,148 additions and 1,807 deletions.
diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
diff --git a/Assets/Scripts/ItemSlot.cs b/Assets/Scripts/ItemSlot.cs
@@ -2,22 +2,27 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
+
 public enum SlotMode{
     Item,
     Empty,
     Cancel
 }
+
 public enum SlotType{
     Item,
     Shop
 }
+
 public class ItemSlot : MonoBehaviour {
 	public bool isKeyItem;
 	public CustomText slotNameText, slotQuantityText;
 	public ItemsEnum item;
     //public ItemDataEntry itemData;
 	public int intquantity;
+    public int price;
     public SlotMode mode;
+    public SlotType type;
 
 	// Use this for initialization
 	void Awake () {
@@ -40,10 +45,25 @@ void Update () {
         }
 
 		if (!isKeyItem && mode == SlotMode.Item) {
-			slotQuantityText.text = "*" + (intquantity <= 9 ? " ": "") + intquantity.ToString();
+            if(type == SlotType.Item){
+			    slotQuantityText.text = "*" + (intquantity <= 9 ? " ": "") + intquantity.ToString();
+            }else{
+                slotQuantityText.text = "$" + price;
+            }
 		} else {
 
 			slotQuantityText.text = "";
 		}
 	}
+
+    public void UpdatePrice()
+    {
+        ItemDataEntry itemDataEntry = PokemonData.itemData[(int)item];
+
+        if (itemDataEntry.price != 0)
+        {
+            price = itemDataEntry.price;
+        }
+        else throw new UnityException("A price entry doesn't exist for " + "\"" + name + "\"");
+    }
 }
diff --git a/Assets/Scripts/Menus/Badges.cs b/Assets/Scripts/Menus/Badges.cs
@@ -11,43 +11,32 @@ public class Badges : MonoBehaviour {
     public GameCursor cursor;
 
 	// Use this for initialization
-
     public void Init(){
         nameText.text = GameData.instance.playerName;
         moneyText.text = GameData.instance.money.ToString();
         timeText.text =  GameData.instance.hours.SpaceFormat(3) + " " + GameData.instance.minutes.ZeroFormat("0x");
-        for (int i = 0; i < 8; i++)
-        {
+
+        for (int i = 0; i < 8; i++){
             if (GameData.instance.hasBadge[i])
             {
                 allbadges[i].sprite = obtainedimages[i];
-
-            }
-            else
-            {
-
+            }else{
                 allbadges[i].sprite = notobtainedimages[i];
             }
-
-
         }
     }
-    // Update is called once per frame
-    void Update()
-    {
-        if (Inputs.pressed("a"))
-        {
-
 
-            if (MainMenu.instance.currentmenu == MainMenu.instance.badgesmenu)
-            {
+    // Update is called once per frame
+    void Update(){
+        if (Inputs.pressed("a")){
+            if (MainMenu.instance.currentmenu == MainMenu.instance.badgesmenu){
                 SoundManager.instance.PlayABSound();
                 MainMenu.instance.currentmenu = MainMenu.instance.thismenu;
                 Inputs.Enable("start");
                 cursor.SetActive(true);
                 this.gameObject.SetActive(false);
-
             }
         }
     }
+
 }