Merge pull request #4520 from nemaara/dunefolk_renaming

Rename some Dunefolk units
This commit is contained in:
nemaara 2019-11-08 19:52:08 -05:00 committed by GitHub
commit ce25a92bf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 68 additions and 54 deletions

View File

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

View File

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

View File

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

View File

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

View File

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

View File

@ -10,7 +10,7 @@
experience=80
level=2
alignment=liminal
advances_to=Dune Ranger
advances_to=Dune Wayfarer
cost=29
usage=mixed fighter
description= _ "A slow-moving caravan out in the open desert is a prime target for bandits or marauders. In order to protect themselves, the Dunefolk employ Explorers to scout and repel potential threats. In doing so, these fleet fighters not only protect their vulnerable caravans, but pilfer the supplies of supposed raiders for themselves. When employed for warfare, Explorers no longer act only as scouts for probing enemies, but are skilled enough to be effective flankers or potent shock attackers."

View File

@ -1,21 +1,21 @@
#textdomain wesnoth-units
[unit_type]
id=Dune Swiftrider
name= _ "Dune Swiftrider"
id=Dune Horse Archer
name= _ "Dune Horse Archer"
race=dunefolk
image="units/dunefolk/swiftrider.png"
image="units/dunefolk/horse-archer.png"
hitpoints=44
movement_type=dunehorse
movement=8
experience=90
level=2
alignment=liminal
advances_to=Dune Windrider
advances_to=Dune Windbolt
cost=38
usage=archer
description= _ "Swiftriders are those who favor archery over melee weaponry. Fleet and elusive, these horsemen are experts at harassing less mobile foes with hails of arrows. As excellent skirmishers in the desert, Swiftriders are most often used as combat scouts or to hunt down fleeing enemies. Though not usually trained for infiltration or spying, these equestrians ability to pass messages from afar with their long-ranged arrows is of great use to maintain communication among the Dunefolk armies."
description= _ "Horse Archers are those favor archery as their technique of choice for combat. Fleet and elusive, these horsemen are experts at harassing less mobile foes with hails of arrows and hunting down fleeing enemies from a distance. Though not usually trained for infiltration or spying, these equestrians ability to pass messages from afar with their long-ranged arrows is of great use to maintain communication among the Dunefolk armies."
die_sound=horse-die.ogg
{DEFENSE_ANIM "units/dunefolk/swiftrider.png" "units/dunefolk/swiftrider.png" {SOUND_LIST:HORSE_HIT} }
{DEFENSE_ANIM "units/dunefolk/horse-archer.png" "units/dunefolk/horse-archer.png" {SOUND_LIST:HORSE_HIT} }
[attack]
name=mace
@ -43,7 +43,7 @@
start_time=-250
horse_sound_start_time=-250
[frame]
image="units/dunefolk/swiftrider.png:400"
image="units/dunefolk/horse-archer.png:400"
[/frame]
[horse_sound_frame]
sound=horse-canter.wav
@ -62,7 +62,7 @@
image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[frame]
image="units/dunefolk/swiftrider.png:300"
image="units/dunefolk/horse-archer.png:300"
[/frame]
{SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}
[/attack_anim]

View File

@ -10,7 +10,7 @@
experience=42
level=1
alignment=liminal
advances_to=Dune Raider,Dune Swiftrider,Dune Sunderer
advances_to=Dune Raider,Dune Horse Archer,Dune Sunderer
cost=18
usage=archer
description= _ "The Dunefolk are prominent horse breeders who raise many different varieties of mounts to fulfill various purposes. Those who are used for hard labor are bred for power, while those for journeys or caravans are bred for endurance. For warfare, a mix of traits is usually best, though the ability to easily and rapidly traverse sand is of utmost importance. The riders of these horses primarily function as scouts and messengers, or occasionally as supporting forces for weakened lines. The crucial trait of maneuverability is what allows these horsemen to be so effective and versatile out on the rolling dunes."

