Refactored jet factory; added ControllerCommand enum to remove magic strings
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user