Moved scripts to scripts folder; added data structure for jets; further control flow work

scenes/control_modes/player.gd

@@ -1,11 +0,0 @@
-class_name Player extends Node
-
-
-func process(_delta: float) -> String:
-	return ""
-
-func physics_process(_delta: float) -> String:
-	return ""
-
-func unhandled_input(_event: InputEvent) -> String:
-	return ""

scenes/jet.gd

@@ -1,18 +1,15 @@
 class_name Jet extends Node3D
 
 
-const ALLIES_SIDE: int = 0
-const ALLY_JET         = preload("uid://cfcid44xnsbdt")
-
-const AXIS_SIDE: int   = 1
-const AXIS_JET         = preload("uid://d07rxx62esueq")
+var ALLIES_SIDE: EaglePlus = EaglePlus.new()
+var AXIS_SIDE: SakerFalcon = SakerFalcon.new()
 
 @export_enum("CPU:0", "PLAYER:1") var control_mode: int   = JetController.CPU_MODE
-@export_enum("Allies:0", "Axis:1") var CONFLICT_SIDE: int = ALLIES_SIDE
+@export_enum("Allies:0", "Axis:1") var CONFLICT_SIDE: int = ALLIES_SIDE.CONFLICT_SIDE
 
 const JET_MODEL: Dictionary = {
-	ALLIES_SIDE: ALLY_JET,
-	AXIS_SIDE: AXIS_JET
+	ALLIES_SIDE.CONFLICT_SIDE: ALLIES_SIDE.MODEL,
+	AXIS_SIDE.CONFLICT_SIDE: AXIS_SIDE.MODEL
 }
 
 @onready var camera: Camera3D          = $camera
@@ -20,7 +17,7 @@ const JET_MODEL: Dictionary = {
 
 
 func _ready() -> void:
-	load_jet(CONFLICT_SIDE)
+	_load_jet(CONFLICT_SIDE)
 
 	if JetController.CPU_MODE == control_mode:
 		set_as_cpu()
@@ -31,16 +28,18 @@ func _process(delta: float) -> void:
 	var action = controller.process(delta)
 	if not action: return
 
-func _physics_process(delta: float) -> void:
-	controller.physics_process(delta)
+#func _physics_process(delta: float) -> void:
+	#var action = controller.physics_process(delta)
+	#if not action: return
 
-func _unhandled_input(event: InputEvent) -> void:
-	controller.unhandled_input(event)
+#func _unhandled_input(event: InputEvent) -> void:
+	#var action = controller.unhandled_input(event)
+	#if not action: return
 
-
-func load_jet(type: int = CONFLICT_SIDE):
+func _load_jet(type: int = CONFLICT_SIDE):
 	add_child( JET_MODEL[type].instantiate() )
 
+
 func set_as_player():
 	camera.current          = true
 	controller.control_mode = controller.PLAYER_MODE
@@ -48,22 +47,3 @@ func set_as_player():
 func set_as_cpu():
 	camera.current          = false
 	controller.control_mode = controller.CPU_MODE
-
-
-func pull_up():
-	pass
-
-func push_down():
-	pass
-
-func yaw_left():
-	pass
-
-func yaw_right():
-	pass
-
-func roll_left():
-	pass
-
-func roll_right():
-	pass

scenes/jet.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://mtfp7066molc"]
 
 [ext_resource type="Script" uid="uid://be64wnjbfhnhh" path="res://scenes/jet.gd" id="1_l0pwp"]
-[ext_resource type="PackedScene" uid="uid://b5btmjvj2gosl" path="res://scenes/control_modes/jet_controller.tscn" id="2_t5v3o"]
+[ext_resource type="PackedScene" uid="uid://b5btmjvj2gosl" path="res://scripts/control_modes/jet_controller.tscn" id="2_t5v3o"]
 
 [node name="jet" type="Node3D"]
 script = ExtResource("1_l0pwp")

scripts/control_modes/cpu.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://baiynrn3xqvqh"]
 
-[ext_resource type="Script" uid="uid://co4w1q06mtmjx" path="res://scenes/control_modes/cpu.gd" id="1_72ynb"]
+[ext_resource type="Script" uid="uid://co4w1q06mtmjx" path="res://scripts/control_modes/cpu.gd" id="1_72ynb"]
 
 [node name="cpu" type="Node"]
 script = ExtResource("1_72ynb")

scripts/control_modes/jet_controller.tscn

@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=3 uid="uid://b5btmjvj2gosl"]
 
