1 files changed, 15 insertions, 18 deletions

diff --git a/scripts/multiverse_shop.gd b/scripts/multiverse_shop.gd
index 494ccd5..d4c32b0 100644
--- a/scripts/multiverse_shop.gd
+++ b/scripts/multiverse_shop.gd
@@ -1,16 +1,20 @@
 extends Control
 
-var Items = preload("res://scripts/items.gd")
+const Items = preload("res://scripts/items.gd")
 
 func _ready():
-  var map = {"1": get_node("tabs/*/items"),
-            "2": get_node("tabs/**/items"),
-            "3": get_node("tabs/***/items"),
-            "other": get_node("tabs/other/items")}
+  var map = {"solid": get_node("tabs/*/items"),
+             "gas": get_node("tabs/*/items"),
+            "precursor": get_node("tabs/**/items"),
+            "life": get_node("tabs/***/items")}
   var items = Items.new()
   for k in items.data.keys():
     var tree = map[k]
-    var root = tree.create_item()
+    var root = null
+    if tree.get_root() == null:
+      root = tree.create_item()
+    else:
+      root = tree.get_root()
     tree.set_columns(2)
     tree.set_column_title(0, "Item")
     tree.set_column_title(1, "Cost")
@@ -20,17 +24,10 @@ func _ready():
     tree.set_hide_root(true)
     tree.set_select_mode(Tree.SELECT_ROW)
     for i in range(items.data[k].size()):
-      var item = items.data[k][i]
-      var itm = tree.create_item(root)
-      itm.set_text(0, item["name"])
-      itm.set_text(1, str(item["cost"]))
-      itm.set_tooltip(0, item["desc"])
-      itm.set_metadata(0, item)
-      itm.set_collapsed(true)
-      
-      var desc = tree.create_item(itm)
-      desc.set_text(0, item["desc"])
-      desc.set_selectable(0, false)
+      var dict = items.data[k][i]
+      var id = dict["id"]
+      var item = items.get(id)
+      item.insert_in_shop(tree, root)
 
 func _on_buy_pressed():
   var tab = get_node("tabs").get_current_tab_control()
@@ -40,7 +37,7 @@ func _on_buy_pressed():
     var item = itm.get_metadata(0)
     var player = get_tree().get_root().get_node("Game/Player")
     if player.cash >= item["cost"]:
-      player.add_item(item["id"], item, 1)
+      player.add_item(item["id"], 1)
       player.cash -= item["cost"]
     else:
       pass
\ No newline at end of file