Make inventory view work and also enlarge UI

outfrost · Apr 26, 2021 · bf5d255 · bf5d255
1 parent fa89faf
commit bf5d255
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/environment/props/ResearchTable.gd b/environment/props/ResearchTable.gd
@@ -29,6 +29,7 @@ func interact():
 	character.set_process_input(false)
 	character.set_physics_process(false)
 	panel.show()
+	update_inventory_view()
 
 func done_interacting():
 	panel.hide()
@@ -43,6 +44,7 @@ func update_inventory_view():
 		character = null
 		return
 	var inventory_buttons = $CanvasLayer/ResearchPanel/InventoryButtons.get_children()
+	print_debug(inventory_buttons)
 	var button_idx = 0
 	for item_type in character.inventory:
 		if button_idx >= inventory_buttons.size():

diff --git a/level/Item.gd b/level/Item.gd
@@ -16,17 +16,17 @@ enum ItemType {
 }
 
 const ICONS: Dictionary = {
-	NONE = preload("res://item/None.tres"),
-	ORB_RED = preload("res://item/OrbRed.tres"),
-	ORB_BLUE = preload("res://item/OrbBlue.tres"),
-	ORB_YELLOW = preload("res://item/OrbYellow.tres"),
-	ORB_GREEN = preload("res://item/OrbGreen.tres"),
-	LEAVES = preload("res://item/Leaves.tres"),
-	TWIG = preload("res://item/Twig.tres"),
-	BOTTLE_RED = preload("res://item/BottleRed.tres"),
-	BOTTLE_BLUE = preload("res://item/BottleBlue.tres"),
-	BOTTLE_YELLOW = preload("res://item/BottleYellow.tres"),
-	BOTTLE_GREEN = preload("res://item/BottleGreen.tres"),
+	ItemType.NONE: preload("res://item/None.tres"),
+	ItemType.ORB_RED: preload("res://item/OrbRed.tres"),
+	ItemType.ORB_BLUE: preload("res://item/OrbBlue.tres"),
+	ItemType.ORB_YELLOW: preload("res://item/OrbYellow.tres"),
+	ItemType.ORB_GREEN: preload("res://item/OrbGreen.tres"),
+	ItemType.LEAVES: preload("res://item/Leaves.tres"),
+	ItemType.TWIG: preload("res://item/Twig.tres"),
+	ItemType.BOTTLE_RED: preload("res://item/BottleRed.tres"),
+	ItemType.BOTTLE_BLUE: preload("res://item/BottleBlue.tres"),
+	ItemType.BOTTLE_YELLOW: preload("res://item/BottleYellow.tres"),
+	ItemType.BOTTLE_GREEN: preload("res://item/BottleGreen.tres"),
 }
 
 static func type_str(item_type):

diff --git a/project.godot b/project.godot
@@ -67,6 +67,7 @@ gdscript/warnings/integer_division=false
 
 window/size/width=1280
 window/size/height=720
+window/stretch/mode="viewport"
 window/stretch/aspect="expand"
 
 [input]