Align project to Godot 4.1

lampe-games · Jul 1, 2023 · 8b5f3c9 · 8b5f3c9
1 parent 82386eb
commit 8b5f3c9
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [main]
+
+### New features
+ - Added structure rally points
+
+### Changed
+ - Godot 4.1 support added instead of Godot 4.0 (4.0 support is still present on branch)
+
 ## [0.9.0]
 
 ### New features

diff --git a/README.md b/README.md
@@ -31,7 +31,9 @@ This game is not going to be a very advanced RTS that would compete with other g
 
 ## Godot compatibility
 
-This project is compatible with Godot `4.0`, `4.0.1`, `4.0.2`, and `4.0.3`.
+This project is compatible with Godot `4.1`.
+
+Support for Godot `4.0`, `4.0.1`, `4.0.2`, and `4.0.3` is available on `godot-4.0-support` branch.
 
 ## Screenshots
 

diff --git a/project.godot b/project.godot
@@ -12,7 +12,7 @@ config_version=5
 
 config/name="Open RTS"
 run/main_scene="res://source/Main.tscn"
-config/features=PackedStringArray("4.0", "Forward Plus")
+config/features=PackedStringArray("4.1", "Forward Plus")
 boot_splash/bg_color=Color(0, 0, 0, 1)
 boot_splash/image="res://assets/logos/godot_logo_vertical_monochrome_dark_312x357.png"
 boot_splash/fullsize=false
@@ -31,8 +31,8 @@ Utils="*res://source/Utils.gd"
 
 gdscript/warnings/standalone_expression=0
 gdscript/warnings/incompatible_ternary=0
-gdscript/warnings/assert_always_false=0
 gdscript/warnings/static_called_on_instance=0
+gdscript/warnings/assert_always_false=0
 
 [display]
 

diff --git a/source/match/TerrainNavigation.gd b/source/match/TerrainNavigation.gd
@@ -5,5 +5,9 @@ extends Node3D
 @onready var _navigation_region = find_child("NavigationRegion3D")
 
 
+func _ready():
+	NavigationServer3D.map_force_update(navigation_map_rid)
+
+
 func rebake():
 	_navigation_region.bake_navigation_mesh(false)
diff --git a/source/match/units/AircraftFactory.tscn b/source/match/units/AircraftFactory.tscn
@@ -33,9 +33,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)
 radius = 1.5
 
 [node name="MovementObstacle" parent="." instance=ExtResource("3_j1buj")]
-estimate_radius = false
 radius = 1.5
-agent_height_offset = 0.5
+path_height_offset = 0.5
 
 [node name="HealthBar" parent="." instance=ExtResource("4_igtfr")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)

diff --git a/source/match/units/AntiAirTurret.tscn b/source/match/units/AntiAirTurret.tscn
@@ -54,9 +54,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)
 radius = 0.6
 
 [node name="MovementObstacle" parent="." instance=ExtResource("3_hgb44")]
-estimate_radius = false
 radius = 0.6
-agent_height_offset = 0.5
+path_height_offset = 0.5
 
 [node name="HealthBar" parent="." instance=ExtResource("4_qhoj1")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0)

diff --git a/source/match/units/AntiGroundTurret.tscn b/source/match/units/AntiGroundTurret.tscn
@@ -48,9 +48,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)
 radius = 0.6
 
 [node name="MovementObstacle" parent="." instance=ExtResource("3_ds80w")]
-estimate_radius = false
 radius = 0.6
-agent_height_offset = 0.5
+path_height_offset = 0.5
 
 [node name="HealthBar" parent="." instance=ExtResource("4_r6emo")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0)

diff --git a/source/match/units/CommandCenter.tscn b/source/match/units/CommandCenter.tscn
@@ -33,9 +33,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)
 radius = 2.0
 
 [node name="MovementObstacle" parent="." instance=ExtResource("4_f5u8t")]
-estimate_radius = false
 radius = 2.0
-agent_height_offset = 0.5
+path_height_offset = 0.5
 
 [node name="HealthBar" parent="." instance=ExtResource("5_xuulo")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)

diff --git a/source/match/units/Drone.tscn b/source/match/units/Drone.tscn
@@ -35,7 +35,7 @@ radius = 0.6
 [node name="Movement" parent="." instance=ExtResource("4_wemaw")]
 path_desired_distance = 0.1
 target_desired_distance = 0.1
-agent_height_offset = 0.5
+path_height_offset = 0.5
 radius = 0.6
 neighbor_distance = 8.0
 max_neighbors = 40

