itdominator/GrowlerFury
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored jet factory; added ControllerCommand enum to remove magic strings

Browse Source
This commit is contained in:
itdominator
2026-10-20 21:38:30 -05:00
parent 44e973f1f1
commit bf1623d771
11 changed files with 130 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/factories/jet_factory.gd
+31 -37
View File
@@ -1,69 +1,63 @@
class_name JetFactory extends Node
const JET = preload("res://scenes/jet.tscn")
var ALLIES_JET: EaglePlus = EaglePlus.new()
var AXIS_JET: SakerFalcon = SakerFalcon.new()
var NEUTRAL_JET: EaglePlus = EaglePlus.new()
const JET = preload("res://scenes/jet.tscn")
func _ready() -> void:
pass
func _get_jet_type(faction: int) -> Jet:
if faction == Globals.FACTION.ALLIES:
return create_allies_jet()
if faction == Globals.FACTION.AXIS:
return create_axis_jet()
if faction == Globals.FACTION.NEUTRAL:
return create_neutral_jet()
var jet: Jet = null
return create_neutral_jet()
if faction == Globals.Faction.ALLIES:
jet = create_allies_jet()
elif faction == Globals.Faction.AXIS:
jet = create_axis_jet()
elif faction == Globals.Faction.NEUTRAL:
jet = create_neutral_jet()
else:
jet = create_neutral_jet()
get_tree().root.add_child.call_deferred(jet)
await jet.ready
return jet
func create_player_jet(faction: int = 0) -> Jet:
var jet: Jet = _get_jet_type(faction)
get_tree().root.add_child.call_deferred(jet)
await jet.ready
var jet: Jet = await _get_jet_type(faction)
jet.set_as_player()
return jet
func create_cpu_jet(faction: int = 0) -> Jet:
var jet = _get_jet_type(faction)
get_tree().root.add_child.call_deferred(jet)
await jet.ready
var jet = await _get_jet_type(faction)
jet.set_as_cpu()
return jet
func create_neutral_jet() -> Jet:
var jet = JET.new()
jet.add_child( NEUTRAL_JET.MODEL.instantiate() )
jet.faction = Globals.FACTION.NEUTRAL
jet.control_frame = NEUTRAL_JET
return jet
return create_jet_frame(
Globals.Faction.NEUTRAL, EaglePlus.new()
)
func create_allies_jet() -> Jet:
var jet = JET.instantiate()
jet.add_child( ALLIES_JET.MODEL.instantiate() )
jet.faction = Globals.FACTION.ALLIES
jet.control_frame = ALLIES_JET
return jet
return create_jet_frame(
Globals.Faction.ALLIES, EaglePlus.new()
)
func create_axis_jet() -> Jet:
return create_jet_frame(
Globals.Faction.AXIS, SakerFalcon.new()
)
func create_jet_frame(faction: Globals.Faction, frame: BaseJet) -> Jet:
var jet = JET.instantiate()
jet.add_child( AXIS_JET.MODEL.instantiate() )
jet.faction = Globals.FACTION.AXIS
jet.control_frame = AXIS_JET
jet.add_child( frame.MODEL.instantiate() )
jet.faction = faction
jet.control_frame = frame
return jet
scripts/game_modes/game_mode.gd
+1 -1
View File
@@ -16,4 +16,4 @@ const MODES: Dictionary = {
func _ready() -> void:
#MODES[mode].instantiate()
jet_factory.create_player_jet(Globals.FACTION.ALLIES)
jet_factory.create_player_jet(Globals.Faction.ALLIES)
scripts/jet_controls/controller.gd
+7 -6
View File
@@ -13,26 +13,27 @@ const PLAYER_MODE: int = 1
@onready var player: Player = $player
func process(delta: float) -> String:
func process(delta: float) -> Globals.ControllerCommand:
if CPU_MODE == control_mode:
return cpu.process(delta)
elif PLAYER_MODE == control_mode:
return player.process(delta)
return ""
return Globals.ControllerCommand.NONE
func physics_process(delta: float) -> String:
func physics_process(delta: float) -> Globals.ControllerCommand:
if CPU_MODE == control_mode:
return cpu.physics_process(delta)
elif PLAYER_MODE == control_mode:
return player.physics_process(delta)
return ""
return Globals.ControllerCommand.NONE
func unhandled_input(event: InputEvent) -> String:
func unhandled_input(event: InputEvent) -> Globals.ControllerCommand:
if CPU_MODE == control_mode:
return cpu.unhandled_input(event)
elif PLAYER_MODE == control_mode:
return player.unhandled_input(event)
return ""
return Globals.ControllerCommand.NONE
scripts/jet_controls/cpu.gd
+6 -6
View File
@@ -1,11 +1,11 @@
class_name CPU extends Node
func process(_delta: float) -> String:
return ""
func process(_delta: float) -> Globals.ControllerCommand:
return Globals.ControllerCommand.NONE
func physics_process(_delta: float) -> String:
return ""
func physics_process(_delta: float) -> Globals.ControllerCommand:
return Globals.ControllerCommand.NONE
func unhandled_input(_event: InputEvent) -> String:
return ""
func unhandled_input(_event: InputEvent) -> Globals.ControllerCommand:
return Globals.ControllerCommand.NONE
scripts/jet_controls/player.gd
+14 -14
View File
@@ -1,28 +1,28 @@
class_name Player extends Node
func process(_delta: float) -> String:
func process(_delta: float) -> Globals.ControllerCommand:
if Input.is_action_pressed("pull_up"):
return "pull_up"
return Globals.ControllerCommand.PULL_UP
if Input.is_action_pressed("push_down"):
return "push_down"
return Globals.ControllerCommand.PUSH_DOWN
if Input.is_action_pressed("yaw_left"):
return "yaw_left"
return Globals.ControllerCommand.YAW_LEFT
if Input.is_action_pressed("yaw_right"):
return "yaw_right"
return Globals.ControllerCommand.YAW_RIGHT
if Input.is_action_pressed("roll_left"):
return "roll_left"
return Globals.ControllerCommand.ROLL_LEFT
if Input.is_action_pressed("roll_right"):
return "roll_right"
return Globals.ControllerCommand.ROLL_RIGHT
if Input.is_action_pressed("throttle_up"):
return "throttle_up"
return Globals.ControllerCommand.THROTTLE_UP
if Input.is_action_pressed("throttle_down"):
return "throttle_down"
return Globals.ControllerCommand.THROTTLE_DOWN
return ""
return Globals.ControllerCommand.NONE
func physics_process(_delta: float) -> String:
return ""
func physics_process(_delta: float) -> Globals.ControllerCommand:
return Globals.ControllerCommand.NONE
func unhandled_input(_event: InputEvent) -> String:
return ""
func unhandled_input(_event: InputEvent) -> Globals.ControllerCommand:
return Globals.ControllerCommand.NONE
scripts/jet_variants/base_jet.gd
+15 -10
View File
@@ -1,7 +1,7 @@
class_name BaseJet extends Node
var CONFLICT_SIDE = Globals.FACTION.NEUTRAL
var CONFLICT_SIDE = Globals.Faction.NEUTRAL
var HEALTH: int = 100
var YAW_SPEED: int = 50
@@ -14,28 +14,28 @@ var speed: float = float(MIN_SPEED)
func do_action(
action: String,
action: Globals.ControllerCommand,
delta: float,
jet: Jet
) -> void:
var change_rate: float = deg_to_rad(1) * delta
match action:
"pull_up":
Globals.ControllerCommand.PULL_UP:
pull_up(change_rate, jet)
"push_down":
Globals.ControllerCommand.PUSH_DOWN:
push_down(change_rate, jet)
"yaw_left":
Globals.ControllerCommand.YAW_LEFT:
yaw_left(change_rate, jet)
"yaw_right":
Globals.ControllerCommand.YAW_RIGHT:
yaw_right(change_rate, jet)
"roll_left":
Globals.ControllerCommand.ROLL_LEFT:
roll_left(change_rate, jet)
"roll_right":
Globals.ControllerCommand.ROLL_RIGHT:
roll_right(change_rate, jet)
"throttle_up":
Globals.ControllerCommand.THROTTLE_UP:
throttle_up(delta)
"throttle_down":
Globals.ControllerCommand.THROTTLE_DOWN:
throttle_down(delta)
_:
pass
@@ -63,3 +63,8 @@ func throttle_up(delta: float) -> void:
func throttle_down(delta: float) -> void:
speed = move_toward(speed, MIN_SPEED, ACCELERATION * delta)
#func cpu_fly_at(change_rate: float, jet: Jet):
# jet.rotate_toward(...)
# NOTE: example to consider
# runner_visual.angle = rotate_toward(runner_visual.angle, direction.orthogonal().angle(), 8.0 * delta)
scripts/jet_variants/eagle_plus.gd
+1 -1
View File
@@ -5,7 +5,7 @@ const MODEL = preload("uid://cfcid44xnsbdt")
func _init() -> void:
CONFLICT_SIDE = Globals.FACTION.ALLIES
CONFLICT_SIDE = Globals.Faction.ALLIES
HEALTH = 100
YAW_SPEED = 50
ROLL_SPEED = 100
scripts/jet_variants/saker_falcon.gd
+1 -1
View File
@@ -5,7 +5,7 @@ const MODEL = preload("uid://d07rxx62esueq")
func _init() -> void:
CONFLICT_SIDE = Globals.FACTION.AXIS
CONFLICT_SIDE = Globals.Faction.AXIS
HEALTH = 100
YAW_SPEED = 50
ROLL_SPEED = 100