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

converters/gold_to_coaldiamond/coal_diamond_converter.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=24 format=3 uid="uid://clanhkk4sg47w"]
+[gd_scene load_steps=25 format=3 uid="uid://clanhkk4sg47w"]
 
 [ext_resource type="Script" path="res://converters/converter.gd" id="1_mf1ls"]
 [ext_resource type="Texture2D" uid="uid://2dhqp2liete7" path="res://converters/gold_to_coaldiamond/diamond_converter_back.png" id="2_nj8gd"]
@@ -13,6 +13,7 @@
 [ext_resource type="PackedScene" uid="uid://diy8fj7mcc00p" path="res://entity/coal_diamond/coal.tscn" id="10_ry7ak"]
 [ext_resource type="AudioStream" uid="uid://7tw5efuo3gxj" path="res://audio/conversione/coin_to_coin.wav" id="11_5c46k"]
 [ext_resource type="PackedScene" uid="uid://bevj27e1ha8m3" path="res://converters/converter_placement_body.tscn" id="12_xld3l"]
+[ext_resource type="AudioStream" uid="uid://du16ilpv6gmxd" path="res://audio/conversione/drop_in_lava.wav" id="13_jvouj"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_00uxa"]
 atlas = ExtResource("3_p4wsd")
@@ -133,7 +134,6 @@ 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="SoundWorking" type="AudioStreamPlayer" parent="."]
@@ -142,6 +142,10 @@ stream = ExtResource("10_hy4ck")
 [node name="SoundComplete" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("11_5c46k")
 
+[node name="SoundAbsorb" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("13_jvouj")
+volume_db = -12.291
+
 [node name="ConverterPlacementBody" parent="." instance=ExtResource("12_xld3l")]
 
 [connection signal="input_event" from="." to="." method="_on_input_event"]

entity/coin_copper/coin_copper.tscn

@@ -5,7 +5,7 @@
 [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"]
 [ext_resource type="PackedScene" uid="uid://ujpra0s1kpqi" path="res://value/valuable.tscn" id="5_fd0r7"]
-[ext_resource type="AudioStream" uid="uid://ds2rl6eg5jr1" path="res://audio/tap/click5.wav" id="7_fxd28"]
+[ext_resource type="AudioStream" uid="uid://wy7f2j0wg1ur" path="res://audio/tap/click5.wav" id="7_fxd28"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_c6byl"]
 size = Vector2(14, 3)
@@ -49,4 +49,7 @@ volume_db = -24.397
 wait_time = 2.108
 one_shot = true
 
+[connection signal="body_entered" from="." to="." method="_on_body_entered"]
+[connection signal="body_exited" from="." to="." method="_on_body_exited"]
+[connection signal="sleeping_state_changed" from="." to="." method="_on_sleeping_state_changed"]
 [connection signal="collected" from="Collectible" to="Collectible" method="_on_done"]

entity/coin_gold/coin_gold.tscn

@@ -7,7 +7,7 @@
 [ext_resource type="PackedScene" uid="uid://ujpra0s1kpqi" path="res://value/valuable.tscn" id="5_palpv"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_c6byl"]
-size = Vector2(27, 5)
+size = Vector2(20, 16)
 
 [node name="CoinGold" type="RigidBody2D"]
 collision_layer = 4

game/game.tscn

@@ -17,7 +17,9 @@
 [ext_resource type="Texture2D" uid="uid://c8pvjgtr2ufjl" path="res://interface/upgrade_copper.png" id="11_lt33g"]
 [ext_resource type="PackedScene" uid="uid://c3kitncwpi42j" path="res://entity/coin_copper/coin_copper.tscn" id="13_4j8om"]
 [ext_resource type="Script" path="res://game/DebugTimer.gd" id="13_6ai3c"]
+[ext_resource type="PackedScene" uid="uid://du3005kwybbrh" path="res://entity/coin_gold/coin_gold.tscn" id="13_8ux81"]
 [ext_resource type="PackedScene" uid="uid://qtk4tm6l367w" path="res://interface/ghost.tscn" id="16_8vhx6"]
+[ext_resource type="PackedScene" uid="uid://clanhkk4sg47w" path="res://converters/gold_to_coaldiamond/coal_diamond_converter.tscn" id="18_bjs6i"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_rh35r"]
 size = Vector2(240, 384)
@@ -66,6 +68,7 @@ debug_color = Color(0, 0.6, 0.701961, 0)
 
 [node name="TimeSpawner" parent="." node_paths=PackedStringArray("target") instance=ExtResource("3_qwsty")]
 position = Vector2(136, 0)
+scene = ExtResource("13_8ux81")
 target = NodePath("..")
 buffer_cap = 1
 spawn_rect = Rect2(-20, 0, 40, 0)
@@ -77,6 +80,7 @@ shape = SubResource("RectangleShape2D_4uksi")
 debug_color = Color(0, 0.6, 0.701961, 0)
 
 [node name="Timer" type="Timer" parent="TimeSpawner"]
+one_shot = true
 
 [node name="DebugSpawner" parent="." node_paths=PackedStringArray("target") instance=ExtResource("3_qwsty")]
 position = Vector2(136, 0)
@@ -84,7 +88,7 @@ scene = ExtResource("13_4j8om")
 target = NodePath("..")
 buffer_cap = 1
 spawn_rect = Rect2(-20, 0, 40, 0)
-overlapping_body_count_limit = 16
+overlapping_body_count_limit = 128
 metadata/_edit_lock_ = true
 
 [node name="NeckShape" type="CollisionShape2D" parent="DebugSpawner"]
@@ -187,7 +191,15 @@ position = Vector2(405, 540)
 shape = SubResource("RectangleShape2D_jed57")
 debug_color = Color(0, 0, 0, 0.419608)
 
+[node name="CoalDiamondConverter" parent="." instance=ExtResource("18_bjs6i")]
+position = Vector2(140, 217)
+
+[node name="Spawner" parent="CoalDiamondConverter" index="6" node_paths=PackedStringArray("target")]
+target = NodePath("../..")
+
 [connection signal="changed" from="Bottle/Evaluator" to="." method="_on_score_changed"]
 [connection signal="timeout" from="TimeSpawner/Timer" to="TimeSpawner" method="spawn"]
 [connection signal="timeout" from="DebugSpawner/DebugTimer" to="DebugSpawner" method="spawn"]
 [connection signal="collected" from="StoreCollector" to="." method="_on_store_collector_collected"]
+
+[editable path="CoalDiamondConverter"]

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.gd

@@ -54,6 +54,10 @@ func _do_spawn():
 		return
 	if scene == null:
 		return
+#	if scene._bundled["names"][0]=="Coal":
+#		var scene = PackedScene.new()
+#		scene.pack(get_node(""))
+#		print("ehi")
 	var instantiated = scene.instantiate()
 	instantiated.global_position = global_position + _select_spawn_position()
 	instantiated.rotation_degrees = _select_spawn_rotation()