Merge branch 'main' into dev

Elektryk-Andrzej · Elektryk-Andrzej · commit 88f37a0286e5 · 2026-02-20T22:01:26.000+01:00
diff --git a/Code/MethodSystem/Methods/HealthMethods/DamageInfoMethod.cs b/Code/MethodSystem/Methods/HealthMethods/DamageInfoMethod.cs
@@ -47,7 +47,7 @@ public override void Execute()
         
         ReturnValue = Args.GetOption("property") switch
         {
-            "damage" => new StaticTextValue(standard?.Damage.ToString() ?? "none"),
+            "damage" => new NumberValue((decimal)(standard?.Damage ?? 0)),
             "hitbox" => new StaticTextValue(standard?.Hitbox.ToString() ?? "none"),
             "firearmused" => new ReferenceValue(firearm?.Firearm),
             "attacker" => new ReferenceValue(attacker?.Attacker),

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public override void Execute()`
`47`	`47`
`48`	`48`	`ReturnValue = Args.GetOption("property") switch`
`49`	`49`	`{`
`50`		`- "damage" => new StaticTextValue(standard?.Damage.ToString() ?? "none"),`
	`50`	`+ "damage" => new NumberValue((decimal)(standard?.Damage ?? 0)),`
`51`	`51`	`"hitbox" => new StaticTextValue(standard?.Hitbox.ToString() ?? "none"),`
`52`	`52`	`"firearmused" => new ReferenceValue(firearm?.Firearm),`
`53`	`53`	`"attacker" => new ReferenceValue(attacker?.Attacker),`