Last minute Naga things (#5855)

* move UtBS mace nagas to core

* adding mace naga portraits from LordBob

* move naga hunter portrait to UtBS from core

* de-bow-ify the ophidian nagas and add Deflect weapon special

* revisions to mace nagas base sprites

* revisions to naga guards, including new weapon special Absorb

* compatibility Nagas for UtBS

data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Guardian.cfg

@@ -1,49 +0,0 @@
-#textdomain wesnoth-utbs
-[unit_type]
-    id=Naga Guardian
-    name= _ "Naga Guardian"
-    race=naga
-    image="units/nagas/guardian.png"
-    hitpoints=38
-    movement_type=naga
-    movement=5
-    [resistance]
-        blade=90
-        pierce=90
-        impact=90
-    [/resistance]
-    experience=35
-    level=1
-    alignment=neutral
-    advances_to=Naga Warden
-    cost=16
-    usage=fighter
-    description= _ "These heavy fighters are the elite guards of the naga. They are slower and more heavily armored than most naga and wield huge maces which they use to crush their enemies. They mostly guard naga outposts, but occasionally participate in offensive raids."
-    die_sound=naga-die.ogg
-    {DEFENSE_ANIM "units/nagas/guardian-defend-2.png" "units/nagas/guardian-defend-1.png" {SOUND_LIST:NAGA_HIT} }
-    [attack]
-        name=mace
-        #textdomain wesnoth-units
-        description= _"mace"
-        #textdomain wesnoth-utbs
-        type=impact
-        range=melee
-        damage=7
-        number=3
-    [/attack]
-    [attack_anim]
-        [filter_attack]
-            name=mace
-        [/filter_attack]
-        offset=0.0~0.3,0.3~0.5,0.5~0.60,0.60~0.3,0.3~0.0
-        start_time=-450
-        [frame]
-            image="units/nagas/guardian-attack-[1~4].png:[100*2,150,200]"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/nagas/guardian.png"
-        [/frame]
-        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
-    [/attack_anim]
-[/unit_type]

data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Guardians.cfg

@@ -0,0 +1,60 @@
+#textdomain wesnoth-utbs
+
+[unit_type]
+    id=Naga Guardian
+    name= _ "Naga Guardian"
+    [base_unit]
+        id=Naga Guard
+    [/base_unit]
+    cost=16
+    advances_to=Naga Warden
+    [attack]
+        name=mace
+        #textdomain wesnoth-units
+        description= _"mace"
+        #textdomain wesnoth-utbs
+        type=impact
+        range=melee
+        damage=7
+        number=3
+    [/attack]
+[/unit_type]
+
+[unit_type]
+    id=Naga Warden
+    name= _ "Naga Warden"
+    [base_unit]
+        id=Naga Shield Guard
+    [/base_unit]
+    cost=48
+    advances_to=Naga Sentinel
+    [attack]
+        name=mace
+        #textdomain wesnoth-units
+        description= _"mace"
+        #textdomain wesnoth-utbs
+        type=impact
+        range=melee
+        damage=12
+        number=3
+    [/attack]
+[/unit_type]
+
+[unit_type]
+    id=Naga Sentinel
+    name= _ "Naga Sentinel"
+    [base_unit]
+        id=Naga High Guard
+    [/base_unit]
+    cost=100
+    [attack]
+        name=mace
+        #textdomain wesnoth-units
+        description= _"mace"
+        #textdomain wesnoth-utbs
+        type=impact
+        range=melee
+        damage=12
+        number=4
+    [/attack]
+[/unit_type]

data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Sentinel.cfg

@@ -1,50 +0,0 @@
-#textdomain wesnoth-utbs
-[unit_type]
-    id=Naga Sentinel
-    name= _ "Naga Sentinel"
-    race=naga
-    image="units/nagas/sentinel.png"
-    hitpoints=55
-    movement_type=naga
-    movement=6
-    experience=150
-    [resistance]
-        blade=90
-        pierce=90
-        impact=90
-    [/resistance]
-    level=3
-    alignment=neutral
-    advances_to=null
-    {AMLA_DEFAULT}
-    cost=100
-    usage=fighter
-    description= _ "These heavy fighters are the elite guards of the naga. They are slower and more heavily armored than most naga and wield huge maces which they use to crush their enemies. They mostly guard naga outposts, but occasionally participate in offensive raids."
-    die_sound=naga-die.ogg
-    {DEFENSE_ANIM "units/nagas/sentinel-defend-2.png" "units/nagas/sentinel-defend-1.png" {SOUND_LIST:NAGA_HIT} }
-    [attack]
-        name=mace
-        #textdomain wesnoth-units
-        description= _"mace"
-        #textdomain wesnoth-utbs
-        type=impact
-        range=melee
-        damage=12
-        number=4
-    [/attack]
-    [attack_anim]
-        [filter_attack]
-            name=mace
-        [/filter_attack]
-        start_time=-450
-        offset=0.0~0.3,0.3~0.5,0.5~0.60,0.60~0.3,0.3~0.0
-        [frame]
-            image="units/nagas/sentinel-attack-[1~4].png:[100*2,150,200]"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/nagas/sentinel.png"
-        [/frame]
-        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
-    [/attack_anim]
-[/unit_type]

data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Warden.cfg

@@ -1,49 +0,0 @@
-#textdomain wesnoth-utbs
-[unit_type]
-    id=Naga Warden
-    name= _ "Naga Warden"
-    race=naga
-    image="units/nagas/warden.png"
-    hitpoints=50
-    movement_type=naga
-    movement=5
-    experience=70
-    [resistance]
-        blade=90
-        pierce=90
-        impact=90
-    [/resistance]
-    level=2
-    alignment=neutral
-    advances_to=Naga Sentinel
-    cost=48
-    usage=fighter
-    description= _ "These heavy fighters are the elite guards of the naga. They are slower and more heavily armored than most naga and wield huge maces which they use to crush their enemies. They mostly guard naga outposts, but occasionally participate in offensive raids."
-    die_sound=naga-die.ogg
-    {DEFENSE_ANIM "units/nagas/warden-defend-2.png" "units/nagas/warden-defend-1.png" {SOUND_LIST:NAGA_HIT} }
-    [attack]
-        name=mace
-        #textdomain wesnoth-units
-        description= _"mace"
-        #textdomain wesnoth-utbs
-        type=impact
-        range=melee
-        damage=12
-        number=3
-    [/attack]
-    [attack_anim]
-        [filter_attack]
-            name=mace
-        [/filter_attack]
-        start_time=-450
-        offset=0.0~0.3,0.3~0.5,0.5~0.60,0.60~0.3,0.3~0.0
-        [frame]
-            image="units/nagas/warden-attack-[1~4].png:[100*2,150,200]"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/nagas/warden.png"
-        [/frame]
-        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
-    [/attack_anim]
-[/unit_type]

data/core/macros/abilities.cfg

@@ -481,6 +481,21 @@ Enemy units cannot see this unit while it is in deep water, except if they have
     [/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.
@@ -519,6 +534,19 @@ Enemy units cannot see this unit while it is in deep water, except if they have
     [/damage]
 #enddef
 
+#define WEAPON_SPECIAL_ABSORB AMT
+    # 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
+
 #define WEAPON_SPECIAL_DRAIN
     # Canned definition of the Drain ability to be included in a
     # [specials] clause.

data/core/units/nagas/Guard.cfg

@@ -0,0 +1,50 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=Naga Guard
+    name= _ "Naga Guard"
+    race=naga
+    image="units/nagas/guardian.png"
+    profile=portraits/nagas/naga-mace_warrior1.png
+    hitpoints=38
+    movement_type=naga
+    movement=5
+    [resistance]
+        blade=90
+        pierce=90
+        impact=90
+    [/resistance]
+    experience=35
+    level=1
+    alignment=neutral
+    advances_to=Naga Shield Guard
+    cost=15
+    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
+    # {DEFENSE_ANIM "units/nagas/guardian-defend-2.png" "units/nagas/guardian-defend-1.png" {SOUND_LIST:NAGA_HIT} }
+    {DEFENSE_ANIM "units/nagas/guardian.png" "units/nagas/guardian.png" {SOUND_LIST:NAGA_HIT} }
+    [attack]
+        name=mace
+        description= _"mace"
+        type=impact
+        range=melee
+        damage=7
+        number=3
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            name=mace
+        [/filter_attack]
+        offset=0.0~0.3,0.3~0.5,0.5~0.60,0.60~0.3,0.3~0.0
+        start_time=-450
+        [frame]
+            # image="units/nagas/guardian-attack-[1~4].png:[100*2,150,200]"
+            image="units/nagas/guardian.png:550"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/nagas/guardian.png"
+        [/frame]
+        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
+    [/attack_anim]
+[/unit_type]

data/core/units/nagas/Guard_High.cfg

@@ -0,0 +1,63 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=Naga High Guard
+    name= _ "Naga High Guard"
+    race=naga
+    image="units/nagas/sentinel.png"
+    profile=portraits/nagas/naga-mace_warrior3.png
+    hitpoints=55
+    movement_type=naga
+    movement=6
+    experience=150
+    [resistance]
+        blade=90
+        pierce=90
+        impact=90
+    [/resistance]
+    level=3
+    alignment=neutral
+    advances_to=null
+    {AMLA_DEFAULT}
+    cost=44
+    usage=fighter
+    description= _ "The elite naga guards are a rigid barrier to any invaders of a naga stronghold.  They have powerful stikes 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
+    {DEFENSE_ANIM "units/nagas/sentinel.png" "units/nagas/sentinel.png" {SOUND_LIST:NAGA_HIT} }
+    # {DEFENSE_ANIM "units/nagas/sentinel-defend-2.png" "units/nagas/sentinel-defend-1.png" {SOUND_LIST:NAGA_HIT} }
+    [attack]
+        name=mace
+        description= _"mace"
+        type=impact
+        range=melee
+        damage=15
+        number=3
+    [/attack]
+    [attack]
+        name=shield
+        description= _"shield"
+        type=impact
+        range=melee
+        damage=10
+        number=1
+        [specials]
+            {WEAPON_SPECIAL_ABSORB 0.6}
+        [/specials]
+        icon=attacks/rectangular-shield.png
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            name=mace
+        [/filter_attack]
+        start_time=-450
+        offset=0.0~0.3,0.3~0.5,0.5~0.60,0.60~0.3,0.3~0.0
+        [frame]
+            image="units/nagas/sentinel.png:550"
+            # image="units/nagas/sentinel-attack-[1~4].png:[100*2,150,200]"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/nagas/sentinel.png"
+        [/frame]
+        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
+    [/attack_anim]
+[/unit_type]

data/core/units/nagas/Guard_Shield.cfg

@@ -0,0 +1,62 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=Naga Shield Guard
+    name= _ "Naga Shield Guard"
+    race=naga
+    image="units/nagas/warden.png"
+    profile=portraits/nagas/naga-mace_warrior2.png
+    hitpoints=50
+    movement_type=naga
+    movement=5
+    experience=70
+    [resistance]
+        blade=90
+        pierce=90
+        impact=90
+    [/resistance]
+    level=2
+    alignment=neutral
+    advances_to=Naga High Guard
+    cost=25
+    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."
+    die_sound=naga-die.ogg
+    # {DEFENSE_ANIM "units/nagas/warden-defend-2.png" "units/nagas/warden-defend-1.png" {SOUND_LIST:NAGA_HIT} }
+    {DEFENSE_ANIM "units/nagas/warden.png" "units/nagas/warden.png" {SOUND_LIST:NAGA_HIT} }
+    [attack]
+        name=mace
+        description= _"mace"
+        type=impact
+        range=melee
+        damage=10
+        number=3
+    [/attack]
+    [attack]
+        name=shield
+        description= _"shield"
+        type=impact
+        range=melee
+        damage=8
+        number=1
+        [specials]
+            {WEAPON_SPECIAL_ABSORB 0.75}
+        [/specials]
+        icon=attacks/heater-shield.png
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            name=mace
+        [/filter_attack]
+        start_time=-450
+        offset=0.0~0.3,0.3~0.5,0.5~0.60,0.60~0.3,0.3~0.0
+        [frame]
+            image="units/nagas/warden.png:550"
+            # image="units/nagas/warden-attack-[1~4].png:[100*2,150,200]"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/nagas/warden.png"
+        [/frame]
+        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
+    [/attack_anim]
+[/unit_type]

data/core/units/nagas/Ophidian.cfg

@@ -5,7 +5,7 @@
     race=naga
     gender=male,female
     image="units/nagas/ophidian.png"
-    profile="portraits/nagas/naga-hunter.png"
+    # profile="portraits/nagas/naga-hunter.png"
     hitpoints=43
     movement_type=naga
     movement=7
@@ -15,14 +15,13 @@
     advances_to=Naga Sicarius
     cost=22
     usage=fighter
-    description= _ "Experienced warriors of the Southern Naga often find work as mercenaries, usually hired by neighboring Dunefolk to control key waterways near the coastline. Due to their constant confrontations with enemy horsemen, Ophidians have retired the ringed blades of their youth and picked up the piercing bow. Though generally amicable with their wealthy employers, this friendliness should not be mistaken for loyalty, for the Ophidian are known for readily switching between rival city-state factions at the start of each shipping season, when demand for water-based protection is the highest. As a group, these nagas encourage a healthy amount of competition among the surface factions, ensuring their services are valued by one tribe or another."
+    description= _ "Experienced warriors of the Southern Naga often find work as mercenaries, usually hired by neighboring Dunefolk to control key waterways near the coastline. Due to their constant confrontations with enemy horsemen, Ophidians have retired the ringed blades of their youth and picked up the piercing jarid, a type of small javelin that the nagas have made more deadly by adding lead harvested from sunken ship ballasts.  Though generally amicable with their wealthy employers, this friendliness should not be mistaken for loyalty, for the Ophidian are known for readily switching between rival city-state factions at the start of each shipping season, when demand for water-based protection is the highest. As a group, these nagas encourage a healthy amount of competition among the surface factions, ensuring their services are valued by one tribe or another."
     die_sound=naga-die.ogg
     {DEFENSE_ANIM "units/nagas/ophidian.png" "units/nagas/ophidian.png" {SOUND_LIST:NAGA_HIT} }
     [defense]
         flat=60
         sand=50
     [/defense]
-
     [attack]
         name=curved blade
         description=_"curved blade"
@@ -33,13 +32,13 @@
         icon=attacks/blade-curved.png
     [/attack]
     [attack]
-        name=bow
-        description= _"bow"
+        name=jarid
+        description= _"jarid"
         type=pierce
         range=ranged
         damage=12
         number=2
-        icon=attacks/bow-orcish.png
+        icon=attacks/javelin-orcish.png
     [/attack]
 
     [attack_anim]
@@ -54,7 +53,7 @@
     [/attack_anim]
     [attack_anim]
         [filter_attack]
-            name=bow
+            name=jarid
         [/filter_attack]
         start_time=-225
         missile_start_time=-150

data/core/units/nagas/Sicarius.cfg

@@ -5,7 +5,7 @@
     race=naga
     gender=male,female
     image="units/nagas/sicarius.png"
-    profile="portraits/nagas/naga-hunter.png"
+    # profile="portraits/nagas/naga-hunter.png"
     hitpoints=55
     movement_type=naga
     movement=7
@@ -16,15 +16,13 @@
     {AMLA_DEFAULT}
     cost=46
     usage=fighter
-    description= _ "While they sometimes still stand in as sellswords for potential Dunefolk allies, Naga Sicarii are more often the keepers of trade routes and resource beds close to waterways. For the right fee or exchange of goods, a Sicarius will guarantee safe travel or free access to valuable supplies in his territory. Rubbed the wrong way and a Sicarius becomes a fearsome foe, not because of their personal strength in combat, but instead due to the numerous allies that he can call upon to quash any potential nuisance. Though perfectly capable warriors when the time is necessary, these experienced mercenaries know perfectly well that the best methods for generating money are those that do not place themselves in danger."
+    description= _ "While they sometimes still stand in as sellswords for potential Dunefolk allies, Naga Sicarii are more often the keepers of trade routes and resource beds close to waterways. For the right fee or exchange of goods, a Sicarius will guarantee safe travel or free access to valuable supplies in his territory. Rubbed the wrong way and a Sicarius becomes a fearsome foe, not because of their personal strength in combat, but instead due to the numerous allies that he can call upon to quash any potential nuisance. Though perfectly capable warriors when the time is necessary, these experienced mercenaries know perfectly well that the best methods for generating money are those that do not place themselves in danger.  When they do find themselves in danger, their manipulative cunning is put to good use, for they can anticipate many enemy strikes, and use their heavy, curved blade to deflect or distract at the critical moment."
     die_sound=naga-die.ogg
     {DEFENSE_ANIM "units/nagas/sicarius.png" "units/nagas/sicarius.png" {SOUND_LIST:NAGA_HIT} }
-
     [defense]
         flat=50
         sand=40
     [/defense]
-
     [attack]
         name=curved blade
         description=_"curved blade"
@@ -33,15 +31,18 @@
         damage=9
         number=3
         icon=attacks/blade-curved.png
+        [specials]
+            {WEAPON_SPECIAL_DEFLECT}
+        [/specials]
     [/attack]
     [attack]
-        name=bow
-        description= _"bow"
+        name=jarid
+        description= _"jarid"
         type=pierce
         range=ranged
         damage=13
         number=3
-        icon=attacks/bow.png
+        icon=attacks/javelin-human.png
     [/attack]
 
     [attack_anim]
@@ -56,7 +57,7 @@
     [/attack_anim]
     [attack_anim]
         [filter_attack]
-            name=bow
+            name=jarid
         [/filter_attack]
         start_time=-225
         missile_start_time=-150