From c45e9fc300b0ca1f54d1e144d72cd9054827df18 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <kristofers.solo@gmail.com>
Date: Tue, 9 Nov 2021 00:47:46 +0200
Subject: [PATCH] Added bullet despawn timer

---
 project.godot                                          | 10 ++++++++++
 source/assets/scripts/player_handlers/player_bullet.gd |  2 +-
 source/entities/bullet/player_bullet.tscn              |  9 ++++++---
 source/entities/player/player_node.tscn                |  1 -
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/project.godot b/project.godot
index 243da71..9f433a9 100644
--- a/project.godot
+++ b/project.godot
@@ -95,6 +95,16 @@ rotation_decrease={
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":81,"unicode":0,"echo":false,"script":null)
  ]
 }
+weapon_1={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777351,"unicode":0,"echo":false,"script":null)
+ ]
+}
+weapon_2={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777352,"unicode":0,"echo":false,"script":null)
+ ]
+}
 
 [physics]
 
diff --git a/source/assets/scripts/player_handlers/player_bullet.gd b/source/assets/scripts/player_handlers/player_bullet.gd
index 76106da..d3d5199 100644
--- a/source/assets/scripts/player_handlers/player_bullet.gd
+++ b/source/assets/scripts/player_handlers/player_bullet.gd
@@ -50,7 +50,7 @@ sync func destroy() -> void:
 	queue_free()
 
 
-func _on_Destroy_timer_timeout():
+func _on_destroy_timer_timeout():
 	if get_tree().has_network_peer():
 		if get_tree().is_network_server():
 			rpc("destroy")
diff --git a/source/entities/bullet/player_bullet.tscn b/source/entities/bullet/player_bullet.tscn
index 1b30fbc..d3813c1 100644
--- a/source/entities/bullet/player_bullet.tscn
+++ b/source/entities/bullet/player_bullet.tscn
@@ -6,18 +6,21 @@
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 22.0883, 10 )
 
-[node name="player_bullet" type="Sprite" groups=["Net"]]
+[node name="player_bullet" type="Sprite" groups=[
+"Net",
+]]
 texture = ExtResource( 1 )
 script = ExtResource( 2 )
 
-[node name="hitbox" type="Area2D" parent="." groups=["Player_damager"]]
+[node name="hitbox" type="Area2D" parent="." groups=[
+"Player_damager",
+]]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"]
 visible = false
 shape = SubResource( 1 )
 
 [node name="destroy_timer" type="Timer" parent="."]
-wait_time = 5.0
 one_shot = true
 autostart = true
 
diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn
index 0a58fe8..4b1ce08 100644
--- a/source/entities/player/player_node.tscn
+++ b/source/entities/player/player_node.tscn
@@ -334,7 +334,6 @@ animations = [ {
 "Player",
 ]]
 script = ExtResource( 11 )
-theme = "03"
 
 [node name="player_collider" type="CollisionShape2D" parent="."]
 shape = SubResource( 1 )