Restructure to use more strategy/GOAP pattern

This commit is contained in:
2026-11-06 21:08:21 -06:00
parent 324a01c165
commit 90370b8837
10 changed files with 64 additions and 21 deletions
+2 -1
View File
@@ -7,9 +7,10 @@ class_name Jet extends CharacterBody3D
"Neutral:2" "Neutral:2"
) var faction: int ) var faction: int
@onready var target_ray: RayCast3D = $target_ray
@onready var camera: Camera3D = $camera @onready var camera: Camera3D = $camera
@onready var controller: JetController = $controller @onready var controller: JetController = $controller
@onready var target_ray: RayCast3D = $target_ray @onready var strategy_stack: StrategyStack = $strategy_stack
var control_frame: BaseJet = null var control_frame: BaseJet = null
var target: Jet = null var target: Jet = null
+4 -2
View File
@@ -1,14 +1,14 @@
[gd_scene load_steps=4 format=3 uid="uid://mtfp7066molc"] [gd_scene load_steps=5 format=3 uid="uid://mtfp7066molc"]
[ext_resource type="Script" uid="uid://be64wnjbfhnhh" path="res://scenes/jet.gd" id="1_l0pwp"] [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/jet_controls/controller.tscn" id="2_t5v3o"] [ext_resource type="PackedScene" uid="uid://b5btmjvj2gosl" path="res://scripts/jet_controls/controller.tscn" id="2_t5v3o"]
[ext_resource type="PackedScene" uid="uid://lyj5b1l6kevd" path="res://scripts/controllers/cpu_system/strategy_stack.tscn" id="3_ggp50"]
[sub_resource type="BoxShape3D" id="BoxShape3D_31fu5"] [sub_resource type="BoxShape3D" id="BoxShape3D_31fu5"]
size = Vector3(3, 2, 18) size = Vector3(3, 2, 18)
[node name="jet" type="CharacterBody3D"] [node name="jet" type="CharacterBody3D"]
script = ExtResource("1_l0pwp") script = ExtResource("1_l0pwp")
faction = null
[node name="camera" type="Camera3D" parent="."] [node name="camera" type="Camera3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 18) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 18)
@@ -25,3 +25,5 @@ collide_with_areas = true
debug_shape_custom_color = Color(0.76862746, 0, 0, 1) debug_shape_custom_color = Color(0.76862746, 0, 0, 1)
[node name="controller" parent="." instance=ExtResource("2_t5v3o")] [node name="controller" parent="." instance=ExtResource("2_t5v3o")]
[node name="strategy_stack" parent="." instance=ExtResource("3_ggp50")]
@@ -0,0 +1,5 @@
class_name ActionBase extends Node
func do(_jet: Jet) -> void:
assert(false, "Must override 'do' method from child")
@@ -0,0 +1 @@
uid://c64hi66nb5l6g
@@ -0,0 +1,18 @@
class_name MoveTowards extends ActionBase
func do(jet: Jet) -> void:
if not is_instance_valid(jet.target): return
var target_local_position: Vector3 = jet.to_local(jet.target.global_position)
var target_direction: Vector3 = target_local_position.normalized()
jet.target_ray.target_position = target_direction
#NOTE: When using unit (normalized) vectors, the result will always be
# between -1.0 (180 degree angle) when the vectors are facing opposite
# directions, and 1.0 (0 degree angle) when the vectors are aligned.
var forward_dot: float = target_direction.dot(Vector3.UP)
var ud_dot: float = target_direction.dot(Vector3.FORWARD)
var lr_dot: float = target_direction.dot(Vector3.RIGHT)
jet.controller.cpu.yaw_left()
@@ -0,0 +1 @@
uid://bwug7hpehjw21
@@ -20,6 +20,7 @@ func handle_init_spawns_loaded_event() -> void:
func create_jet_plan(jet: Jet) -> void: func create_jet_plan(jet: Jet) -> void:
assign_jet_target(jet) assign_jet_target(jet)
assign_jet_action(jet)
func assign_jet_target(jet: Jet) -> void: func assign_jet_target(jet: Jet) -> void:
for _jet: Jet in jets_collection.get_children(): for _jet: Jet in jets_collection.get_children():
@@ -31,25 +32,11 @@ func assign_jet_target(jet: Jet) -> void:
break break
func assign_jet_action(jet: Jet) -> void:
jet.strategy_stack.add_child( MoveTowards.new() )
func process_jet_plan(jet: Jet) -> void: func process_jet_plan(jet: Jet) -> void:
if not is_instance_valid(jet.target): return jet.strategy_stack.process_action(jet)
var target_local_position: Vector3 = jet.to_local(jet.target.global_position)
var target_direction: Vector3 = target_local_position.normalized()
jet.target_ray.target_position = target_direction
#NOTE: When using unit (normalized) vectors, the result will always be
# between -1.0 (180 degree angle) when the vectors are facing opposite
# directions, and 1.0 (0 degree angle) when the vectors are aligned.
var forward_dot: float = target_direction.dot(Vector3.UP)
var ud_dot: float = target_direction.dot(Vector3.FORWARD)
var lr_dot: float = target_direction.dot(Vector3.RIGHT)
jet.controller.cpu.yaw_left()
@@ -0,0 +1,21 @@
class_name StrategyStack extends Node
func _init() -> void:
tree_entered.connect(add_action)
tree_exited.connect(remove_action)
func add_action() -> void:
pass
func remove_action() -> void:
pass
func process_action(jet: Jet) -> void:
var action = get_child(0)
if not action: return
action.do(jet)
@@ -0,0 +1 @@
uid://bcbkyyje5grh5
@@ -0,0 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://lyj5b1l6kevd"]
[ext_resource type="Script" uid="uid://bcbkyyje5grh5" path="res://scripts/controllers/cpu_system/strategy_stack.gd" id="1_fmp2h"]
[node name="strategy_stack" type="Node"]
script = ExtResource("1_fmp2h")