jcreek/CosmicClash
1
0
Fork 0
mirror of https://github.com/jcreek/CosmicClash.git synced 2026-09-13 10:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(arena): add elevated-goal arena variants

Browse Source 
Each of the three arenas gains an ELEVATED sibling scene that inherits the
base arena and overrides the boundary's goal_mode, the two goal transforms
and the ship spawns, so the goal sits at mid-wall height instead of flush
with the deck. Registered in ArenaRegistry alongside the floor-level arenas,
plus a training_elevated scene for self-play on them.

TrainingMode reads the arena's goal_mode once in _start() and widens the
ball-placement height range to match the goal's real position; on FLOOR
arenas the bound is a no-op, so floor-level training is unchanged. It is read
in _start() rather than _ready() because TrainingMode has no _ready()
override and GameMode._ready() is what discovers the arena first.

Policies trained against floor-level goals are not expected to score on an
elevated one, so the two are kept as separate arenas rather than a variant of
the same entry.
This commit is contained in:
Josh Creek
2026-08-04 13:36:19 +01:00
parent 66b6215fdd
commit df3e168b31
6 changed files with 105 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Game/scripts/training_mode.gd
+12 -1
View File
@@ -120,8 +120,16 @@ var _ai_overrides := {}
# arena spawn instead of drifting into the play area as a stray obstacle.
var _inert_ships: Array[Ship] = []
# Whether this run's arena is an ELEVATED-goal variant (see
# ArenaBoundary.GoalMode) — read once _start() runs so _place_ball_near_goal
# can sample a height range matching the goal's real position. Read here
# rather than _ready(): TrainingMode has no _ready() override, and
# GameMode._ready() is what discovers `arena` before calling _start().
var _elevated := false
func _start() -> void:
_elevated = (arena.get_node("Boundary") as ArenaBoundary).goal_mode == ArenaBoundary.GoalMode.ELEVATED
_parse_eval_args()
_parse_curriculum_args()
spawn_ball()
@@ -371,9 +379,12 @@ func _place_ball_random() -> void:
func _place_ball_near_goal() -> void:
var goal := _goal_for_team(0) if randf() < attack_goal_bias else _goal_for_team(1)
var toward_centre := -signf(goal.global_position.z)
# Upper Y bound is a no-op on FLOOR arenas (goal.global_position.y ~0.79,
# so maxf(4.0, ...) stays 4.0); on ELEVATED arenas it widens to sample
# near the goal's real height instead of always landing near the floor.
var position := Vector3(
randf_range(-4.0, 4.0),
randf_range(FIELD_MIN_Y, 4.0),
randf_range(FIELD_MIN_Y, maxf(4.0, goal.global_position.y + 2.0)),
goal.global_position.z + toward_centre * randf_range(3.0, 6.0)
)
var to_goal := (goal.global_position - position).normalized()