From 7fe8c0418efb8abdf2c8fc3cb1a40c994c9c490c Mon Sep 17 00:00:00 2001 From: Maxim Lobovsky Date: Mon, 2 Oct 2023 15:49:49 +0200 Subject: [PATCH 1/4] add item converter fixed gem --- entity/item_converter_back_1.png | 3 +++ entity/item_converter_back_2.png | 3 +++ entity/item_converter_back_3.png | 3 +++ entity/item_converter_back_4.png | 3 +++ entity/item_converter_back_5.png | 3 +++ entity/item_converter_front_1.png | 3 +++ entity/item_converter_front_2.png | 3 +++ entity/item_converter_front_3.png | 3 +++ entity/item_converter_front_4.png | 3 +++ entity/item_converter_front_5.png | 3 +++ entity/item_ring_gems.png | 4 ++-- 11 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 entity/item_converter_back_1.png create mode 100644 entity/item_converter_back_2.png create mode 100644 entity/item_converter_back_3.png create mode 100644 entity/item_converter_back_4.png create mode 100644 entity/item_converter_back_5.png create mode 100644 entity/item_converter_front_1.png create mode 100644 entity/item_converter_front_2.png create mode 100644 entity/item_converter_front_3.png create mode 100644 entity/item_converter_front_4.png create mode 100644 entity/item_converter_front_5.png diff --git a/entity/item_converter_back_1.png b/entity/item_converter_back_1.png new file mode 100644 index 0000000..3df3be4 --- /dev/null +++ b/entity/item_converter_back_1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b16d94bef9bf00faaabfb53b8ae2fe0b6185c2fb1aa731cfed04dfd19fe4c56 +size 444 diff --git a/entity/item_converter_back_2.png b/entity/item_converter_back_2.png new file mode 100644 index 0000000..2c3d538 --- /dev/null +++ b/entity/item_converter_back_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aebf62026c8302b09f866a8336612ac173906c9fbfbb75e7348de993948023d6 +size 480 diff --git a/entity/item_converter_back_3.png b/entity/item_converter_back_3.png new file mode 100644 index 0000000..a914b51 --- /dev/null +++ b/entity/item_converter_back_3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5017b6eebf29530918a7c362d610f0a50a85effb9004010abe3df1c49901d92 +size 441 diff --git a/entity/item_converter_back_4.png b/entity/item_converter_back_4.png new file mode 100644 index 0000000..9142e87 --- /dev/null +++ b/entity/item_converter_back_4.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b2b8d09f5400375c939c0180095c0dace32e45a814eb58ad541049886c1d8bc +size 452 diff --git a/entity/item_converter_back_5.png b/entity/item_converter_back_5.png new file mode 100644 index 0000000..f35e58a --- /dev/null +++ b/entity/item_converter_back_5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e11cf2b9ac0ad338f1c5c877250a49d858a149782d9d1c370c558e2a9d7068b +size 457 diff --git a/entity/item_converter_front_1.png b/entity/item_converter_front_1.png new file mode 100644 index 0000000..9588135 --- /dev/null +++ b/entity/item_converter_front_1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1d0ae94edb939f55c6a4a7daf661f57776dc08d8f69e70dc3bff2feac716956 +size 1185 diff --git a/entity/item_converter_front_2.png b/entity/item_converter_front_2.png new file mode 100644 index 0000000..1663366 --- /dev/null +++ b/entity/item_converter_front_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dfe9b7c2acd714cdc26ac5c40fa8046aa2a9f9fcf9d89189a572b4bfe514ede +size 1214 diff --git a/entity/item_converter_front_3.png b/entity/item_converter_front_3.png new file mode 100644 index 0000000..4a4e0b9 --- /dev/null +++ b/entity/item_converter_front_3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d83cd20b40fb8985d481f7f4454e20ea429773fe2f763701871373523a8e6cf +size 1314 diff --git a/entity/item_converter_front_4.png b/entity/item_converter_front_4.png new file mode 100644 index 0000000..0c0e4ed --- /dev/null +++ b/entity/item_converter_front_4.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c77f3447291d1e30b240871b47d67445c3528d25574cb6e4ae88368865b96734 +size 1163 diff --git a/entity/item_converter_front_5.png b/entity/item_converter_front_5.png new file mode 100644 index 0000000..4e418b7 --- /dev/null +++ b/entity/item_converter_front_5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c61daba7e813a3773c7db6f576631aecb392611f17b9fc924c6ebfe809f60404 +size 1289 diff --git a/entity/item_ring_gems.png b/entity/item_ring_gems.png index aae980c..b083df3 100644 --- a/entity/item_ring_gems.png +++ b/entity/item_ring_gems.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83ae678cf8d64f2dcf6e1e0ce48a7113d1d9c9bbd5cefa91b7d16075b43d3ed7 -size 219 +oid sha256:c8c2e0026cdf0f55fa51e5c4967e36b66241f137fc2638fcaf42e411e44c1297 +size 209 From 7c4af0e6c76de90c7cc868c62c594cfb4fe43d11 Mon Sep 17 00:00:00 2001 From: Matteo Balugani Date: Mon, 2 Oct 2023 15:50:25 +0200 Subject: [PATCH 2/4] mmm idk --- .../FurnaceConverter/furnace_converter.tscn | 139 ++++++++++++++++++ converters/gold_to_gem/gem_converter.tscn | 11 +- entity/coin_copper/coin_copper.gd | 49 +++--- entity/coin_copper/coin_copper.tscn | 3 +- entity/gem/gemstone.gdshader | 0 game/game.tscn | 24 +-- main.tscn | 9 +- 7 files changed, 181 insertions(+), 54 deletions(-) create mode 100644 converters/FurnaceConverter/furnace_converter.tscn create mode 100644 entity/gem/gemstone.gdshader diff --git a/converters/FurnaceConverter/furnace_converter.tscn b/converters/FurnaceConverter/furnace_converter.tscn new file mode 100644 index 0000000..93d6184 --- /dev/null +++ b/converters/FurnaceConverter/furnace_converter.tscn @@ -0,0 +1,139 @@ +[gd_scene load_steps=21 format=3 uid="uid://c0hcrkf1s2mww"] + +[ext_resource type="Script" path="res://converters/converter.gd" id="1_nl8w8"] +[ext_resource type="Texture2D" uid="uid://440yhlpwpfw4" path="res://converters/copper_to_silver/copper_converter_back.png" id="2_n2t4e"] +[ext_resource type="Texture2D" uid="uid://dq5aowbt2wxec" path="res://converters/copper_to_silver/copper_converter_front_1.png" id="3_5albl"] +[ext_resource type="Texture2D" uid="uid://ck254fewe4l41" path="res://converters/copper_to_silver/copper_converter_front_2.png" id="4_lk7ni"] +[ext_resource type="Texture2D" uid="uid://dg4qq1pgojk8d" path="res://converters/copper_to_silver/copper_converter_front_3.png" id="5_b51qy"] +[ext_resource type="Texture2D" uid="uid://60502lbpup6" path="res://converters/copper_to_silver/copper_converter_front_4.png" id="6_w1me1"] +[ext_resource type="PackedScene" uid="uid://c5w3b55aiui6c" path="res://collector/collector.tscn" id="7_8xgpc"] +[ext_resource type="PackedScene" uid="uid://c67lfbk4gf1ga" path="res://spawner/spawner.tscn" id="8_gdane"] +[ext_resource type="PackedScene" uid="uid://dme22vvfgme5f" path="res://entity/coin_silver/coin_silver.tscn" id="9_scl8h"] +[ext_resource type="AudioStream" uid="uid://br25ip30mu174" path="res://audio/conversione/mechanic_sound.wav" id="10_rm0va"] +[ext_resource type="AudioStream" uid="uid://7tw5efuo3gxj" path="res://audio/conversione/coin_to_coin.wav" id="11_mv2w6"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_62dyi"] +atlas = ExtResource("3_5albl") +region = Rect2(0, 2, 32, 33) + +[sub_resource type="AtlasTexture" id="AtlasTexture_gs3wo"] +atlas = ExtResource("4_lk7ni") +region = Rect2(0, 2, 32, 33) + +[sub_resource type="AtlasTexture" id="AtlasTexture_tboq2"] +atlas = ExtResource("5_b51qy") +region = Rect2(0, 2, 32, 33) + +[sub_resource type="AtlasTexture" id="AtlasTexture_okgf4"] +atlas = ExtResource("6_w1me1") +region = Rect2(0, 2, 32, 33) + +[sub_resource type="SpriteFrames" id="SpriteFrames_4m3dg"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_62dyi") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_gs3wo") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_tboq2") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_okgf4") +}], +"loop": true, +"name": &"default", +"speed": 15.0 +}] + +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_aslkt"] +radius = 1.5 +height = 28.0 + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_31dtl"] +size = Vector2(26, 4) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_k11if"] +size = Vector2(26, 5) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_jeo5f"] +size = Vector2(26, 8.83334) + +[node name="FurnaceConverter" type="StaticBody2D" node_paths=PackedStringArray("sprite_front", "conversion_timer", "sound_working", "sound_complete", "spawner")] +scale = Vector2(3, 3) +script = ExtResource("1_nl8w8") +sprite_front = NodePath("") +conversion_timer = NodePath("") +sound_working = NodePath("") +sound_complete = NodePath("") +spawner = NodePath("") + +[node name="SpriteBack" type="Sprite2D" parent="."] +z_index = -2 +texture_filter = 1 +texture = ExtResource("2_n2t4e") + +[node name="SpriteFront" type="AnimatedSprite2D" parent="."] +z_index = 2 +texture_filter = 1 +sprite_frames = SubResource("SpriteFrames_4m3dg") + +[node name="LeftWall" type="CollisionShape2D" parent="."] +z_index = 2 +position = Vector2(-14.5, -3) +shape = SubResource("CapsuleShape2D_aslkt") + +[node name="RightWall" type="CollisionShape2D" parent="."] +z_index = 2 +position = Vector2(14.5, -3) +shape = SubResource("CapsuleShape2D_aslkt") + +[node name="InnerWall" type="CollisionShape2D" parent="."] +z_index = 3 +position = Vector2(0, 4.5) +rotation = 3.14159 +shape = SubResource("RectangleShape2D_31dtl") + +[node name="Collector" parent="." node_paths=PackedStringArray("sound_absorb") instance=ExtResource("7_8xgpc")] +z_index = 2 +collecting_types = Array[StringName]([&"Copper"]) +sound_absorb = NodePath("") +collecting_amount = 10 + +[node name="CollectShape" type="CollisionShape2D" parent="Collector"] +shape = SubResource("RectangleShape2D_k11if") +debug_color = Color(0, 0.701961, 0.188235, 0.419608) + +[node name="Spawner" parent="." instance=ExtResource("8_gdane")] +position = Vector2(0, 8) +scene = ExtResource("9_scl8h") +buffer_cap = 1 +spawn_rect = Rect2(-8, 0, 16, 4) +spawn_rotation_degrees_min = 80.0 +spawn_rotation_degrees_max = 100.0 +overlapping_body_count_limit = 4 + +[node name="PreventSpawnShape" type="CollisionShape2D" parent="Spawner"] +z_index = 3 +position = Vector2(0, 3.5) +shape = SubResource("RectangleShape2D_jeo5f") +debug_color = Color(0.701961, 0, 0, 0.419608) + +[node name="ConversionTimer" type="Timer" parent="."] +wait_time = 0.5 +one_shot = true + +[node name="SoundAbsorb" type="AudioStreamPlayer" parent="."] +stream = ExtResource("10_rm0va") + +[node name="SoundWorking" type="AudioStreamPlayer" parent="."] +stream = ExtResource("10_rm0va") + +[node name="SoundComplete" type="AudioStreamPlayer" parent="."] +stream = ExtResource("11_mv2w6") + +[connection signal="collected" from="Collector" to="." method="_on_collector_collected" flags=18] +[connection signal="goal" from="Collector" to="." method="_on_collector_goal" flags=18] +[connection signal="timeout" from="ConversionTimer" to="." method="_on_timer_timeout" flags=18] diff --git a/converters/gold_to_gem/gem_converter.tscn b/converters/gold_to_gem/gem_converter.tscn index 9c1959f..fa18dfe 100644 --- a/converters/gold_to_gem/gem_converter.tscn +++ b/converters/gold_to_gem/gem_converter.tscn @@ -9,7 +9,7 @@ [ext_resource type="PackedScene" uid="uid://c5w3b55aiui6c" path="res://collector/collector.tscn" id="7_m34js"] [ext_resource type="Texture2D" uid="uid://bfxmurfe4o44s" path="res://entity/gold_converter_front_5.png" id="7_w8dcp"] [ext_resource type="PackedScene" uid="uid://c67lfbk4gf1ga" path="res://spawner/spawner.tscn" id="8_qwbjp"] -[ext_resource type="PackedScene" uid="uid://du3005kwybbrh" path="res://entity/coin_gold/coin_gold.tscn" id="10_5hiv4"] +[ext_resource type="PackedScene" uid="uid://w2er6cmul5yx" path="res://entity/gem/gem.tscn" id="9_2ugi1"] [ext_resource type="AudioStream" uid="uid://br25ip30mu174" path="res://audio/conversione/mechanic_sound.wav" id="10_f1h6i"] [ext_resource type="AudioStream" uid="uid://7tw5efuo3gxj" path="res://audio/conversione/coin_to_coin.wav" id="11_ywwn2"] @@ -69,9 +69,14 @@ size = Vector2(26, 5) [sub_resource type="RectangleShape2D" id="RectangleShape2D_jeo5f"] size = Vector2(26, 8.83334) -[node name="GemConverter" type="StaticBody2D"] +[node name="GemConverter" type="StaticBody2D" node_paths=PackedStringArray("sprite_front", "conversion_timer", "sound_working", "sound_complete", "spawner")] scale = Vector2(3, 3) script = ExtResource("1_f5plk") +sprite_front = NodePath("SpriteFront") +conversion_timer = NodePath("ConversionTimer") +sound_working = NodePath("SoundWorking") +sound_complete = NodePath("SoundComplete") +spawner = NodePath("Spawner") [node name="SpriteBack" type="Sprite2D" parent="."] z_index = -2 @@ -112,7 +117,7 @@ debug_color = Color(0, 0.701961, 0.188235, 0.419608) [node name="Spawner" parent="." instance=ExtResource("8_qwbjp")] position = Vector2(0, 8) -scene = ExtResource("10_5hiv4") +scene = ExtResource("9_2ugi1") buffer_cap = 1 spawn_rect = Rect2(-8, 0, 16, 4) spawn_rotation_degrees_min = 80.0 diff --git a/entity/coin_copper/coin_copper.gd b/entity/coin_copper/coin_copper.gd index 594d523..c31701b 100644 --- a/entity/coin_copper/coin_copper.gd +++ b/entity/coin_copper/coin_copper.gd @@ -1,38 +1,27 @@ #extends RigidBody2D # +#@export var sound_touch: AudioStreamPlayer # -## Called when the node enters the scene tree for the first time. -#func _ready(): -# pass # Replace with function body. +#var touched=false +#var was_sleeping: bool = false # +#func set_touched(): +# touched=true # -## Called every frame. 'delta' is the elapsed time since the previous frame. - - -extends RigidBody2D - -@export var sound_touch: AudioStreamPlayer - -var touched=false -var was_sleeping: bool = false - -func set_touched(): - touched=true - -func _on_sleeping_state_changed(): - was_sleeping = true - -func _on_body_entered(body): - if not was_sleeping: - if touched==false and $Timer.is_stopped(): - #$sound_touch.play() - $Timer.start() - var other_node=body - if other_node.has_method("set_touched"): - other_node.set_touched() - -func _on_body_exited(body): - touched=false +#func _on_sleeping_state_changed(): +# was_sleeping = true +# +#func _on_body_entered(body): +# if not was_sleeping: +# if touched==false and $Timer.is_stopped(): +# #$sound_touch.play() +# $Timer.start() +# var other_node=body +# if other_node.has_method("set_touched"): +# other_node.set_touched() +# +#func _on_body_exited(body): +# touched=false diff --git a/entity/coin_copper/coin_copper.tscn b/entity/coin_copper/coin_copper.tscn index 08850eb..750fd34 100644 --- a/entity/coin_copper/coin_copper.tscn +++ b/entity/coin_copper/coin_copper.tscn @@ -11,7 +11,7 @@ [sub_resource type="RectangleShape2D" id="RectangleShape2D_c6byl"] size = Vector2(14, 3) -[node name="CoinCopper" type="RigidBody2D" node_paths=PackedStringArray("sound_touch")] +[node name="CoinCopper" type="RigidBody2D"] collision_layer = 5 collision_mask = 7 inertia = 1000.0 @@ -22,7 +22,6 @@ contact_monitor = true linear_damp = 0.1 angular_damp = 0.1 script = ExtResource("2_1r8w3") -sound_touch = NodePath("sound_touch") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] scale = Vector2(2, 2) diff --git a/entity/gem/gemstone.gdshader b/entity/gem/gemstone.gdshader new file mode 100644 index 0000000..e69de29 diff --git a/game/game.tscn b/game/game.tscn index 2d8c926..1a1d92f 100644 --- a/game/game.tscn +++ b/game/game.tscn @@ -11,12 +11,11 @@ [ext_resource type="PackedScene" uid="uid://du3005kwybbrh" path="res://entity/coin_gold/coin_gold.tscn" id="7_hh80i"] [ext_resource type="PackedScene" uid="uid://ratkps4plkhl" path="res://converters/copper_to_silver/copper_converter.tscn" id="7_ipeok"] [ext_resource type="PackedScene" uid="uid://but1bdslxp5jl" path="res://converters/silver_to_gold/silver_converter.tscn" id="8_0bbpi"] -[ext_resource type="PackedScene" path="res://entity/gem/gem.tscn" id="8_a3sk0"] [ext_resource type="PackedScene" uid="uid://c2rlx7egl7xiv" path="res://collector/universal_collector.tscn" id="9_7op48"] [ext_resource type="PackedScene" uid="uid://c5w3b55aiui6c" path="res://collector/collector.tscn" id="9_evdhb"] [ext_resource type="Theme" uid="uid://ba5utvfhnxa5i" path="res://interface/interface_theme.tres" id="10_sayqn"] [ext_resource type="Texture2D" uid="uid://c8pvjgtr2ufjl" path="res://interface/upgrade_copper.png" id="11_lt33g"] -[ext_resource type="PackedScene" uid="uid://qtk4tm6l367w" path="res://interface/ghost.tscn" id="16_8vhx6"] +[ext_resource type="PackedScene" uid="uid://c4ew8x4gch275" path="res://converters/gold_to_gem/gem_converter.tscn" id="16_e62br"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_4uksi"] size = Vector2(80, 80) @@ -40,16 +39,11 @@ upgrade_copper_texture = ExtResource("11_lt33g") upgrade_silver_texture = ExtResource("3_8wvr1") upgrade_gold_texture = ExtResource("4_i557v") -[node name="Ghost" parent="." instance=ExtResource("16_8vhx6")] -position = Vector2(90, 306) -collision_layer = 8 -collision_mask = 6 - [node name="Bottle" parent="." instance=ExtResource("1_y7o2l")] [node name="TimeSpawner" parent="." node_paths=PackedStringArray("target") instance=ExtResource("3_qwsty")] position = Vector2(136, 0) -scene = ExtResource("8_a3sk0") +scene = ExtResource("7_hh80i") target = NodePath("..") buffer_cap = 1 spawn_rect = Rect2(-20, 0, 40, 0) @@ -87,7 +81,7 @@ shape = SubResource("RectangleShape2D_rh35r") debug_color = Color(0, 0.6, 0.701961, 0) [node name="CopperConverter" parent="." instance=ExtResource("7_ipeok")] -position = Vector2(62, 176) +position = Vector2(53, 156) metadata/_edit_group_ = true [node name="Spawner" parent="CopperConverter" index="6" node_paths=PackedStringArray("target")] @@ -97,8 +91,12 @@ target = NodePath("../..") position = Vector2(0, 4.08333) [node name="SilverConverter" parent="." instance=ExtResource("8_0bbpi")] -position = Vector2(205, 337) -rotation = -3.14159 +position = Vector2(53, 273) +rotation = -6.28319 +metadata/_edit_group_ = true + +[node name="CollectShape" parent="SilverConverter/Collector" index="1"] +metadata/_edit_group_ = true [node name="Spawner" parent="SilverConverter" index="6" node_paths=PackedStringArray("target")] target = NodePath("../..") @@ -180,6 +178,10 @@ position = Vector2(405, 540) shape = SubResource("RectangleShape2D_jed57") debug_color = Color(0, 0, 0, 0.419608) +[node name="GemConverter" parent="." instance=ExtResource("16_e62br")] +position = Vector2(144, 184) +metadata/_edit_group_ = true + [connection signal="timeout" from="TimeSpawner/Timer" to="TimeSpawner" method="spawn"] [connection signal="changed" from="Evaluator" to="." method="_on_score_changed"] [connection signal="collected" from="StoreCollector" to="." method="_on_store_collector_collected"] diff --git a/main.tscn b/main.tscn index 2319e5f..f366657 100644 --- a/main.tscn +++ b/main.tscn @@ -6,7 +6,7 @@ [ext_resource type="PackedScene" uid="uid://cklkdygv61bny" path="res://interface/shop_ui.tscn" id="2_qj86l"] [ext_resource type="Script" path="res://interface/custom_ui.gd" id="3_xav0n"] [ext_resource type="PackedScene" uid="uid://bo5unrhqpoyim" path="res://interface/game_ui.tscn" id="4_siim3"] -[ext_resource type="PackedScene" uid="uid://bpvx3nkkbluip" path="res://safe_ui.tscn" id="5_2uxda"] +[ext_resource type="PackedScene" path="res://safe_ui.tscn" id="5_2uxda"] [ext_resource type="Script" path="res://game_camera.gd" id="5_xxjtg"] [sub_resource type="GDScript" id="GDScript_kyj65"] @@ -58,9 +58,6 @@ layout_mode = 1 anchors_preset = 10 anchor_bottom = 0.0 grow_vertical = 1 -apply_margin_left = true -apply_margin_right = true -apply_margin_top = true [node name="GameUI" parent="CustomUI/GameSafeUI" instance=ExtResource("4_siim3")] layout_mode = 2 @@ -69,10 +66,6 @@ layout_mode = 2 process_mode = 4 visible = false layout_mode = 1 -apply_margin_left = true -apply_margin_right = true -apply_margin_top = true -apply_margin_bottom = true [node name="ShopUI" parent="CustomUI/ShopSafeUI" instance=ExtResource("2_qj86l")] layout_mode = 2 From 91a5b55338ca9d49fed386ef1364f109a6ac544e Mon Sep 17 00:00:00 2001 From: Matteo Balugani Date: Mon, 2 Oct 2023 15:57:26 +0200 Subject: [PATCH 3/4] gem_converter finished --- converters/gold_to_gem/gem_converter.tscn | 2 +- entity/gem/gem.tscn | 2 +- entity/item_converter_back_1.png.import | 34 +++++++++++++++++++++++ entity/item_converter_back_2.png.import | 34 +++++++++++++++++++++++ entity/item_converter_back_3.png.import | 34 +++++++++++++++++++++++ entity/item_converter_back_4.png.import | 34 +++++++++++++++++++++++ entity/item_converter_back_5.png.import | 34 +++++++++++++++++++++++ entity/item_converter_front_1.png.import | 34 +++++++++++++++++++++++ entity/item_converter_front_2.png.import | 34 +++++++++++++++++++++++ entity/item_converter_front_3.png.import | 34 +++++++++++++++++++++++ entity/item_converter_front_4.png.import | 34 +++++++++++++++++++++++ entity/item_converter_front_5.png.import | 34 +++++++++++++++++++++++ game/game.tscn | 9 ++++-- 13 files changed, 348 insertions(+), 5 deletions(-) create mode 100644 entity/item_converter_back_1.png.import create mode 100644 entity/item_converter_back_2.png.import create mode 100644 entity/item_converter_back_3.png.import create mode 100644 entity/item_converter_back_4.png.import create mode 100644 entity/item_converter_back_5.png.import create mode 100644 entity/item_converter_front_1.png.import create mode 100644 entity/item_converter_front_2.png.import create mode 100644 entity/item_converter_front_3.png.import create mode 100644 entity/item_converter_front_4.png.import create mode 100644 entity/item_converter_front_5.png.import diff --git a/converters/gold_to_gem/gem_converter.tscn b/converters/gold_to_gem/gem_converter.tscn index fa18dfe..5f760b0 100644 --- a/converters/gold_to_gem/gem_converter.tscn +++ b/converters/gold_to_gem/gem_converter.tscn @@ -9,7 +9,7 @@ [ext_resource type="PackedScene" uid="uid://c5w3b55aiui6c" path="res://collector/collector.tscn" id="7_m34js"] [ext_resource type="Texture2D" uid="uid://bfxmurfe4o44s" path="res://entity/gold_converter_front_5.png" id="7_w8dcp"] [ext_resource type="PackedScene" uid="uid://c67lfbk4gf1ga" path="res://spawner/spawner.tscn" id="8_qwbjp"] -[ext_resource type="PackedScene" uid="uid://w2er6cmul5yx" path="res://entity/gem/gem.tscn" id="9_2ugi1"] +[ext_resource type="PackedScene" uid="uid://bawprh8kluilq" path="res://entity/gem/gem.tscn" id="9_2ugi1"] [ext_resource type="AudioStream" uid="uid://br25ip30mu174" path="res://audio/conversione/mechanic_sound.wav" id="10_f1h6i"] [ext_resource type="AudioStream" uid="uid://7tw5efuo3gxj" path="res://audio/conversione/coin_to_coin.wav" id="11_ywwn2"] diff --git a/entity/gem/gem.tscn b/entity/gem/gem.tscn index 9bce7f2..bfa6cf6 100644 --- a/entity/gem/gem.tscn +++ b/entity/gem/gem.tscn @@ -24,7 +24,7 @@ linear_damp = 0.1 angular_damp = 0.1 [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -scale = Vector2(2, 2) +scale = Vector2(4, 4) shape = SubResource("CapsuleShape2D_jkfas") [node name="Sprite" type="Sprite2D" parent="CollisionShape2D"] diff --git a/entity/item_converter_back_1.png.import b/entity/item_converter_back_1.png.import new file mode 100644 index 0000000..35c453d --- /dev/null +++ b/entity/item_converter_back_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://devcho3gaigt0" +path="res://.godot/imported/item_converter_back_1.png-504f384826f865e5213c168e001876c9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://entity/item_converter_back_1.png" +dest_files=["res://.godot/imported/item_converter_back_1.png-504f384826f865e5213c168e001876c9.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/item_converter_back_2.png.import b/entity/item_converter_back_2.png.import new file mode 100644 index 0000000..18f4f84 --- /dev/null +++ b/entity/item_converter_back_2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bq54rpw5jufyd" +path="res://.godot/imported/item_converter_back_2.png-0fd3a73f910c9c00b603c75b3b0f55f4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://entity/item_converter_back_2.png" +dest_files=["res://.godot/imported/item_converter_back_2.png-0fd3a73f910c9c00b603c75b3b0f55f4.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/item_converter_back_3.png.import b/entity/item_converter_back_3.png.import new file mode 100644 index 0000000..23bbb69 --- /dev/null +++ b/entity/item_converter_back_3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dsolplf1s7va6" +path="res://.godot/imported/item_converter_back_3.png-44592ce80459d081a51fa60a87ff6090.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://entity/item_converter_back_3.png" +dest_files=["res://.godot/imported/item_converter_back_3.png-44592ce80459d081a51fa60a87ff6090.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/item_converter_back_4.png.import b/entity/item_converter_back_4.png.import new file mode 100644 index 0000000..4eb7eee --- /dev/null +++ b/entity/item_converter_back_4.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c4vpmiwjfvcpy" +path="res://.godot/imported/item_converter_back_4.png-eacfbc8d6316157d900a2c72c1bb20ee.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://entity/item_converter_back_4.png" +dest_files=["res://.godot/imported/item_converter_back_4.png-eacfbc8d6316157d900a2c72c1bb20ee.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/item_converter_back_5.png.import b/entity/item_converter_back_5.png.import new file mode 100644 index 0000000..b6d26c2 --- /dev/null +++ b/entity/item_converter_back_5.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c0kstbgsm65vq" +path="res://.godot/imported/item_converter_back_5.png-2287576b2a984ac762fd4f1ad8910e7b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://entity/item_converter_back_5.png" +dest_files=["res://.godot/imported/item_converter_back_5.png-2287576b2a984ac762fd4f1ad8910e7b.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/item_converter_front_1.png.import b/entity/item_converter_front_1.png.import new file mode 100644 index 0000000..f8683ce --- /dev/null +++ b/entity/item_converter_front_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://crnu1x5n33yqu" +path="res://.godot/imported/item_converter_front_1.png-8fc15a37e8098d3560a3f88b8f9827e0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://entity/item_converter_front_1.png" +dest_files=["res://.godot/imported/item_converter_front_1.png-8fc15a37e8098d3560a3f88b8f9827e0.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/item_converter_front_2.png.import b/entity/item_converter_front_2.png.import new file mode 100644 index 0000000..ba198e9 --- /dev/null +++ b/entity/item_converter_front_2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b0vkliltyaljc" +path="res://.godot/imported/item_converter_front_2.png-e653b194e92a69931664110581dbcef9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://entity/item_converter_front_2.png" +dest_files=["res://.godot/imported/item_converter_front_2.png-e653b194e92a69931664110581dbcef9.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/item_converter_front_3.png.import b/entity/item_converter_front_3.png.import new file mode 100644 index 0000000..2782b89 --- /dev/null +++ b/entity/item_converter_front_3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://fqerky4lyps8" +path="res://.godot/imported/item_converter_front_3.png-08a58bd2bf34aed3155a6f742c5b4b08.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://entity/item_converter_front_3.png" +dest_files=["res://.godot/imported/item_converter_front_3.png-08a58bd2bf34aed3155a6f742c5b4b08.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/item_converter_front_4.png.import b/entity/item_converter_front_4.png.import new file mode 100644 index 0000000..92875a0 --- /dev/null +++ b/entity/item_converter_front_4.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bw0jgw0jen4lg" +path="res://.godot/imported/item_converter_front_4.png-4c6918397b65aa38cd774bb7f8e3e7dd.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://entity/item_converter_front_4.png" +dest_files=["res://.godot/imported/item_converter_front_4.png-4c6918397b65aa38cd774bb7f8e3e7dd.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/item_converter_front_5.png.import b/entity/item_converter_front_5.png.import new file mode 100644 index 0000000..73bdeeb --- /dev/null +++ b/entity/item_converter_front_5.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://4tg81ksibacf" +path="res://.godot/imported/item_converter_front_5.png-04862389a241f13a6391fe35d4276216.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://entity/item_converter_front_5.png" +dest_files=["res://.godot/imported/item_converter_front_5.png-04862389a241f13a6391fe35d4276216.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/game/game.tscn b/game/game.tscn index 45e3cad..397e99a 100644 --- a/game/game.tscn +++ b/game/game.tscn @@ -11,7 +11,6 @@ [ext_resource type="PackedScene" uid="uid://du3005kwybbrh" path="res://entity/coin_gold/coin_gold.tscn" id="7_hh80i"] [ext_resource type="PackedScene" uid="uid://ratkps4plkhl" path="res://converters/copper_to_silver/copper_converter.tscn" id="7_ipeok"] [ext_resource type="PackedScene" uid="uid://but1bdslxp5jl" path="res://converters/silver_to_gold/silver_converter.tscn" id="8_0bbpi"] -[ext_resource type="PackedScene" uid="uid://bawprh8kluilq" path="res://entity/gem/gem.tscn" id="8_a3sk0"] [ext_resource type="PackedScene" uid="uid://c2rlx7egl7xiv" path="res://collector/universal_collector.tscn" id="9_7op48"] [ext_resource type="PackedScene" uid="uid://c5w3b55aiui6c" path="res://collector/collector.tscn" id="9_evdhb"] [ext_resource type="Theme" uid="uid://ba5utvfhnxa5i" path="res://interface/interface_theme.tres" id="10_sayqn"] @@ -82,7 +81,7 @@ shape = SubResource("RectangleShape2D_rh35r") debug_color = Color(0, 0.6, 0.701961, 0) [node name="CopperConverter" parent="." instance=ExtResource("7_ipeok")] -position = Vector2(53, 156) +position = Vector2(56, 390) metadata/_edit_group_ = true [node name="Spawner" parent="CopperConverter" index="6" node_paths=PackedStringArray("target")] @@ -180,12 +179,16 @@ shape = SubResource("RectangleShape2D_jed57") debug_color = Color(0, 0, 0, 0.419608) [node name="GemConverter" parent="." instance=ExtResource("16_e62br")] -position = Vector2(144, 184) +position = Vector2(145, 180) metadata/_edit_group_ = true +[node name="Spawner" parent="GemConverter" index="6" node_paths=PackedStringArray("target")] +target = NodePath("../..") + [connection signal="timeout" from="TimeSpawner/Timer" to="TimeSpawner" method="spawn"] [connection signal="changed" from="Evaluator" to="." method="_on_score_changed"] [connection signal="collected" from="StoreCollector" to="." method="_on_store_collector_collected"] [editable path="CopperConverter"] [editable path="SilverConverter"] +[editable path="GemConverter"] From 72a007f5c261366254ce5ea94c1e74ac20a1aba4 Mon Sep 17 00:00:00 2001 From: Matteo Balugani Date: Mon, 2 Oct 2023 16:17:34 +0200 Subject: [PATCH 4/4] fornace base --- converters/gold_to_gem/gem_converter.tscn | 24 +-- .../gold_to_gem}/gold_converter_back.png | 0 .../gold_converter_back.png.import | 6 +- .../gold_to_gem}/gold_converter_front_1.png | 0 .../gold_converter_front_1.png.import | 6 +- .../gold_to_gem}/gold_converter_front_2.png | 0 .../gold_converter_front_2.png.import | 6 +- .../gold_to_gem}/gold_converter_front_3.png | 0 .../gold_converter_front_3.png.import | 6 +- .../gold_to_gem}/gold_converter_front_4.png | 0 .../gold_converter_front_4.png.import | 6 +- .../gold_to_gem}/gold_converter_front_5.png | 0 .../gold_converter_front_5.png.import | 6 +- .../item_converter/furnace_converter.tscn | 88 ++++++++ converters/item_converter/item_converter.tscn | 189 ++++++++++++++++++ .../item_converter}/item_converter_back_1.png | 0 .../item_converter_back_1.png.import | 6 +- .../item_converter}/item_converter_back_2.png | 0 .../item_converter_back_2.png.import | 6 +- .../item_converter}/item_converter_back_3.png | 0 .../item_converter_back_3.png.import | 6 +- .../item_converter}/item_converter_back_4.png | 0 .../item_converter_back_4.png.import | 6 +- .../item_converter}/item_converter_back_5.png | 0 .../item_converter_back_5.png.import | 6 +- .../item_converter_front_1.png | 0 .../item_converter_front_1.png.import | 6 +- .../item_converter_front_2.png | 0 .../item_converter_front_2.png.import | 6 +- .../item_converter_front_3.png | 0 .../item_converter_front_3.png.import | 6 +- .../item_converter_front_4.png | 0 .../item_converter_front_4.png.import | 6 +- .../item_converter_front_5.png | 0 .../item_converter_front_5.png.import | 6 +- 35 files changed, 337 insertions(+), 60 deletions(-) rename {entity => converters/gold_to_gem}/gold_converter_back.png (100%) rename {entity => converters/gold_to_gem}/gold_converter_back.png.import (68%) rename {entity => converters/gold_to_gem}/gold_converter_front_1.png (100%) rename {entity => converters/gold_to_gem}/gold_converter_front_1.png.import (67%) rename {entity => converters/gold_to_gem}/gold_converter_front_2.png (100%) rename {entity => converters/gold_to_gem}/gold_converter_front_2.png.import (67%) rename {entity => converters/gold_to_gem}/gold_converter_front_3.png (100%) rename {entity => converters/gold_to_gem}/gold_converter_front_3.png.import (67%) rename {entity => converters/gold_to_gem}/gold_converter_front_4.png (100%) rename {entity => converters/gold_to_gem}/gold_converter_front_4.png.import (67%) rename {entity => converters/gold_to_gem}/gold_converter_front_5.png (100%) rename {entity => converters/gold_to_gem}/gold_converter_front_5.png.import (67%) create mode 100644 converters/item_converter/furnace_converter.tscn create mode 100644 converters/item_converter/item_converter.tscn rename {entity => converters/item_converter}/item_converter_back_1.png (100%) rename {entity => converters/item_converter}/item_converter_back_1.png.import (67%) rename {entity => converters/item_converter}/item_converter_back_2.png (100%) rename {entity => converters/item_converter}/item_converter_back_2.png.import (67%) rename {entity => converters/item_converter}/item_converter_back_3.png (100%) rename {entity => converters/item_converter}/item_converter_back_3.png.import (67%) rename {entity => converters/item_converter}/item_converter_back_4.png (100%) rename {entity => converters/item_converter}/item_converter_back_4.png.import (67%) rename {entity => converters/item_converter}/item_converter_back_5.png (100%) rename {entity => converters/item_converter}/item_converter_back_5.png.import (67%) rename {entity => converters/item_converter}/item_converter_front_1.png (100%) rename {entity => converters/item_converter}/item_converter_front_1.png.import (67%) rename {entity => converters/item_converter}/item_converter_front_2.png (100%) rename {entity => converters/item_converter}/item_converter_front_2.png.import (67%) rename {entity => converters/item_converter}/item_converter_front_3.png (100%) rename {entity => converters/item_converter}/item_converter_front_3.png.import (67%) rename {entity => converters/item_converter}/item_converter_front_4.png (100%) rename {entity => converters/item_converter}/item_converter_front_4.png.import (67%) rename {entity => converters/item_converter}/item_converter_front_5.png (100%) rename {entity => converters/item_converter}/item_converter_front_5.png.import (67%) diff --git a/converters/gold_to_gem/gem_converter.tscn b/converters/gold_to_gem/gem_converter.tscn index 5f760b0..cd40b5b 100644 --- a/converters/gold_to_gem/gem_converter.tscn +++ b/converters/gold_to_gem/gem_converter.tscn @@ -1,36 +1,36 @@ [gd_scene load_steps=23 format=3 uid="uid://c4ew8x4gch275"] [ext_resource type="Script" path="res://converters/converter.gd" id="1_f5plk"] -[ext_resource type="Texture2D" uid="uid://bbn8t32v1ie0y" path="res://entity/gold_converter_back.png" id="2_4abgr"] -[ext_resource type="Texture2D" uid="uid://0u8wtb38l3s5" path="res://entity/gold_converter_front_1.png" id="3_rtp3d"] -[ext_resource type="Texture2D" uid="uid://bo46tom7khspd" path="res://entity/gold_converter_front_2.png" id="4_oathm"] -[ext_resource type="Texture2D" uid="uid://dclhuc7h26brj" path="res://entity/gold_converter_front_3.png" id="5_5deah"] -[ext_resource type="Texture2D" uid="uid://dn433fvnhgp5v" path="res://entity/gold_converter_front_4.png" id="6_isyc7"] +[ext_resource type="Texture2D" uid="uid://chc8wqc1pclbk" path="res://converters/gold_to_gem/gold_converter_back.png" id="2_icys1"] +[ext_resource type="Texture2D" uid="uid://dgw5ip5qf5k7a" path="res://converters/gold_to_gem/gold_converter_front_1.png" id="3_n6auo"] +[ext_resource type="Texture2D" uid="uid://h7hu4paxjq84" path="res://converters/gold_to_gem/gold_converter_front_2.png" id="4_dxxyk"] +[ext_resource type="Texture2D" uid="uid://dlog0f5nk4b3c" path="res://converters/gold_to_gem/gold_converter_front_3.png" id="5_lnr8u"] +[ext_resource type="Texture2D" uid="uid://cj5m5k0hr3wmw" path="res://converters/gold_to_gem/gold_converter_front_4.png" id="6_nh41p"] +[ext_resource type="Texture2D" uid="uid://b5uershakuq20" path="res://converters/gold_to_gem/gold_converter_front_5.png" id="7_jfv3m"] [ext_resource type="PackedScene" uid="uid://c5w3b55aiui6c" path="res://collector/collector.tscn" id="7_m34js"] -[ext_resource type="Texture2D" uid="uid://bfxmurfe4o44s" path="res://entity/gold_converter_front_5.png" id="7_w8dcp"] [ext_resource type="PackedScene" uid="uid://c67lfbk4gf1ga" path="res://spawner/spawner.tscn" id="8_qwbjp"] [ext_resource type="PackedScene" uid="uid://bawprh8kluilq" path="res://entity/gem/gem.tscn" id="9_2ugi1"] [ext_resource type="AudioStream" uid="uid://br25ip30mu174" path="res://audio/conversione/mechanic_sound.wav" id="10_f1h6i"] [ext_resource type="AudioStream" uid="uid://7tw5efuo3gxj" path="res://audio/conversione/coin_to_coin.wav" id="11_ywwn2"] [sub_resource type="AtlasTexture" id="AtlasTexture_wy1v3"] -atlas = ExtResource("3_rtp3d") +atlas = ExtResource("3_n6auo") region = Rect2(0, 4, 32, 31) [sub_resource type="AtlasTexture" id="AtlasTexture_2164d"] -atlas = ExtResource("4_oathm") +atlas = ExtResource("4_dxxyk") region = Rect2(0, 4, 32, 31) [sub_resource type="AtlasTexture" id="AtlasTexture_i5584"] -atlas = ExtResource("5_5deah") +atlas = ExtResource("5_lnr8u") region = Rect2(0, 4, 32, 31) [sub_resource type="AtlasTexture" id="AtlasTexture_qad4c"] -atlas = ExtResource("6_isyc7") +atlas = ExtResource("6_nh41p") region = Rect2(0, 4, 32, 31) [sub_resource type="AtlasTexture" id="AtlasTexture_600qi"] -atlas = ExtResource("7_w8dcp") +atlas = ExtResource("7_jfv3m") region = Rect2(0, 4, 32, 31) [sub_resource type="SpriteFrames" id="SpriteFrames_4m3dg"] @@ -81,7 +81,7 @@ spawner = NodePath("Spawner") [node name="SpriteBack" type="Sprite2D" parent="."] z_index = -2 texture_filter = 1 -texture = ExtResource("2_4abgr") +texture = ExtResource("2_icys1") [node name="SpriteFront" type="AnimatedSprite2D" parent="."] z_index = 2 diff --git a/entity/gold_converter_back.png b/converters/gold_to_gem/gold_converter_back.png similarity index 100% rename from entity/gold_converter_back.png rename to converters/gold_to_gem/gold_converter_back.png diff --git a/entity/gold_converter_back.png.import b/converters/gold_to_gem/gold_converter_back.png.import similarity index 68% rename from entity/gold_converter_back.png.import rename to converters/gold_to_gem/gold_converter_back.png.import index dc5bd0d..a964061 100644 --- a/entity/gold_converter_back.png.import +++ b/converters/gold_to_gem/gold_converter_back.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://chc8wqc1pclbk" -path="res://.godot/imported/gold_converter_back.png-542530d6d643b64e20755f9b54d1da49.ctex" +path="res://.godot/imported/gold_converter_back.png-57f6151a59bebb5f4f377558fa7bed66.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/gold_converter_back.png" -dest_files=["res://.godot/imported/gold_converter_back.png-542530d6d643b64e20755f9b54d1da49.ctex"] +source_file="res://converters/gold_to_gem/gold_converter_back.png" +dest_files=["res://.godot/imported/gold_converter_back.png-57f6151a59bebb5f4f377558fa7bed66.ctex"] [params] diff --git a/entity/gold_converter_front_1.png b/converters/gold_to_gem/gold_converter_front_1.png similarity index 100% rename from entity/gold_converter_front_1.png rename to converters/gold_to_gem/gold_converter_front_1.png diff --git a/entity/gold_converter_front_1.png.import b/converters/gold_to_gem/gold_converter_front_1.png.import similarity index 67% rename from entity/gold_converter_front_1.png.import rename to converters/gold_to_gem/gold_converter_front_1.png.import index 4d62cdc..070a729 100644 --- a/entity/gold_converter_front_1.png.import +++ b/converters/gold_to_gem/gold_converter_front_1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dgw5ip5qf5k7a" -path="res://.godot/imported/gold_converter_front_1.png-20d40342907ebeaf5453b3fbc06f6b04.ctex" +path="res://.godot/imported/gold_converter_front_1.png-8d8215c09612bfed0000441abb0b28cd.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/gold_converter_front_1.png" -dest_files=["res://.godot/imported/gold_converter_front_1.png-20d40342907ebeaf5453b3fbc06f6b04.ctex"] +source_file="res://converters/gold_to_gem/gold_converter_front_1.png" +dest_files=["res://.godot/imported/gold_converter_front_1.png-8d8215c09612bfed0000441abb0b28cd.ctex"] [params] diff --git a/entity/gold_converter_front_2.png b/converters/gold_to_gem/gold_converter_front_2.png similarity index 100% rename from entity/gold_converter_front_2.png rename to converters/gold_to_gem/gold_converter_front_2.png diff --git a/entity/gold_converter_front_2.png.import b/converters/gold_to_gem/gold_converter_front_2.png.import similarity index 67% rename from entity/gold_converter_front_2.png.import rename to converters/gold_to_gem/gold_converter_front_2.png.import index c9ca2b5..7e9f4f7 100644 --- a/entity/gold_converter_front_2.png.import +++ b/converters/gold_to_gem/gold_converter_front_2.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://h7hu4paxjq84" -path="res://.godot/imported/gold_converter_front_2.png-6b48a8121d01d35430dedd6a7ebaaed7.ctex" +path="res://.godot/imported/gold_converter_front_2.png-be7df5216327f8bc15affb3be160f525.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/gold_converter_front_2.png" -dest_files=["res://.godot/imported/gold_converter_front_2.png-6b48a8121d01d35430dedd6a7ebaaed7.ctex"] +source_file="res://converters/gold_to_gem/gold_converter_front_2.png" +dest_files=["res://.godot/imported/gold_converter_front_2.png-be7df5216327f8bc15affb3be160f525.ctex"] [params] diff --git a/entity/gold_converter_front_3.png b/converters/gold_to_gem/gold_converter_front_3.png similarity index 100% rename from entity/gold_converter_front_3.png rename to converters/gold_to_gem/gold_converter_front_3.png diff --git a/entity/gold_converter_front_3.png.import b/converters/gold_to_gem/gold_converter_front_3.png.import similarity index 67% rename from entity/gold_converter_front_3.png.import rename to converters/gold_to_gem/gold_converter_front_3.png.import index 1004753..a2e4317 100644 --- a/entity/gold_converter_front_3.png.import +++ b/converters/gold_to_gem/gold_converter_front_3.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dlog0f5nk4b3c" -path="res://.godot/imported/gold_converter_front_3.png-4b8a07d186c945c584be92c7bbbf79b8.ctex" +path="res://.godot/imported/gold_converter_front_3.png-850e0ec6590a97fe109779989afaac4a.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/gold_converter_front_3.png" -dest_files=["res://.godot/imported/gold_converter_front_3.png-4b8a07d186c945c584be92c7bbbf79b8.ctex"] +source_file="res://converters/gold_to_gem/gold_converter_front_3.png" +dest_files=["res://.godot/imported/gold_converter_front_3.png-850e0ec6590a97fe109779989afaac4a.ctex"] [params] diff --git a/entity/gold_converter_front_4.png b/converters/gold_to_gem/gold_converter_front_4.png similarity index 100% rename from entity/gold_converter_front_4.png rename to converters/gold_to_gem/gold_converter_front_4.png diff --git a/entity/gold_converter_front_4.png.import b/converters/gold_to_gem/gold_converter_front_4.png.import similarity index 67% rename from entity/gold_converter_front_4.png.import rename to converters/gold_to_gem/gold_converter_front_4.png.import index ca131bc..490966f 100644 --- a/entity/gold_converter_front_4.png.import +++ b/converters/gold_to_gem/gold_converter_front_4.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cj5m5k0hr3wmw" -path="res://.godot/imported/gold_converter_front_4.png-1dd90efaf325965268d803bbed7fda3b.ctex" +path="res://.godot/imported/gold_converter_front_4.png-16819d42eb9c86094f5063cdede729fb.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/gold_converter_front_4.png" -dest_files=["res://.godot/imported/gold_converter_front_4.png-1dd90efaf325965268d803bbed7fda3b.ctex"] +source_file="res://converters/gold_to_gem/gold_converter_front_4.png" +dest_files=["res://.godot/imported/gold_converter_front_4.png-16819d42eb9c86094f5063cdede729fb.ctex"] [params] diff --git a/entity/gold_converter_front_5.png b/converters/gold_to_gem/gold_converter_front_5.png similarity index 100% rename from entity/gold_converter_front_5.png rename to converters/gold_to_gem/gold_converter_front_5.png diff --git a/entity/gold_converter_front_5.png.import b/converters/gold_to_gem/gold_converter_front_5.png.import similarity index 67% rename from entity/gold_converter_front_5.png.import rename to converters/gold_to_gem/gold_converter_front_5.png.import index e30df37..52f6cfd 100644 --- a/entity/gold_converter_front_5.png.import +++ b/converters/gold_to_gem/gold_converter_front_5.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b5uershakuq20" -path="res://.godot/imported/gold_converter_front_5.png-a825d75eb13b041b1a6213049c3d7637.ctex" +path="res://.godot/imported/gold_converter_front_5.png-521650e19092d447f412bf69ceea3d57.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/gold_converter_front_5.png" -dest_files=["res://.godot/imported/gold_converter_front_5.png-a825d75eb13b041b1a6213049c3d7637.ctex"] +source_file="res://converters/gold_to_gem/gold_converter_front_5.png" +dest_files=["res://.godot/imported/gold_converter_front_5.png-521650e19092d447f412bf69ceea3d57.ctex"] [params] diff --git a/converters/item_converter/furnace_converter.tscn b/converters/item_converter/furnace_converter.tscn new file mode 100644 index 0000000..073262f --- /dev/null +++ b/converters/item_converter/furnace_converter.tscn @@ -0,0 +1,88 @@ +[gd_scene load_steps=12 format=3 uid="uid://c0hcrkf1s2mww"] + +[ext_resource type="Script" path="res://converters/converter.gd" id="1_h0rfu"] +[ext_resource type="Texture2D" uid="uid://440yhlpwpfw4" path="res://converters/copper_to_silver/copper_converter_back.png" id="2_dgtpa"] +[ext_resource type="PackedScene" uid="uid://c5w3b55aiui6c" path="res://collector/collector.tscn" id="3_t872f"] +[ext_resource type="PackedScene" uid="uid://c67lfbk4gf1ga" path="res://spawner/spawner.tscn" id="4_jko1c"] +[ext_resource type="PackedScene" uid="uid://dme22vvfgme5f" path="res://entity/coin_silver/coin_silver.tscn" id="5_4nt0s"] +[ext_resource type="AudioStream" uid="uid://br25ip30mu174" path="res://audio/conversione/mechanic_sound.wav" id="6_4vucc"] +[ext_resource type="AudioStream" uid="uid://7tw5efuo3gxj" path="res://audio/conversione/coin_to_coin.wav" id="7_dw32b"] + +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_aslkt"] +radius = 1.5 +height = 28.0 + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_31dtl"] +size = Vector2(26, 4) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_k11if"] +size = Vector2(26, 5) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_jeo5f"] +size = Vector2(26, 8.83334) + +[node name="ItemConverter" type="StaticBody2D"] +scale = Vector2(3, 3) +script = ExtResource("1_h0rfu") + +[node name="SpriteBack" type="Sprite2D" parent="."] +z_index = -2 +texture_filter = 1 +texture = ExtResource("2_dgtpa") + +[node name="LeftWall" type="CollisionShape2D" parent="."] +z_index = 2 +position = Vector2(-14.5, -3) +shape = SubResource("CapsuleShape2D_aslkt") + +[node name="RightWall" type="CollisionShape2D" parent="."] +z_index = 2 +position = Vector2(14.5, -3) +shape = SubResource("CapsuleShape2D_aslkt") + +[node name="InnerWall" type="CollisionShape2D" parent="."] +z_index = 3 +position = Vector2(0, 4.5) +rotation = 3.14159 +shape = SubResource("RectangleShape2D_31dtl") + +[node name="Collector" parent="." instance=ExtResource("3_t872f")] +z_index = 2 +collecting_types = Array[StringName]([&"Copper"]) +collecting_amount = 10 + +[node name="CollectShape" type="CollisionShape2D" parent="Collector"] +shape = SubResource("RectangleShape2D_k11if") +debug_color = Color(0, 0.701961, 0.188235, 0.419608) + +[node name="Spawner" parent="." instance=ExtResource("4_jko1c")] +position = Vector2(0, 8) +scene = ExtResource("5_4nt0s") +buffer_cap = 1 +spawn_rect = Rect2(-8, 0, 16, 4) +spawn_rotation_degrees_min = 80.0 +spawn_rotation_degrees_max = 100.0 +overlapping_body_count_limit = 4 + +[node name="PreventSpawnShape" type="CollisionShape2D" parent="Spawner"] +z_index = 3 +position = Vector2(0, 3.5) +shape = SubResource("RectangleShape2D_jeo5f") +debug_color = Color(0.701961, 0, 0, 0.419608) + +[node name="ConversionTimer" type="Timer" parent="."] +wait_time = 0.5 +one_shot = true + +[node name="SoundAbsorb" type="AudioStreamPlayer" parent="."] +stream = ExtResource("6_4vucc") + +[node name="SoundWorking" type="AudioStreamPlayer" parent="."] +stream = ExtResource("6_4vucc") + +[node name="SoundComplete" type="AudioStreamPlayer" parent="."] +stream = ExtResource("7_dw32b") + +[connection signal="collected" from="Collector" to="." method="_on_collector_collected" flags=18] +[connection signal="goal" from="Collector" to="." method="_on_collector_goal" flags=18] +[connection signal="timeout" from="ConversionTimer" to="." method="_on_timer_timeout" flags=18] diff --git a/converters/item_converter/item_converter.tscn b/converters/item_converter/item_converter.tscn new file mode 100644 index 0000000..4b97a2e --- /dev/null +++ b/converters/item_converter/item_converter.tscn @@ -0,0 +1,189 @@ +[gd_scene load_steps=33 format=3 uid="uid://ddrhfhebwtq5"] + +[ext_resource type="Script" path="res://converters/converter.gd" id="1_qln0a"] +[ext_resource type="Texture2D" uid="uid://devcho3gaigt0" path="res://converters/item_converter/item_converter_back_1.png" id="2_136t7"] +[ext_resource type="Texture2D" uid="uid://bq54rpw5jufyd" path="res://converters/item_converter/item_converter_back_2.png" id="3_6gyd6"] +[ext_resource type="PackedScene" uid="uid://c5w3b55aiui6c" path="res://collector/collector.tscn" id="3_qehi7"] +[ext_resource type="Texture2D" uid="uid://dsolplf1s7va6" path="res://converters/item_converter/item_converter_back_3.png" id="4_bs7n5"] +[ext_resource type="PackedScene" uid="uid://c67lfbk4gf1ga" path="res://spawner/spawner.tscn" id="4_ihtl7"] +[ext_resource type="PackedScene" uid="uid://dme22vvfgme5f" path="res://entity/coin_silver/coin_silver.tscn" id="5_fp5qt"] +[ext_resource type="Texture2D" uid="uid://c4vpmiwjfvcpy" path="res://converters/item_converter/item_converter_back_4.png" id="5_lk4ym"] +[ext_resource type="Texture2D" uid="uid://c0kstbgsm65vq" path="res://converters/item_converter/item_converter_back_5.png" id="6_io2km"] +[ext_resource type="AudioStream" uid="uid://br25ip30mu174" path="res://audio/conversione/mechanic_sound.wav" id="6_w6x4p"] +[ext_resource type="Texture2D" uid="uid://crnu1x5n33yqu" path="res://converters/item_converter/item_converter_front_1.png" id="7_khayw"] +[ext_resource type="AudioStream" uid="uid://7tw5efuo3gxj" path="res://audio/conversione/coin_to_coin.wav" id="7_x4ti3"] +[ext_resource type="Texture2D" uid="uid://b0vkliltyaljc" path="res://converters/item_converter/item_converter_front_2.png" id="8_w6rnl"] +[ext_resource type="Texture2D" uid="uid://fqerky4lyps8" path="res://converters/item_converter/item_converter_front_3.png" id="9_88mk7"] +[ext_resource type="Texture2D" uid="uid://bw0jgw0jen4lg" path="res://converters/item_converter/item_converter_front_4.png" id="10_fjv52"] +[ext_resource type="Texture2D" uid="uid://4tg81ksibacf" path="res://converters/item_converter/item_converter_front_5.png" id="11_cg5dk"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_uqtie"] +atlas = ExtResource("2_136t7") +region = Rect2(0, 0, 32, 9) + +[sub_resource type="AtlasTexture" id="AtlasTexture_aej48"] +atlas = ExtResource("3_6gyd6") +region = Rect2(0, 0, 32, 9) + +[sub_resource type="AtlasTexture" id="AtlasTexture_tc0dd"] +atlas = ExtResource("4_bs7n5") +region = Rect2(0, 0, 32, 9) + +[sub_resource type="AtlasTexture" id="AtlasTexture_xunws"] +atlas = ExtResource("5_lk4ym") +region = Rect2(0, 0, 32, 9) + +[sub_resource type="AtlasTexture" id="AtlasTexture_kf4dp"] +atlas = ExtResource("6_io2km") +region = Rect2(0, 0, 32, 9) + +[sub_resource type="SpriteFrames" id="SpriteFrames_psnir"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_uqtie") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_aej48") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_tc0dd") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_xunws") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_kf4dp") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[sub_resource type="AtlasTexture" id="AtlasTexture_qnpyk"] +atlas = ExtResource("7_khayw") +region = Rect2(0, 5, 32, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_m7447"] +atlas = ExtResource("8_w6rnl") +region = Rect2(0, 5, 32, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_5cwul"] +atlas = ExtResource("9_88mk7") +region = Rect2(0, 5, 32, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ee880"] +atlas = ExtResource("10_fjv52") +region = Rect2(0, 5, 32, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qs650"] +atlas = ExtResource("11_cg5dk") +region = Rect2(0, 5, 32, 27) + +[sub_resource type="SpriteFrames" id="SpriteFrames_qqah4"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_qnpyk") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_m7447") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_5cwul") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ee880") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_qs650") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_aslkt"] +radius = 1.5 +height = 28.0 + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_31dtl"] +size = Vector2(26, 4) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_k11if"] +size = Vector2(26, 5) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_jeo5f"] +size = Vector2(26, 8.83334) + +[node name="ItemConverter" type="StaticBody2D"] +scale = Vector2(3, 3) +script = ExtResource("1_qln0a") + +[node name="SpriteBack" type="AnimatedSprite2D" parent="."] +texture_filter = 1 +position = Vector2(0, -14) +sprite_frames = SubResource("SpriteFrames_psnir") +frame_progress = 0.0929807 + +[node name="SpriteFront" type="AnimatedSprite2D" parent="."] +texture_filter = 1 +sprite_frames = SubResource("SpriteFrames_qqah4") +frame_progress = 0.859387 + +[node name="LeftWall" type="CollisionShape2D" parent="."] +z_index = 2 +position = Vector2(-14.5, -3) +shape = SubResource("CapsuleShape2D_aslkt") + +[node name="RightWall" type="CollisionShape2D" parent="."] +z_index = 2 +position = Vector2(14.5, -3) +shape = SubResource("CapsuleShape2D_aslkt") + +[node name="InnerWall" type="CollisionShape2D" parent="."] +z_index = 3 +position = Vector2(0, 4.5) +rotation = 3.14159 +shape = SubResource("RectangleShape2D_31dtl") + +[node name="Collector" parent="." instance=ExtResource("3_qehi7")] +z_index = 2 +collecting_types = Array[StringName]([&"Copper"]) +collecting_amount = 10 + +[node name="CollectShape" type="CollisionShape2D" parent="Collector"] +shape = SubResource("RectangleShape2D_k11if") +debug_color = Color(0, 0.701961, 0.188235, 0.419608) + +[node name="Spawner" parent="." instance=ExtResource("4_ihtl7")] +position = Vector2(0, 8) +scene = ExtResource("5_fp5qt") +buffer_cap = 1 +spawn_rect = Rect2(-8, 0, 16, 4) +spawn_rotation_degrees_min = 80.0 +spawn_rotation_degrees_max = 100.0 +overlapping_body_count_limit = 4 + +[node name="PreventSpawnShape" type="CollisionShape2D" parent="Spawner"] +z_index = 3 +position = Vector2(0, 3.5) +shape = SubResource("RectangleShape2D_jeo5f") +debug_color = Color(0.701961, 0, 0, 0.419608) + +[node name="ConversionTimer" type="Timer" parent="."] +wait_time = 0.5 +one_shot = true + +[node name="SoundAbsorb" type="AudioStreamPlayer" parent="."] +stream = ExtResource("6_w6x4p") + +[node name="SoundWorking" type="AudioStreamPlayer" parent="."] +stream = ExtResource("6_w6x4p") + +[node name="SoundComplete" type="AudioStreamPlayer" parent="."] +stream = ExtResource("7_x4ti3") + +[connection signal="collected" from="Collector" to="." method="_on_collector_collected" flags=18] +[connection signal="goal" from="Collector" to="." method="_on_collector_goal" flags=18] +[connection signal="timeout" from="ConversionTimer" to="." method="_on_timer_timeout" flags=18] diff --git a/entity/item_converter_back_1.png b/converters/item_converter/item_converter_back_1.png similarity index 100% rename from entity/item_converter_back_1.png rename to converters/item_converter/item_converter_back_1.png diff --git a/entity/item_converter_back_1.png.import b/converters/item_converter/item_converter_back_1.png.import similarity index 67% rename from entity/item_converter_back_1.png.import rename to converters/item_converter/item_converter_back_1.png.import index 35c453d..fb4fdb2 100644 --- a/entity/item_converter_back_1.png.import +++ b/converters/item_converter/item_converter_back_1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://devcho3gaigt0" -path="res://.godot/imported/item_converter_back_1.png-504f384826f865e5213c168e001876c9.ctex" +path="res://.godot/imported/item_converter_back_1.png-02fb6c676f39604a12591aa253536bdc.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/item_converter_back_1.png" -dest_files=["res://.godot/imported/item_converter_back_1.png-504f384826f865e5213c168e001876c9.ctex"] +source_file="res://converters/item_converter/item_converter_back_1.png" +dest_files=["res://.godot/imported/item_converter_back_1.png-02fb6c676f39604a12591aa253536bdc.ctex"] [params] diff --git a/entity/item_converter_back_2.png b/converters/item_converter/item_converter_back_2.png similarity index 100% rename from entity/item_converter_back_2.png rename to converters/item_converter/item_converter_back_2.png diff --git a/entity/item_converter_back_2.png.import b/converters/item_converter/item_converter_back_2.png.import similarity index 67% rename from entity/item_converter_back_2.png.import rename to converters/item_converter/item_converter_back_2.png.import index 18f4f84..d5b6232 100644 --- a/entity/item_converter_back_2.png.import +++ b/converters/item_converter/item_converter_back_2.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bq54rpw5jufyd" -path="res://.godot/imported/item_converter_back_2.png-0fd3a73f910c9c00b603c75b3b0f55f4.ctex" +path="res://.godot/imported/item_converter_back_2.png-4185f44143b834d6b4de21c37ed10c7a.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/item_converter_back_2.png" -dest_files=["res://.godot/imported/item_converter_back_2.png-0fd3a73f910c9c00b603c75b3b0f55f4.ctex"] +source_file="res://converters/item_converter/item_converter_back_2.png" +dest_files=["res://.godot/imported/item_converter_back_2.png-4185f44143b834d6b4de21c37ed10c7a.ctex"] [params] diff --git a/entity/item_converter_back_3.png b/converters/item_converter/item_converter_back_3.png similarity index 100% rename from entity/item_converter_back_3.png rename to converters/item_converter/item_converter_back_3.png diff --git a/entity/item_converter_back_3.png.import b/converters/item_converter/item_converter_back_3.png.import similarity index 67% rename from entity/item_converter_back_3.png.import rename to converters/item_converter/item_converter_back_3.png.import index 23bbb69..d7ef522 100644 --- a/entity/item_converter_back_3.png.import +++ b/converters/item_converter/item_converter_back_3.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dsolplf1s7va6" -path="res://.godot/imported/item_converter_back_3.png-44592ce80459d081a51fa60a87ff6090.ctex" +path="res://.godot/imported/item_converter_back_3.png-54c120abb9e3422ebcfe32b932dbc251.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/item_converter_back_3.png" -dest_files=["res://.godot/imported/item_converter_back_3.png-44592ce80459d081a51fa60a87ff6090.ctex"] +source_file="res://converters/item_converter/item_converter_back_3.png" +dest_files=["res://.godot/imported/item_converter_back_3.png-54c120abb9e3422ebcfe32b932dbc251.ctex"] [params] diff --git a/entity/item_converter_back_4.png b/converters/item_converter/item_converter_back_4.png similarity index 100% rename from entity/item_converter_back_4.png rename to converters/item_converter/item_converter_back_4.png diff --git a/entity/item_converter_back_4.png.import b/converters/item_converter/item_converter_back_4.png.import similarity index 67% rename from entity/item_converter_back_4.png.import rename to converters/item_converter/item_converter_back_4.png.import index 4eb7eee..7f3a43f 100644 --- a/entity/item_converter_back_4.png.import +++ b/converters/item_converter/item_converter_back_4.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://c4vpmiwjfvcpy" -path="res://.godot/imported/item_converter_back_4.png-eacfbc8d6316157d900a2c72c1bb20ee.ctex" +path="res://.godot/imported/item_converter_back_4.png-1c9f35db5b4a349a668f18d5214b2727.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/item_converter_back_4.png" -dest_files=["res://.godot/imported/item_converter_back_4.png-eacfbc8d6316157d900a2c72c1bb20ee.ctex"] +source_file="res://converters/item_converter/item_converter_back_4.png" +dest_files=["res://.godot/imported/item_converter_back_4.png-1c9f35db5b4a349a668f18d5214b2727.ctex"] [params] diff --git a/entity/item_converter_back_5.png b/converters/item_converter/item_converter_back_5.png similarity index 100% rename from entity/item_converter_back_5.png rename to converters/item_converter/item_converter_back_5.png diff --git a/entity/item_converter_back_5.png.import b/converters/item_converter/item_converter_back_5.png.import similarity index 67% rename from entity/item_converter_back_5.png.import rename to converters/item_converter/item_converter_back_5.png.import index b6d26c2..b1dae29 100644 --- a/entity/item_converter_back_5.png.import +++ b/converters/item_converter/item_converter_back_5.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://c0kstbgsm65vq" -path="res://.godot/imported/item_converter_back_5.png-2287576b2a984ac762fd4f1ad8910e7b.ctex" +path="res://.godot/imported/item_converter_back_5.png-42bccf2648ac72639c3222e782973419.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/item_converter_back_5.png" -dest_files=["res://.godot/imported/item_converter_back_5.png-2287576b2a984ac762fd4f1ad8910e7b.ctex"] +source_file="res://converters/item_converter/item_converter_back_5.png" +dest_files=["res://.godot/imported/item_converter_back_5.png-42bccf2648ac72639c3222e782973419.ctex"] [params] diff --git a/entity/item_converter_front_1.png b/converters/item_converter/item_converter_front_1.png similarity index 100% rename from entity/item_converter_front_1.png rename to converters/item_converter/item_converter_front_1.png diff --git a/entity/item_converter_front_1.png.import b/converters/item_converter/item_converter_front_1.png.import similarity index 67% rename from entity/item_converter_front_1.png.import rename to converters/item_converter/item_converter_front_1.png.import index f8683ce..aed1574 100644 --- a/entity/item_converter_front_1.png.import +++ b/converters/item_converter/item_converter_front_1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://crnu1x5n33yqu" -path="res://.godot/imported/item_converter_front_1.png-8fc15a37e8098d3560a3f88b8f9827e0.ctex" +path="res://.godot/imported/item_converter_front_1.png-dd1daf8a9c0a510530b499678f35b24b.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/item_converter_front_1.png" -dest_files=["res://.godot/imported/item_converter_front_1.png-8fc15a37e8098d3560a3f88b8f9827e0.ctex"] +source_file="res://converters/item_converter/item_converter_front_1.png" +dest_files=["res://.godot/imported/item_converter_front_1.png-dd1daf8a9c0a510530b499678f35b24b.ctex"] [params] diff --git a/entity/item_converter_front_2.png b/converters/item_converter/item_converter_front_2.png similarity index 100% rename from entity/item_converter_front_2.png rename to converters/item_converter/item_converter_front_2.png diff --git a/entity/item_converter_front_2.png.import b/converters/item_converter/item_converter_front_2.png.import similarity index 67% rename from entity/item_converter_front_2.png.import rename to converters/item_converter/item_converter_front_2.png.import index ba198e9..b41d7fe 100644 --- a/entity/item_converter_front_2.png.import +++ b/converters/item_converter/item_converter_front_2.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b0vkliltyaljc" -path="res://.godot/imported/item_converter_front_2.png-e653b194e92a69931664110581dbcef9.ctex" +path="res://.godot/imported/item_converter_front_2.png-94c58f1e66500054fedc8d146ac34825.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/item_converter_front_2.png" -dest_files=["res://.godot/imported/item_converter_front_2.png-e653b194e92a69931664110581dbcef9.ctex"] +source_file="res://converters/item_converter/item_converter_front_2.png" +dest_files=["res://.godot/imported/item_converter_front_2.png-94c58f1e66500054fedc8d146ac34825.ctex"] [params] diff --git a/entity/item_converter_front_3.png b/converters/item_converter/item_converter_front_3.png similarity index 100% rename from entity/item_converter_front_3.png rename to converters/item_converter/item_converter_front_3.png diff --git a/entity/item_converter_front_3.png.import b/converters/item_converter/item_converter_front_3.png.import similarity index 67% rename from entity/item_converter_front_3.png.import rename to converters/item_converter/item_converter_front_3.png.import index 2782b89..4599bc0 100644 --- a/entity/item_converter_front_3.png.import +++ b/converters/item_converter/item_converter_front_3.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://fqerky4lyps8" -path="res://.godot/imported/item_converter_front_3.png-08a58bd2bf34aed3155a6f742c5b4b08.ctex" +path="res://.godot/imported/item_converter_front_3.png-094b9f361323b52b8091796ebea8ef3c.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/item_converter_front_3.png" -dest_files=["res://.godot/imported/item_converter_front_3.png-08a58bd2bf34aed3155a6f742c5b4b08.ctex"] +source_file="res://converters/item_converter/item_converter_front_3.png" +dest_files=["res://.godot/imported/item_converter_front_3.png-094b9f361323b52b8091796ebea8ef3c.ctex"] [params] diff --git a/entity/item_converter_front_4.png b/converters/item_converter/item_converter_front_4.png similarity index 100% rename from entity/item_converter_front_4.png rename to converters/item_converter/item_converter_front_4.png diff --git a/entity/item_converter_front_4.png.import b/converters/item_converter/item_converter_front_4.png.import similarity index 67% rename from entity/item_converter_front_4.png.import rename to converters/item_converter/item_converter_front_4.png.import index 92875a0..c1b482f 100644 --- a/entity/item_converter_front_4.png.import +++ b/converters/item_converter/item_converter_front_4.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bw0jgw0jen4lg" -path="res://.godot/imported/item_converter_front_4.png-4c6918397b65aa38cd774bb7f8e3e7dd.ctex" +path="res://.godot/imported/item_converter_front_4.png-2fe2de3df3bc903bb82ba4c361a76624.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/item_converter_front_4.png" -dest_files=["res://.godot/imported/item_converter_front_4.png-4c6918397b65aa38cd774bb7f8e3e7dd.ctex"] +source_file="res://converters/item_converter/item_converter_front_4.png" +dest_files=["res://.godot/imported/item_converter_front_4.png-2fe2de3df3bc903bb82ba4c361a76624.ctex"] [params] diff --git a/entity/item_converter_front_5.png b/converters/item_converter/item_converter_front_5.png similarity index 100% rename from entity/item_converter_front_5.png rename to converters/item_converter/item_converter_front_5.png diff --git a/entity/item_converter_front_5.png.import b/converters/item_converter/item_converter_front_5.png.import similarity index 67% rename from entity/item_converter_front_5.png.import rename to converters/item_converter/item_converter_front_5.png.import index 73bdeeb..f5e2e0b 100644 --- a/entity/item_converter_front_5.png.import +++ b/converters/item_converter/item_converter_front_5.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://4tg81ksibacf" -path="res://.godot/imported/item_converter_front_5.png-04862389a241f13a6391fe35d4276216.ctex" +path="res://.godot/imported/item_converter_front_5.png-8ae35893cd89f1f98246039909bd75cb.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entity/item_converter_front_5.png" -dest_files=["res://.godot/imported/item_converter_front_5.png-04862389a241f13a6391fe35d4276216.ctex"] +source_file="res://converters/item_converter/item_converter_front_5.png" +dest_files=["res://.godot/imported/item_converter_front_5.png-8ae35893cd89f1f98246039909bd75cb.ctex"] [params]