mirror of
https://github.com/Steffo99/swear-jar.git
synced 2024-11-21 23:34:18 +00:00
Fix deletion failure bug
This commit is contained in:
parent
8f499b9e1f
commit
f4b439f650
6 changed files with 7 additions and 12 deletions
|
@ -68,7 +68,6 @@ size = Vector2(16, 4)
|
||||||
scale = Vector2(3, 3)
|
scale = Vector2(3, 3)
|
||||||
collision_layer = 8
|
collision_layer = 8
|
||||||
collision_mask = 0
|
collision_mask = 0
|
||||||
input_pickable = true
|
|
||||||
script = ExtResource("1_mas6k")
|
script = ExtResource("1_mas6k")
|
||||||
spawner = NodePath("Spawner")
|
spawner = NodePath("Spawner")
|
||||||
|
|
||||||
|
@ -140,6 +139,6 @@ debug_color = Color(0.701961, 0, 0, 0.419608)
|
||||||
|
|
||||||
[node name="SoundComplete" parent="Spawner" instance=ExtResource("14_ycmxn")]
|
[node name="SoundComplete" parent="Spawner" instance=ExtResource("14_ycmxn")]
|
||||||
|
|
||||||
[connection signal="input_event" from="." to="." method="_on_input_event"]
|
[connection signal="input_event" from="PlacementObstruction" to="." method="_on_input_event"]
|
||||||
[connection signal="goal" from="Collector" to="." method="_on_collector_goal"]
|
[connection signal="goal" from="Collector" to="." method="_on_collector_goal"]
|
||||||
[connection signal="timeout" from="WorkingTimer" to="." method="_on_working_timer_timeout"]
|
[connection signal="timeout" from="WorkingTimer" to="." method="_on_working_timer_timeout"]
|
||||||
|
|
|
@ -78,7 +78,6 @@ size = Vector2(16, 4)
|
||||||
scale = Vector2(3, 3)
|
scale = Vector2(3, 3)
|
||||||
collision_layer = 8
|
collision_layer = 8
|
||||||
collision_mask = 0
|
collision_mask = 0
|
||||||
input_pickable = true
|
|
||||||
script = ExtResource("1_mf1ls")
|
script = ExtResource("1_mf1ls")
|
||||||
spawner = NodePath("Spawner")
|
spawner = NodePath("Spawner")
|
||||||
spawner_alt = NodePath("Spawner2")
|
spawner_alt = NodePath("Spawner2")
|
||||||
|
@ -171,6 +170,6 @@ debug_color = Color(0.701961, 0, 0, 0.419608)
|
||||||
|
|
||||||
[node name="SoundComplete" parent="Spawner2" instance=ExtResource("17_iaatb")]
|
[node name="SoundComplete" parent="Spawner2" instance=ExtResource("17_iaatb")]
|
||||||
|
|
||||||
[connection signal="input_event" from="." to="." method="_on_input_event"]
|
[connection signal="input_event" from="PlacementObstruction" to="." method="_on_input_event"]
|
||||||
[connection signal="goal" from="Collector" to="." method="_on_collector_goal"]
|
[connection signal="goal" from="Collector" to="." method="_on_collector_goal"]
|
||||||
[connection signal="timeout" from="WorkingTimer" to="." method="_on_working_timer_timeout"]
|
[connection signal="timeout" from="WorkingTimer" to="." method="_on_working_timer_timeout"]
|
||||||
|
|
|
@ -77,7 +77,6 @@ size = Vector2(16, 4)
|
||||||
scale = Vector2(3, 3)
|
scale = Vector2(3, 3)
|
||||||
collision_layer = 8
|
collision_layer = 8
|
||||||
collision_mask = 0
|
collision_mask = 0
|
||||||
input_pickable = true
|
|
||||||
script = ExtResource("1_fgju3")
|
script = ExtResource("1_fgju3")
|
||||||
spawner = NodePath("Spawner")
|
spawner = NodePath("Spawner")
|
||||||
|
|
||||||
|
@ -133,7 +132,7 @@ working_sound = NodePath("SoundWorking")
|
||||||
|
|
||||||
[node name="SoundWorking" parent="WorkingTimer" instance=ExtResource("12_4ej0q")]
|
[node name="SoundWorking" parent="WorkingTimer" instance=ExtResource("12_4ej0q")]
|
||||||
|
|
||||||
[node name="Spawner" parent="." node_paths=PackedStringArray("sound_complete") instance=ExtResource("9_ojqfv")]
|
[node name="Spawner" parent="." instance=ExtResource("9_ojqfv")]
|
||||||
position = Vector2(0, 10)
|
position = Vector2(0, 10)
|
||||||
scene = ExtResource("10_op7xt")
|
scene = ExtResource("10_op7xt")
|
||||||
buffer_cap = 1
|
buffer_cap = 1
|
||||||
|
@ -141,7 +140,6 @@ spawn_rect = Rect2(-8, 0, 16, 4)
|
||||||
spawn_rotation_degrees_min = 80.0
|
spawn_rotation_degrees_min = 80.0
|
||||||
spawn_rotation_degrees_max = 100.0
|
spawn_rotation_degrees_max = 100.0
|
||||||
overlapping_body_count_limit = 4
|
overlapping_body_count_limit = 4
|
||||||
sound_complete = NodePath("")
|
|
||||||
|
|
||||||
[node name="PreventSpawnShape" type="CollisionShape2D" parent="Spawner"]
|
[node name="PreventSpawnShape" type="CollisionShape2D" parent="Spawner"]
|
||||||
z_index = 3
|
z_index = 3
|
||||||
|
@ -153,6 +151,6 @@ debug_color = Color(0.701961, 0, 0, 0.419608)
|
||||||
stream = ExtResource("16_mkx22")
|
stream = ExtResource("16_mkx22")
|
||||||
pitch_scale = 1.0
|
pitch_scale = 1.0
|
||||||
|
|
||||||
[connection signal="input_event" from="." to="." method="_on_input_event"]
|
[connection signal="input_event" from="PlacementObstruction" to="." method="_on_input_event"]
|
||||||
[connection signal="goal" from="Collector" to="." method="_on_collector_goal"]
|
[connection signal="goal" from="Collector" to="." method="_on_collector_goal"]
|
||||||
[connection signal="timeout" from="WorkingTimer" to="." method="_on_working_timer_timeout"]
|
[connection signal="timeout" from="WorkingTimer" to="." method="_on_working_timer_timeout"]
|
||||||
|
|
|
@ -126,7 +126,6 @@ size = Vector2(16, 4)
|
||||||
scale = Vector2(3, 3)
|
scale = Vector2(3, 3)
|
||||||
collision_layer = 8
|
collision_layer = 8
|
||||||
collision_mask = 0
|
collision_mask = 0
|
||||||
input_pickable = true
|
|
||||||
script = ExtResource("1_o3eos")
|
script = ExtResource("1_o3eos")
|
||||||
|
|
||||||
[node name="SpriteBack" type="AnimatedSprite2D" parent="."]
|
[node name="SpriteBack" type="AnimatedSprite2D" parent="."]
|
||||||
|
@ -263,7 +262,7 @@ debug_color = Color(0.701961, 0, 0, 0.419608)
|
||||||
volume_db = 0.0
|
volume_db = 0.0
|
||||||
pitch_scale = 0.74
|
pitch_scale = 0.74
|
||||||
|
|
||||||
[connection signal="input_event" from="." to="." method="_on_input_event"]
|
[connection signal="input_event" from="PlacementObstruction" to="." method="_on_input_event"]
|
||||||
[connection signal="collected" from="GoldCollector" to="." method="_on_gold_collector_collected"]
|
[connection signal="collected" from="GoldCollector" to="." method="_on_gold_collector_collected"]
|
||||||
[connection signal="collected" from="GemCollector" to="." method="_on_gem_collector_collected"]
|
[connection signal="collected" from="GemCollector" to="." method="_on_gem_collector_collected"]
|
||||||
[connection signal="timeout" from="WorkingTimer" to="." method="_on_working_timer_timeout"]
|
[connection signal="timeout" from="WorkingTimer" to="." method="_on_working_timer_timeout"]
|
||||||
|
|
|
@ -5,5 +5,6 @@
|
||||||
[node name="PlacementObstruction" type="StaticBody2D"]
|
[node name="PlacementObstruction" type="StaticBody2D"]
|
||||||
collision_layer = 16
|
collision_layer = 16
|
||||||
collision_mask = 0
|
collision_mask = 0
|
||||||
|
input_pickable = true
|
||||||
|
|
||||||
[node name="ShieldConverterObstructionShape" parent="." instance=ExtResource("1_mcdb6")]
|
[node name="ShieldConverterObstructionShape" parent="." instance=ExtResource("1_mcdb6")]
|
||||||
|
|
|
@ -53,7 +53,6 @@ position = Vector2(0, -2)
|
||||||
scale = Vector2(3, 3)
|
scale = Vector2(3, 3)
|
||||||
collision_layer = 8
|
collision_layer = 8
|
||||||
collision_mask = 0
|
collision_mask = 0
|
||||||
input_pickable = true
|
|
||||||
script = ExtResource("1_chhfg")
|
script = ExtResource("1_chhfg")
|
||||||
spawner = NodePath("Spawner")
|
spawner = NodePath("Spawner")
|
||||||
|
|
||||||
|
@ -129,6 +128,6 @@ debug_color = Color(0.701961, 0, 0, 0.419608)
|
||||||
|
|
||||||
[node name="SoundComplete" parent="Spawner" instance=ExtResource("14_vjw0q")]
|
[node name="SoundComplete" parent="Spawner" instance=ExtResource("14_vjw0q")]
|
||||||
|
|
||||||
[connection signal="input_event" from="." to="." method="_on_input_event"]
|
[connection signal="input_event" from="PlacementObstruction" to="." method="_on_input_event"]
|
||||||
[connection signal="goal" from="Collector" to="." method="_on_collector_goal"]
|
[connection signal="goal" from="Collector" to="." method="_on_collector_goal"]
|
||||||
[connection signal="timeout" from="WorkingTimer" to="." method="_on_working_timer_timeout"]
|
[connection signal="timeout" from="WorkingTimer" to="." method="_on_working_timer_timeout"]
|
||||||
|
|
Loading…
Reference in a new issue