View File

@ -1,9 +1,9 @@
#textdomain wesnoth-units
[unit_type]
id=Dune Ranger
name= _ "Dune Ranger"
id=Dune Wayfarer
name= _ "Dune Wayfarer"
race=dunefolk
image="units/dunefolk/ranger.png"
image="units/dunefolk/wayfarer.png"
hitpoints=62
movement_type=dunefoot
movement=6
@ -22,9 +22,9 @@
... Day eleven. I cornered the creature after it landed on the hillside, but there were three more that I was not accounting for. Rocs are ferocious creatures in close quarters; fighting one is already no simple task, but four at once? I am lucky I brought my second axe, otherwise I would have sustained severe injury during that battle. As it is, I am waiting for the gauze to set on my leg before I return to slay the final two. Perhaps then it will finally be time to eat and get some rest.
... it comes as a surprise to even me that I traveled nearly halfway across the Northern Dunes in my twenty-one day expedition. It would take the caravan nearly three months to make that trip, but I do suppose the circumstances around my joruney were somewhat extenuating. On the bright side, I was able to procure some salted roc meat along the way, which should make for a fine treat for the children. It will also be nice to see some of the other Rangers again. My tale might not be that impressive to them, but at least it is an improvement over my previous encounter with the wyvern...”"
... it comes as a surprise to even me that I traveled nearly halfway across the Northern Dunes in my twenty-one day expedition. It would take the caravan nearly three months to make that trip, but I do suppose the circumstances around my joruney were somewhat extenuating. On the bright side, I was able to procure some salted roc meat along the way, which should make for a fine treat for the children. It will also be nice to see some of the other Wayfarers again. My tale might not be that impressive to them, but at least it is an improvement over my previous encounter with the wyvern...”"
die_sound={SOUND_LIST:HUMAN_DIE}
{DEFENSE_ANIM "units/dunefolk/ranger.png" "units/dunefolk/ranger.png" {SOUND_LIST:HUMAN_HIT} }
{DEFENSE_ANIM "units/dunefolk/wayfarer.png" "units/dunefolk/wayfarer.png" {SOUND_LIST:HUMAN_HIT} }
[resistance]
pierce=80
@ -59,7 +59,7 @@
[/filter_attack]
start_time=-200
[frame]
image="units/dunefolk/ranger.png:300"
image="units/dunefolk/wayfarer.png:300"
[/frame]
{SOUND:HIT_AND_MISS axe.ogg {SOUND_LIST:MISS} -50}
[/attack_anim]
@ -75,7 +75,7 @@
image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[frame]
image="units/dunefolk/ranger.png:300"
image="units/dunefolk/wayfarer.png:300"
[/frame]
{SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}
[/attack_anim]

View File

