diff --git a/scenes/control_modes/player.gd b/scenes/control_modes/player.gd deleted file mode 100644 index 9e3c2fa..0000000 --- a/scenes/control_modes/player.gd +++ /dev/null @@ -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 "" diff --git a/scenes/jet.gd b/scenes/jet.gd index 7207ceb..f6ee32b 100644 --- a/scenes/jet.gd +++ b/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 diff --git a/scenes/jet.tscn b/scenes/jet.tscn index 728c54c..af7ff5e 100644 --- a/scenes/jet.tscn +++ b/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") diff --git a/scenes/control_modes/cpu.gd b/scripts/control_modes/cpu.gd similarity index 100% rename from scenes/control_modes/cpu.gd rename to scripts/control_modes/cpu.gd diff --git a/scenes/control_modes/cpu.gd.uid b/scripts/control_modes/cpu.gd.uid similarity index 100% rename from scenes/control_modes/cpu.gd.uid rename to scripts/control_modes/cpu.gd.uid diff --git a/scenes/control_modes/cpu.tscn b/scripts/control_modes/cpu.tscn similarity index 80% rename from scenes/control_modes/cpu.tscn rename to scripts/control_modes/cpu.tscn index eda2c04..b3e6f9c 100644 --- a/scenes/control_modes/cpu.tscn +++ b/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") diff --git a/scenes/control_modes/jet_controller.gd b/scripts/control_modes/jet_controller.gd similarity index 100% rename from scenes/control_modes/jet_controller.gd rename to scripts/control_modes/jet_controller.gd diff --git a/scenes/control_modes/jet_controller.gd.uid b/scripts/control_modes/jet_controller.gd.uid similarity index 100% rename from scenes/control_modes/jet_controller.gd.uid rename to scripts/control_modes/jet_controller.gd.uid diff --git a/scenes/control_modes/jet_controller.tscn b/scripts/control_modes/jet_controller.tscn similarity index 73% rename from scenes/control_modes/jet_controller.tscn rename to scripts/control_modes/jet_controller.tscn index f5d975d..cbd26f8 100644 --- a/scenes/control_modes/jet_controller.tscn +++ b/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") diff --git a/scripts/control_modes/player.gd b/scripts/control_modes/player.gd new file mode 100644 index 0000000..6764ab0 --- /dev/null +++ b/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 "" diff --git a/scenes/control_modes/player.gd.uid b/scripts/control_modes/player.gd.uid similarity index 100% rename from scenes/control_modes/player.gd.uid rename to scripts/control_modes/player.gd.uid diff --git a/scenes/control_modes/player.tscn b/scripts/control_modes/player.tscn similarity index 79% rename from scenes/control_modes/player.tscn rename to scripts/control_modes/player.tscn index c828a6f..a449a4c 100644 --- a/scenes/control_modes/player.tscn +++ b/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") diff --git a/scripts/jet_variants/base_jet.gd b/scripts/jet_variants/base_jet.gd new file mode 100644 index 0000000..cd590c9 --- /dev/null +++ b/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 diff --git a/scripts/jet_variants/base_jet.gd.uid b/scripts/jet_variants/base_jet.gd.uid new file mode 100644 index 0000000..2cbfb3b --- /dev/null +++ b/scripts/jet_variants/base_jet.gd.uid @@ -0,0 +1 @@ +uid://hbdhncs4pjbr diff --git a/scripts/jet_variants/eagle_plus.gd b/scripts/jet_variants/eagle_plus.gd new file mode 100644 index 0000000..9f61f64 --- /dev/null +++ b/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 diff --git a/scripts/jet_variants/eagle_plus.gd.uid b/scripts/jet_variants/eagle_plus.gd.uid new file mode 100644 index 0000000..0984e68 --- /dev/null +++ b/scripts/jet_variants/eagle_plus.gd.uid @@ -0,0 +1 @@ +uid://cbh6e8skmwk63 diff --git a/scripts/jet_variants/saker_falcon.gd b/scripts/jet_variants/saker_falcon.gd new file mode 100644 index 0000000..9fab7a8 --- /dev/null +++ b/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 diff --git a/scripts/jet_variants/saker_falcon.gd.uid b/scripts/jet_variants/saker_falcon.gd.uid new file mode 100644 index 0000000..eaa62dd --- /dev/null +++ b/scripts/jet_variants/saker_falcon.gd.uid @@ -0,0 +1 @@ +uid://b3wn7j71nge4l