diff --git a/source/match/units/Helicopter.tscn b/source/match/units/Helicopter.tscn
@@ -81,7 +81,7 @@ radius = 0.8
 [node name="Movement" parent="." instance=ExtResource("3_4ms8e")]
 path_desired_distance = 0.1
 target_desired_distance = 0.1
-agent_height_offset = 0.5
+path_height_offset = 0.5
 radius = 0.8
 neighbor_distance = 8.0
 max_neighbors = 40

diff --git a/source/match/units/Tank.tscn b/source/match/units/Tank.tscn
@@ -43,12 +43,12 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)
 [node name="Movement" parent="." instance=ExtResource("3_4m8ma")]
 path_desired_distance = 0.5
 target_desired_distance = 0.5
-agent_height_offset = 0.5
+path_height_offset = 0.5
 path_max_distance = 0.51
 radius = 1.0
 neighbor_distance = 8.0
 max_neighbors = 40
-time_horizon = 3.0
+time_horizon_agents = 3.0
 speed = 2.75
 
 [node name="HealthBar" parent="." instance=ExtResource("4_7l0rt")]

diff --git a/source/match/units/VehicleFactory.tscn b/source/match/units/VehicleFactory.tscn
@@ -33,9 +33,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)
 radius = 1.5
 
 [node name="MovementObstacle" parent="." instance=ExtResource("3_cp6bx")]
-estimate_radius = false
 radius = 1.5
-agent_height_offset = 0.5
+path_height_offset = 0.5
 
 [node name="HealthBar" parent="." instance=ExtResource("4_xd2eg")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.75, 0)

diff --git a/source/match/units/Worker.tscn b/source/match/units/Worker.tscn
@@ -36,12 +36,12 @@ radius = 0.6
 [node name="Movement" parent="." instance=ExtResource("4_lmprj")]
 path_desired_distance = 0.31
 target_desired_distance = 0.31
-agent_height_offset = 0.5
+path_height_offset = 0.5
 path_max_distance = 0.31
 radius = 0.6
 neighbor_distance = 8.0
 max_neighbors = 40
-time_horizon = 3.0
+time_horizon_agents = 3.0
 speed = 2.5
 
 [node name="HealthBar" parent="." instance=ExtResource("5_50cqd")]

diff --git a/source/match/units/non-player/ResourceA.tscn b/source/match/units/non-player/ResourceA.tscn
@@ -31,9 +31,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)
 radius = 0.6
 
 [node name="MovementObstacle" parent="." instance=ExtResource("3_xabt4")]
-estimate_radius = false
 radius = 0.6
-agent_height_offset = 0.5
+path_height_offset = 0.5
 
 [node name="Targetability" parent="." instance=ExtResource("5_vqxvf")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)

diff --git a/source/match/units/non-player/ResourceB.tscn b/source/match/units/non-player/ResourceB.tscn
@@ -31,9 +31,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)
 radius = 0.6
 
 [node name="MovementObstacle" parent="." instance=ExtResource("4_sxjck")]
-estimate_radius = false
 radius = 0.6
-agent_height_offset = 0.5
+path_height_offset = 0.5
 
 [node name="Targetability" parent="." instance=ExtResource("5_y6273")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)

diff --git a/source/match/units/traits/Movement.gd b/source/match/units/traits/Movement.gd
@@ -72,7 +72,7 @@ func _align_unit_position_to_navigation():
 		NavigationServer3D.map_get_closest_point(
 			get_navigation_map(), get_parent().global_transform.origin
 		)
-		- Vector3(0, agent_height_offset, 0)
+		- Vector3(0, path_height_offset, 0)
 	)
 
 

diff --git a/source/match/units/traits/MovementObstacle.gd b/source/match/units/traits/MovementObstacle.gd
@@ -1,7 +1,7 @@
 extends NavigationObstacle3D
 
 @export var domain = Constants.Match.Navigation.Domain.TERRAIN
-@export var agent_height_offset = 0.0
+@export var path_height_offset = 0.0
 
 @onready var _match = find_parent("Match")
 @onready var _unit = get_parent()
@@ -18,5 +18,5 @@ func _align_unit_position_to_navigation():
 		NavigationServer3D.map_get_closest_point(
 			get_navigation_map(), get_parent().global_transform.origin
 		)
-		- Vector3(0, agent_height_offset, 0)
+		- Vector3(0, path_height_offset, 0)
 	)