From b15931b7d84cb35316d7c4a6d7ee3b8b63d7cf2f Mon Sep 17 00:00:00 2001 From: Matteo Balugani Date: Mon, 2 Oct 2023 16:50:01 +0200 Subject: [PATCH] bugfix fornace --- audio/conversione/new_item.wav | 3 +++ audio/conversione/new_item.wav.import | 24 +++++++++++++++++++ bottle/bottle.tscn | 4 ++-- collector/collector.tscn | 13 ++++++---- converters/converter.gd | 2 +- .../copper_to_silver/copper_converter.tscn | 7 +++--- converters/item_converter/item_converter.tscn | 8 +++---- entity/gem/gem.tscn | 2 +- game/game.tscn | 22 ++++++++++++----- main.tscn | 2 +- spawner/spawner.tscn | 2 -- 11 files changed, 65 insertions(+), 24 deletions(-) create mode 100644 audio/conversione/new_item.wav create mode 100644 audio/conversione/new_item.wav.import diff --git a/audio/conversione/new_item.wav b/audio/conversione/new_item.wav new file mode 100644 index 0000000..ffee2ca --- /dev/null +++ b/audio/conversione/new_item.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e8f14d62de9a55770e67b9cfd13acf4d6ed347708bc2ef9b2a9dba32bd35fd1 +size 501320 diff --git a/audio/conversione/new_item.wav.import b/audio/conversione/new_item.wav.import new file mode 100644 index 0000000..e439ecc --- /dev/null +++ b/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 diff --git a/bottle/bottle.tscn b/bottle/bottle.tscn index fc6930b..4a862a0 100644 --- a/bottle/bottle.tscn +++ b/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 = 2 -physics_layer_0/collision_mask = 0 +physics_layer_0/collision_layer = 3 +physics_layer_0/collision_mask = 3 physics_layer_0/physics_material = SubResource("PhysicsMaterial_y0g3v") sources/1 = SubResource("TileSetAtlasSource_6tyce") diff --git a/collector/collector.tscn b/collector/collector.tscn index 5eb872a..a7f738e 100644 --- a/collector/collector.tscn +++ b/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"] -collision_layer = 0 -collision_mask = 4 +[node name="Collector" type="Area2D" node_paths=PackedStringArray("sound_absorb")] 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"] diff --git a/converters/converter.gd b/converters/converter.gd index bd9b380..b098484 100644 --- a/converters/converter.gd +++ b/converters/converter.gd @@ -23,7 +23,7 @@ func _process(_delta): func _on_timer_timeout(): coda-=1 sprite_front.stop() - sprite_back.play() + sprite_back.stop() sound_working.stop() sound_complete.play() spawner.spawn() diff --git a/converters/copper_to_silver/copper_converter.tscn b/converters/copper_to_silver/copper_converter.tscn index 6ae1582..3cccf4a 100644 --- a/converters/copper_to_silver/copper_converter.tscn +++ b/converters/copper_to_silver/copper_converter.tscn @@ -59,12 +59,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") @@ -126,6 +124,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") diff --git a/converters/item_converter/item_converter.tscn b/converters/item_converter/item_converter.tscn index 4083a73..b27c11d 100644 --- a/converters/item_converter/item_converter.tscn +++ b/converters/item_converter/item_converter.tscn @@ -16,7 +16,7 @@ [ext_resource type="Texture2D" uid="uid://4tg81ksibacf" path="res://converters/item_converter/item_converter_front_5.png" id="11_cg5dk"] [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://cc4mqxq6mxmdg" path="res://audio/conversione/coin_to_gem.wav" id="17_58rct"] +[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") @@ -124,7 +124,7 @@ sprite_front = NodePath("SpriteFront") sprite_back = NodePath("SpriteBack") conversion_timer = NodePath("ConversionTimer") sound_working = NodePath("SoundWorking") -sound_complete = NodePath("SoundAbsorb") +sound_complete = NodePath("SoundComplete") spawner = NodePath("Spawner") [node name="SpriteBack" type="AnimatedSprite2D" parent="."] @@ -137,7 +137,6 @@ frame_progress = 0.883907 z_index = 2 texture_filter = 1 sprite_frames = SubResource("SpriteFrames_qqah4") -frame_progress = 0.650314 [node name="LeftWall" type="CollisionShape2D" parent="."] z_index = 2 @@ -186,12 +185,13 @@ one_shot = true [node name="SoundAbsorb" type="AudioStreamPlayer" parent="."] stream = ExtResource("15_nahnf") +volume_db = -12.291 [node name="SoundWorking" type="AudioStreamPlayer" parent="."] stream = ExtResource("16_ptmks") [node name="SoundComplete" type="AudioStreamPlayer" parent="."] -stream = ExtResource("17_58rct") +stream = ExtResource("17_4wm4w") [node name="SpriteBack2" type="AnimatedSprite2D" parent="."] texture_filter = 1 diff --git a/entity/gem/gem.tscn b/entity/gem/gem.tscn index ec92543..bfa6cf6 100644 --- a/entity/gem/gem.tscn +++ b/entity/gem/gem.tscn @@ -35,7 +35,7 @@ texture = ExtResource("3_6jejy") shader = ExtResource("5_v6ppl") [node name="Collectible" parent="." instance=ExtResource("4_idoeu")] -type = &"Gem" +type = &"Silver" [node name="Valuable" parent="." instance=ExtResource("5_7bd6c")] value = 10 diff --git a/game/game.tscn b/game/game.tscn index ae72a4d..4699ae6 100644 --- a/game/game.tscn +++ b/game/game.tscn @@ -8,14 +8,15 @@ [ext_resource type="PackedScene" uid="uid://c3kitncwpi42j" path="res://entity/coin_copper/coin_copper.tscn" id="4_5oayc"] [ext_resource type="Texture2D" uid="uid://taojrwr7xrp4" path="res://interface/upgrade_gold.png" id="4_i557v"] [ext_resource type="PackedScene" uid="uid://beg758fa6o0cs" path="res://value/evaluator.tscn" id="6_my6nv"] +[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"] [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" path="res://interface/ghost.tscn" id="16_8vhx6"] +[ext_resource type="PackedScene" uid="uid://ddrhfhebwtq5" path="res://converters/item_converter/item_converter.tscn" id="17_fi36f"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_rh35r"] size = Vector2(240, 384) @@ -62,7 +63,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("8_a3sk0") +scene = ExtResource("7_hh80i") target = NodePath("..") buffer_cap = 1 spawn_rect = Rect2(-20, 0, 40, 0) @@ -74,7 +75,7 @@ shape = SubResource("RectangleShape2D_4uksi") debug_color = Color(0, 0.6, 0.701961, 0) [node name="Timer" type="Timer" parent="TimeSpawner"] -wait_time = 0.1 +wait_time = 0.458 autostart = true [node name="ButtonSpawner" parent="." node_paths=PackedStringArray("target") instance=ExtResource("3_qwsty")] @@ -93,7 +94,7 @@ debug_color = Color(0, 0.6, 0.701961, 0) [node name="GravityFromGyro" parent="." instance=ExtResource("2_h2pfr")] [node name="CopperConverter" parent="." instance=ExtResource("7_ipeok")] -position = Vector2(62, 176) +position = Vector2(-81, 181) metadata/_edit_group_ = true [node name="Spawner" parent="CopperConverter" index="6" node_paths=PackedStringArray("target")] @@ -103,8 +104,9 @@ target = NodePath("../..") position = Vector2(0, 4.08333) [node name="SilverConverter" parent="." instance=ExtResource("8_0bbpi")] -position = Vector2(205, 337) +position = Vector2(-84, 312) rotation = -3.14159 +metadata/_edit_group_ = true [node name="Spawner" parent="SilverConverter" index="6" node_paths=PackedStringArray("target")] target = NodePath("../..") @@ -186,9 +188,17 @@ position = Vector2(405, 540) shape = SubResource("RectangleShape2D_jed57") debug_color = Color(0, 0, 0, 0.419608) +[node name="ItemConverter" parent="." instance=ExtResource("17_fi36f")] +position = Vector2(134, 191) +metadata/_edit_group_ = true + +[node name="Spawner" parent="ItemConverter" 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="collected" from="StoreCollector" to="." method="_on_store_collector_collected"] [editable path="CopperConverter"] [editable path="SilverConverter"] +[editable path="ItemConverter"] diff --git a/main.tscn b/main.tscn index 7a2dfb4..873f7b6 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"] diff --git a/spawner/spawner.tscn b/spawner/spawner.tscn index a671abf..50ad214 100644 --- a/spawner/spawner.tscn +++ b/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")