From 9d9d2cd027b62077bc1720cdf05a78e591eca254 Mon Sep 17 00:00:00 2001
From: Dalas121 <33790750+Dalas121@users.noreply.github.com>
Date: Thu, 7 Nov 2024 18:26:21 -0600
Subject: [PATCH] Sicarius - replace Deflect with Guard (#9532)

---
 data/core/macros/deprecated-utils.cfg | 16 ++++++++++++++++
 data/core/macros/weapon_specials.cfg  | 15 ---------------
 data/core/units/nagas/Ophidian.cfg    |  4 ++--
 data/core/units/nagas/Sicarius.cfg    | 19 +++++++++----------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/data/core/macros/deprecated-utils.cfg b/data/core/macros/deprecated-utils.cfg
index fdd215d175b..eea8803816b 100644
--- a/data/core/macros/deprecated-utils.cfg
+++ b/data/core/macros/deprecated-utils.cfg
@@ -391,6 +391,22 @@ _"No gold carried over to the next scenario."#enddef
 #deprecated 2 1.17 This advancement is now enabled by default.
 #enddef
 
+#define WEAPON_SPECIAL_DEFLECT
+#deprecated 2 1.21 This special is no longer used in any core units. On the Naga Sicarius, it has been replaced with the "Guard" special.
+    # Canned definition of the Deflect ability to be included in a
+    # [specials] clause.
+    [chance_to_hit]
+        id=deflect
+        name= _ "deflect"
+        description= _ "When used defensively, this attack reduces the opponent’s chance to hit by 10%."
+        special_note=_"This unit’s defensive techniques reduce the chance of a successful enemy attack."
+        sub=10
+        cumulative=yes
+        active_on=defense
+        apply_to=opponent
+    [/chance_to_hit]
+#enddef
+
 #define WEAPON_SPECIAL_ABSORB AMT
 #deprecated 2 1.21 This special has a poor description and is no longer used in any core units. On the Naga Shield/High Guard, it has been replaced with the "Guard" special.
     # Canned definition of the Absorb ability to be included in a
diff --git a/data/core/macros/weapon_specials.cfg b/data/core/macros/weapon_specials.cfg
index b31042f9f07..f3c62daa599 100644
--- a/data/core/macros/weapon_specials.cfg
+++ b/data/core/macros/weapon_specials.cfg
@@ -102,21 +102,6 @@
     [/chance_to_hit]
 #enddef
 
-#define WEAPON_SPECIAL_DEFLECT
-    # Canned definition of the Deflect ability to be included in a
-    # [specials] clause.
-    [chance_to_hit]
-        id=deflect
-        name= _ "deflect"
-        description= _ "When used defensively, this attack reduces the opponent’s chance to hit by 10%."
-        special_note=_"This unit’s defensive techniques reduce the chance of a successful enemy attack."
-        sub=10
-        cumulative=yes
-        active_on=defense
-        apply_to=opponent
-    [/chance_to_hit]
-#enddef
-
 #define WEAPON_SPECIAL_MAGICAL
     # Canned definition of the Magical (targeting) ability to be included in a
     # [specials] clause.
diff --git a/data/core/units/nagas/Ophidian.cfg b/data/core/units/nagas/Ophidian.cfg
index 167443b5d1a..a1639f5909b 100644
--- a/data/core/units/nagas/Ophidian.cfg
+++ b/data/core/units/nagas/Ophidian.cfg
@@ -27,8 +27,8 @@
         description=_"curved blade"
         type=blade
         range=melee
-        damage=6
-        number=3
+        damage=4
+        number=4
         icon=attacks/blade-curved.png
     [/attack]
     [attack]
diff --git a/data/core/units/nagas/Sicarius.cfg b/data/core/units/nagas/Sicarius.cfg
index 12f5031c812..99f91c3d5da 100644
--- a/data/core/units/nagas/Sicarius.cfg
+++ b/data/core/units/nagas/Sicarius.cfg
@@ -6,7 +6,7 @@
     gender=male,female
     image="units/nagas/mixed/sicarius.png"
     profile="portraits/nagas/naga-ophidian.webp"
-    hitpoints=53
+    hitpoints=49
     movement_type=naga
     movement=7
     experience=150
@@ -28,21 +28,20 @@
         description=_"curved blade"
         type=blade
         range=melee
-        damage=6
-        number=3
+        damage=4
+        number=4
         icon=attacks/blade-curved.png
         [specials]
-            {WEAPON_SPECIAL_DEFLECT}
+            {WEAPON_SPECIAL_GUARD}
         [/specials]
     [/attack]
     [attack]
-        # when out of string freeze, we can rename this to 'trishula'
-        name=jarid
-        description= _"jarid"
+        name=trishula
+        description= _"trishula"
         type=pierce
         range=ranged
-        damage=13
-        number=3
+        damage=15
+        number=2
         icon=attacks/trishula.png
     [/attack]
 
@@ -62,7 +61,7 @@
     [/attack_anim]
     [attack_anim]
         [filter_attack]
-            name=jarid
+            name=trishula
         [/filter_attack]
         start_time=-450
         missile_start_time=-150