From 2ec4a8ade61e3a3c9b9b2e7c320701f8f7ff64bd Mon Sep 17 00:00:00 2001
From: antimundo <pablo.rubio.ru@gmail.com>
Date: Sat, 2 Mar 2024 09:50:51 +0100
Subject: [PATCH] Customizable target height and radius

New gamemode configuration settings
---
 assets/gamemodes/horizontal.cfg |  5 ++++-
 assets/gamemodes/moving.cfg     |  5 ++++-
 assets/gamemodes/random.cfg     |  5 ++++-
 assets/gamemodes/tracking.cfg   |  5 ++++-
 scenes/enemies/target.tscn      | 11 ++++++-----
 scenes/game_world/target.gd     |  7 +++++--
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/assets/gamemodes/horizontal.cfg b/assets/gamemodes/horizontal.cfg
index 940d143..33c92d4 100644
--- a/assets/gamemodes/horizontal.cfg
+++ b/assets/gamemodes/horizontal.cfg
@@ -10,6 +10,9 @@ movement={
 	"x": 0,
 	"y": 0
 }
-size=1
+size={
+	"radius": 0.5,
+	"height": 1
+}
 health=0
 initial_targets=1
diff --git a/assets/gamemodes/moving.cfg b/assets/gamemodes/moving.cfg
index bc70cff..c6da082 100644
--- a/assets/gamemodes/moving.cfg
+++ b/assets/gamemodes/moving.cfg
@@ -10,6 +10,9 @@ movement={
 	"x": 5,
 	"y": 5
 }
-size=2
+size={
+	"radius": 1,
+	"height": 2
+}
 health=0
 initial_targets=6
diff --git a/assets/gamemodes/random.cfg b/assets/gamemodes/random.cfg
index 4ebe0ef..1c596ca 100644
--- a/assets/gamemodes/random.cfg
+++ b/assets/gamemodes/random.cfg
@@ -10,6 +10,9 @@ movement={
 	"x": 0,
 	"y": 0
 }
-size=2
+size={
+	"radius": 1,
+	"height": 2
+}
 health=0
 initial_targets=3
diff --git a/assets/gamemodes/tracking.cfg b/assets/gamemodes/tracking.cfg
index 9daae5f..3e7183e 100644
--- a/assets/gamemodes/tracking.cfg
+++ b/assets/gamemodes/tracking.cfg
@@ -10,6 +10,9 @@ movement={
 	"x": 15,
 	"y": 0
 }
-size=2
+size={
+	"radius": 1,
+	"height": 4
+}
 health=3
 initial_targets=1
diff --git a/scenes/enemies/target.tscn b/scenes/enemies/target.tscn
index 559b5ea..27e989e 100644
--- a/scenes/enemies/target.tscn
+++ b/scenes/enemies/target.tscn
@@ -2,7 +2,8 @@
 
 [ext_resource type="Script" path="res://scenes/game_world/target.gd" id="1_mc4da"]
 
-[sub_resource type="SphereShape3D" id="SphereShape3D_ccits"]
+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_do5mn"]
+height = 1.0
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_nkxxc"]
 albedo_color = Color(1, 1, 0, 1)
@@ -10,10 +11,10 @@ emission_enabled = true
 emission = Color(1, 0.74902, 0, 1)
 emission_energy_multiplier = 0.5
 
-[sub_resource type="SphereMesh" id="SphereMesh_gr1eg"]
+[sub_resource type="CapsuleMesh" id="CapsuleMesh_xrxto"]
 material = SubResource("StandardMaterial3D_nkxxc")
+height = 1.0
 radial_segments = 32
-rings = 16
 
 [node name="Target" type="CharacterBody3D" groups=["Enemy"]]
 collision_mask = 2
@@ -21,8 +22,8 @@ motion_mode = 1
 script = ExtResource("1_mc4da")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-shape = SubResource("SphereShape3D_ccits")
+shape = SubResource("CapsuleShape3D_do5mn")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="CollisionShape3D"]
-mesh = SubResource("SphereMesh_gr1eg")
+mesh = SubResource("CapsuleMesh_xrxto")
 skeleton = NodePath("../..")
diff --git a/scenes/game_world/target.gd b/scenes/game_world/target.gd
index 76a98fa..fe166f9 100644
--- a/scenes/game_world/target.gd
+++ b/scenes/game_world/target.gd
@@ -21,8 +21,11 @@ func _ready():
 		material_override.set_emission(Global.string_to_color(DataManager.get_data(category, "TargetColor")))
 		mesh.material_override = material_override
 
-func init(size = 0.5, movement = {"x": 0, "y": 0}):
-	scale = Vector3(size, size, size)
+func init(size = {"radius": .5, "height": 1}, movement = {"x": 0, "y": 0}):
+	$CollisionShape3D.shape.radius = size.radius
+	$CollisionShape3D.shape.height = size.height
+	$CollisionShape3D/MeshInstance3D.mesh.radius = size.radius
+	$CollisionShape3D/MeshInstance3D.mesh.height = size.height
 	current_velocity = Vector3(randf_range(-movement.x, movement.x),\
 		 randf_range(-movement.y, movement.y), 0)