From ee0df4c8864ef7ab61867128a61730b5a455f76d Mon Sep 17 00:00:00 2001
From: Jan <heemstrajan@gmail.com>
Date: Sat, 19 Sep 2020 00:30:59 +0200
Subject: [PATCH] Some refactoring

---
 GUI/Hitmarker.gd                 | 10 ++++++++++
 LevelComponents/LevelGeometry.gd |  2 +-
 Player.gd                        |  4 ----
 Player.tscn                      |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 GUI/Hitmarker.gd

diff --git a/GUI/Hitmarker.gd b/GUI/Hitmarker.gd
new file mode 100644
index 0000000..097768a
--- /dev/null
+++ b/GUI/Hitmarker.gd
@@ -0,0 +1,10 @@
+extends Control
+
+var remaining_time = -10.0
+
+func activate(time):
+	remaining_time = time
+
+func _process(delta):
+	remaining_time -= delta
+	self.modulate = Color(1, 1, 1, exp(remaining_time * 10))
diff --git a/LevelComponents/LevelGeometry.gd b/LevelComponents/LevelGeometry.gd
index 12ddfe9..668d6a5 100644
--- a/LevelComponents/LevelGeometry.gd
+++ b/LevelComponents/LevelGeometry.gd
@@ -4,5 +4,5 @@ var bulletHitEffect = preload("res://Assets/Effects/BulletHit.tscn")
 
 remotesync func on_hit(damage, position):
 	var effect = bulletHitEffect.instance()
+	add_child(effect)
 	effect.global_transform.origin = position
-	get_tree().root.call_deferred("add_child", effect)
diff --git a/Player.gd b/Player.gd
index 62a44e1..86cdb5f 100644
--- a/Player.gd
+++ b/Player.gd
@@ -36,10 +36,6 @@ var walkDirInt = Vector2.ZERO
 
 var bulletHitEffect = preload("res://Assets/Effects/BulletHit.tscn")
 
-# Declare member variables here. Examples:
-# var a = 2
-# var b = "text"
-
 func sfx_play_footsteps():
 	if not sfx_footsteps_play:
 		sfx_footsteps_play = true
diff --git a/Player.tscn b/Player.tscn
index 8bbaac5..b683a53 100644
--- a/Player.tscn
+++ b/Player.tscn
@@ -6,7 +6,7 @@
 [ext_resource path="res://Assets/SFX/Player-Step-Concrete-02.wav" type="AudioStream" id=4]
 [ext_resource path="res://Assets/SFX/Player-Step-Concrete-04.wav" type="AudioStream" id=5]
 [ext_resource path="res://Assets/SFX/Player-Step-Concrete-03.wav" type="AudioStream" id=6]
-[ext_resource path="res://LevelComponents/Hitmarker.gd" type="Script" id=7]
+[ext_resource path="res://GUI/Hitmarker.gd" type="Script" id=7]
 
 [sub_resource type="CapsuleShape" id=1]
 radius = 0.33