@ -1,9 +1,9 @@
#textdomain wesnoth-units
[unit_type]
id=Dune Windrider
name= _ "Dune Windrider"
id=Dune Windbolt
name= _ "Dune Windbolt"
race=dunefolk
image="units/dunefolk/windrider.png"
image="units/dunefolk/windbolt.png"
hitpoints=52
movement_type=dunehorse
movement=8
@ -14,9 +14,9 @@
{AMLA_DEFAULT}
cost=50
usage=archer
description= _ "Archery on horseback presents a number of additional challenges that very few are able to overcome. What separates the renowned Windrider caste from other bowmen is their ability to not only master these difficulties, but turn them into benefits instead. Making great use of their steeds incredible speed, a Windrider is actually a better archer when mounted as compared to on land. The extra momentum from riding on horseback provides additional force to their already potent shots, and by riding in meandering patterns, these bowmen are able to curve the trajectories of their arrows, reaching targets they might not be able to otherwise. Having honed their craft to its apex, Windriders are undisputed masters of ranged combat among the Dunefolk."
description= _ "Archery on horseback presents a number of additional challenges that very few are able to overcome. What separates the renowned Windbolt caste from other bowmen is their ability to not only master these difficulties, but turn them into benefits instead. Making great use of their steeds great speed, a Windbolt is actually a better archer when mounted as compared to on land. The extra momentum from riding on horseback provides additional force to their already potent shots, and by riding in meandering patterns, these bowmen are able to curve the trajectories of their arrows, reaching targets they might not be able to otherwise. Having honed their craft to its apex, Windbolt are the undisputed masters of ranged combat among the Dunefolk."
die_sound=horse-die.ogg
{DEFENSE_ANIM "units/dunefolk/windrider.png" "units/dunefolk/windrider.png" {SOUND_LIST:HORSE_HIT} }
{DEFENSE_ANIM "units/dunefolk/windbolt.png" "units/dunefolk/windbolt.png" {SOUND_LIST:HORSE_HIT} }
[resistance]
blade=90
@ -48,7 +48,7 @@
start_time=-250
horse_sound_start_time=-250
[frame]
image="units/dunefolk/windrider.png:400"
image="units/dunefolk/windbolt.png:400"
[/frame]
[horse_sound_frame]
sound=horse-canter.wav
@ -67,7 +67,7 @@
image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[frame]
image="units/dunefolk/windrider.png:300"
image="units/dunefolk/windbolt.png:300"
[/frame]
{SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}
[/attack_anim]

View File

@ -1,10 +1,10 @@
#textdomain wesnoth-units
[unit_type]
id=Naga Slasher
name= _ "Naga Slasher"
id=Naga Dirkfang
name= _ "Naga Dirkfang"
race=naga
gender=male
image="units/nagas/slasher.png"
image="units/nagas/dirkfang.png"
profile="portraits/nagas/naga-hunter.png"
hitpoints=31
movement_type=naga
@ -12,12 +12,12 @@
experience=38
level=1
alignment=liminal
advances_to=Naga Bladewhirler,Naga Ringcaster
advances_to=Naga Ophidian,Naga Ringcaster
cost=15
usage=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."
die_sound=naga-die.ogg
{DEFENSE_ANIM "units/nagas/slasher.png" "units/nagas/slasher.png" {SOUND_LIST:NAGA_HIT} }
{DEFENSE_ANIM "units/nagas/dirkfang.png" "units/nagas/dirkfang.png" {SOUND_LIST:NAGA_HIT} }
[attack]
name=dagger
@ -44,7 +44,7 @@
[/filter_attack]
start_time=-200
[frame]
image="units/nagas/slasher.png:300"
image="units/nagas/dirkfang.png:300"
[/frame]
{SOUND:HIT_AND_MISS dagger-swish.wav dagger-swish.wav -150}
[/attack_anim]
@ -63,7 +63,7 @@
offset=0~0.8
[/missile_frame]
[frame]
image="units/nagas/slasher.png:300"
image="units/nagas/dirkfang.png:300"
sound=bow.ogg
[/frame]
[/if]
@ -75,7 +75,7 @@
image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[frame]
image="units/nagas/slasher.png:300"
image="units/nagas/dirkfang.png:300"
sound=bow-miss.ogg
[/frame]
[/else]

View File

