From 2aabadc8154281f2aa411065001e0f0cc99409ab Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <me@steffo.eu>
Date: Mon, 2 Oct 2023 20:31:50 +0200
Subject: [PATCH] Shop improv

---
 game/game.gd                                                | 3 +++
 game/game.tscn                                              | 4 +++-
 entity/gem_stack.png => interface/upgrade_gem.png           | 0
 .../upgrade_gem.png.import                                  | 6 +++---
 main.gd                                                     | 3 +++
 5 files changed, 12 insertions(+), 4 deletions(-)
 rename entity/gem_stack.png => interface/upgrade_gem.png (100%)
 rename entity/gem_stack.png.import => interface/upgrade_gem.png.import (71%)

diff --git a/game/game.gd b/game/game.gd
index 352c361..4824f19 100644
--- a/game/game.gd
+++ b/game/game.gd
@@ -71,6 +71,7 @@ func update_counter_text():
 @export var upgrade_copper_texture: Texture2D
 @export var upgrade_silver_texture: Texture2D
 @export var upgrade_gold_texture: Texture2D
+@export var upgrade_gem_texture: Texture2D
 
 func update_counter_icon():
 	if len(store_collector.collecting_types) == 0:
@@ -81,6 +82,8 @@ func update_counter_icon():
 		store_collector_texturerect.texture = upgrade_silver_texture
 	elif store_collector.collecting_types[0] == &"Gold":
 		store_collector_texturerect.texture = upgrade_gold_texture
+	elif store_collector.collecting_types[0] == &"Gem":
+		store_collector_texturerect.texture = upgrade_gem_texture
 	else:
 		store_collector_texturerect.texture = null
 
diff --git a/game/game.tscn b/game/game.tscn
index 99e48c3..24e122d 100644
--- a/game/game.tscn
+++ b/game/game.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=23 format=3 uid="uid://c3rxmcwa5nqng"]
+[gd_scene load_steps=24 format=3 uid="uid://c3rxmcwa5nqng"]
 
 [ext_resource type="Script" path="res://game/game.gd" id="1_i3ly0"]
 [ext_resource type="PackedScene" uid="uid://bllsprv8orpn4" path="res://bottle/bottle.tscn" id="1_y7o2l"]
@@ -6,6 +6,7 @@
 [ext_resource type="Texture2D" uid="uid://7b12rwclhrq0" path="res://interface/upgrade_silver.png" id="3_8wvr1"]
 [ext_resource type="PackedScene" uid="uid://c67lfbk4gf1ga" path="res://spawner/spawner.tscn" id="3_qwsty"]
 [ext_resource type="Texture2D" uid="uid://taojrwr7xrp4" path="res://interface/upgrade_gold.png" id="4_i557v"]
+[ext_resource type="Texture2D" uid="uid://yx3gme4q4ote" path="res://interface/upgrade_gem.png" id="5_wbw72"]
 [ext_resource type="Texture2D" uid="uid://pj3ip6vlatms" path="res://converters/copper_to_silver/copper_converter.png" id="6_0jj8g"]
 [ext_resource type="PackedScene" uid="uid://beg758fa6o0cs" path="res://value/evaluator.tscn" id="6_my6nv"]
 [ext_resource type="PackedScene" uid="uid://ratkps4plkhl" path="res://converters/copper_to_silver/copper_converter.tscn" id="7_ipeok"]
@@ -39,6 +40,7 @@ script = ExtResource("1_i3ly0")
 upgrade_copper_texture = ExtResource("11_lt33g")
 upgrade_silver_texture = ExtResource("3_8wvr1")
 upgrade_gold_texture = ExtResource("4_i557v")
+upgrade_gem_texture = ExtResource("5_wbw72")
 
 [node name="GravityFromGyro" parent="." instance=ExtResource("2_h2pfr")]
 
diff --git a/entity/gem_stack.png b/interface/upgrade_gem.png
similarity index 100%
rename from entity/gem_stack.png
rename to interface/upgrade_gem.png
diff --git a/entity/gem_stack.png.import b/interface/upgrade_gem.png.import
similarity index 71%
rename from entity/gem_stack.png.import
rename to interface/upgrade_gem.png.import
index 6286741..debe2f4 100644
--- a/entity/gem_stack.png.import
+++ b/interface/upgrade_gem.png.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://yx3gme4q4ote"
-path="res://.godot/imported/gem_stack.png-48697e8b235aeec145f6f7d9b3d945cf.ctex"
+path="res://.godot/imported/upgrade_gem.png-5e957de962fd10a13373014fc76b9725.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://entity/gem_stack.png"
-dest_files=["res://.godot/imported/gem_stack.png-48697e8b235aeec145f6f7d9b3d945cf.ctex"]
+source_file="res://interface/upgrade_gem.png"
+dest_files=["res://.godot/imported/upgrade_gem.png-5e957de962fd10a13373014fc76b9725.ctex"]
 
 [params]
 
diff --git a/main.gd b/main.gd
index 21296a8..76eb5ce 100644
--- a/main.gd
+++ b/main.gd
@@ -54,3 +54,6 @@ func _on_shop_ui_delete_begin():
 
 func _on_shop_ui_delete_cancel():
 	ui_state = UIState.GAME
+
+func _on_shop_ui_purchase_cancel(_what):
+	ui_state = UIState.GAME