fixed a few issues

forge/abilities/ForgeManualCancelHitBehavior.cs

@@ -0,0 +1,35 @@
+using Gamesmiths.Forge.Abilities;
+using Gamesmiths.Forge.Effects;
+using Gamesmiths.Forge.Godot.Resources;
+using Gamesmiths.Forge.Godot.Resources.Abilities;
+using Godot;
+
+namespace Movementtests.forge.abilities;
+
+public class ManualCancelHitBehavior(ForgeEffectData? damage) : IAbilityBehavior
+{
+    public void OnStarted(AbilityBehaviorContext context)
+    {
+        if (context.Target == null || damage == null) return;
+        
+        var sourceLocation = (context.Source as Node3D)?.GlobalPosition ?? Vector3.Zero;
+        var targetLocation = (context.Target as Node3D)?.GlobalPosition ?? Vector3.Zero;
+
+        var magnitude = context.Magnitude == 0 ? 1 : context.Magnitude;
+        var effect = new Effect(damage.GetEffectData(), new EffectOwnership(context.Owner, context.Owner));
+        context.Target.EffectsManager.ApplyEffect(effect, new SimpleHitEffectData(sourceLocation, targetLocation, magnitude));
+    }
+
+    public void OnEnded(AbilityBehaviorContext context)
+    {
+        context.AbilityHandle.CommitAbility();
+    }
+}
+
+[Tool]
+[GlobalClass]
+public partial class ForgeManualCancelHitBehavior : ForgeAbilityBehavior
+{
+    [Export] public ForgeEffectData? DamageEffect { get; set; }
+    public override IAbilityBehavior GetBehavior() => new ManualCancelHitBehavior(DamageEffect);
+}

forge/abilities/ForgeManualCancelHitBehavior.cs.uid

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

forge/abilities/ForgeSimpleHitBehavior.cs

@@ -21,12 +21,12 @@ public class SimpleHitBehavior(ForgeEffectData? damage) : IAbilityBehavior
         var effect = new Effect(damage.GetEffectData(), new EffectOwnership(context.Owner, context.Owner));
         context.Target.EffectsManager.ApplyEffect(effect, new SimpleHitEffectData(sourceLocation, targetLocation, magnitude));
         
-        // context.InstanceHandle.End();
+        context.AbilityHandle.CommitAbility();
+        context.InstanceHandle.End();
     }
 
     public void OnEnded(AbilityBehaviorContext context)
     {
-        context.AbilityHandle.CommitAbility();
     }
 }
 

forge/resources/ability_datas/explosion_hit.tres

@@ -26,7 +26,7 @@ metadata/_custom_type_script = "uid://cfx62w40nd84v"
 
 [sub_resource type="Resource" id="Resource_ndb8p"]
 script = ExtResource("5_tw4gc")
-Modifier = 100.0
+Modifier = 500.0
 metadata/_custom_type_script = "uid://b44cse62qru7j"
 
 [sub_resource type="Resource" id="Resource_dy671"]
@@ -57,7 +57,6 @@ BaseValue = 1.0
 
 [sub_resource type="Resource" id="Resource_qqpg8"]
 script = ExtResource("11_bs6rs")
-BaseValue = 10.0
 
 [sub_resource type="Resource" id="Resource_igmn0"]
 script = ExtResource("11_bs6rs")
@@ -70,6 +69,7 @@ metadata/_custom_type_script = "uid://cn3b4ya15fg7e"
 [sub_resource type="Resource" id="Resource_xwtie"]
 script = ExtResource("12_a6jts")
 Attribute = "MetaAttributeSet.IncomingDamage"
+Operation = 2
 CalculationType = 1
 ScalableFloat = SubResource("Resource_acqnn")
 CapturedAttribute = "MetaAttributeSet.Level"
@@ -107,7 +107,6 @@ metadata/_custom_type_script = "uid://n6efm5o4uxvr"
 [resource]
 script = ExtResource("16_hhyju")
 Name = "Explosion "
-InstancingPolicy = 1
 CooldownEffects = []
 AbilityBehavior = SubResource("Resource_ba5lh")
 metadata/_custom_type_script = "uid://dhxfbxh54pyxp"

forge/resources/ability_datas/player_hit.tres

@@ -2,20 +2,19 @@
 
 [ext_resource type="Resource" uid="uid://bn1getr10b4dx" path="res://forge/resources/effect_datas/simple_player_hit.tres" id="1_c4wry"]
 [ext_resource type="Script" uid="uid://1hgogislo1l6" path="res://addons/forge/resources/magnitudes/ForgeScalableInt.cs" id="1_l0l1a"]
-[ext_resource type="Script" uid="uid://n6efm5o4uxvr" path="res://forge/abilities/ForgeSimpleHitBehavior.cs" id="1_n2s8d"]
 [ext_resource type="Script" uid="uid://cw525n4mjqgw0" path="res://addons/forge/resources/ForgeTagContainer.cs" id="1_w1wo0"]
 [ext_resource type="Script" uid="uid://b83hf13nj37k3" path="res://addons/forge/resources/ForgeEffectData.cs" id="2_5vjbv"]
+[ext_resource type="Script" uid="uid://d1bb1fvh1mnpd" path="res://forge/abilities/ForgeManualCancelHitBehavior.cs" id="2_c4wry"]
 [ext_resource type="Script" uid="uid://dngf30hxy5go4" path="res://addons/forge/resources/components/ModifierTags.cs" id="2_jwyed"]
 [ext_resource type="Script" uid="uid://dhxfbxh54pyxp" path="res://addons/forge/resources/abilities/ForgeAbilityData.cs" id="3_w1wo0"]
 [ext_resource type="Script" uid="uid://cn3b4ya15fg7e" path="res://addons/forge/resources/magnitudes/ForgeScalableFloat.cs" id="4_c4wry"]
 [ext_resource type="Script" uid="uid://2gm1hdhi8u08" path="res://addons/forge/resources/magnitudes/ForgeModifierMagnitude.cs" id="5_0cyim"]
 
-[sub_resource type="Resource" id="Resource_r7waw"]
-script = ExtResource("1_n2s8d")
+[sub_resource type="Resource" id="Resource_0cyim"]
+script = ExtResource("2_c4wry")
 DamageEffect = ExtResource("1_c4wry")
-Name = "PlayerHitEffect"
-Description = "Effect applied to target on player hit"
-metadata/_custom_type_script = "uid://n6efm5o4uxvr"
+Name = "Player hit"
+metadata/_custom_type_script = "uid://d1bb1fvh1mnpd"
 
 [sub_resource type="Resource" id="Resource_qk2av"]
 script = ExtResource("1_w1wo0")
@@ -94,6 +93,6 @@ script = ExtResource("3_w1wo0")
 Name = "PlayerHitAbility"
 RetriggerInstancedAbility = true
 CooldownEffects = [SubResource("Resource_cmmfb")]
-AbilityBehavior = SubResource("Resource_r7waw")
+AbilityBehavior = SubResource("Resource_0cyim")
 ActivationBlockedTags = SubResource("Resource_qk2av")
 metadata/_custom_type_script = "uid://dhxfbxh54pyxp"