@ -1,10 +1,10 @@
#textdomain wesnoth-units
[unit_type]
id=Naga Bladewhirler
name= _ "Naga Bladewhirler"
id=Naga Ophidian
name= _ "Naga Ophidian"
race=naga
gender=male
image="units/nagas/bladewhirler.png"
image="units/nagas/ophidian.png"
profile="portraits/nagas/naga-hunter.png"
hitpoints=46
movement_type=naga
@ -15,9 +15,9 @@
advances_to=Naga Dervish
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. Bladewhirlers, 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. 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."
die_sound=naga-die.ogg
{DEFENSE_ANIM "units/nagas/bladewhirler.png" "units/nagas/bladewhirler.png" {SOUND_LIST:NAGA_HIT} }
{DEFENSE_ANIM "units/nagas/ophidian.png" "units/nagas/ophidian.png" {SOUND_LIST:NAGA_HIT} }
[defense]
flat=60
sand=50
@ -48,7 +48,7 @@
[/filter_attack]
start_time=-200
[frame]
image="units/nagas/bladewhirler.png:300"
image="units/nagas/ophidian.png:300"
[/frame]
{SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -150}
[/attack_anim]
@ -67,7 +67,7 @@
offset=0~0.8
[/missile_frame]
[frame]
image="units/nagas/bladewhirler.png:300"
image="units/nagas/ophidian.png:300"
sound=bow.ogg
[/frame]
[/if]
@ -79,7 +79,7 @@
image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[frame]
image="units/nagas/bladewhirler.png:300"
image="units/nagas/ophidian.png:300"
sound=bow-miss.ogg
[/frame]
[/else]

View File

@ -4,9 +4,9 @@
name= _"Dunefolk"
image="units/dunefolk/ranger.png"
type=random
leader=Dune Blademaster,Dune Spearmaster,Dune Warmaster,Dune Ranger,Dune Luminary,Dune Firetrooper
random_leader=Dune Blademaster,Dune Spearmaster,Dune Warmaster,Dune Ranger,Dune Luminary,Dune Firetrooper
recruit=Dune Rover,Dune Soldier,Dune Rider,Dune Herbalist,Dune Burner,Dune Swordsman,Dune Captain,Dune Spearguard,Dune Apothecary,Dune Skirmisher,Dune Strider,Dune Explorer,Dune Sunderer,Dune Raider,Dune Swiftrider,Dune Scorcher,Dune Alchemist,Naga Slasher,Naga Bladewhirler,Naga Ringcaster
leader=Dune Blademaster,Dune Spearmaster,Dune Warmaster,Dune Wayfarer,Dune Luminary,Dune Firetrooper
random_leader=Dune Blademaster,Dune Spearmaster,Dune Warmaster,Dune Wayfarer,Dune Luminary,Dune Firetrooper
recruit=Dune Rover,Dune Soldier,Dune Rider,Dune Herbalist,Dune Burner,Dune Swordsman,Dune Captain,Dune Spearguard,Dune Apothecary,Dune Skirmisher,Dune Strider,Dune Explorer,Dune Sunderer,Dune Raider,Dune Horse Archer,Dune Scorcher,Dune Alchemist,Naga Dirkfang,Naga Ophidian,Naga Ringcaster
terrain_liked=Ss, Hh, Ha, Ww
# wmllint: markcheck off
description="<img>src='portraits/dunefolk/herbalist.png~BG()' align='middle'</img>

View File

@ -6,7 +6,7 @@
type=random
leader=Dune Explorer,Dune Swordsman,Dune Spearguard,Dune Scorcher,Dune Apothecary
random_leader=Dune Explorer,Dune Swordsman,Dune Spearguard,Dune Scorcher,Dune Apothecary
recruit=Dune Rover,Dune Soldier,Dune Skirmisher,Dune Rider,Dune Herbalist,Dune Burner,Naga Slasher
recruit=Dune Rover,Dune Soldier,Dune Skirmisher,Dune Rider,Dune Herbalist,Dune Burner,Naga Dirkfang
terrain_liked=Ss, Hh, Ha, Ww
# wmllint: markcheck off
description="<img>src='portraits/dunefolk/herbalist.png~BG()' align='middle'</img>

View File

@ -1307,9 +1307,9 @@ victory_when_enemies_defeated=yes
[unit]
canrecruit=no
extra_recruit=""
id="Dune Ranger-80"
id="Dune Wayfarer-80"
name="Yushiyadr al"
type="Dune Ranger"
type="Dune Wayfarer"
unrenamable=no
x=4
y=32
@ -1362,9 +1362,9 @@ victory_when_enemies_defeated=yes
[unit]
canrecruit=no
extra_recruit=""
id="Dune Swiftrider-85"
id="Dune Horse Archer-85"
name="Abdul-Allahi"
type="Dune Swiftrider"
type="Dune Horse Archer"
unrenamable=no
x=28
y=34

