way too many changes to list, oops. big rewrite.

This commit is contained in:
2025-05-27 03:38:03 +10:00
parent 16951a9beb
commit 4a21701a35
663 changed files with 7389 additions and 3283 deletions

View File

@ -3,16 +3,20 @@ class_name EnemySpawner extends Node3D
signal enemy_spawned()
@export var land_enemy_scene: PackedScene
@export var leap_enemy_scene: PackedScene
@export var air_enemy_scene: PackedScene
@export var own_id: int = 0
@export var path: VisualizedPath
var astar: AStarGraph3D
@export var own_id: int = 0
@export var type: Data.EnemyType
@export var dest: Node3D
@export var enemy_path: Node
var astar_point_id: int = 0
var enemy_died_callback: Callable
var enemy_reached_goal_callback: Callable
var current_wave: Dictionary = {}
var current_wave: Array[EnemyCard]
var enemy_types_to_spawn: Dictionary = {}
var enemy_spawn_timers: Dictionary = {}
var enemies_spawned: Dictionary = {}
var enemies_to_spawn: int = 0
@ -26,7 +30,7 @@ func _process(delta: float) -> void:
return
for x: Enemy in enemy_spawn_timers:
if enemies_spawned[x] == current_wave[x]:
if enemies_spawned[x] == enemy_types_to_spawn[x]:
continue
var enemy_stats: Enemy = x
@ -35,12 +39,12 @@ func _process(delta: float) -> void:
if enemy_spawn_timers[x] >= enemy_stats.spawn_cooldown:
if is_multiplayer_authority():
if type == Data.EnemyType.LAND:
networked_spawn_land_enemy.rpc(var_to_str(enemy_stats), own_id, enemy_id)
networked_spawn_land_enemy.rpc(Data.enemies.find(enemy_stats), own_id, enemy_id)
if type == Data.EnemyType.AIR:
var radius: float = 10.0
var random_dir: Vector3 = Vector3(randf_range(-1, 1), randf_range(-1, 1), randf_range(-1, 1))
var random_pos: Vector3 = randf_range(0, radius) * random_dir.normalized()
networked_spawn_air_enemy.rpc(var_to_str(enemy_stats), random_pos, own_id, enemy_id)
networked_spawn_air_enemy.rpc(Data.enemies.find(enemy_stats), random_pos, own_id, enemy_id)
enemy_spawn_timers[x] -= enemy_stats.spawn_cooldown
enemy_spawned.emit()
@ -49,43 +53,64 @@ func _process(delta: float) -> void:
enemies_to_spawn -= 1
#TODO: not sure enemies need all this info over the network
#TODO: generalize enemy scene selection, i.e. store the scenes in the enemy
#card like towers do
@rpc("reliable", "call_local")
func networked_spawn_land_enemy(enemy_stats: String, id1: int, id2: int) -> void:
var enemy: EnemyController = land_enemy_scene.instantiate() as EnemyController
func networked_spawn_land_enemy(enemy_stats: int, id1: int, id2: int) -> void:
var enemy: EnemyController
if enemy_stats != 6:
enemy = land_enemy_scene.instantiate() as EnemyController
else:
enemy = leap_enemy_scene.instantiate() as EnemyController
enemy.name = str(id1) + str(id2)
enemy.stats = str_to_var(enemy_stats)
enemy.stats = Data.enemies[enemy_stats]
enemy.died.connect(enemy_died_callback)
enemy.reached_goal.connect(enemy_reached_goal_callback)
enemy.movement_controller.path = path.curve
enemy.movement_controller.astar = astar
enemy.position = global_position
enemy_path.add_child(enemy)
@rpc("reliable", "call_local")
func networked_spawn_air_enemy(enemy_stats: String, pos: Vector3, id1: int, id2: int) -> void:
func networked_spawn_air_enemy(enemy_stats: int, pos: Vector3, id1: int, id2: int) -> void:
var enemy: EnemyController = air_enemy_scene.instantiate() as EnemyController
enemy.name = str(id1) + str(id2)
enemy.position = pos + global_position
enemy.stats = str_to_var(enemy_stats)
enemy.stats = Data.enemies[enemy_stats]
enemy.died.connect(enemy_died_callback)
enemy.reached_goal.connect(enemy_reached_goal_callback)
enemy.movement_controller.goal = dest
enemy_path.add_child(enemy)
func spawn_wave(value: Dictionary) -> void:
var relevant_enemies: Dictionary = {}
var wave: Dictionary = {}
for index: int in value:
wave[Data.enemies[index]] = value[index]
for x: Enemy in wave:
if x.target_type == type:
relevant_enemies[x] = wave[x]
current_wave = relevant_enemies
func spawn_wave() -> void:
enemies_to_spawn = 0
enemy_spawn_timers = {}
for x: Enemy in current_wave:
enemies_to_spawn += current_wave[x]
enemy_spawn_timers[x] = 0.0
enemies_spawned[x] = 0
for card: EnemyCard in current_wave:
match(card.rarity):
Data.Rarity.COMMON:
enemy_types_to_spawn[card.enemy] += card.enemy.common_group
enemies_to_spawn += card.enemy.common_group
Data.Rarity.UNCOMMON:
enemy_types_to_spawn[card.enemy] += card.enemy.uncommon_group
enemies_to_spawn += card.enemy.uncommon_group
Data.Rarity.RARE:
enemy_types_to_spawn[card.enemy] += card.enemy.rare_group
enemies_to_spawn += card.enemy.rare_group
Data.Rarity.EPIC:
enemy_types_to_spawn[card.enemy] += card.enemy.epic_group
enemies_to_spawn += card.enemy.epic_group
Data.Rarity.LEGENDARY:
enemy_types_to_spawn[card.enemy] += card.enemy.legendary_group
enemies_to_spawn += card.enemy.legendary_group
enemy_spawn_timers[card.enemy] = 0.0
enemies_spawned[card.enemy] = 0
current_wave = []
done_spawning = false
func add_card(new_card: EnemyCard) -> void:
current_wave.append(new_card)
enemy_types_to_spawn[new_card.enemy] = 0