Units - Dunefolk Nagas - first revisions (#4701)

* Units - Dunefolk Nagas - first revisions

* Units - Nagas : rework dirkfang line stats and add a couple dirkfang animations

* Units - Nagas : additions to dirkfang animations

* units - nagas : attack anim tweeks

* units - nagas: melee boost to dirkfang and advancements

* units - nagas: terrain defense boost to ringcaster

* units - nagas - add dirkfang portrait

* units - nagas - revise attack numbers for entire line

* units -  nagas - remove reference to old name Dervish in description

* wmlindent run

data/core/units/nagas/Dirkfang.cfg

@@ -3,21 +3,26 @@
     id=Naga Dirkfang
     name= _ "Naga Dirkfang"
     race=naga
-    gender=male
+    gender=male,female
     image="units/nagas/dirkfang.png"
-    profile="portraits/nagas/naga-hunter.png"
+    profile="portraits/nagas/dirkfang.png"
     hitpoints=31
     movement_type=naga
     movement=7
     experience=38
     level=1
-    alignment=liminal
+    alignment=neutral
     advances_to=Naga Ophidian,Naga Ringcaster
     cost=15
     usage=mixed fighter
-    description= _ "In contrast to the heavily melee-focused style of their northern brethren, young Naga of the southern tribes prefer to carry small bows, with which they used to pepper their prey with arrows. While finishing off any water-based enemies usually must be done at close range, softening foes with ranged attacks is usually much less dangerous than rushing headlong directly into the fray. Sometimes viewed as cowardly by more proper Naga warriors, these fighters are nonetheless effective when it comes time to engage in warfare."
+    description= _ "In contrast to the heavily melee-focused style of their northern brethren, young Naga of the southern waters prefer to soften their prey from afar before closing in. The small chakri they throw can be carried on the wrist or on a belt without causing hindrance.  While any final kill under water must usually be done at close range, the mixed combat style often allows them to live long enough to learn and improve. Sometimes viewed as cowardly by the northern Naga warriors, these fighters are nonetheless effective when it comes time to engage in warfare."
     die_sound=naga-die.ogg
-    {DEFENSE_ANIM "units/nagas/dirkfang.png" "units/nagas/dirkfang.png" {SOUND_LIST:NAGA_HIT} }
+    {DEFENSE_ANIM_FILTERED "units/nagas/dirkfang-range-defend2.png" "units/nagas/dirkfang-range-defend1.png" {SOUND_LIST:NAGA_HIT} (
+        [filter_attack]
+            range=ranged
+        [/filter_attack]
+    )}
+    {DEFENSE_ANIM "units/nagas/dirkfang-defend2.png" "units/nagas/dirkfang-defend1.png" {SOUND_LIST:NAGA_HIT} }
 
     [attack]
         name=dagger
@@ -29,55 +34,64 @@
         icon=attacks/dagger-curved.png
     [/attack]
     [attack]
-        name=bow
-        description= _"bow"
-        type=pierce
+        name=chakri
+        description= _"chakri"
+        type=blade
         range=ranged
-        damage=6
+        damage=7
         number=2
-        icon=attacks/bow-orcish.png
+        icon=attacks/chakri.png
     [/attack]
 
     [attack_anim]
         [filter_attack]
             name=dagger
         [/filter_attack]
-        start_time=-200
+        start_time=-540
+        offset="0.0:290,0.0~0.6:250,0.6~0.0:400"
         [frame]
-            image="units/nagas/dirkfang.png:300"
+            image="units/nagas/dirkfang-melee[1~6].png:[120,160,80*2,100,200]"
+        [/frame]
+        [frame]
+            image="units/nagas/dirkfang.png:200"
         [/frame]
         {SOUND:HIT_AND_MISS dagger-swish.wav dagger-swish.wav -150}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
-            name=bow
+            name=chakri
         [/filter_attack]
-        start_time=-225
+        start_time=-800
         missile_start_time=-150
         [if]
             hits=yes
             [missile_frame]
                 duration=150
-                image="projectiles/missile-n.png"
-                image_diagonal="projectiles/missile-ne.png"
+                image="projectiles/chakram.png"
                 offset=0~0.8
             [/missile_frame]
             [frame]
-                image="units/nagas/dirkfang.png:300"
-                sound=bow.ogg
+                image="units/nagas/dirkfang-throw[1~10].png:[90,100,120,150,150,100,100,130,130,120]"
+                sound=throwing-knife.ogg
             [/frame]
         [/if]
         [else]
             hits=no
             [missile_frame]
-                duration=150
-                image="projectiles/missile-n.png"
-                image_diagonal="projectiles/missile-ne.png"
+                duration=200
+                image="projectiles/chakram.png"
+                x=0~7
+                y=0~7
+                offset=0~1.2
             [/missile_frame]
             [frame]
-                image="units/nagas/dirkfang.png:300"
-                sound=bow-miss.ogg
+                image="units/nagas/dirkfang-throw[1~10].png:[90,100,120,150,150,100,100,130,130,120]"
+                sound=throwing-knife-miss.ogg
             [/frame]
         [/else]
     [/attack_anim]
+    [female]
+        name= _ "Nagini Dirkfang"
+        gender=female
+    [/female]
 [/unit_type]

data/core/units/nagas/Ophidian.cfg

@@ -3,19 +3,19 @@
     id=Naga Ophidian
     name= _ "Naga Ophidian"
     race=naga
-    gender=male
+    gender=male,female
     image="units/nagas/ophidian.png"
     profile="portraits/nagas/naga-hunter.png"
-    hitpoints=46
+    hitpoints=43
     movement_type=naga
     movement=7
     experience=76
     level=2
-    alignment=liminal
-    advances_to=Naga Dervish
+    alignment=neutral
+    advances_to=Naga Sicarius
     cost=24
     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. Though generally amicable with their wealthy employers, this friendliness should not be mistaken for loyalty. Ophidian, in particular, 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. By encouraging a healthy amount of competition, these nagas ensure that their services are always sought after 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 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."
     die_sound=naga-die.ogg
     {DEFENSE_ANIM "units/nagas/ophidian.png" "units/nagas/ophidian.png" {SOUND_LIST:NAGA_HIT} }
     [defense]
@@ -28,7 +28,7 @@
         description=_"curved blade"
         type=blade
         range=melee
-        damage=8
+        damage=7
         number=3
         icon=attacks/blade-curved.png
     [/attack]
@@ -37,7 +37,7 @@
         description= _"bow"
         type=pierce
         range=ranged
-        damage=6
+        damage=10
         number=2
         icon=attacks/bow-orcish.png
     [/attack]
@@ -84,4 +84,8 @@
             [/frame]
         [/else]
     [/attack_anim]
+    [female]
+        name= _ "Nagini Ophidian"
+        gender=female
+    [/female]
 [/unit_type]

data/core/units/nagas/Ringcaster.cfg

@@ -3,24 +3,29 @@
     id=Naga Ringcaster
     name= _ "Naga Ringcaster"
     race=naga
-    gender=male
+    gender=male,female
     image="units/nagas/ringcaster.png"
     hitpoints=40
     movement_type=naga
     movement=7
-    experience=76
+    experience=70
     level=2
-    alignment=liminal
+    alignment=neutral
     advances_to=Naga Zephyr
     cost=24
-    usage=archer
-    description= _ "The blade ring, or chakram, is the signature weapon of the southern Naga and their renowned Ringcasters. These nagas choose their tools with great care: the process of forging a chakram underwater is quite tricky and usually results in weapons with a fair bit of variance. Each Ringcaster picks a specific set of chakrams that suits them, whether it be rings with high uniformity for faster spinning, blades with a slight bit of wobble for unpredictability, or lopsided rings for curved trajectories. As different as each blade ring is coming out of the forge, each Ringcaster has a different fighting style to which their tools are tailored."
+    usage=mixed fighter
+    description= _ "The chakram, a greater blade ring than the chakri, is the signature weapon of the southern Naga and their renowned Ringcasters.  Well balanced chakrams are useful for throwing, but the rejected blades make a good fist-load weapon, similar to a sharp-bladed tekko or knuckleduster."
     die_sound=naga-die.ogg
     {DEFENSE_ANIM "units/nagas/ringcaster.png" "units/nagas/ringcaster.png" {SOUND_LIST:NAGA_HIT} }
 
     [defense]
         flat=60
         sand=50
+        forest=50
+        hills=50
+        mountains=50
+        village=50
+        cave=50
     [/defense]
 
     [attack]
@@ -28,17 +33,17 @@
         description=_"chakram"
         type=blade
         range=melee
-        damage=4
-        number=3
-        icon=attacks/chakram.png
+        damage=5
+        number=4
+        icon=attacks/tekko.png
     [/attack]
     [attack]
         name=chakram
         description= _"chakram"
         type=blade
         range=ranged
-        damage=6
-        number=4
+        damage=7
+        number=3
         icon=attacks/chakram.png
     [/attack]
 
@@ -84,4 +89,8 @@
             [/frame]
         [/else]
     [/attack_anim]
+    [female]
+        name= _ "Nagini Ringcaster"
+        gender=female
+    [/female]
 [/unit_type]

data/core/units/nagas/Sicarius.cfg

@@ -1,24 +1,24 @@
 #textdomain wesnoth-units
 [unit_type]
-    id=Naga Dervish
-    name= _ "Naga Dervish"
+    id=Naga Sicarius
+    name= _ "Naga Sicarius"
     race=naga
-    gender=male
-    image="units/nagas/dervish.png"
+    gender=male,female
+    image="units/nagas/sicarius.png"
     profile="portraits/nagas/naga-hunter.png"
-    hitpoints=57
+    hitpoints=55
     movement_type=naga
     movement=7
     experience=150
     level=3
-    alignment=liminal
+    alignment=neutral
     advances_to=null
     {AMLA_DEFAULT}
     cost=48
     usage=fighter
-    description= _ "While they sometimes still stand in as sellswords for potential Dunefolk allies, Naga Dervishes are more often the keepers of trade routes and resource beds close to waterways. For the right fee or exchange of goods, a Dervish will guarantee safe travel or free access to valuable supplies in his territory. Rubbed the wrong way and a Dervish 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."
     die_sound=naga-die.ogg
-    {DEFENSE_ANIM "units/nagas/dervish.png" "units/nagas/dervish.png" {SOUND_LIST:NAGA_HIT} }
+    {DEFENSE_ANIM "units/nagas/sicarius.png" "units/nagas/sicarius.png" {SOUND_LIST:NAGA_HIT} }
 
     [defense]
         flat=50
@@ -31,7 +31,7 @@
         type=blade
         range=melee
         damage=10
-        number=4
+        number=3
         icon=attacks/blade-curved.png
     [/attack]
     [attack]
@@ -39,9 +39,9 @@
         description= _"bow"
         type=pierce
         range=ranged
-        damage=9
-        number=2
-        icon=attacks/bow-orcish.png
+        damage=12
+        number=3
+        icon=attacks/bow.png
     [/attack]
 
     [attack_anim]
@@ -50,7 +50,7 @@
         [/filter_attack]
         start_time=-200
         [frame]
-            image="units/nagas/dervish.png:300"
+            image="units/nagas/sicarius.png:300"
         [/frame]
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -150}
     [/attack_anim]