View File

@ -874,12 +874,12 @@ linechanges = (
# renamed dunefolk units
# images
("units/dunefolk/arif.png", "units/dunefolk/soldier.png"),
("units/dunefolk/batal.png", "units/dunefolk/ranger.png"),
("units/dunefolk/batal.png", "units/dunefolk/wayfarer.png"),
("units/dunefolk/faris.png", "units/dunefolk/sunderer.png"),
("units/dunefolk/ghazi.png", "units/dunefolk/swordsman.png"),
("units/dunefolk/hadaf.png", "units/dunefolk/marauder.png"),
("units/dunefolk/hakim.png", "units/dunefolk/herbalist.png"),
("units/dunefolk/jawal.png", "units/dunefolk/windrider.png"),
("units/dunefolk/jawal.png", "units/dunefolk/windbolt.png"),
("units/dunefolk/jundi.png", "units/dunefolk/rover.png"),
("units/dunefolk/khaiyal.png", "units/dunefolk/piercer.png"),
("units/dunefolk/khalid.png", "units/dunefolk/warmaster.png"),
@ -893,12 +893,19 @@ linechanges = (
("units/dunefolk/qatif-al-nar.png", "units/dunefolk/scorcher.png"),
("units/dunefolk/rami.png", "units/dunefolk/rider.png"),
("units/dunefolk/rasikh.png", "units/dunefolk/spearmaster.png"),
("units/dunefolk/saree.png", "units/dunefolk/swiftrider.png"),
("units/dunefolk/saree.png", "units/dunefolk/horse-archer.png"),
("units/dunefolk/shuja.png", "units/dunefolk/blademaster.png"),
("units/dunefolk/tabib.png", "units/dunefolk/apothecary.png"),
("units/dunefolk/tineen.png", "units/dunefolk/firetrooper.png"),
("images/portraits/dunefolk/hakim.png", "images/portraits/dunefolk/herbalist.png"),
# second round of renaming
("units/dunefolk/ranger.png", "units/dunefolk/wayfarer.png"),
("units/dunefolk/windrider.png", "units/dunefolk/windbolt.png"),
("units/dunefolk/swiftrider.png", "units/dunefolk/horse-archer.png"),
("units/nagas/slasher.png", "units/nagas/dirkfang.png"),
("units/nagas/bladewhirler.png", "units/nagas/ophidian.png"),
# unit ids
("Arif", "Dune Soldier"),
("Ghazi", "Dune Swordsman"),
@ -912,7 +919,7 @@ linechanges = (
("Monawish", "Dune Skirmisher"),
("Mighwar", "Dune Harrier"),
("Muharib", "Dune Explorer"),
("Batal", "Dune Ranger"),
("Batal", "Dune Wayfarer"),
("Khaiyal", "Dune Piercer"),
("Faris", "Dune Sunderer"),
("Mufariq", "Dune Cataphract"),
@ -923,8 +930,15 @@ linechanges = (
("Qatif_al_nar", "Dune Scorcher"),
("Tineen", "Dune Firetrooper"),
("Rami", "Dune Rider"),
("Saree", "Dune Swiftrider"),
("Jawal", "Dune Windrider"),
("Saree", "Dune Horse Archer"),
("Jawal", "Dune Windbolt"),
# second round of renaming
("Dune Ranger", "Dune Wayfarer"),
("Dune Swiftrider", "Dune Horse Archer"),
("Dune Windrider", "Dune Windbolt"),
("Naga Slasher", "Naga Dirkfang"),
("Naga Bladewhirler", "Naga Ophidian"),
# Changed in 1.15.0: separate portrait for leader
("portraits/orcs/leader.png", "portraits/orcs/ruler.png"),