feat: rework spawning system & fix player collisions

scenes/classes/character.gd

@@ -4,6 +4,8 @@ class_name Character extends CharacterBody2D
 @export var speed: float = 40.0
 @export var sprite_frames: Array[SpriteFrames]
 
+@export var display_name: String
+
 
 func _enter_tree() -> void:
 	$AnimatedSprite2D.sprite_frames = sprite_frames.pick_random()

scenes/levels/level.gd

@@ -1,16 +1,20 @@
 extends Node2D
 
 
-@export var zombies_num: int = 2
-@export var players: int = 2
+@export var num_characters: int = 2
+@export var num_players: int = 2
 @export var zombie_scene: PackedScene
 @export var player_scene: PackedScene
-@export var spawn_points: Node
+@export var character_height: int = 34
 @export var colors: Array[Color]
+@export var spawn_offset: Vector2 = Vector2(50, 10)
 
+@export var base_height: int = 360
 
 var characters: Array[Character]
 
+@onready var num_zombies: int = num_characters - num_players
+
 
 @onready var finish_line: Area2D = $Finish
 
@@ -23,11 +27,11 @@ func _ready() -> void:
 
 
 func spawn_characters() -> void:
-	for i in zombies_num:
+	for i in num_zombies:
 		var zombie = zombie_scene.instantiate()
 		zombie.name = "Zombie " + str(i + 1)
 		characters.append(zombie)
-	for i in players:
+	for i in num_players:
 		var player = player_scene.instantiate()
 		player.number = i
 		player.name = "Player" + str(i)
@@ -39,9 +43,13 @@ func spawn_characters() -> void:
 
 	characters.shuffle()
 
-	var points := spawn_points.get_children()
-	for i in points.size():
-		characters[i].position = points[i].position
+	var total_characters: int = num_zombies + num_players
+	for i in num_zombies + num_players:
+		var available_height = base_height - spawn_offset.y
+		var spacing = available_height / total_characters + 1
+		var y_position = spawn_offset.y + i * spacing
+
+		characters[i].position = Vector2(spawn_offset.x, y_position)
 		add_child(characters[i])
 
 

scenes/main.tscn

@@ -9,8 +9,6 @@
 [node name="Main" type="Node"]
 
 [node name="Level" parent="." instance=ExtResource("1_js5b6")]
-zombies_num = 2
-players = 2
 
 [node name="GUI" type="Control" parent="."]
 process_mode = 3

scenes/players/crosshair.tscn

@@ -14,6 +14,7 @@ region = Rect2(97, 49, 14, 14)
 
 [node name="Crosshair" type="Area2D"]
 z_index = 200
+collision_mask = 2
 script = ExtResource("1_gycjl")
 speed = 120.0
 

scenes/players/player.gd

@@ -7,8 +7,6 @@ extends Character
 @export var crosshair_color: Color
 
 
-var display_name: String
-
 var speed_boost
 
 

scenes/players/player.tscn

@@ -6,10 +6,11 @@
 [ext_resource type="SpriteFrames" uid="uid://baufp5u5muwll" path="res://resources/zombie_3_frames.tres" id="4_mstxp"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_5wrs1"]
-size = Vector2(34, 68)
+size = Vector2(32, 64)
 
 [node name="Player" type="CharacterBody2D" groups=["players"]]
 z_index = 100
+collision_layer = 2
 script = ExtResource("1_fff2d")
 run_boost = 48.0
 speed = 32.0

scenes/zombie/zombie.tscn

@@ -6,12 +6,14 @@
 [ext_resource type="SpriteFrames" uid="uid://baufp5u5muwll" path="res://resources/zombie_3_frames.tres" id="4_kcvoe"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_6al3e"]
-size = Vector2(40, 64)
+size = Vector2(32, 64)
 
 [node name="Zombie" type="CharacterBody2D"]
+collision_layer = 2
 script = ExtResource("1_7wpk0")
 speed = 32.0
 sprite_frames = Array[SpriteFrames]([ExtResource("2_8m1jv"), ExtResource("3_rc68x"), ExtResource("4_kcvoe")])
+display_name = "Zombie"
 metadata/_edit_group_ = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]