@@ -69,7 +69,7 @@
                 offset=0~0.8
             [/missile_frame]
             [frame]
-                image="units/nagas/dervish.png:300"
+                image="units/nagas/sicarius.png:300"
                 sound=bow.ogg
             [/frame]
         [/if]
@@ -81,9 +81,13 @@
                 image_diagonal="projectiles/missile-ne.png"
             [/missile_frame]
             [frame]
-                image="units/nagas/dervish.png:300"
+                image="units/nagas/sicarius.png:300"
                 sound=bow-miss.ogg
             [/frame]
         [/else]
     [/attack_anim]
+    [female]
+        name= _ "Nagini Sicarius"
+        gender=female
+    [/female]
 [/unit_type]

data/core/units/nagas/Zephyr.cfg

@@ -3,18 +3,18 @@
     id=Naga Zephyr
     name= _ "Naga Zephyr"
     race=naga
-    gender=male
+    gender=male,female
     image="units/nagas/zephyr.png"
     hitpoints=53
     movement_type=naga
     movement=7
     experience=150
     level=3
-    alignment=liminal
+    alignment=neutral
     advances_to=null
     {AMLA_DEFAULT}
     cost=50
-    usage=archer
+    usage=mixed fighter
     description= _ "The Southern Naga commonly recount a curious story about the Wind Spirit, Zefra and the aetherial chakram:
 
 In the distant past, there was a chakram wielder who was possessed of legendary skill. It is said that he could cleave the very seas with a flurry of blades, fell a hundred foes before a single could reach him, and deflect a thousand arrows without being struck. Called by the name of Xylrix, tempest, he was a warrior whose arrogance was as great as his talent. He was always more than willing to boast his prowess to any and all who would watch him. Then one day, while flaunting himself to a band of young Nagini, he chose a sacred Allnai tree as his target.
