From 3618576d9edee210c80852a9c7072e15ee061dce Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 2 Oct 2023 19:29:42 +0200 Subject: [PATCH] Move converter files --- .../gold_to_coaldiamond/diamond_converter.png | 3 ++ .../diamond_converter.png.import | 34 +++++++++++++++++++ .../diamond_converter_back.png | 0 .../diamond_converter_back.png.import | 6 ++-- .../diamond_converter_front_1.png | 0 .../diamond_converter_front_1.png.import | 6 ++-- .../diamond_converter_front_2.png | 0 .../diamond_converter_front_2.png.import | 6 ++-- .../diamond_converter_front_3.png | 0 .../diamond_converter_front_3.png.import | 6 ++-- .../diamond_converter_front_4.png | 0 .../diamond_converter_front_4.png.import | 6 ++-- .../diamond_converter_front_5.png | 0 .../diamond_converter_front_5.png.import | 6 ++-- interface/shop_ui.tscn | 4 ++- 15 files changed, 58 insertions(+), 19 deletions(-) create mode 100644 converters/gold_to_coaldiamond/diamond_converter.png create mode 100644 converters/gold_to_coaldiamond/diamond_converter.png.import rename {entity => converters/gold_to_coaldiamond}/diamond_converter_back.png (100%) rename {entity => converters/gold_to_coaldiamond}/diamond_converter_back.png.import (66%) rename {entity => converters/gold_to_coaldiamond}/diamond_converter_front_1.png (100%) rename {entity => converters/gold_to_coaldiamond}/diamond_converter_front_1.png.import (73%) rename {entity => converters/gold_to_coaldiamond}/diamond_converter_front_2.png (100%) rename {entity => converters/gold_to_coaldiamond}/diamond_converter_front_2.png.import (73%) rename {entity => converters/gold_to_coaldiamond}/diamond_converter_front_3.png (100%) rename {entity => converters/gold_to_coaldiamond}/diamond_converter_front_3.png.import (73%) rename {entity => converters/gold_to_coaldiamond}/diamond_converter_front_4.png (100%) rename {entity => converters/gold_to_coaldiamond}/diamond_converter_front_4.png.import (73%) rename {entity => converters/gold_to_coaldiamond}/diamond_converter_front_5.png (100%) rename {entity => converters/gold_to_coaldiamond}/diamond_converter_front_5.png.import (73%) diff --git a/converters/gold_to_coaldiamond/diamond_converter.png b/converters/gold_to_coaldiamond/diamond_converter.png new file mode 100644 index 0000000..7369215 --- /dev/null +++ b/converters/gold_to_coaldiamond/diamond_converter.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a30b9c19e305c3b523e9129de9b0cc9fda1fefca773271b5d8e5f956a8f98aae +size 5497 diff --git a/converters/gold_to_coaldiamond/diamond_converter.png.import b/converters/gold_to_coaldiamond/diamond_converter.png.import new file mode 100644 index 0000000..ed6578e --- /dev/null +++ b/converters/gold_to_coaldiamond/diamond_converter.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://caljydl4v2smk" +path="res://.godot/imported/diamond_converter.png-7fee922931a7ad3278f492d59ed09d41.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://converters/gold_to_coaldiamond/diamond_converter.png" +dest_files=["res://.godot/imported/diamond_converter.png-7fee922931a7ad3278f492d59ed09d41.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/entity/diamond_converter_back.png b/converters/gold_to_coaldiamond/diamond_converter_back.png similarity index 100% rename from entity/diamond_converter_back.png rename to converters/gold_to_coaldiamond/diamond_converter_back.png diff --git a/entity/diamond_converter_back.png.import b/converters/gold_to_coaldiamond/diamond_converter_back.png.import similarity index 66% rename from entity/diamond_converter_back.png.import rename to converters/gold_to_coaldiamond/diamond_converter_back.png.import index 91569f5..cc4ea1a 100644 --- a/entity/diamond_converter_back.png.import +++ b/converters/gold_to_coaldiamond/diamond_converter_back.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://2dhqp2liete7" -path="res://.godot/imported/diamond_converter_back.png-c4955e132244a62b38140e3d1ea5fb41.ctex" +path="res://.godot/imported/diamond_converter_back.png-66576af8432f4983f34629210cf629e6.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/diamond_converter_back.png" -dest_files=["res://.godot/imported/diamond_converter_back.png-c4955e132244a62b38140e3d1ea5fb41.ctex"] +source_file="res://converters/gold_to_coaldiamond/diamond_converter_back.png" +dest_files=["res://.godot/imported/diamond_converter_back.png-66576af8432f4983f34629210cf629e6.ctex"] [params] diff --git a/entity/diamond_converter_front_1.png b/converters/gold_to_coaldiamond/diamond_converter_front_1.png similarity index 100% rename from entity/diamond_converter_front_1.png rename to converters/gold_to_coaldiamond/diamond_converter_front_1.png diff --git a/entity/diamond_converter_front_1.png.import b/converters/gold_to_coaldiamond/diamond_converter_front_1.png.import similarity index 73% rename from entity/diamond_converter_front_1.png.import rename to converters/gold_to_coaldiamond/diamond_converter_front_1.png.import index df0ebcb..6f3da0e 100644 --- a/entity/diamond_converter_front_1.png.import +++ b/converters/gold_to_coaldiamond/diamond_converter_front_1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cxbiwq3sjp77w" -path="res://.godot/imported/diamond_converter_front_1.png-5dfce85251ce80128baa984163bc2d62.ctex" +path="res://.godot/imported/diamond_converter_front_1.png-c78bcf4d3dfc43a0fbe9df23d3eb68d8.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/diamond_converter_front_1.png" -dest_files=["res://.godot/imported/diamond_converter_front_1.png-5dfce85251ce80128baa984163bc2d62.ctex"] +source_file="res://converters/gold_to_coaldiamond/diamond_converter_front_1.png" +dest_files=["res://.godot/imported/diamond_converter_front_1.png-c78bcf4d3dfc43a0fbe9df23d3eb68d8.ctex"] [params] diff --git a/entity/diamond_converter_front_2.png b/converters/gold_to_coaldiamond/diamond_converter_front_2.png similarity index 100% rename from entity/diamond_converter_front_2.png rename to converters/gold_to_coaldiamond/diamond_converter_front_2.png diff --git a/entity/diamond_converter_front_2.png.import b/converters/gold_to_coaldiamond/diamond_converter_front_2.png.import similarity index 73% rename from entity/diamond_converter_front_2.png.import rename to converters/gold_to_coaldiamond/diamond_converter_front_2.png.import index 76f4b8a..5bcf924 100644 --- a/entity/diamond_converter_front_2.png.import +++ b/converters/gold_to_coaldiamond/diamond_converter_front_2.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://crniyi0tyugvv" -path="res://.godot/imported/diamond_converter_front_2.png-a447556be75f73c0305e320a4534bb88.ctex" +path="res://.godot/imported/diamond_converter_front_2.png-db4b1df1e8cd9bbb1f4543abe33c2f2a.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/diamond_converter_front_2.png" -dest_files=["res://.godot/imported/diamond_converter_front_2.png-a447556be75f73c0305e320a4534bb88.ctex"] +source_file="res://converters/gold_to_coaldiamond/diamond_converter_front_2.png" +dest_files=["res://.godot/imported/diamond_converter_front_2.png-db4b1df1e8cd9bbb1f4543abe33c2f2a.ctex"] [params] diff --git a/entity/diamond_converter_front_3.png b/converters/gold_to_coaldiamond/diamond_converter_front_3.png similarity index 100% rename from entity/diamond_converter_front_3.png rename to converters/gold_to_coaldiamond/diamond_converter_front_3.png diff --git a/entity/diamond_converter_front_3.png.import b/converters/gold_to_coaldiamond/diamond_converter_front_3.png.import similarity index 73% rename from entity/diamond_converter_front_3.png.import rename to converters/gold_to_coaldiamond/diamond_converter_front_3.png.import index 7cbe8f6..d378812 100644 --- a/entity/diamond_converter_front_3.png.import +++ b/converters/gold_to_coaldiamond/diamond_converter_front_3.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://d1lb0mobj4rb" -path="res://.godot/imported/diamond_converter_front_3.png-347e37887088e77193c9e6bc0535a894.ctex" +path="res://.godot/imported/diamond_converter_front_3.png-9cac72a978866a2b4bc9701b836e951e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/diamond_converter_front_3.png" -dest_files=["res://.godot/imported/diamond_converter_front_3.png-347e37887088e77193c9e6bc0535a894.ctex"] +source_file="res://converters/gold_to_coaldiamond/diamond_converter_front_3.png" +dest_files=["res://.godot/imported/diamond_converter_front_3.png-9cac72a978866a2b4bc9701b836e951e.ctex"] [params] diff --git a/entity/diamond_converter_front_4.png b/converters/gold_to_coaldiamond/diamond_converter_front_4.png similarity index 100% rename from entity/diamond_converter_front_4.png rename to converters/gold_to_coaldiamond/diamond_converter_front_4.png diff --git a/entity/diamond_converter_front_4.png.import b/converters/gold_to_coaldiamond/diamond_converter_front_4.png.import similarity index 73% rename from entity/diamond_converter_front_4.png.import rename to converters/gold_to_coaldiamond/diamond_converter_front_4.png.import index ebe1eeb..e4af8ce 100644 --- a/entity/diamond_converter_front_4.png.import +++ b/converters/gold_to_coaldiamond/diamond_converter_front_4.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://qnw7pse2bog4" -path="res://.godot/imported/diamond_converter_front_4.png-e97570a5cfb5e50dea98cb2cbcef8956.ctex" +path="res://.godot/imported/diamond_converter_front_4.png-dcea5445207a6e8b105512015b2713a4.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/diamond_converter_front_4.png" -dest_files=["res://.godot/imported/diamond_converter_front_4.png-e97570a5cfb5e50dea98cb2cbcef8956.ctex"] +source_file="res://converters/gold_to_coaldiamond/diamond_converter_front_4.png" +dest_files=["res://.godot/imported/diamond_converter_front_4.png-dcea5445207a6e8b105512015b2713a4.ctex"] [params] diff --git a/entity/diamond_converter_front_5.png b/converters/gold_to_coaldiamond/diamond_converter_front_5.png similarity index 100% rename from entity/diamond_converter_front_5.png rename to converters/gold_to_coaldiamond/diamond_converter_front_5.png diff --git a/entity/diamond_converter_front_5.png.import b/converters/gold_to_coaldiamond/diamond_converter_front_5.png.import similarity index 73% rename from entity/diamond_converter_front_5.png.import rename to converters/gold_to_coaldiamond/diamond_converter_front_5.png.import index 76b6ac4..458587f 100644 --- a/entity/diamond_converter_front_5.png.import +++ b/converters/gold_to_coaldiamond/diamond_converter_front_5.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b3vbqgitwo8la" -path="res://.godot/imported/diamond_converter_front_5.png-c9142a5e3face7350e2ea6789e6053b2.ctex" +path="res://.godot/imported/diamond_converter_front_5.png-ee46f3f858dc4bb30cf4b172d25d4284.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/diamond_converter_front_5.png" -dest_files=["res://.godot/imported/diamond_converter_front_5.png-c9142a5e3face7350e2ea6789e6053b2.ctex"] +source_file="res://converters/gold_to_coaldiamond/diamond_converter_front_5.png" +dest_files=["res://.godot/imported/diamond_converter_front_5.png-ee46f3f858dc4bb30cf4b172d25d4284.ctex"] [params] diff --git a/interface/shop_ui.tscn b/interface/shop_ui.tscn index 204847b..b1efc34 100644 --- a/interface/shop_ui.tscn +++ b/interface/shop_ui.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=3 uid="uid://cklkdygv61bny"] +[gd_scene load_steps=21 format=3 uid="uid://cklkdygv61bny"] [ext_resource type="Theme" uid="uid://ba5utvfhnxa5i" path="res://interface/interface_theme.tres" id="1_qdf0y"] [ext_resource type="PackedScene" uid="uid://dul1fpyh733t7" path="res://interface/purchasable_item.tscn" id="2_2dtc0"] @@ -19,6 +19,7 @@ [ext_resource type="PackedScene" uid="uid://cb1t7ylnkmt3t" path="res://converters/gold_to_gem/gold_converter.tscn" id="13_m0kio"] [ext_resource type="Texture2D" uid="uid://bktdm8yu8tdfn" path="res://converters/item_converter/item_converter.png" id="14_1p6uj"] [ext_resource type="PackedScene" uid="uid://ddrhfhebwtq5" path="res://converters/item_converter/item_converter.tscn" id="14_tgckt"] +[ext_resource type="Texture2D" uid="uid://caljydl4v2smk" path="res://converters/gold_to_coaldiamond/diamond_converter.png" id="15_ecie1"] [node name="ShopUI" type="Panel"] anchors_preset = 15 @@ -154,6 +155,7 @@ layout_mode = 2 [node name="BuyCompressor" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("2_2dtc0")] layout_mode = 2 +item_icon = ExtResource("15_ecie1") item_name = "Coal-pressor" item_description = "Consumes ten gold coins to create either a precious white diamond or an useless lump of coal!" item_cost_text = "??"