1
Fork 0
mirror of https://github.com/Steffo99/swear-jar.git synced 2024-11-21 23:34:18 +00:00

Various minor fixes and improvements

This commit is contained in:
Steffo 2023-10-25 00:47:26 +02:00
parent f4b439f650
commit d9a5336a99
Signed by: steffo
GPG key ID: 2A24051445686895
3 changed files with 31 additions and 7 deletions

View file

@ -15,6 +15,8 @@ collision_mask = 14
mass = 10.0 mass = 10.0
inertia = 1500.0 inertia = 1500.0
physics_material_override = ExtResource("1_1hg8e") physics_material_override = ExtResource("1_1hg8e")
max_contacts_reported = 1
contact_monitor = true
can_sleep = false can_sleep = false
linear_damp = 0.1 linear_damp = 0.1
angular_damp = 0.1 angular_damp = 0.1

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=27 format=3 uid="uid://c3rxmcwa5nqng"] [gd_scene load_steps=28 format=3 uid="uid://c3rxmcwa5nqng"]
[ext_resource type="Script" path="res://game/game.gd" id="1_i3ly0"] [ext_resource type="Script" path="res://game/game.gd" id="1_i3ly0"]
[ext_resource type="PackedScene" uid="uid://bllsprv8orpn4" path="res://bottle/bottle.tscn" id="1_y7o2l"] [ext_resource type="PackedScene" uid="uid://bllsprv8orpn4" path="res://bottle/bottle.tscn" id="1_y7o2l"]
@ -20,6 +20,7 @@
[ext_resource type="PackedScene" uid="uid://qtk4tm6l367w" path="res://interface/ghost/ghost.tscn" id="16_8vhx6"] [ext_resource type="PackedScene" uid="uid://qtk4tm6l367w" path="res://interface/ghost/ghost.tscn" id="16_8vhx6"]
[ext_resource type="PackedScene" uid="uid://bawprh8kluilq" path="res://entity/gem/gem.tscn" id="16_20aff"] [ext_resource type="PackedScene" uid="uid://bawprh8kluilq" path="res://entity/gem/gem.tscn" id="16_20aff"]
[ext_resource type="PackedScene" uid="uid://diy8fj7mcc00p" path="res://entity/coal_diamond/coal.tscn" id="17_mf5fk"] [ext_resource type="PackedScene" uid="uid://diy8fj7mcc00p" path="res://entity/coal_diamond/coal.tscn" id="17_mf5fk"]
[ext_resource type="PackedScene" uid="uid://cr5tiep20hk0s" path="res://entity/coal_diamond/diamond.tscn" id="18_2t5ba"]
[ext_resource type="AudioStream" uid="uid://daiute7lbjet7" path="res://audio/tap/click4.ogg" id="19_i72ko"] [ext_resource type="AudioStream" uid="uid://daiute7lbjet7" path="res://audio/tap/click4.ogg" id="19_i72ko"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_rh35r"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_rh35r"]
@ -170,6 +171,21 @@ debug_color = Color(0, 0.6, 0.701961, 0)
[node name="ActionTimer" parent="Spawners/CheatCoalSpawner" instance=ExtResource("13_y2562")] [node name="ActionTimer" parent="Spawners/CheatCoalSpawner" instance=ExtResource("13_y2562")]
action = "cheat_spawn_coal" action = "cheat_spawn_coal"
[node name="CheatDiamondSpawner" parent="Spawners" node_paths=PackedStringArray("target") instance=ExtResource("3_qwsty")]
scene = ExtResource("18_2t5ba")
target = NodePath("../..")
buffer_cap = 10
spawn_rect = Rect2(-20, 0, 40, 0)
overlapping_body_count_limit = 16
metadata/_edit_lock_ = true
[node name="NeckShape" type="CollisionShape2D" parent="Spawners/CheatDiamondSpawner"]
shape = SubResource("RectangleShape2D_4uksi")
debug_color = Color(0, 0.6, 0.701961, 0)
[node name="ActionTimer" parent="Spawners/CheatDiamondSpawner" instance=ExtResource("13_y2562")]
action = "cheat_spawn_diamond"
[node name="StoreCollector" parent="." node_paths=PackedStringArray("sound_absorb") instance=ExtResource("9_evdhb")] [node name="StoreCollector" parent="." node_paths=PackedStringArray("sound_absorb") instance=ExtResource("9_evdhb")]
position = Vector2(135, 0) position = Vector2(135, 0)
sound_absorb = NodePath("SoundAbsorb") sound_absorb = NodePath("SoundAbsorb")
@ -183,7 +199,7 @@ debug_color = Color(0, 0.701961, 0.188235, 0.419608)
[node name="Panel" type="Panel" parent="StoreCollector"] [node name="Panel" type="Panel" parent="StoreCollector"]
visible = false visible = false
z_index = -10 z_index = 10
anchors_preset = 5 anchors_preset = 5
anchor_left = 0.5 anchor_left = 0.5
anchor_right = 0.5 anchor_right = 0.5
@ -264,6 +280,7 @@ debug_color = Color(0, 0, 0, 0.419608)
[connection signal="timeout" from="Spawners/CheatGoldSpawner/ActionTimer" to="Spawners/CheatGoldSpawner" method="spawn"] [connection signal="timeout" from="Spawners/CheatGoldSpawner/ActionTimer" to="Spawners/CheatGoldSpawner" method="spawn"]
[connection signal="timeout" from="Spawners/CheatGemSpawner/ActionTimer" to="Spawners/CheatGemSpawner" method="spawn"] [connection signal="timeout" from="Spawners/CheatGemSpawner/ActionTimer" to="Spawners/CheatGemSpawner" method="spawn"]
[connection signal="timeout" from="Spawners/CheatCoalSpawner/ActionTimer" to="Spawners/CheatCoalSpawner" method="spawn"] [connection signal="timeout" from="Spawners/CheatCoalSpawner/ActionTimer" to="Spawners/CheatCoalSpawner" method="spawn"]
[connection signal="timeout" from="Spawners/CheatDiamondSpawner/ActionTimer" to="Spawners/CheatDiamondSpawner" method="spawn"]
[connection signal="collected" from="StoreCollector" to="." method="_on_store_collector_collected"] [connection signal="collected" from="StoreCollector" to="." method="_on_store_collector_collected"]
[editable path="Ghost"] [editable path="Ghost"]

View file

@ -75,27 +75,32 @@ ghost_precise={
} }
cheat_spawn_copper={ cheat_spawn_copper={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":49,"key_label":0,"unicode":49,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":true,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":49,"key_label":0,"unicode":49,"echo":false,"script":null)
] ]
} }
cheat_spawn_silver={ cheat_spawn_silver={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":50,"key_label":0,"unicode":50,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":true,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":50,"key_label":0,"unicode":50,"echo":false,"script":null)
] ]
} }
cheat_spawn_gold={ cheat_spawn_gold={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":51,"key_label":0,"unicode":51,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":true,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":51,"key_label":0,"unicode":51,"echo":false,"script":null)
] ]
} }
cheat_spawn_gem={ cheat_spawn_gem={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":52,"key_label":0,"unicode":52,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":true,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":52,"key_label":0,"unicode":52,"echo":false,"script":null)
] ]
} }
cheat_spawn_coal={ cheat_spawn_coal={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":53,"key_label":0,"unicode":53,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":true,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":53,"key_label":0,"unicode":53,"echo":false,"script":null)
]
}
cheat_spawn_diamond={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":true,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":54,"key_label":0,"unicode":38,"echo":false,"script":null)
] ]
} }