-[ext_resource type="Script" uid="uid://d2hwj8lth1mmo" path="res://scenes/control_modes/jet_controller.gd" id="1_chekb"]
-[ext_resource type="PackedScene" uid="uid://baiynrn3xqvqh" path="res://scenes/control_modes/cpu.tscn" id="2_xyvvi"]
-[ext_resource type="PackedScene" uid="uid://87s4f2f202g2" path="res://scenes/control_modes/player.tscn" id="3_c27ir"]
+[ext_resource type="Script" uid="uid://d2hwj8lth1mmo" path="res://scripts/control_modes/jet_controller.gd" id="1_chekb"]
+[ext_resource type="PackedScene" uid="uid://baiynrn3xqvqh" path="res://scripts/control_modes/cpu.tscn" id="2_xyvvi"]
+[ext_resource type="PackedScene" uid="uid://87s4f2f202g2" path="res://scripts/control_modes/player.tscn" id="3_c27ir"]
 
 [node name="jet_controller" type="Node"]
 script = ExtResource("1_chekb")

scripts/control_modes/player.gd

@@ -0,0 +1,24 @@
+class_name Player extends Node
+
+
+func process(_delta: float) -> String:
+	if Input.is_action_just_pressed("pull_up"):
+		return "pull_up"
+	if Input.is_action_just_pressed("push_down"):
+		return "push_down"
+	if Input.is_action_just_pressed("yaw_left"):
+		return "yaw_left"
+	if Input.is_action_just_pressed("yaw_right"):
+		return "yaw_right"
+	if Input.is_action_just_pressed("roll_left"):
+		return "roll_left"
+	if Input.is_action_just_pressed("roll_right"):
+		return "roll_right"
+
+	return ""
+
+func physics_process(_delta: float) -> String:
+	return ""
+
+func unhandled_input(_event: InputEvent) -> String:
+	return ""

scripts/control_modes/player.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://87s4f2f202g2"]
 
-[ext_resource type="Script" uid="uid://bbugo3nlb76k7" path="res://scenes/control_modes/player.gd" id="1_3256j"]
+[ext_resource type="Script" uid="uid://bbugo3nlb76k7" path="res://scripts/control_modes/player.gd" id="1_3256j"]
 
 [node name="player" type="Node"]
 script = ExtResource("1_3256j")

scripts/jet_variants/base_jet.gd

@@ -0,0 +1,33 @@
+class_name BaseJet extends Node
+
+
+var HEALTH: int     = 100
+var YAW_SPEED: int  = 50
+var ROLL_SPEED: int = 100
+var MIN_SPEED: int  = 50
+var MAX_SPEED: int  = 200
+
+
+func pull_up():
+	pass
+
+func push_down():
+	pass
+
+func yaw_left():
+	pass
+
+func yaw_right():
+	pass
+
+func roll_left():
+	pass
+
+func roll_right():
+	pass
+
+func throttle_up():
+	pass
+
+func throttle_down():
+	pass

scripts/jet_variants/base_jet.gd.uid

@@ -0,0 +1 @@
+uid://hbdhncs4pjbr

scripts/jet_variants/eagle_plus.gd

@@ -0,0 +1,13 @@
+class_name EaglePlus extends BaseJet
+
+
+const CONFLICT_SIDE = 0
+const MODEL         = preload("uid://cfcid44xnsbdt")
+
+
+func _init() -> void:
+	HEALTH     = 100
+	YAW_SPEED  = 50
+	ROLL_SPEED = 100
+	MIN_SPEED  = 50
+	MAX_SPEED  = 200

scripts/jet_variants/eagle_plus.gd.uid

@@ -0,0 +1 @@
+uid://cbh6e8skmwk63

scripts/jet_variants/saker_falcon.gd

@@ -0,0 +1,13 @@
+class_name SakerFalcon extends BaseJet
+
+
+const CONFLICT_SIDE = 1
+const MODEL         = preload("uid://d07rxx62esueq")
+
+
+func _init() -> void:
+	HEALTH     = 100
+	YAW_SPEED  = 50
+	ROLL_SPEED = 100
+	MIN_SPEED  = 50
+	MAX_SPEED  = 200

scripts/jet_variants/saker_falcon.gd.uid

@@ -0,0 +1 @@
+uid://b3wn7j71nge4l