Added WIP game modes; renamed control_modes folder to jet_controls

2026-10-18 18:11:32 -05:00
parent 79b7265688
commit 4462600e06
23 changed files with 57 additions and 32 deletions
@@ -1,7 +1,8 @@
-[gd_scene load_steps=3 format=3 uid="uid://cx5ewmp2xcuia"]
+[gd_scene load_steps=4 format=3 uid="uid://cx5ewmp2xcuia"]

 [ext_resource type="PackedScene" uid="uid://bhjfvc7gkrvah" path="res://base_environment.tscn" id="1_80nbo"]
 [ext_resource type="PackedScene" uid="uid://dk32bn35qku60" path="res://scripts/factories/jet_factory.tscn" id="2_e2o6t"]
+[ext_resource type="PackedScene" uid="uid://nlwfoq6opqck" path="res://scripts/game_modes/game_mode.tscn" id="3_fc0e3"]

 [node name="game" type="Node3D"]

@@ -11,3 +12,6 @@
 current = true

 [node name="jet_factory" parent="." instance=ExtResource("2_e2o6t")]
+
+[node name="game_mode" parent="." node_paths=PackedStringArray("jetFactory") instance=ExtResource("3_fc0e3")]
+jetFactory = NodePath("../jet_factory")
@@ -10,9 +10,6 @@ class_name Jet extends Node3D


 func _ready() -> void:
-	print("Jet ready: ", is_node_ready())
-	print("Camera: ", camera)
-
 	pass

 func _process(delta: float) -> void:
@@ -31,8 +28,6 @@ func set_model(model: Node):
 	add_child(model)

 func set_as_player():
-	print("Setting player. Ready: ", is_node_ready())
-	print("Camera reference: ", camera)
 	camera.current          = true
 	controller.control_mode = controller.PLAYER_MODE

@@ -1,12 +1,10 @@
 [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://scripts/control_modes/jet_controller.tscn" id="2_t5v3o"]
+[ext_resource type="PackedScene" uid="uid://b5btmjvj2gosl" path="res://scripts/jet_controls/controller.tscn" id="2_t5v3o"]

 [node name="jet" type="Node3D"]
 script = ExtResource("1_l0pwp")
-control_mode = null
-CONFLICT_SIDE = null

 [node name="camera" type="Camera3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 120, 350)
@@ -1,12 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://b5btmjvj2gosl"]
-
-[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")
-
-[node name="cpu" parent="." instance=ExtResource("2_xyvvi")]
-
-[node name="player" parent="." instance=ExtResource("3_c27ir")]
@@ -25,21 +25,17 @@ func _get_jet_type(faction: int) -> Jet:
 func create_player_jet(faction: int = 0) -> Jet:
 	var jet: Jet = _get_jet_type(faction)

-	get_tree().root.add_child(jet)
-	print("1")
-	await get_tree().process_frame
-	await get_tree().process_frame
-	await get_tree().process_frame
-	await get_tree().process_frame
-	print("2")
+	get_tree().root.add_child.call_deferred(jet)
+	await jet.ready
+
 	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(jet)
-	await get_tree().process_frame
+	get_tree().root.add_child.call_deferred(jet)
+	await jet.ready

 	jet.set_as_cpu()
 	return jet
@@ -0,0 +1 @@
+class_name BaseGameMode extends Node
@@ -0,0 +1 @@
+uid://bkove4hhspua4
@@ -0,0 +1 @@
+class_name DogFight extends BaseGameMode
@@ -0,0 +1 @@
+uid://bkbfu1tsd611m
@@ -0,0 +1 @@
+class_name DogFightWaves extends BaseGameMode
@@ -0,0 +1 @@
+uid://qo3ajsysrh4c
@@ -0,0 +1,19 @@
+class_name GameMode extends Node
+
+
+const MODES: Dictionary = {
+	0: preload("res://scripts/game_modes/dog_fight.gd"),
+	1: preload("res://scripts/game_modes/dog_fight_waves.gd")
+}
+
+@export_enum(
+	"Dog Fight:0",
+	"Dog Fight Waves:1"
+) var mode: int = 0
+
+@export var jetFactory: JetFactory
+
+
+func _ready() -> void:
+	#MODES[mode].instantiate()
+	jetFactory.create_player_jet(Globals.FACTION.ALLIES)
@@ -0,0 +1 @@
+uid://dwkkrl7unxqau
@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://nlwfoq6opqck"]
+
+[ext_resource type="Script" uid="uid://dwkkrl7unxqau" path="res://scripts/game_modes/game_mode.gd" id="1_7wd16"]
+
+[node name="game_mode" type="Node"]
+script = ExtResource("1_7wd16")
@@ -0,0 +1,12 @@
+[gd_scene load_steps=4 format=3 uid="uid://b5btmjvj2gosl"]
+
+[ext_resource type="Script" uid="uid://d2hwj8lth1mmo" path="res://scripts/jet_controls/controller.gd" id="1_ontwn"]
+[ext_resource type="PackedScene" uid="uid://baiynrn3xqvqh" path="res://scripts/jet_controls/cpu.tscn" id="2_nsdyw"]
+[ext_resource type="PackedScene" uid="uid://87s4f2f202g2" path="res://scripts/jet_controls/player.tscn" id="3_qj8xu"]
+
+[node name="controller" type="Node"]
+script = ExtResource("1_ontwn")
+
+[node name="cpu" parent="." instance=ExtResource("2_nsdyw")]
+
+[node name="player" parent="." instance=ExtResource("3_qj8xu")]
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://baiynrn3xqvqh"]

-[ext_resource type="Script" uid="uid://co4w1q06mtmjx" path="res://scripts/control_modes/cpu.gd" id="1_72ynb"]
+[ext_resource type="Script" uid="uid://co4w1q06mtmjx" path="res://scripts/jet_controls/cpu.gd" id="1_72ynb"]

 [node name="cpu" type="Node"]
 script = ExtResource("1_72ynb")
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://87s4f2f202g2"]

-[ext_resource type="Script" uid="uid://bbugo3nlb76k7" path="res://scripts/control_modes/player.gd" id="1_3256j"]
+[ext_resource type="Script" uid="uid://bbugo3nlb76k7" path="res://scripts/jet_controls/player.gd" id="1_3256j"]

 [node name="player" type="Node"]
 script = ExtResource("1_3256j")
				`@@ -0,0 +1 @@`
				`class_name DogFightWaves extends BaseGameMode`