@@ -27,13 +27,22 @@ He retorted, ‘Come, spirit. I am not afraid. No weapon, steel, water, or wind,
 
 The wind whirled ever faster, a torrent of gale force spiraling and spiraling in a gyrating dance of fury. He felt himself lifted from the ground, spinning at a tremendous rate, rendered utterly hapless at the mercy of Zefra’s wrath. Face upturned in terror, he let go of his blades and suddenly saw it in the whirling tempest—the twirling motion of the ringed chakrams, patterned in the very wind itself.
 
-As quickly as the storm came, it vanished, leaving Xylrix to contemplate his broken weapons. When he finally returned to his home many days later, he announced his new name: Zephyr, a warrior who serves the Wind on which his blades fly."
+As quickly as the storm came, it vanished, leaving Xylrix to contemplate his broken weapons. When he finally returned to his home many days later, he announced his new name: Zephyr, a warrior who serves the Wind on which his blades fly.
+
+While the old tales drive the elite warriors of this legacy to focus on the thrown blade, this doesn't mean they are weak in melee combat, as the unbalanced chakram can be enhanced with spikes and smaller blades.
+"
     die_sound=naga-die.ogg
     {DEFENSE_ANIM "units/nagas/zephyr.png" "units/nagas/zephyr.png" {SOUND_LIST:NAGA_HIT} }
 
     [defense]
+        deep_water=40
         flat=50
         sand=40
+        forest=50
+        hills=50
+        mountains=50
+        village=40
+        cave=50
     [/defense]
 
     [attack]
@@ -41,17 +50,17 @@ As quickly as the storm came, it vanished, leaving Xylrix to contemplate his bro
         description=_"chakram"
         type=blade
         range=melee
-        damage=6
-        number=3
-        icon=attacks/chakram.png
+        damage=7
+        number=4
+        icon=attacks/tekko.png
     [/attack]
     [attack]
         name=chakram
         description= _"chakram"
         type=blade
         range=ranged
-        damage=7
-        number=5
+        damage=9
+        number=4
         icon=attacks/chakram.png
     [/attack]
 
@@ -97,4 +106,8 @@ As quickly as the storm came, it vanished, leaving Xylrix to contemplate his bro
             [/frame]
         [/else]
     [/attack_anim]
+    [female]
+        name= _ "Nagini Zephyr"
+        gender=female
+    [/female]
 [/unit_type]