Merge pull request 'Update release with fixes' (#4) from main into release/prohel-02-26

Reviewed-on: #4

Movement tests.csproj

@@ -126,7 +126,6 @@
     <ItemGroup>
         <Folder Include="addons\" />
         <Folder Include="tests\" />
-        <Folder Include="tools\" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="RustyOptions" Version="0.10.1" />

forge/abilities/REmpoweredAction.cs

@@ -1,78 +0,0 @@
-using Gamesmiths.Forge.Abilities;
-using Gamesmiths.Forge.Effects;
-using Gamesmiths.Forge.Effects.Components;
-using Gamesmiths.Forge.Effects.Duration;
-using Gamesmiths.Forge.Effects.Magnitudes;
-using Gamesmiths.Forge.Effects.Modifiers;
-using Gamesmiths.Forge.Tags;
-using Godot;
-
-namespace Movementtests.forge.abilities;
-
-[GlobalClass, Icon("res://assets/ui/IconGodotNode/white/icon_animation.png")]
-public partial class REmpoweredAction(float cost, float cooldown, float manaRegenPause) : Resource
-{
-    [Export(PropertyHint.Range, "0,100,1,or_greater")]
-    public float Cost { get; set; } = cost;
-
-    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
-    public float Cooldown { get; set; } = cooldown;
-
-    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
-    public float ManaRegenPause { get; set; } = manaRegenPause;
-    
-    public REmpoweredAction() : this(20.0f, 1.0f, 3.0f)
-    {
-    }
-
-    public EffectData CostEffect()
-    {
-        return new(
-            "Empowered Action Mana Cost",
-            new DurationData(DurationType.Instant),
-            new[]
-            {
-                new Modifier(
-                    "PlayerAttributeSet.Mana",
-                    ModifierOperation.FlatBonus,
-                    new ModifierMagnitude(
-                        MagnitudeCalculationType.ScalableFloat,
-                        new ScalableFloat(-Cost)
-                    )
-                )
-            });
-    }
-
-    public EffectData CooldownEffect(TagsManager tagsManager)
-    {
-        return new(
-            "Empowered Action Cooldown",
-            new DurationData(
-                DurationType.HasDuration,
-                new ModifierMagnitude(
-                    MagnitudeCalculationType.ScalableFloat,
-                    new ScalableFloat(Cooldown))),
-            effectComponents: new[]
-            {
-                new ModifierTagsEffectComponent(
-                    tagsManager.RequestTagContainer(new[] { "cooldown.empoweredAction" })
-                )
-            });
-    }
-}
-
-
-public class EmpoweredActionBehavior : IAbilityBehavior
-{
-    public void OnStarted(AbilityBehaviorContext context)
-    {
-        // Apply costs and cooldowns
-        context.AbilityHandle.CommitAbility();
-        context.InstanceHandle.End();
-    }
-
-    public void OnEnded(AbilityBehaviorContext context)
-    {
-        // Do any necessary cleanups
-    }
-}

forge/abilities/REmpoweredAction.cs.uid

@@ -1 +0,0 @@
-uid://d0l07gcx1ef18

forge/effects/RManaRegen.cs

@@ -1,46 +0,0 @@
-using Gamesmiths.Forge.Effects;
-using Gamesmiths.Forge.Effects.Duration;
-using Gamesmiths.Forge.Effects.Magnitudes;
-using Gamesmiths.Forge.Effects.Modifiers;
-using Gamesmiths.Forge.Effects.Periodic;
-using Godot;
-
-namespace Movementtests.tools.effects;
-
-[GlobalClass, Icon("res://assets/ui/IconGodotNode/white/icon_liquid.png")]
-public partial class RManaRegen(float manaRegenRate, float frequency) : Resource
-{
-    [Export(PropertyHint.Range, "0,100,0.1,or_greater")] 
-    public float ManaRegenRate { get; set; } = manaRegenRate;
-    
-    [Export(PropertyHint.Range, "0.01,1,0.1,or_greater")] 
-    public float Frequency { get; set; } = frequency;
-
-    public RManaRegen() : this(1.0f, 0.1f)
-    {
-    }
-    
-    public EffectData ManaRegen()
-    {
-        return new EffectData(
-            "Mana Regen",
-            durationData: new DurationData(
-                DurationType.Infinite
-            ),
-            modifiers: [
-                new Modifier(
-                    "PlayerAttributeSet.Mana",
-                    ModifierOperation.FlatBonus,
-                    new ModifierMagnitude(
-                        MagnitudeCalculationType.ScalableFloat,
-                        new ScalableFloat(ManaRegenRate * Frequency))
-                    )
-            ],
-            periodicData: new PeriodicData(
-                Period: new ScalableFloat(Frequency),
-                ExecuteOnApplication: true,
-                PeriodInhibitionRemovedPolicy: PeriodInhibitionRemovedPolicy.ResetPeriod
-            )
-        );
-    }
-}

forge/effects/RManaRegen.cs.uid

@@ -1 +0,0 @@
-uid://di04jvuqp0h7m

scenes/components/health/RHealth.cs

@@ -3,10 +3,14 @@ using System;
 using Movementtests.interfaces;
 
 [GlobalClass, Icon("res://assets/ui/IconGodotNode/white/icon_heart.png")]
-public partial class RHealth(float startingHealth) : Resource
+public partial class RHealth : Resource
 {
     [Export]
-    public float StartingHealth { get; set;} = startingHealth;
+    public float StartingHealth { get; set;}
-
+    
     public RHealth() : this(100.0f) {}
+    public RHealth(float startingHealth)
+    {
+        StartingHealth = startingHealth;
+    }
 }

scenes/enemies/Enemy.cs

@@ -1,14 +1,7 @@
 using System;
-using Gamesmiths.Forge.Core;
-using Gamesmiths.Forge.Effects;
-using Gamesmiths.Forge.Events;
-using Gamesmiths.Forge.Tags;
 using Godot;
 using Movementtests.interfaces;
-using Movementtests.scenes.enemies;
-using Movementtests.scenes.player_controller.scripts;
 using Movementtests.systems;
-using Movementtests.tools;
 
 [GlobalClass, Icon("res://assets/ui/IconGodotNode/node_3D/icon_beetle.png")]
 public partial class Enemy : CharacterBody3D, 
@@ -20,8 +13,7 @@ public partial class Enemy : CharacterBody3D,
 	ISpawnable,
 	IKnockbackable,
 	ITargetable,
-	IStunnable,
+	IStunnable
-	IForgeEntity
 {
 	// Signals and events
 	public event Action<IDamageable, DamageRecord> DamageTaken = null!;
@@ -63,12 +55,6 @@ public partial class Enemy : CharacterBody3D,
 		set => CHealth.CurrentHealth = value;
 	}
 	
-	public EntityAttributes Attributes { get; set; } = null!;
-	public EntityTags Tags { get; set; } = null!;
-	public EffectsManager EffectsManager { get; set; } = null!;
-	public EntityAbilities Abilities { get; set; } = null!;
-	public EventManager Events { get; set; } = null!;
-	
 	// Private stuff
 	private Area3D _damageBox = null!;
 	internal Node3D _target = null!;
@@ -85,21 +71,6 @@ public partial class Enemy : CharacterBody3D,
 		_damageBox = GetNode<Area3D>("DamageBox");
 		_target = GetNode<Node3D>("CTarget");
 		
-		// Forge stuff
-		var forgeManager = GetTree().Root.GetNode<ForgeManager>("ForgeManager")!;
-		var baseTags = new TagContainer(
-			forgeManager.TagsManager,
-			[
-				Tag.RequestTag(forgeManager.TagsManager, "character.player"),
-				Tag.RequestTag(forgeManager.TagsManager, "class.warrior")
-			]);
-
-		Attributes = new EntityAttributes(new EnemyAttributeSet());
-		Tags = new EntityTags(baseTags);
-		EffectsManager = new EffectsManager(this, forgeManager.CuesManager);
-		Abilities = new(this);
-		Events = new();
-		
 		CDamageable = (GetNode<Node>("CDamageable") as IDamageable)!;
 		CMovement = (GetNode<Node>("CMovement") as IMoveable)!;
 		CHealth = (GetNode<Node>("CHealth") as IHealthable)!;

scenes/enemies/EnemyAttributeSet.cs

@@ -1,16 +0,0 @@
-using Gamesmiths.Forge.Attributes;
-namespace Movementtests.scenes.enemies;
-
-public class EnemyAttributeSet : AttributeSet
-{
-    public EntityAttribute Health { get; }
-    public EntityAttribute Strength { get; }
-    public EntityAttribute Speed { get; }
-
-    public EnemyAttributeSet()
-    {
-        Health = InitializeAttribute(nameof(Health), 100, 0, 150);
-        Strength = InitializeAttribute(nameof(Strength), 10, 0, 99);
-        Speed = InitializeAttribute(nameof(Speed), 5, 0, 10);
-    }
-}

scenes/enemies/EnemyAttributeSet.cs.uid

@@ -1 +0,0 @@
-uid://nqxdkkg3l7go

scenes/player_controller/PlayerController.tscn

@@ -5,7 +5,6 @@
 [ext_resource type="Script" uid="uid://jitubgv6judn" path="res://scenes/components/damage/RDamage.cs" id="2_x835q"]
 [ext_resource type="Script" uid="uid://b44cse62qru7j" path="res://scenes/components/knockback/RKnockback.cs" id="3_cb2lu"]
 [ext_resource type="Resource" uid="uid://bl5crtu1gkrtr" path="res://inputs/base_mode/base_mode.tres" id="3_cresl"]
-[ext_resource type="Resource" uid="uid://dtmhtlix2amme" path="res://scenes/player_controller/resources/player_mana_regen.tres" id="3_n24vh"]
 [ext_resource type="PackedScene" uid="uid://c4ikbhojckpnc" path="res://scenes/components/health/CHealth.tscn" id="3_q7bng"]
 [ext_resource type="Script" uid="uid://baiapod3csndf" path="res://scenes/components/health/RHealth.cs" id="4_abfq8"]
 [ext_resource type="Resource" uid="uid://bjyd801wvverk" path="res://scenes/player_controller/resources/player_health.tres" id="4_m8gvy"]
@@ -18,7 +17,6 @@
 [ext_resource type="Resource" uid="uid://t612lts1wi1s" path="res://inputs/base_mode/move_right.tres" id="6_q7bng"]
 [ext_resource type="Script" uid="uid://cwbvxlfvmocc1" path="res://scenes/player_controller/scripts/StairsSystem.cs" id="7_bmt5a"]
 [ext_resource type="Resource" uid="uid://brswsknpgwal2" path="res://inputs/base_mode/move_front.tres" id="7_m8gvy"]
-[ext_resource type="Resource" uid="uid://7dpkk5rk3di5" path="res://scenes/player_controller/resources/forge_empowered_action.tres" id="7_qheee"]
 [ext_resource type="PackedScene" uid="uid://bctpe34ddamg5" path="res://scenes/components/knockback/CKnockback.tscn" id="7_x835q"]
 [ext_resource type="Resource" uid="uid://s1l0n1iitc6m" path="res://inputs/base_mode/move_back.tres" id="8_jb43f"]
 [ext_resource type="Resource" uid="uid://j1o5ud0plk4" path="res://inputs/base_mode/aim_release.tres" id="8_lhb11"]
@@ -114,8 +112,6 @@ blend_mode = 1
 [node name="Player" type="CharacterBody3D" unique_id=709076448]
 collision_mask = 272
 script = ExtResource("1_poq2x")
-EmpoweredAction = ExtResource("7_qheee")
-ManaRegen = ExtResource("3_n24vh")
 AimAssistStrength = 0.3
 AimAssistReductionWhenCloseToTarget = 0.1
 AimAssistReductionStartDistance = 8.0

scenes/player_controller/resources/forge_empowered_action.tres

@@ -1,10 +0,0 @@
-[gd_resource type="Resource" script_class="REmpoweredAction" format=3 uid="uid://7dpkk5rk3di5"]
-
-[ext_resource type="Script" uid="uid://d0l07gcx1ef18" path="res://forge/abilities/REmpoweredAction.cs" id="1_1rxoq"]
-
-[resource]
-script = ExtResource("1_1rxoq")
-Cost = 50.0
-Cooldown = 1.0
-ManaRegenPause = 3.0
-metadata/_custom_type_script = "uid://d0l07gcx1ef18"

scenes/player_controller/resources/player_mana_regen.tres

@@ -1,9 +0,0 @@
-[gd_resource type="Resource" script_class="RManaRegen" format=3 uid="uid://dtmhtlix2amme"]
-
-[ext_resource type="Script" uid="uid://di04jvuqp0h7m" path="res://forge/effects/RManaRegen.cs" id="1_ecb1p"]
-
-[resource]
-script = ExtResource("1_ecb1p")
-ManaRegenRate = 20.0
-Frequency = 0.1
-metadata/_custom_type_script = "uid://di04jvuqp0h7m"

scenes/player_controller/scripts/PlayerAttributeSet.cs

@@ -11,6 +11,7 @@ public class PlayerAttributeSet : AttributeSet
 
     public PlayerAttributeSet()
     {
+        // Initialize the attributes with the current, min and max values.
         Health = InitializeAttribute(nameof(Health), 100, 0, 150);
         Mana = InitializeAttribute(nameof(Mana), 100, 0, 100);
         Strength = InitializeAttribute(nameof(Strength), 10, 0, 99);

scenes/player_controller/scripts/PlayerController.cs

@@ -1,22 +1,17 @@
 using System;
 using System.Collections.Generic;
-using Gamesmiths.Forge.Abilities;
 using Gamesmiths.Forge.Core;
 using Gamesmiths.Forge.Effects;
 using Gamesmiths.Forge.Events;
 using Gamesmiths.Forge.Tags;
-
 using Godot;
 using GodotStateCharts;
-
 using Movementtests.addons.godot_state_charts.csharp;
 using Movementtests.interfaces;
 using Movementtests.systems;
 using Movementtests.player_controller.Scripts;
 using Movementtests.scenes.player_controller.scripts;
 using Movementtests.tools;
-using Movementtests.forge.abilities;
-using Movementtests.tools.effects;
 using RustyOptions;
 
 [GlobalClass, Icon("res://assets/ui/IconGodotNode/node_3D/icon_character.png")]
@@ -97,12 +92,6 @@ public partial class PlayerController : CharacterBody3D,
 	[Export] public bool HasSword { get; set; } = true;
 	[Export] public bool HasParry { get; set; } = true;
 	
-	// Forge stuff
-	[ExportCategory("Forge")]
-	[ExportGroup("General")]
-	[Export] public REmpoweredAction EmpoweredAction = null!;
-	[Export] public RManaRegen ManaRegen = null!;
-	
 	// Combat stuff
 	[ExportCategory("Combat")]
 	[ExportGroup("General")]
@@ -409,9 +398,6 @@ public partial class PlayerController : CharacterBody3D,
 	private ShapeCast3D _closeEnemyDetector = null!;
 	private RayCast3D _aimAssisRayCast = null!;
 	private Camera3D _camera = null!;
-	
-	private AbilityHandle? _empoweredActionHandle;
-	private ActiveEffectHandle? _manaRegenEffectHandle;
 
 	public override void _Ready()
 	{
@@ -442,28 +428,12 @@ public partial class PlayerController : CharacterBody3D,
 		EffectsManager = new EffectsManager(this, forgeManager.CuesManager);
 		Abilities = new(this);
 		Events = new();
-
-		var empoweredActionData = new AbilityData(
-			name: "Empowered Action",
-			costEffect: EmpoweredAction.CostEffect(),
-			cooldownEffects: [EmpoweredAction.CooldownEffect(forgeManager.TagsManager)],
-			instancingPolicy: AbilityInstancingPolicy.PerEntity,
-			behaviorFactory: () => new EmpoweredActionBehavior());
-		
-		// Grant permanently
-		_empoweredActionHandle = Abilities.GrantAbilityPermanently(
-			empoweredActionData,
-			abilityLevel: 1,
-			levelOverridePolicy: LevelComparison.None,
-			sourceEntity: this);
-
-		var manaRegenEffect = new Effect(ManaRegen.ManaRegen(), new EffectOwnership(this, this));
-		_manaRegenEffectHandle = EffectsManager.ApplyEffect(manaRegenEffect);
 		
 		var health = Attributes["PlayerAttributeSet.Health"].CurrentValue; // 100
 		var mana = Attributes["PlayerAttributeSet.Mana"].CurrentValue; // 100
 		var strength = Attributes["PlayerAttributeSet.Strength"].CurrentValue; // 10
 		var speed = Attributes["PlayerAttributeSet.Speed"].CurrentValue; // 5
+		GD.Print(health, mana, strength, speed);
 		
 		// DashIndicator = GetNode<TextureRect>("%DashIndicator");
 		PowerCooldownIndicator = GetNode<ColorRect>("%DashCooldownIndicator");
@@ -1943,53 +1913,10 @@ public partial class PlayerController : CharacterBody3D,
 	
 	public bool CanPerformEmpoweredAction()
 	{
-		if(_empoweredActionHandle == null) return false;
-		var cooldowns = _empoweredActionHandle.GetCooldownData();
-		foreach (var cd in cooldowns)
-		{
-			//GD.Print($"Cooldown remaining: {cd.RemainingTime}");
-		}
-		var costs = _empoweredActionHandle.GetCostData();
-		foreach (var cost in costs)
-		{
-			// Assuming you want to check Mana costs
-			if (cost.Attribute == "PlayerAttributeSet.Mana")
-			{
-				//GD.Print($"Mana Cost: {cost.Cost}");
-			}
-		}
-
-		var canActivate = _empoweredActionHandle.CanActivate(out var failures);
-		if (!canActivate)
-		{
-			GD.PrintErr($"Cannot activate empowered action: {failures}");
-			if (failures.HasFlag(AbilityActivationFailures.Cooldown)) GD.PrintErr("In Cooldown");
-			if (failures.HasFlag(AbilityActivationFailures.InsufficientResources)) GD.PrintErr("Not Enough Mana");
-		}
-		return canActivate;
 		return EmpoweredActionsLeft > 0 && TutorialDone;
 	}
 	public void PerformEmpoweredAction()
 	{
-		if(_empoweredActionHandle == null) return;
-		
-		var canActivate = _empoweredActionHandle.Activate(out var failures);
-		if (!canActivate)
-		{
-			GD.PrintErr($"Cannot activate empowered action: {failures}");
-			if (failures.HasFlag(AbilityActivationFailures.Cooldown)) GD.PrintErr("In Cooldown");
-			if (failures.HasFlag(AbilityActivationFailures.InsufficientResources)) GD.PrintErr("Not Enough Mana");
-		}
-		else
-		{
-			GD.Print($"Remaining mana: {Attributes["PlayerAttributeSet.Mana"].CurrentValue}");
-		}
-		
-		// Inhibit Mana Regeneration for a while after using an empowered action
-		// TODO: Use Forge events instead of relying on direct referencing
-		_manaRegenEffectHandle!.SetInhibit(true);
-		GetTree().CreateTimer(EmpoweredAction.ManaRegenPause).Timeout += () => {_manaRegenEffectHandle!.SetInhibit(false);};
-		
 		_isWallJumpAvailable = true;
 		_canDashAirborne = true;
 		EmpoweredActionsLeft--;
@@ -2296,10 +2223,14 @@ public partial class PlayerController : CharacterBody3D,
 		_spaceState = GetWorld3D().DirectSpaceState;
 		
 		if (_currentInputBufferFrames > 0) _currentInputBufferFrames -= 1;
+		
 		// Limit maximum speed
 		if (Velocity.Length() > AbsoluteMaxSpeed)
 			Velocity = Velocity.Normalized() * AbsoluteMaxSpeed;
 		
+		// Manage head and camera movement
+		LookAround(delta);
+		
 		// Manage general movement
 		Velocity += ComputeKnockback();
 		MoveSlideAndHandleStairs((float) delta);
@@ -2307,17 +2238,21 @@ public partial class PlayerController : CharacterBody3D,
 		// Manage gameplay systems
 		MantleSystem.ProcessMantle(_grounded.Active);
 		HandleEnemyTargeting();
-	}
-
-	public override void _Process(double delta)
-	{
-		// Manage head and camera movement
-		LookAround(delta);
 		
-		EffectsManager.UpdateEffects(delta);
+		// Manage dash target and tutorial specific stuff
-		GD.Print(Attributes["PlayerAttributeSet.Mana"].CurrentValue);
+		// if (WeaponSystem.InHandState.Active && !_aiming.Active && TutorialDone)
+		// {
+		// 	DashIndicatorMesh.Visible = false;
+		// }
+		// if (!WeaponSystem.InHandState.Active && TutorialDone)
+		// {
+		// 	DashIndicatorMesh.Visible = true;
+		// 	
+		// 	DashIndicatorMeshCylinder.Height = WeaponSystem.GlobalPosition.DistanceTo(GlobalPosition) * 2;
+		// 	DashIndicatorNode.LookAt(WeaponSystem.GlobalPosition);
+		// }
 	}
-
+	
 	///////////////////////////
 	// Hit Management ///////
 	///////////////////////////

tools/ForgeManager.cs

@@ -13,10 +13,15 @@ public partial class ForgeManager : Node
         "class.warrior",
         "status.stunned",
         "status.burning",
+        "status.enraged",
         "status.immune.fire",
         "cues.damage.fire",
         "events.combat.damage",
         "events.combat.hit",
-        "cooldown.empoweredAction",
+        "cooldown.fireball"
     ]);
+    
+    public ForgeManager()
+    {
+    }
 }