Improve Naga Guard line (#9529)

Redesigns the Naga Guard, Shield Guard, and High Guard to make their shield bash attack less redundant. Also adds the new Unwieldy and Guard specials, and deprecates the Absorb special.
2024-11-08 01:33:23 +03:00 · 2024-11-08 01:33:23 +03:00 · 32b5570103
commit 32b5570103
parent 4f97c10e35
5 changed files with 92 additions and 42 deletions
--- a/data/core/macros/deprecated-utils.cfg
+++ b/data/core/macros/deprecated-utils.cfg
@ -390,3 +390,17 @@ _"No gold carried over to the next scenario."#enddef
 #define ENABLE_NIGHTBLADE
 #deprecated 2 1.17 This advancement is now enabled by default.
 #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
+    # [specials] clause.
+    [damage]
+        id=absorb
+        name= _ "absorb"
+        description= _ "This attack puts the unit in good defensive position, and it absorbs some of the damage dealt by an enemy strike."
+        special_note= _ "This unit can block enemy strikes, so that it takes reduced damage when hit."
+        multiply={AMT}
+        apply_to=opponent
+    [/damage]
+#enddef
--- a/data/core/macros/weapon_specials.cfg
+++ b/data/core/macros/weapon_specials.cfg
@ -1,6 +1,16 @@
 #textdomain wesnoth-help
 # Weapon special macros to be included in the SingleWML description of a unit.

+#define WEAPON_SPECIAL_UNWIELDY
+    [disable]
+        id=unwieldy
+        name=_"unwieldy"
+        description=_"This attack can only be used offensively."
+        active_on=defense
+        special_note=_ "This unit has an unwieldy weapon, which cannot be used defensively."
+    [/disable]
+#enddef
+
 #define WEAPON_SPECIAL_BERSERK
    # Canned definition of the Berserk ability to be included in a
    # [specials] clause.
@ -145,15 +155,15 @@
    [/damage]
 #enddef

-#define WEAPON_SPECIAL_ABSORB AMT
-    # Canned definition of the Absorb ability to be included in a
+#define WEAPON_SPECIAL_GUARD
+    # Canned definition of the Guard ability to be included in a
    # [specials] clause.
    [damage]
-        id=absorb
-        name= _ "absorb"
-        description= _ "This attack puts the unit in good defensive position, and it absorbs some of the damage dealt by an enemy strike."
-        special_note= _ "This unit can block enemy strikes, so that it takes reduced damage when hit."
-        multiply={AMT}
+        id=guard
+        name= _ "guard"
+        description= _ "This attack blocks half of the damage from its target’s strikes."
+        special_note= _ "This unit’s guarding attack can halve incoming damage, but only when used in combat."
+        multiply=0.5
        apply_to=opponent
    [/damage]
 #enddef
--- a/data/core/units/nagas/Guard.cfg
+++ b/data/core/units/nagas/Guard.cfg
@ -5,19 +5,18 @@
    race=naga
    image="units/nagas/guardian/guardian.png"
    profile=portraits/nagas/naga-mace_warrior1.webp
-    hitpoints=38
+    hitpoints=40
    movement_type=naga
-    movement=5
-    [resistance]
-        blade=90
-        pierce=90
-        impact=90
-    [/resistance]
-    experience=36
+    movement=6
+    [defense]
+        castle=40
+        village=40
+    [/defense]
+    experience=40
    level=1
    alignment=neutral
    advances_to=Naga Shield Guard
-    cost=15
+    cost=16
    usage=fighter
    description= _ "Nagas tend to value agility and grace on the battlefield, but the slower, stronger individuals play a key role in defending important positions. These guards are not often encountered, for they do not take part in raids or mercenary activities. They are said to have a strong code of honor, though like all things naga, it is mostly a mystery to outsiders."
    die_sound=naga-die.ogg
@ -27,8 +26,8 @@
        description= _"mace"
        type=impact
        range=melee
-        damage=7
-        number=3
+        damage=9
+        number=2
    [/attack]
    [attack_anim]
        [filter_attack]
--- a/data/core/units/nagas/Guard_High.cfg
+++ b/data/core/units/nagas/Guard_High.cfg
@ -5,20 +5,19 @@
    race=naga
    image="units/nagas/guardian/sentinel.png"
    profile=portraits/nagas/naga-mace_warrior3.webp
-    hitpoints=55
+    hitpoints=58
    movement_type=naga
    movement=6
+    [defense]
+        castle=40
+        village=40
+    [/defense]
    experience=150
-    [resistance]
-        blade=90
-        pierce=90
-        impact=90
-    [/resistance]
    level=3
    alignment=neutral
    advances_to=null
    {AMLA_DEFAULT}
-    cost=44
+    cost=50
    usage=fighter
    description= _ "The elite naga guards are a rigid barrier to any invaders of a naga stronghold. They have powerful strikes and, like the lesser Shield Guard, they are difficult to dislodge from their posts because of effective use of a shield in melee techniques. This tactic does nothing against ranged attacks, but the nagas can usually seek better terrain advantage in such situations."
    die_sound=naga-die.ogg
@ -39,16 +38,19 @@
        range=melee
        damage=15
        number=3
+        [specials]
+            {WEAPON_SPECIAL_UNWIELDY}
+        [/specials]
    [/attack]
    [attack]
        name=shield
        description= _"shield"
        type=impact
        range=melee
-        damage=10
-        number=1
+        damage=11
+        number=2
        [specials]
-            {WEAPON_SPECIAL_ABSORB 0.6}
+            {WEAPON_SPECIAL_GUARD}
        [/specials]
        icon=icons/shield_steel.png
    [/attack]
@ -68,4 +70,25 @@
        [/frame]
        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
    [/attack_anim]
+
+    [attack_anim]
+        [filter_attack]
+            name=shield
+        [/filter_attack]
+        start_time=-550
+        offset=0.0:250,0.0~0.5:200,0.5~0.0:200
+        [frame]
+            image="units/nagas/guardian/sentinel-defend-1.png:100"
+        [/frame]
+        [frame]
+            image="units/nagas/guardian/sentinel-defend-1abs.png:150"
+        [/frame]
+        [frame]
+            image="units/nagas/guardian/sentinel-defend-2abs.png:300"
+        [/frame]
+        [frame]
+            image="units/nagas/guardian/sentinel.png:100"
+        [/frame]
+        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -550}
+    [/attack_anim]
 [/unit_type]
