Merge branch 'main' of github.com:Steffo99/ld54

audio/conversione/drop_in_lava.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://du16ilpv6gmxd"
+path="res://.godot/imported/drop_in_lava.wav-d8564f2442e0be55cb7f8cc5bb24444b.sample"
+
+[deps]
+
+source_file="res://audio/conversione/drop_in_lava.wav"
+dest_files=["res://.godot/imported/drop_in_lava.wav-d8564f2442e0be55cb7f8cc5bb24444b.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

audio/conversione/lava.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dv1e0wiiquxp0"
+path="res://.godot/imported/lava.wav-673d1274334b931ccacf184957a397bc.sample"
+
+[deps]
+
+source_file="res://audio/conversione/lava.wav"
+dest_files=["res://.godot/imported/lava.wav-673d1274334b931ccacf184957a397bc.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

audio/conversione/new_item.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://c0uhi1hrejyxg"
+path="res://.godot/imported/new_item.wav-c96d0e51e4b995e42ca31990475b7ff3.sample"
+
+[deps]
+
+source_file="res://audio/conversione/new_item.wav"
+dest_files=["res://.godot/imported/new_item.wav-c96d0e51e4b995e42ca31990475b7ff3.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

bottle/bottle.tscn

@@ -105,8 +105,8 @@ texture = ExtResource("1_qvgnf")
 4:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 
 [sub_resource type="TileSet" id="TileSet_tr7be"]
-physics_layer_0/collision_layer = 18
+physics_layer_0/collision_layer = 3
-physics_layer_0/collision_mask = 0
+physics_layer_0/collision_mask = 3
 physics_layer_0/physics_material = SubResource("PhysicsMaterial_y0g3v")
 sources/1 = SubResource("TileSetAtlasSource_6tyce")
 

collector/collector.tscn

@@ -1,10 +1,15 @@
-[gd_scene load_steps=2 format=3 uid="uid://c5w3b55aiui6c"]
+[gd_scene load_steps=3 format=3 uid="uid://c5w3b55aiui6c"]
 
 [ext_resource type="Script" path="res://collector/collector.gd" id="1_1xtt5"]
+[ext_resource type="AudioStream" uid="uid://bpxjhl0aq3yrv" path="res://audio/conversione/suck2.wav" id="2_n0plc"]
 
-[node name="Collector" type="Area2D"]
+[node name="Collector" type="Area2D" node_paths=PackedStringArray("sound_absorb")]
-collision_layer = 0
-collision_mask = 4
 script = ExtResource("1_1xtt5")
+sound_absorb = NodePath("sound_absorb")
+
+[node name="sound_absorb" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("2_n0plc")
+volume_db = -8.0
+pitch_scale = 2.0
 
 [connection signal="body_entered" from="." to="." method="_on_body_entered"]

converters/converter.gd

@@ -4,6 +4,7 @@ class_name Converter
 var coda : int = 0
 
 @export var sprite_front: AnimatedSprite2D
+@export var sprite_back: AnimatedSprite2D
 @export var conversion_timer: Timer
 @export var sound_working: AudioStreamPlayer
 @export var sound_complete: AudioStreamPlayer
@@ -15,12 +16,16 @@ func _on_collector_goal():
 func _process(_delta):
 	if coda>=1 and conversion_timer.is_stopped():
 		sprite_front.play()
+		if not sprite_back==null:
+			sprite_back.play()
 		conversion_timer.start()
 		sound_working.play()
 
 func _on_timer_timeout():
 	coda-=1
 	sprite_front.stop()
+	if not sprite_back==null:
+		sprite_back.stop()
 	sound_working.stop()
 	sound_complete.play()
 	spawner.spawn()

converters/copper_to_silver/copper_converter.tscn

@@ -60,12 +60,10 @@ size = Vector2(26, 4)
 size = Vector2(26, 5)
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_jeo5f"]
-size = Vector2(26, 10)
+size = Vector2(26, 8.83334)
 
 [node name="CopperConverter" type="StaticBody2D" node_paths=PackedStringArray("sprite_front", "conversion_timer", "sound_working", "sound_complete", "spawner")]
 scale = Vector2(3, 3)
-collision_layer = 8
-collision_mask = 0
 script = ExtResource("1_mas6k")
 sprite_front = NodePath("SpriteFront")
 conversion_timer = NodePath("ConversionTimer")
@@ -127,6 +125,9 @@ debug_color = Color(0.701961, 0, 0, 0.419608)
 wait_time = 0.5
 one_shot = true
 
+[node name="SoundAbsorb" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("10_6hhch")
+
 [node name="SoundWorking" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("10_6hhch")
 

converters/gold_to_gem/gold_converter.tscn

@@ -1,37 +1,37 @@
-[gd_scene load_steps=24 format=3 uid="uid://c4ew8x4gch275"]
+[gd_scene load_steps=23 format=3 uid="uid://cqshgmptdav2b"]
 
-[ext_resource type="Script" path="res://converters/converter.gd" id="1_f5plk"]
+[ext_resource type="Script" path="res://converters/converter.gd" id="1_fgju3"]
-[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://chc8wqc1pclbk" path="res://converters/gold_to_gem/gold_converter_back.png" id="2_hh4ft"]
-[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://dgw5ip5qf5k7a" path="res://converters/gold_to_gem/gold_converter_front_1.png" id="3_ofrsl"]
-[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://h7hu4paxjq84" path="res://converters/gold_to_gem/gold_converter_front_2.png" id="4_bfibv"]
-[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://dlog0f5nk4b3c" path="res://converters/gold_to_gem/gold_converter_front_3.png" id="5_grq6d"]
-[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://cj5m5k0hr3wmw" path="res://converters/gold_to_gem/gold_converter_front_4.png" id="6_m1sjp"]
-[ext_resource type="Texture2D" uid="uid://b5uershakuq20" path="res://converters/gold_to_gem/gold_converter_front_5.png" id="7_jfv3m"]
+[ext_resource type="Texture2D" uid="uid://b5uershakuq20" path="res://converters/gold_to_gem/gold_converter_front_5.png" id="7_ccs4f"]
-[ext_resource type="PackedScene" uid="uid://c5w3b55aiui6c" path="res://collector/collector.tscn" id="7_m34js"]
+[ext_resource type="PackedScene" uid="uid://c5w3b55aiui6c" path="res://collector/collector.tscn" id="8_77gmi"]
-[ext_resource type="PackedScene" uid="uid://c67lfbk4gf1ga" path="res://spawner/spawner.tscn" id="8_qwbjp"]
+[ext_resource type="PackedScene" uid="uid://c67lfbk4gf1ga" path="res://spawner/spawner.tscn" id="9_ojqfv"]
-[ext_resource type="PackedScene" uid="uid://bawprh8kluilq" path="res://entity/gem/gem.tscn" id="9_2ugi1"]
+[ext_resource type="PackedScene" uid="uid://bawprh8kluilq" path="res://entity/gem/gem.tscn" id="10_op7xt"]
-[ext_resource type="AudioStream" uid="uid://br25ip30mu174" path="res://audio/conversione/mechanic_sound.wav" id="10_f1h6i"]
+[ext_resource type="AudioStream" uid="uid://br25ip30mu174" path="res://audio/conversione/mechanic_sound.wav" id="11_lofho"]
-[ext_resource type="AudioStream" uid="uid://7tw5efuo3gxj" path="res://audio/conversione/coin_to_coin.wav" id="11_ywwn2"]
+[ext_resource type="AudioStream" uid="uid://7tw5efuo3gxj" path="res://audio/conversione/coin_to_coin.wav" id="12_vklpo"]
 [ext_resource type="PackedScene" uid="uid://bevj27e1ha8m3" path="res://converters/converter_placement_body.tscn" id="13_6o73w"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_wy1v3"]
-atlas = ExtResource("3_n6auo")
+atlas = ExtResource("3_ofrsl")
 region = Rect2(0, 4, 32, 31)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_2164d"]
-atlas = ExtResource("4_dxxyk")
+atlas = ExtResource("4_bfibv")
 region = Rect2(0, 4, 32, 31)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_i5584"]
-atlas = ExtResource("5_lnr8u")
+atlas = ExtResource("5_grq6d")
 region = Rect2(0, 4, 32, 31)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_qad4c"]
-atlas = ExtResource("6_nh41p")
+atlas = ExtResource("6_m1sjp")
 region = Rect2(0, 4, 32, 31)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_600qi"]
-atlas = ExtResource("7_jfv3m")
+atlas = ExtResource("7_ccs4f")
 region = Rect2(0, 4, 32, 31)
 
 [sub_resource type="SpriteFrames" id="SpriteFrames_4m3dg"]
@@ -54,7 +54,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"default",
-"speed": 15.0
+"speed": 10.5
 }]
 
 [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_aslkt"]
@@ -70,11 +70,10 @@ size = Vector2(26, 5)
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_jeo5f"]
 size = Vector2(26, 8.83334)
 
-[node name="GemConverter" type="StaticBody2D" node_paths=PackedStringArray("sprite_front", "conversion_timer", "sound_working", "sound_complete", "spawner")]
+[node name="GoldConverter" type="StaticBody2D" node_paths=PackedStringArray("sprite_front", "conversion_timer", "sound_working", "sound_complete", "spawner")]
-scale = Vector2(3, 3)
 collision_layer = 8
 collision_mask = 0
-script = ExtResource("1_f5plk")
+script = ExtResource("1_fgju3")
 sprite_front = NodePath("SpriteFront")
 conversion_timer = NodePath("ConversionTimer")
 sound_working = NodePath("SoundWorking")
@@ -84,7 +83,7 @@ spawner = NodePath("Spawner")
 [node name="SpriteBack" type="Sprite2D" parent="."]
 z_index = -2
 texture_filter = 1
-texture = ExtResource("2_icys1")
+texture = ExtResource("2_hh4ft")
 
 [node name="SpriteFront" type="AnimatedSprite2D" parent="."]
 z_index = 2
@@ -109,7 +108,7 @@ position = Vector2(0, 4.5)
 rotation = 3.14159
 shape = SubResource("RectangleShape2D_31dtl")
 
-[node name="Collector" parent="." instance=ExtResource("7_m34js")]
+[node name="Collector" parent="." instance=ExtResource("8_77gmi")]
 z_index = 2
 collecting_types = Array[StringName]([&"Gold"])
 collecting_amount = 10
@@ -118,9 +117,9 @@ collecting_amount = 10
 shape = SubResource("RectangleShape2D_k11if")
 debug_color = Color(0, 0.701961, 0.188235, 0.419608)
 
-[node name="Spawner" parent="." instance=ExtResource("8_qwbjp")]
+[node name="Spawner" parent="." instance=ExtResource("9_ojqfv")]
 position = Vector2(0, 8)
-scene = ExtResource("9_2ugi1")
+scene = ExtResource("10_op7xt")
 buffer_cap = 1
 spawn_rect = Rect2(-8, 0, 16, 4)
 spawn_rotation_degrees_min = 80.0
@@ -134,17 +133,16 @@ 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_f1h6i")
+stream = ExtResource("11_lofho")
 
 [node name="SoundWorking" type="AudioStreamPlayer" parent="."]
-stream = ExtResource("10_f1h6i")
+stream = ExtResource("11_lofho")
 
 [node name="SoundComplete" type="AudioStreamPlayer" parent="."]
-stream = ExtResource("11_ywwn2")
+stream = ExtResource("12_vklpo")
 
 [node name="ConverterPlacementBody" parent="." instance=ExtResource("13_6o73w")]
 

converters/item_converter/item_converter.tscn

@@ -9,14 +9,15 @@
 [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"]
 [ext_resource type="PackedScene" uid="uid://bevj27e1ha8m3" path="res://converters/converter_placement_body.tscn" id="17_udaa3"]
+[ext_resource type="AudioStream" uid="uid://du16ilpv6gmxd" path="res://audio/conversione/drop_in_lava.wav" id="15_nahnf"]
+[ext_resource type="AudioStream" uid="uid://dv1e0wiiquxp0" path="res://audio/conversione/lava.wav" id="16_ptmks"]
+[ext_resource type="AudioStream" uid="uid://c0uhi1hrejyxg" path="res://audio/conversione/new_item.wav" id="17_4wm4w"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_uqtie"]
 atlas = ExtResource("2_136t7")
@@ -117,20 +118,26 @@ size = Vector2(26, 5)
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_jeo5f"]
 size = Vector2(26, 8.83334)
 
-[node name="ItemConverter" type="StaticBody2D"]
+[node name="ItemConverter" type="StaticBody2D" node_paths=PackedStringArray("sprite_front", "sprite_back", "conversion_timer", "sound_working", "sound_complete", "spawner")]
 scale = Vector2(3, 3)
 script = ExtResource("1_qln0a")
+sprite_front = NodePath("SpriteFront")
+sprite_back = NodePath("SpriteBack")
+conversion_timer = NodePath("ConversionTimer")
+sound_working = NodePath("SoundWorking")
+sound_complete = NodePath("SoundComplete")
+spawner = NodePath("Spawner")
 
 [node name="SpriteBack" type="AnimatedSprite2D" parent="."]
 texture_filter = 1
 position = Vector2(0, -14)
 sprite_frames = SubResource("SpriteFrames_psnir")
-frame_progress = 0.0929807
+frame_progress = 0.883907
 
 [node name="SpriteFront" type="AnimatedSprite2D" parent="."]
+z_index = 2
 texture_filter = 1
 sprite_frames = SubResource("SpriteFrames_qqah4")
-frame_progress = 0.859387
 
 [node name="LeftWall" type="CollisionShape2D" parent="."]
 z_index = 2
@@ -148,9 +155,10 @@ position = Vector2(0, 4.5)
 rotation = 3.14159
 shape = SubResource("RectangleShape2D_31dtl")
 
-[node name="Collector" parent="." instance=ExtResource("3_qehi7")]
+[node name="Collector" parent="." node_paths=PackedStringArray("sound_absorb") instance=ExtResource("3_qehi7")]
 z_index = 2
-collecting_types = Array[StringName]([&"Copper"])
+collecting_types = Array[StringName]([&"Gold", &"Gem"])
+sound_absorb = NodePath("../SoundAbsorb")
 collecting_amount = 10
 
 [node name="CollectShape" type="CollisionShape2D" parent="Collector"]
@@ -173,17 +181,22 @@ 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")
+stream = ExtResource("15_nahnf")
+volume_db = -12.291
 
 [node name="SoundWorking" type="AudioStreamPlayer" parent="."]
-stream = ExtResource("6_w6x4p")
+stream = ExtResource("16_ptmks")
 
 [node name="SoundComplete" type="AudioStreamPlayer" parent="."]
-stream = ExtResource("7_x4ti3")
+stream = ExtResource("17_4wm4w")
+
+[node name="SpriteBack2" type="AnimatedSprite2D" parent="."]
+texture_filter = 1
+sprite_frames = SubResource("SpriteFrames_psnir")
+frame_progress = 0.228399
 
 [node name="ConverterPlacementBody" parent="." instance=ExtResource("17_udaa3")]
 

converters/silver_to_gold/silver_converter.tscn

@@ -48,8 +48,6 @@ size = Vector2(26, 10)
 
 [node name="SilverConverter" type="StaticBody2D" node_paths=PackedStringArray("sprite_front", "conversion_timer", "sound_working", "sound_complete", "spawner")]
 scale = Vector2(3, 3)
-collision_layer = 8
-collision_mask = 0
 script = ExtResource("1_chhfg")
 sprite_front = NodePath("SpriteFront")
 conversion_timer = NodePath("ConversionTimer")

entity/coin_copper/coin_copper.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=9 format=3 uid="uid://c3kitncwpi42j"]
+[gd_scene load_steps=8 format=3 uid="uid://c3kitncwpi42j"]
 
 [ext_resource type="PhysicsMaterial" uid="uid://c6kn1an85lccr" path="res://entity/coin_physics_material.tres" id="1_1fypc"]
-[ext_resource type="Script" path="res://entity/coin_copper/coin_copper.gd" id="2_1r8w3"]
 [ext_resource type="Texture2D" uid="uid://dbdkb4vt7dh85" path="res://entity/coin_copper/coin_copper_4.png" id="2_4pvkj"]
 [ext_resource type="Texture2D" uid="uid://2vtvoj6ua3cb" path="res://entity/coin_copper/coin_copper_outline_2.png" id="3_dq1f7"]
 [ext_resource type="PackedScene" uid="uid://bk1vvq5rug01m" path="res://collector/collectible.tscn" id="4_npwn2"]
@@ -21,7 +20,6 @@ max_contacts_reported = 1
 contact_monitor = true
 linear_damp = 0.1
 angular_damp = 0.1
-script = ExtResource("2_1r8w3")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 scale = Vector2(2, 2)

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"]

spawner/spawner.tscn

@@ -3,6 +3,4 @@
 [ext_resource type="Script" path="res://spawner/spawner.gd" id="1_xqfmg"]
 
 [node name="Spawner" type="Area2D"]
-collision_layer = 0
-collision_mask = 4
 script = ExtResource("1_xqfmg")