Replicated the weapon flying tick setup using resources

2026-04-07 16:32:26 +02:00
parent cc7cb90041
commit 1d856fd937
145 changed files with 12943 additions and 109 deletions
--- a/scenes/enemies/Enemy.cs
+++ b/scenes/enemies/Enemy.cs
@@ -4,6 +4,7 @@ using Gamesmiths.Forge.Effects;
 using Gamesmiths.Forge.Events;
 using Gamesmiths.Forge.Godot.Core;
 using Gamesmiths.Forge.Godot.Nodes;
+using Gamesmiths.Forge.Statescript;
 using Gamesmiths.Forge.Tags;
 using Godot;
 using Movementtests.interfaces;
@@ -11,6 +12,7 @@ using Movementtests.scenes.enemies;
 using Movementtests.scenes.player_controller.scripts;
 using Movementtests.systems;
 using Movementtests.tools;
+using Node = Godot.Node;

 [GlobalClass, Icon("res://assets/ui/IconGodotNode/node_3D/icon_beetle.png")]
 public partial class Enemy : CharacterBody3D, 
@@ -91,7 +93,9 @@ public partial class Enemy : CharacterBody3D,
 		get => _forgeEntity.Events;
 		set => _forgeEntity.Events = value;
 	}
-	
+
+	public Variables SharedVariables { get; }
+
 	// Private stuff
 	private Area3D _damageBox = null!;
 	internal Node3D _target = null!;
--- a/scenes/player_controller/components/weapon/WeaponSystem.cs
+++ b/scenes/player_controller/components/weapon/WeaponSystem.cs
@@ -14,6 +14,7 @@ using Gamesmiths.Forge.Godot.Core;
 using Gamesmiths.Forge.Godot.Nodes;
 using Gamesmiths.Forge.Godot.Resources;
 using Gamesmiths.Forge.Godot.Resources.Abilities;
+using Gamesmiths.Forge.Statescript;
 using Gamesmiths.Forge.Tags;
 using Godot;
 using GodotStateCharts;
@@ -24,6 +25,7 @@ using Movementtests.scenes.player_controller.components.weapon;
 using Movementtests.systems.damage;
 using Movementtests.tools;
 using Movementtests.tools.calculators;
+using Node = Godot.Node;

 namespace Movementtests.systems;

@@ -54,7 +56,8 @@ public partial class WeaponSystem : RigidBody3D, IDamageDealer, IForgeEntity
    public EffectsManager EffectsManager { get; set; } = null!;
    public EntityAbilities Abilities { get; set; } = null!;
    public EventManager Events { get; set; } = null!;
-    
+    public Variables SharedVariables { get; }
+
    private StateChart      _weaponState = null!;
    public StateChartState  InHandState = null!;
    public StateChartState  FlyingState = null!;
@@ -162,7 +165,7 @@ public partial class WeaponSystem : RigidBody3D, IDamageDealer, IForgeEntity
        Events = new();
        
        // TODO: Waiting on bug resolve
-        // _weaponFlyingAbility = Abilities.GrantAbilityPermanently(FlyingTickAbility.GetAbilityData(), 1, LevelComparison.None, this);
+        _weaponFlyingAbility = Abilities.GrantAbilityPermanently(FlyingTickAbility.GetAbilityData(), 1, LevelComparison.None, this);

        foreach (var ability in WeaponAbilities)
        {
@@ -257,7 +260,7 @@ public partial class WeaponSystem : RigidBody3D, IDamageDealer, IForgeEntity
        Events.Subscribe(WeaponStoppedFlyingEventTag, data =>
        {
            // TODO: Waiting on bug resolve
-            // _weaponFlyingAbility.Cancel();
+            _weaponFlyingAbility.Cancel();
        });
    }

--- a/scenes/player_controller/components/weapon/weapon.tscn
+++ b/scenes/player_controller/components/weapon/weapon.tscn
@@ -7,6 +7,7 @@
 [ext_resource type="Script" uid="uid://couw105c3bde4" path="res://addons/godot_state_charts/state_chart.gd" id="3_5owyf"]
 [ext_resource type="Resource" uid="uid://busdbvfi3jiic" path="res://scenes/player_controller/resources/forge/exploding_sword_weapon_left.tres" id="3_7bruw"]
 [ext_resource type="ArrayMesh" uid="uid://cho5fixitrbds" path="res://assets/meshes/swords/resources/sword23.tres" id="3_svc06"]
+[ext_resource type="Resource" uid="uid://bl0mng4kl1xy8" path="res://scenes/player_controller/resources/forge/exploding_sword_weapon_flight.tres" id="4_2wsgo"]
 [ext_resource type="Resource" uid="uid://btnnpqann3ktp" path="res://scenes/player_controller/resources/forge/weapon_flying_tick_ability.tres" id="4_7bruw"]
 [ext_resource type="Script" uid="uid://ccovd5i0wr3kk" path="res://addons/forge/editor/attributes/AttributeValues.cs" id="4_q6xv7"]
 [ext_resource type="Script" uid="uid://jk2jm1g6q853" path="res://addons/godot_state_charts/compound_state.gd" id="4_svc06"]
@@ -59,7 +60,7 @@ continuous_cd = true
 contact_monitor = true
 max_contacts_reported = 1
 script = ExtResource("1_csqwk")
-WeaponAbilities = [ExtResource("2_pgbtr"), ExtResource("3_7bruw")]
+WeaponAbilities = [ExtResource("2_pgbtr"), ExtResource("3_7bruw"), ExtResource("4_2wsgo")]
 FlyingTickAbility = ExtResource("4_7bruw")
 RDamage = SubResource("Resource_jpdh0")