--- a/data/core/units/nagas/Guard_Shield.cfg
+++ b/data/core/units/nagas/Guard_Shield.cfg
@ -5,21 +5,22 @@
    race=naga
    image="units/nagas/guardian/warden.png"
    profile=portraits/nagas/naga-mace_warrior2.webp
-    hitpoints=50
+    hitpoints=48
    movement_type=naga
-    movement=5
-    experience=54
-    [resistance]
-        blade=90
-        pierce=90
-        impact=90
-    [/resistance]
+    movement=6
+    [defense]
+        castle=40
+        village=40
+    [/defense]
+    experience=60
    level=2
    alignment=neutral
    advances_to=Naga High Guard
-    cost=25
+    cost=28
    usage=fighter
-    description= _ "The veteran naga guards are more difficult to dislodge from their posts because of effective use of a shield in melee techniques. This tactic does nothing against ranged attacks, but the nagas can usually seek better terrain advantage in such situations."
+    description= _ "The veteran naga guards have learnt a unique fighting style, different from the heavy infantry of other races. By combining the inertia of a heavy mace with the flexibility of their bodies, they can deliver a series of swift and crushing blows.
+
+This technique can be powerful given time to prepare, but is challenging to use under duress. Defensively, Shield Guards instead leverage their natural flexibility to shield themselves and bend in the direction of the blow, absorbing some of the damage. Though their small shields do little against ranged attacks, this tactic nevertheless makes them sturdy fighters in melee."
    die_sound=naga-die.ogg
    {DEFENSE_ANIM_FILTERED "units/nagas/guardian/warden-shield-defend2.png" "units/nagas/guardian/warden-shield-attack-2.png" {SOUND_LIST:NAGA_HIT} (
        [filter]
@ -35,18 +36,21 @@
        description= _"mace"
        type=impact
        range=melee
-        damage=10
+        damage=9
        number=3
+        [specials]
+            {WEAPON_SPECIAL_UNWIELDY}
+        [/specials]
    [/attack]
    [attack]
        name=shield
        description= _"shield"
        type=impact
        range=melee
-        damage=8
-        number=1
+        damage=9
+        number=2
        [specials]
-            {WEAPON_SPECIAL_ABSORB 0.75}
+            {WEAPON_SPECIAL_GUARD}
        [/specials]
        icon=attacks/heater-shield.png
    [/attack]