--- a/scenes/player_controller/resources/forge/inhibit_mana_regen_temporarily.tres
+++ b/scenes/player_controller/resources/forge/inhibit_mana_regen_temporarily.tres
@@ -9,7 +9,7 @@

 [sub_resource type="Resource" id="Resource_gi65x"]
 script = ExtResource("1_bi1d8")
-ContainerTags = Array[String](["character.player.mana.regen.inhibited"])
+ContainerTags = Array[String](["character.player.mana.regen.inhibited", "cues.resources.mana.inhibited"])
 metadata/_custom_type_script = "uid://cw525n4mjqgw0"

 [sub_resource type="Resource" id="Resource_bi1d8"]
--- a/scenes/player_controller/resources/forge/mana_regeneration.tres
+++ b/scenes/player_controller/resources/forge/mana_regeneration.tres
@@ -10,7 +10,7 @@

 [sub_resource type="Resource" id="Resource_5yygy"]
 script = ExtResource("1_q8tml")
-ContainerTags = Array[String](["character.player.mana.regen.inhibited"])
+ContainerTags = Array[String](["character.player.mana.regen.inhibited", "cues.resources.mana.inhibited"])
 metadata/_custom_type_script = "uid://cw525n4mjqgw0"

 [sub_resource type="Resource" id="Resource_ncjx6"]
--- a/scenes/player_controller/resources/forge/raise_flying_tick_event.tres
+++ b/scenes/player_controller/resources/forge/raise_flying_tick_event.tres
@@ -1,12 +1,9 @@
 [gd_resource type="Resource" script_class="ForgeRaiseEventTagExecution" format=3 uid="uid://oe2suroa1klj"]

-[ext_resource type="Script" uid="uid://cw525n4mjqgw0" path="res://addons/forge/resources/ForgeTagContainer.cs" id="1_iqjlm"]
-[ext_resource type="Script" path="res://forge/calculators/ForgeRaiseEventTagExecution.cs" id="2_am2ak"]
-
-[sub_resource type="Resource" id="Resource_sxbq4"]
-script = ExtResource("1_iqjlm")
-ContainerTags = Array[String](["events.weapon.flyingtick"])
+[ext_resource type="Resource" uid="uid://x7vtcobi7s4r" path="res://scenes/player_controller/resources/forge/weapon_flyingtick_tagcontainer.tres" id="1_ce5fv"]
+[ext_resource type="Script" uid="uid://br7ut4lbau66w" path="res://forge/calculators/ForgeRaiseEventTagExecution.cs" id="2_am2ak"]

 [resource]
 script = ExtResource("2_am2ak")
+EventTags = ExtResource("1_ce5fv")
 metadata/_custom_type_script = "uid://br7ut4lbau66w"
--- a/scenes/player_controller/resources/forge/weapon_flying_tick_ability.tres
+++ b/scenes/player_controller/resources/forge/weapon_flying_tick_ability.tres
@@ -23,6 +23,7 @@ BaseValue = 1

 [sub_resource type="Resource" id="Resource_esyoj"]
 script = ExtResource("4_e2sm2")
+Name = "Call Flying Tick Event Periodically"
 Modifiers = []
 Components = []
 Executions = Array[Object]([ExtResource("1_pdt6v")])
--- a/scenes/player_controller/resources/forge/weapon_flyingtick_tagcontainer.tres
+++ b/scenes/player_controller/resources/forge/weapon_flyingtick_tagcontainer.tres
@@ -0,0 +1,7 @@
+[gd_resource type="Resource" script_class="ForgeTagContainer" format=3 uid="uid://x7vtcobi7s4r"]
+
+[ext_resource type="Script" uid="uid://cw525n4mjqgw0" path="res://addons/forge/resources/ForgeTagContainer.cs" id="1_nlohk"]
+
+[resource]
+script = ExtResource("1_nlohk")
+ContainerTags = Array[String](["events.weapon.flyingtick"])
--- a/scenes/player_controller/scripts/PlayerController.cs
+++ b/scenes/player_controller/scripts/PlayerController.cs
@@ -15,6 +15,7 @@ using Gamesmiths.Forge.Godot.Core;
 using Gamesmiths.Forge.Godot.Nodes;
 using Gamesmiths.Forge.Godot.Resources;
 using Gamesmiths.Forge.Godot.Resources.Abilities;
+using Gamesmiths.Forge.Statescript;
 using Gamesmiths.Forge.Tags;

 using Godot;
@@ -29,6 +30,7 @@ using Movementtests.tools;
 using Movementtests.forge.abilities;
 using Movementtests.tools.calculators;
 using RustyOptions;
+using Node = Godot.Node;

 public record struct EmpoweredActionPayload;

@@ -103,6 +105,7 @@ public partial class PlayerController : CharacterBody3D,
 	public EffectsManager EffectsManager { get; set; } = null!;
 	public EntityAbilities Abilities { get; set; } = null!;
 	public EventManager Events { get; set; } = null!;
+	public Variables SharedVariables { get; }

 	// Inspector stuff
 	[Export] public Marker3D TutorialWeaponTarget = null!;
@@ -763,7 +766,6 @@ public partial class PlayerController : CharacterBody3D,
 				effectComponents: [leftGrantComponent]);
 			EffectsManager.ApplyEffect(new Effect(leftGrantEffect, new EffectOwnership(this, this)));
 		}
-		// GetTree().CreateTimer(5).Timeout += () => WeaponSystem.GrantNewAbilityForWeaponFly(weaponLandAbility);
 		// Forge events
 		var weaponLeftToken = WeaponSystem.Events.Subscribe(WeaponSystem.WeaponStartedFlyingEventTag, OnWeaponLeft);
 		var weaponLandedToken = WeaponSystem.Events.Subscribe(WeaponSystem.WeaponStoppedFlyingEventTag, OnWeaponLanded);