diff --git a/data/campaigns/Dead_Water/units/Brawler.cfg b/data/campaigns/Dead_Water/units/Brawler.cfg index ef1def40d6b1..6905eb2c513a 100644 --- a/data/campaigns/Dead_Water/units/Brawler.cfg +++ b/data/campaigns/Dead_Water/units/Brawler.cfg @@ -14,7 +14,8 @@ alignment=lawful cost=19 usage=fighter - description= _ "Exceptionally large and strong mermen are sometimes more comfortable with their own fists and tails than with other weapons."+{SPECIAL_NOTES}+{SPECIAL_NOTES_STUN} + description= _ "Exceptionally large and strong mermen are sometimes more comfortable with their own fists and tails than with other weapons." + {NOTE_STUN} die_sound=mermen-die.ogg {DEFENSE_ANIM "units/merfolk/brawler-defend.png" "units/merfolk/brawler-defend.png" mermen-hit.wav } [attack] diff --git a/data/campaigns/Dead_Water/units/Kraken.cfg b/data/campaigns/Dead_Water/units/Kraken.cfg index 85632de9d9c1..b83ac1ee9ff2 100644 --- a/data/campaigns/Dead_Water/units/Kraken.cfg +++ b/data/campaigns/Dead_Water/units/Kraken.cfg @@ -21,7 +21,9 @@ cost=62 undead_variation=swimmer usage=fighter - description= _ "Krakens are gigantic creatures of the seas. They can grab their opponents with strong tentacles, or spit a poisonous black ink from a distance. The best way to survive an encounter with these monsters is to remain ashore."+{SPECIAL_NOTES}+{SPECIAL_NOTES_POISON}+{SPECIAL_NOTES_SWARM} + description= _ "Krakens are gigantic creatures of the seas. They can grab their opponents with strong tentacles, or spit a poisonous black ink from a distance. The best way to survive an encounter with these monsters is to remain ashore." + {NOTE_POISON} + {NOTE_SWARM} die_sound=water-blast.wav {DEFENSE_ANIM_DIRECTIONAL_RANGE "units/monsters/kraken-defend.png" "units/monsters/kraken.png" "units/monsters/kraken-n-defend.png" "units/monsters/kraken-n-tentacle-1.png" squishy-hit.wav melee} {DEFENSE_ANIM_DIRECTIONAL_RANGE "units/monsters/kraken-defend.png" "units/monsters/kraken.png" "units/monsters/kraken-defend.png" "units/monsters/kraken.png" squishy-hit.wav ranged} diff --git a/data/campaigns/Dead_Water/units/Soldier_King.cfg b/data/campaigns/Dead_Water/units/Soldier_King.cfg index 69c75f6919a8..b103bd98bda0 100644 --- a/data/campaigns/Dead_Water/units/Soldier_King.cfg +++ b/data/campaigns/Dead_Water/units/Soldier_King.cfg @@ -17,7 +17,8 @@ [abilities] {ABILITY_LEADERSHIP} [/abilities] - description= _ "A king who is skilled at combat commands great respect — especially among soldiers. His strength allows him to wield powerful weapons and move quickly, even with heavy armor. His leadership abilities inspire his troops."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "A king who is skilled at combat commands great respect — especially among soldiers. His strength allows him to wield powerful weapons and move quickly, even with heavy armor. His leadership abilities inspire his troops." + {NOTE_LEADERSHIP} die_sound=mermen-die.ogg {DEFENSE_ANIM "units/merfolk/soldier_king.png" "units/merfolk/soldier_king.png" mermen-hit.wav } [resistance] diff --git a/data/campaigns/Dead_Water/units/Warrior_King.cfg b/data/campaigns/Dead_Water/units/Warrior_King.cfg index 2803f37c6b1b..fa9219deffe9 100644 --- a/data/campaigns/Dead_Water/units/Warrior_King.cfg +++ b/data/campaigns/Dead_Water/units/Warrior_King.cfg @@ -17,7 +17,8 @@ [abilities] {ABILITY_LEADERSHIP} [/abilities] - description= _ "Warrior kings often become legendary in their own time. Their skill and strength allows them to be truly formidable in battle. They are also fast despite their heavy armor. Even skilled soldiers look upon them with awe."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "Warrior kings often become legendary in their own time. Their skill and strength allows them to be truly formidable in battle. They are also fast despite their heavy armor. Even skilled soldiers look upon them with awe." + {NOTE_LEADERSHIP} die_sound=mermen-die.ogg {DEFENSE_ANIM "units/merfolk/warrior_king.png" "units/merfolk/warrior_king.png" mermen-hit.wav } [resistance] diff --git a/data/campaigns/Dead_Water/units/Young_King.cfg b/data/campaigns/Dead_Water/units/Young_King.cfg index d89649d30b5a..3fdd85a3fd4e 100644 --- a/data/campaigns/Dead_Water/units/Young_King.cfg +++ b/data/campaigns/Dead_Water/units/Young_King.cfg @@ -17,7 +17,8 @@ [abilities] {ABILITY_LEADERSHIP} [/abilities] - description= _ "A young king with some battle experience will be treated with some respect. Common citizens will be inspired to do their utmost when the king is nearby, but battle-hardened veterens will be less impressed."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "A young king with some battle experience will be treated with some respect. Common citizens will be inspired to do their utmost when the king is nearby, but battle-hardened veterens will be less impressed." + {NOTE_LEADERSHIP} die_sound=mermen-die.ogg {DEFENSE_ANIM "units/merfolk/young_king.png" "units/merfolk/young_king.png" mermen-hit.wav } [attack] diff --git a/data/campaigns/Dead_Water/utils/specials.cfg b/data/campaigns/Dead_Water/utils/specials.cfg index ba34659beaa9..34b4060ea2ee 100644 --- a/data/campaigns/Dead_Water/utils/specials.cfg +++ b/data/campaigns/Dead_Water/utils/specials.cfg @@ -1,8 +1,10 @@ #textdomain wesnoth-dw -#define SPECIAL_NOTES_STUN -_ " -• This unit is able to stun its enemies, disrupting their zones of control."#enddef +#define NOTE_STUN +[special_note] + note=_ "This unit is able to stun its enemies, disrupting their zones of control." +[/special_note] +#enddef #define WEAPON_SPECIAL_STUN [damage] diff --git a/data/campaigns/Delfadors_Memoirs/units/Journeyman_Mage.cfg b/data/campaigns/Delfadors_Memoirs/units/Journeyman_Mage.cfg index 39e21b16886e..4b99383d7f72 100644 --- a/data/campaigns/Delfadors_Memoirs/units/Journeyman_Mage.cfg +++ b/data/campaigns/Delfadors_Memoirs/units/Journeyman_Mage.cfg @@ -9,5 +9,6 @@ alignment=neutral # Rather than lawful cost=25 # A little more expensive advances_to=Mage Leader - description=_"A mage who has just finished his apprenticeship is known as a journeyman. Journeyman mages travel far in search of employment and experience."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL} + description=_"A mage who has just finished his apprenticeship is known as a journeyman. Journeyman mages travel far in search of employment and experience." + {NOTE_MAGICAL} [/unit_type] diff --git a/data/campaigns/Delfadors_Memoirs/units/King_of_Wesnoth.cfg b/data/campaigns/Delfadors_Memoirs/units/King_of_Wesnoth.cfg index b09aafdaf13a..f164031cc456 100644 --- a/data/campaigns/Delfadors_Memoirs/units/King_of_Wesnoth.cfg +++ b/data/campaigns/Delfadors_Memoirs/units/King_of_Wesnoth.cfg @@ -12,5 +12,6 @@ experience=250 level=5 cost=200 - description=_"Under the feudal system, all authority ultimately rested with the sovereign. His lords held their property only with his agreement, and had to pay him tribute. In return, the king would defend the realm against invaders, and redistribute wealth in times of need."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP} + description=_"Under the feudal system, all authority ultimately rested with the sovereign. His lords held their property only with his agreement, and had to pay him tribute. In return, the king would defend the realm against invaders, and redistribute wealth in times of need." + {NOTE_LEADERSHIP} [/unit_type] diff --git a/data/campaigns/Delfadors_Memoirs/units/Mage_Commander.cfg b/data/campaigns/Delfadors_Memoirs/units/Mage_Commander.cfg index e7957182a31e..bf451022ed9f 100644 --- a/data/campaigns/Delfadors_Memoirs/units/Mage_Commander.cfg +++ b/data/campaigns/Delfadors_Memoirs/units/Mage_Commander.cfg @@ -13,7 +13,10 @@ movement=6 # A little faster advances_to=Mage Magister cost=100 # A lot more expensive - description=_"This mage has gained much experience leading others into battle. As a result, level 1 and 2 units fight more effectively when they are adjacent to him. He also has the power to heal others during combat."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_HEALS} + description=_"This mage has gained much experience leading others into battle. As a result, level 1 and 2 units fight more effectively when they are adjacent to him. He also has the power to heal others during combat." + {NOTE_MAGICAL} + {NOTE_LEADERSHIP} + {NOTE_HEALS} [attack] icon=attacks/staff-magic.png name=staff diff --git a/data/campaigns/Delfadors_Memoirs/units/Mage_Leader.cfg b/data/campaigns/Delfadors_Memoirs/units/Mage_Leader.cfg index a670bd31d45f..7623e7f2e966 100644 --- a/data/campaigns/Delfadors_Memoirs/units/Mage_Leader.cfg +++ b/data/campaigns/Delfadors_Memoirs/units/Mage_Leader.cfg @@ -12,7 +12,9 @@ experience=100 # Same as base unit advances_to=Mage Commander cost=60 # Considerably more expensive - description=_"This mage has gained some experience leading others into battle. As a result, level 1 units fight more effectively when they are adjacent to him." +{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_LEADERSHIP} + description=_"This mage has gained some experience leading others into battle. As a result, level 1 units fight more effectively when they are adjacent to him." + {NOTE_MAGICAL} + {NOTE_LEADERSHIP} [attack] name=staff #textdomain wesnoth-units diff --git a/data/campaigns/Delfadors_Memoirs/units/Mage_Magister.cfg b/data/campaigns/Delfadors_Memoirs/units/Mage_Magister.cfg index 38c06e5ba128..4c19f55f0c69 100644 --- a/data/campaigns/Delfadors_Memoirs/units/Mage_Magister.cfg +++ b/data/campaigns/Delfadors_Memoirs/units/Mage_Magister.cfg @@ -15,7 +15,10 @@ [/resistance] movement=6 # A little faster cost=125 # Rather more expensive - description=_"A Mage Magister, though equivalent in degree to a Great Mage, has special abilities of command and healing derived from extensive experience of battle."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_HEALS} + description=_"A Mage Magister, though equivalent in degree to a Great Mage, has special abilities of command and healing derived from extensive experience of battle." + {NOTE_MAGICAL} + {NOTE_LEADERSHIP} + {NOTE_HEALS} [attack] icon=attacks/staff-magic.png name=staff diff --git a/data/campaigns/Descent_Into_Darkness/units/Apprentice_Mage.cfg b/data/campaigns/Descent_Into_Darkness/units/Apprentice_Mage.cfg index b4bbad1dedd8..b96544209e99 100644 --- a/data/campaigns/Descent_Into_Darkness/units/Apprentice_Mage.cfg +++ b/data/campaigns/Descent_Into_Darkness/units/Apprentice_Mage.cfg @@ -14,7 +14,8 @@ advances_to=Apprentice Necromancer cost=15 usage=mixed fighter - description=_ "Trained in swordsmanship as a boy and the magical arts as a young man, Malin Keshar is talented at both but an expert in neither. Although not as powerful as other fighters in direct combat, Malin’s sharp wit often allows him to outsmart his foes without putting himself in much danger."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL} + description=_ "Trained in swordsmanship as a boy and the magical arts as a young man, Malin Keshar is talented at both but an expert in neither. Although not as powerful as other fighters in direct combat, Malin’s sharp wit often allows him to outsmart his foes without putting himself in much danger." + {NOTE_MAGICAL} {DEFENSE_ANIM "units/apprentice-mage-defend.png" "units/apprentice-mage-sword.png" {SOUND_LIST:HUMAN_HIT} } die_sound={SOUND_LIST:HUMAN_DIE} [attack] diff --git a/data/campaigns/Descent_Into_Darkness/units/Apprentice_Necromancer.cfg b/data/campaigns/Descent_Into_Darkness/units/Apprentice_Necromancer.cfg index 78b206aa545a..06880229593b 100644 --- a/data/campaigns/Descent_Into_Darkness/units/Apprentice_Necromancer.cfg +++ b/data/campaigns/Descent_Into_Darkness/units/Apprentice_Necromancer.cfg @@ -13,7 +13,9 @@ advances_to=Dark Mage gender=male usage=mixed fighter - description=_ "Under Darken Volk’s tutelage, Malin has become adept at wielding necromancy both as a tool to raise an army of undead, and as a means to increase his own, personal power. Malin’s focus on improving his magical prowess has left little time for him to improve his swordsmanship, but he still holds on to his short sword as his melee weapon of choice."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_ARCANE} + description=_ "Under Darken Volk’s tutelage, Malin has become adept at wielding necromancy both as a tool to raise an army of undead, and as a means to increase his own, personal power. Malin’s focus on improving his magical prowess has left little time for him to improve his swordsmanship, but he still holds on to his short sword as his melee weapon of choice." + {NOTE_MAGICAL} + {NOTE_ARCANE} {DEFENSE_ANIM "units/apprentice-necromancer-defend.png" "units/apprentice-necromancer.png" {SOUND_LIST:HUMAN_HIT} } die_sound={SOUND_LIST:HUMAN_DIE} [attack] diff --git a/data/campaigns/Descent_Into_Darkness/units/Dark_Mage.cfg b/data/campaigns/Descent_Into_Darkness/units/Dark_Mage.cfg index e30da639ac84..20dd3f1ec701 100644 --- a/data/campaigns/Descent_Into_Darkness/units/Dark_Mage.cfg +++ b/data/campaigns/Descent_Into_Darkness/units/Dark_Mage.cfg @@ -14,7 +14,9 @@ {AMLA_DEFAULT} cost=50 usage=mixed fighter - description= _ "Although Malin’s sword has grown rusty from lack of proper care, he continues to use it for melee combat, perhaps more as a keepsake than an effective weapon. His increasing skill with magic, however, is more than enough to compensate."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_ARCANE} + description= _ "Although Malin’s sword has grown rusty from lack of proper care, he continues to use it for melee combat, perhaps more as a keepsake than an effective weapon. His increasing skill with magic, however, is more than enough to compensate." + {NOTE_MAGICAL} + {NOTE_ARCANE} die_sound={SOUND_LIST:HUMAN_DIE} {DEFENSE_ANIM "units/dark-mage-defend.png" "units/dark-mage.png" {SOUND_LIST:HUMAN_HIT} } [attack] diff --git a/data/campaigns/Descent_Into_Darkness/units/Frontier_Baroness.cfg b/data/campaigns/Descent_Into_Darkness/units/Frontier_Baroness.cfg index 53e4da7a1a16..e4cd73a7d4fe 100644 --- a/data/campaigns/Descent_Into_Darkness/units/Frontier_Baroness.cfg +++ b/data/campaigns/Descent_Into_Darkness/units/Frontier_Baroness.cfg @@ -20,7 +20,8 @@ {ABILITY_SKIRMISHER} [/abilities] usage=mixed fighter - description= _ "At Wesnoth’s frontiers, all able-bodied men and women must be able to defend their homes in times of need. Men are most often trained in the use of sword or bow and are used as soldiers who withstand the brunt of orcish assaults to hold the raiders at bay. Women, instead, learn to use the staff and sling and are most effective as scouts and ambushers. The most proficient are powerful skirmishers and are highly adept at reconnaissance, allowing them to often outmaneuver and entrap orcish raiders."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SKIRMISHER} + description= _ "At Wesnoth’s frontiers, all able-bodied men and women must be able to defend their homes in times of need. Men are most often trained in the use of sword or bow and are used as soldiers who withstand the brunt of orcish assaults to hold the raiders at bay. Women, instead, learn to use the staff and sling and are most effective as scouts and ambushers. The most proficient are powerful skirmishers and are highly adept at reconnaissance, allowing them to often outmaneuver and entrap orcish raiders." + {NOTE_SKIRMISHER} die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [defend] hits=miss diff --git a/data/campaigns/Eastern_Invasion/units/Bone_Knight.cfg b/data/campaigns/Eastern_Invasion/units/Bone_Knight.cfg index ef629c0261c6..7ab037e92b48 100644 --- a/data/campaigns/Eastern_Invasion/units/Bone_Knight.cfg +++ b/data/campaigns/Eastern_Invasion/units/Bone_Knight.cfg @@ -24,7 +24,8 @@ {AMLA_DEFAULT} cost=35 usage=scout - description= _ "Once great warriors across the plains, these mounted riders atop their skeletal horses were raised from the ground by unholy magic to spread fear and destruction."+{SPECIAL_NOTES}+{SPECIAL_NOTES_CHARGE} + description= _ "Once great warriors across the plains, these mounted riders atop their skeletal horses were raised from the ground by unholy magic to spread fear and destruction." + {NOTE_CHARGE} die_sound=skeleton-big-die.ogg [attack] name=axe diff --git a/data/campaigns/Eastern_Invasion/units/Skeleton_Rider.cfg b/data/campaigns/Eastern_Invasion/units/Skeleton_Rider.cfg index 73a0b7d82ffb..f4df6b819104 100644 --- a/data/campaigns/Eastern_Invasion/units/Skeleton_Rider.cfg +++ b/data/campaigns/Eastern_Invasion/units/Skeleton_Rider.cfg @@ -30,7 +30,8 @@ advances_to=Bone Knight cost=19 usage=scout - description= _ "Once great warriors thundering across the plains, these mounted riders atop their skeletal horses were raised from the grave by unholy magic to spread fear and destruction."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SUBMERGE} + description= _ "Once great warriors thundering across the plains, these mounted riders atop their skeletal horses were raised from the grave by unholy magic to spread fear and destruction." + {NOTE_SUBMERGE} die_sound={SOUND_LIST:SKELETON_DIE} [abilities] {ABILITY_SUBMERGE} diff --git a/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg b/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg index 701901259b71..546aa3788f46 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg @@ -25,7 +25,9 @@ {ABILITY_INITIATIVE} [/abilities] usage=fighter - description= _ "A noble by birth, the Princess has learnt swordplay with the greatest generals and battle tactics with the greatest sages, making her both a great combatant and a leader. Now battle-hardened and strong of will, she can aid those around her in the art of combat."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_INITIATIVE} + description= _ "A noble by birth, the Princess has learnt swordplay with the greatest generals and battle tactics with the greatest sages, making her both a great combatant and a leader. Now battle-hardened and strong of will, she can aid those around her in the art of combat." + {NOTE_LEADERSHIP} + {NOTE_INITIATIVE} die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [attack] name=sword @@ -120,7 +122,10 @@ {ABILITY_INITIATIVE} [/abilities] usage=fighter - description= _ "A noble by birth, the Princess has learnt swordplay with the greatest generals and battle tactics with the greatest sages, making her both a great combatant and a leader. Now battle-hardened and strong of will, she can aid those around her in the art of combat."{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_INITIATIVE}+{SPECIAL_NOTES_MAGICAL} + description= _ "A noble by birth, the Princess has learnt swordplay with the greatest generals and battle tactics with the greatest sages, making her both a great combatant and a leader. Now battle-hardened and strong of will, she can aid those around her in the art of combat."{SPECIAL_NOTES} + {NOTE_LEADERSHIP} + {NOTE_INITIATIVE} + {NOTE_MAGICAL} die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [attack] name=sword diff --git a/data/campaigns/Heir_To_The_Throne/units/Commander.cfg b/data/campaigns/Heir_To_The_Throne/units/Commander.cfg index 2d440c042c1e..9dc22ed49bc2 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Commander.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Commander.cfg @@ -92,7 +92,8 @@ image="units/konrad-commander-leading.png:300" [/frame] [/leading_anim] - description= _ "The rank of Commander is held by those who lead battle groups into combat. Possessing leadership skills, they give lower-level units in adjacent hexes improved performance in combat. Commanders are best skilled with the sword, although they also carry a bow to use when necessary. If the Commander is lost, so is the battle."{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "The rank of Commander is held by those who lead battle groups into combat. Possessing leadership skills, they give lower-level units in adjacent hexes improved performance in combat. Commanders are best skilled with the sword, although they also carry a bow to use when necessary. If the Commander is lost, so is the battle."{SPECIAL_NOTES} + {NOTE_LEADERSHIP} {DEFENSE_ANIM_RANGE "units/konrad-commander-bow-defend.png" "units/konrad-commander-bow.png" {SOUND_LIST:HUMAN_HIT} ranged} [variation] @@ -101,7 +102,9 @@ hide_help=yes cost=60 {LEADING_ANIM "units/konrad-commander-scepter-leading.png" "units/konrad-commander-scepter.png" 17,-22} - description= _ "The rank of Commander is held by those who lead battle groups into combat. Possessing leadership skills, they give lower-level units in adjacent hexes improved performance in combat. Commanders are best skilled with the sword, although they also carry a bow to use when necessary. If the Commander is lost, so is the battle."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_MAGICAL} + description= _ "The rank of Commander is held by those who lead battle groups into combat. Possessing leadership skills, they give lower-level units in adjacent hexes improved performance in combat. Commanders are best skilled with the sword, although they also carry a bow to use when necessary. If the Commander is lost, so is the battle." + {NOTE_LEADERSHIP} + {NOTE_MAGICAL} [attack] name=sceptre of fire # the sceptre of fire always has the 're' writing, this is intentional! diff --git a/data/campaigns/Heir_To_The_Throne/units/Dark_Queen.cfg b/data/campaigns/Heir_To_The_Throne/units/Dark_Queen.cfg index 9c73e30b2fa9..3d301f0d22cd 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Dark_Queen.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Dark_Queen.cfg @@ -16,7 +16,8 @@ {AMLA_DEFAULT} cost=35 usage=fighter - description= _ "The evil queen Asheviere has terrorized Wesnoth for many years. Her knowledge of magic makes her a worthy foe in combat, although her power is mostly derived from those she commands."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL} + description= _ "The evil queen Asheviere has terrorized Wesnoth for many years. Her knowledge of magic makes her a worthy foe in combat, although her power is mostly derived from those she commands." + {NOTE_MAGICAL} die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} {DEFENSE_ANIM "units/human-queen-defend2.png" "units/human-queen-defend1.png" {SOUND_LIST:HUMAN_FEMALE_HIT} } [attack] diff --git a/data/campaigns/Heir_To_The_Throne/units/Fighter.cfg b/data/campaigns/Heir_To_The_Throne/units/Fighter.cfg index b5830f0dcf24..662d7185fd5b 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Fighter.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Fighter.cfg @@ -57,7 +57,8 @@ variation_id=sceptre hide_help=yes cost=38 - description= _ "Young and brash, Fighters attack with a sword, and are vulnerable to more seasoned enemies. However, they have the potential to become great warriors one day."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL} + description= _ "Young and brash, Fighters attack with a sword, and are vulnerable to more seasoned enemies. However, they have the potential to become great warriors one day." + {NOTE_MAGICAL} [attack] name=sceptre of fire # the sceptre of fire always has the 're' writing, this is intentional! diff --git a/data/campaigns/Heir_To_The_Throne/units/Lord.cfg b/data/campaigns/Heir_To_The_Throne/units/Lord.cfg index a04f32acc22a..9f2fb7b50713 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Lord.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Lord.cfg @@ -106,7 +106,8 @@ image="units/konrad-lord-leading.png:300" [/frame] [/leading_anim] - description= _ "The noble leaders of many troops, Lords are especially strong in melee combat, and also possess skill with the bow. Like Commanders, Lords possess leadership skills, and improve the fighting ability of all adjacent lower-level units."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "The noble leaders of many troops, Lords are especially strong in melee combat, and also possess skill with the bow. Like Commanders, Lords possess leadership skills, and improve the fighting ability of all adjacent lower-level units." + {NOTE_LEADERSHIP} {DEFENSE_ANIM_RANGE "units/konrad-lord-bow-defend.png" "units/konrad-lord-bow.png" {SOUND_LIST:HUMAN_HIT} ranged} [variation] {HTTT_LORD -scepter} @@ -114,7 +115,9 @@ hide_help=yes cost=85 {LEADING_ANIM "units/konrad-lord-scepter-leading.png" "units/konrad-lord-scepter.png" -16,-21} - description= _ "The noble leaders of many troops, Lords are especially strong in melee combat, and also possess skill with the bow. Like Commanders, Lords possess leadership skills, and improve the fighting ability of all adjacent lower-level units."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_MAGICAL} + description= _ "The noble leaders of many troops, Lords are especially strong in melee combat, and also possess skill with the bow. Like Commanders, Lords possess leadership skills, and improve the fighting ability of all adjacent lower-level units." + {NOTE_LEADERSHIP} + {NOTE_MAGICAL} {DEFENSE_ANIM_FILTERED "units/konrad-lord-scepter-defend.png" "units/konrad-lord-scepter.png" {SOUND_LIST:HUMAN_HIT} ( [filter_second_attack] name=sceptre of fire diff --git a/data/campaigns/Heir_To_The_Throne/units/Princess.cfg b/data/campaigns/Heir_To_The_Throne/units/Princess.cfg index 8b86f9aac02c..9ffefbfd7814 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Princess.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Princess.cfg @@ -25,7 +25,9 @@ {ABILITY_INITIATIVE} [/abilities] usage=fighter - description= _ "A noble by birth, the Princess has learnt swordplay with the greatest generals and battle tactics with the greatest sages, making her both a great combatant and a leader. The units of lower level around the Princess will fight better due to her presence."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_INITIATIVE} + description= _ "A noble by birth, the Princess has learnt swordplay with the greatest generals and battle tactics with the greatest sages, making her both a great combatant and a leader. The units of lower level around the Princess will fight better due to her presence." + {NOTE_LEADERSHIP} + {NOTE_INITIATIVE} die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [attack] name=sword @@ -80,7 +82,10 @@ {ABILITY_INITIATIVE} [/abilities] usage=fighter - description= _ "A noble by birth, the Princess has learnt swordplay with the greatest generals and battle tactics with the greatest sages, making her both a great combatant and a leader. The units of lower level around the Princess will fight better due to her presence."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_INITIATIVE}+{SPECIAL_NOTES_MAGICAL} + description= _ "A noble by birth, the Princess has learnt swordplay with the greatest generals and battle tactics with the greatest sages, making her both a great combatant and a leader. The units of lower level around the Princess will fight better due to her presence." + {NOTE_LEADERSHIP} + {NOTE_INITIATIVE} + {NOTE_MAGICAL} die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [attack] name=sword diff --git a/data/campaigns/Heir_To_The_Throne/utils/abilities.cfg b/data/campaigns/Heir_To_The_Throne/utils/abilities.cfg index e57359b8f37f..f1ab13251ab4 100644 --- a/data/campaigns/Heir_To_The_Throne/utils/abilities.cfg +++ b/data/campaigns/Heir_To_The_Throne/utils/abilities.cfg @@ -14,6 +14,8 @@ [/firststrike] #enddef -#define SPECIAL_NOTES_INITIATIVE -_" -• This unit's grasp of melee tactics allows adjacent allies to strike the first blow even when defending."#enddef +#define NOTE_INITIATIVE +[special_note] + note=_"This unit's grasp of melee tactics allows adjacent allies to strike the first blow even when defending." +[/special_note] +#enddef diff --git a/data/campaigns/Liberty/units/Bone_Knight.cfg b/data/campaigns/Liberty/units/Bone_Knight.cfg index 67311ef752a6..73aa50925b0f 100644 --- a/data/campaigns/Liberty/units/Bone_Knight.cfg +++ b/data/campaigns/Liberty/units/Bone_Knight.cfg @@ -24,7 +24,8 @@ {AMLA_DEFAULT} cost=35 usage=scout - description= _ "Once great warriors across the plains, these mounted riders atop their skeletal horses were raised from the ground by unholy magic to spread fear and destruction."+{SPECIAL_NOTES}+{SPECIAL_NOTES_CHARGE} + description= _ "Once great warriors across the plains, these mounted riders atop their skeletal horses were raised from the ground by unholy magic to spread fear and destruction." + {NOTE_CHARGE} die_sound=skeleton-big-die.ogg [attack] name=axe diff --git a/data/campaigns/Liberty/units/Death_Squire.cfg b/data/campaigns/Liberty/units/Death_Squire.cfg index d54ef888798b..169d046fa6bc 100644 --- a/data/campaigns/Liberty/units/Death_Squire.cfg +++ b/data/campaigns/Liberty/units/Death_Squire.cfg @@ -23,7 +23,9 @@ {ABILITY_SUBMERGE} [/abilities] usage=fighter - description= _ "Sometimes the mightiest warriors and generals, cursed with hate and angst, came back to this world as Death Knights. Death Squires serve them whilst accruing enough unholy power to become Death Knights. In the process they pick up a good deal of the Knight’s power, including the ability to command underlings."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_SUBMERGE} + description= _ "Sometimes the mightiest warriors and generals, cursed with hate and angst, came back to this world as Death Knights. Death Squires serve them whilst accruing enough unholy power to become Death Knights. In the process they pick up a good deal of the Knight’s power, including the ability to command underlings." + {NOTE_LEADERSHIP} + {NOTE_SUBMERGE} {DEFENSE_ANIM "units/undead-skeletal/deathsquire-defend.png" "units/undead-skeletal/deathsquire.png" {SOUND_LIST:SKELETON_HIT} } die_sound={SOUND_LIST:SKELETON_DIE} [attack] diff --git a/data/campaigns/Liberty/units/Rogue_Mage.cfg b/data/campaigns/Liberty/units/Rogue_Mage.cfg index 096f5dfe84a1..8b210feb08b4 100644 --- a/data/campaigns/Liberty/units/Rogue_Mage.cfg +++ b/data/campaigns/Liberty/units/Rogue_Mage.cfg @@ -14,7 +14,8 @@ advances_to=Shadow Mage cost=17 usage=mixed fighter - description= _ "Some mages are thrown out of the mages’ guild for attempting to practice forbidden arts. Now completely outside the law, these rogue mages do whatever is necessary to support their study of black magic. Although not as skilled as mages with more formal training, their magic can be quite lethal, while their banditry has resulted in moderate skill with the short sword."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL} + description= _ "Some mages are thrown out of the mages’ guild for attempting to practice forbidden arts. Now completely outside the law, these rogue mages do whatever is necessary to support their study of black magic. Although not as skilled as mages with more formal training, their magic can be quite lethal, while their banditry has resulted in moderate skill with the short sword." + {NOTE_MAGICAL} {DEFENSE_ANIM "units/human-outlaws/rogue-mage-defend2.png" "units/human-outlaws/rogue-mage-defend1.png" {SOUND_LIST:HUMAN_OLD_HIT} } die_sound={SOUND_LIST:HUMAN_DIE} [attack] diff --git a/data/campaigns/Liberty/units/Shadow_Lord.cfg b/data/campaigns/Liberty/units/Shadow_Lord.cfg index 3a86905b4623..c51c1a829beb 100644 --- a/data/campaigns/Liberty/units/Shadow_Lord.cfg +++ b/data/campaigns/Liberty/units/Shadow_Lord.cfg @@ -18,7 +18,9 @@ cost=56 {AMLA_DEFAULT} usage=mixed fighter - description= _ "Few humans fathom the secrets of light and dark magic and retain their sanity. Those that can master that balance become Shadow Lords, fully existing neither in the world of light nor the world of darkness. No longer needing physical weapons, they are fearsome to both their enemies and those they lord over."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "Few humans fathom the secrets of light and dark magic and retain their sanity. Those that can master that balance become Shadow Lords, fully existing neither in the world of light nor the world of darkness. No longer needing physical weapons, they are fearsome to both their enemies and those they lord over." + {NOTE_MAGICAL} + {NOTE_LEADERSHIP} die_sound={SOUND_LIST:HUMAN_DIE} [standing_anim] start_time=0 diff --git a/data/campaigns/Liberty/units/Shadow_Mage.cfg b/data/campaigns/Liberty/units/Shadow_Mage.cfg index 5b3712fd2b13..0166cea9f23a 100644 --- a/data/campaigns/Liberty/units/Shadow_Mage.cfg +++ b/data/campaigns/Liberty/units/Shadow_Mage.cfg @@ -17,7 +17,9 @@ advances_to=Shadow Lord cost=39 usage=mixed fighter - description= _ "Years of violence and brutality to support the study of forbidden magical arts have turned the shadow mages into feared fighters. Now completely enthralled with power, they have been known to command small followings of henchmen. They are outmatched in direct magical combat with their magic-using peers, instead channeling their energies into devastating melee attacks. Despite their offensive power, the corruption in their souls has begun to adversely affect their health."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_MAGICAL} + description= _ "Years of violence and brutality to support the study of forbidden magical arts have turned the shadow mages into feared fighters. Now completely enthralled with power, they have been known to command small followings of henchmen. They are outmatched in direct magical combat with their magic-using peers, instead channeling their energies into devastating melee attacks. Despite their offensive power, the corruption in their souls has begun to adversely affect their health." + {NOTE_LEADERSHIP} + {NOTE_MAGICAL} die_sound={SOUND_LIST:HUMAN_DIE} [standing_anim] start_time=0 diff --git a/data/campaigns/Liberty/units/Skeleton_Rider.cfg b/data/campaigns/Liberty/units/Skeleton_Rider.cfg index e5115df04328..86d27f705c02 100644 --- a/data/campaigns/Liberty/units/Skeleton_Rider.cfg +++ b/data/campaigns/Liberty/units/Skeleton_Rider.cfg @@ -30,7 +30,8 @@ advances_to=Bone Knight cost=19 usage=scout - description= _ "Once great warriors thundering across the plains, these mounted riders atop their skeletal horses were raised from the grave by unholy magic to spread fear and destruction."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SUBMERGE} + description= _ "Once great warriors thundering across the plains, these mounted riders atop their skeletal horses were raised from the grave by unholy magic to spread fear and destruction." + {NOTE_SUBMERGE} die_sound={SOUND_LIST:SKELETON_DIE} [abilities] {ABILITY_SUBMERGE} diff --git a/data/campaigns/Northern_Rebirth/units/Cave_Serpent.cfg b/data/campaigns/Northern_Rebirth/units/Cave_Serpent.cfg index 59d6c82f8813..3280ac4fbecd 100644 --- a/data/campaigns/Northern_Rebirth/units/Cave_Serpent.cfg +++ b/data/campaigns/Northern_Rebirth/units/Cave_Serpent.cfg @@ -4,7 +4,8 @@ [base_unit] id=Water Serpent [/base_unit] - description=_"The Water Serpent is a foe dire enough when encountered in the rivers and seas of the sunlit world, but his rare cave-dwelling kin are yet more terrible. Though their eyes are of little use in the stygian darkness of the deep caves where they dwell, they have become sensitive to even the tiniest sound that might indicate unwary prey in their domain, and will home in on it with remorseless efficiency."+{SPECIAL_NOTES}+{SPECIAL_NOTES_POISON} + description=_"The Water Serpent is a foe dire enough when encountered in the rivers and seas of the sunlit world, but his rare cave-dwelling kin are yet more terrible. Though their eyes are of little use in the stygian darkness of the deep caves where they dwell, they have become sensitive to even the tiniest sound that might indicate unwary prey in their domain, and will home in on it with remorseless efficiency." + {NOTE_POISON} # We used to deploy a Sea Serpent here. The poison ability from # the Water Serpent base type should do a pretty good job of # compensating for the fact that the main attack is 6 points diff --git a/data/campaigns/Sceptre_of_Fire/units/Haldric_II.cfg b/data/campaigns/Sceptre_of_Fire/units/Haldric_II.cfg index 774abe93f198..3df06df26650 100644 --- a/data/campaigns/Sceptre_of_Fire/units/Haldric_II.cfg +++ b/data/campaigns/Sceptre_of_Fire/units/Haldric_II.cfg @@ -18,7 +18,8 @@ {ABILITY_LEADERSHIP} [/abilities] hide_help=yes - description= _ "King of Wesnoth."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "King of Wesnoth." + {NOTE_LEADERSHIP} {DEFENSE_ANIM "units/heroes/haldric-ii-defend.png" "units/heroes/haldric-ii.png" {SOUND_LIST:HUMAN_HIT} } [attack] name=sword diff --git a/data/campaigns/Secrets_of_the_Ancients/units/Bone_Bird.cfg b/data/campaigns/Secrets_of_the_Ancients/units/Bone_Bird.cfg index 84b6f79204f1..21caf12a1273 100644 --- a/data/campaigns/Secrets_of_the_Ancients/units/Bone_Bird.cfg +++ b/data/campaigns/Secrets_of_the_Ancients/units/Bone_Bird.cfg @@ -10,7 +10,7 @@ hills=60 mountains=50 fungus=60 - # wmllint: match forest=-70 with {SPECIAL_NOTES_DEFENSE_CAP} + # wmllint: match forest=-70 with {NOTE_DEFENSE_CAP} forest=-70 village=60 [/defense] @@ -25,7 +25,9 @@ {AMLA_DEFAULT} cost=16 usage=scout - description=""+{SPECIAL_NOTES}+{SPECIAL_NOTES_SUBMERGE}+{SPECIAL_NOTES_DEFENSE_CAP} + description="" + {NOTE_SUBMERGE} + {NOTE_DEFENSE_CAP} [abilities] {ABILITY_SUBMERGE} [/abilities] diff --git a/data/campaigns/Secrets_of_the_Ancients/units/Bone_Captain.cfg b/data/campaigns/Secrets_of_the_Ancients/units/Bone_Captain.cfg index 27bbbf885b35..146a2a8f6e51 100644 --- a/data/campaigns/Secrets_of_the_Ancients/units/Bone_Captain.cfg +++ b/data/campaigns/Secrets_of_the_Ancients/units/Bone_Captain.cfg @@ -16,7 +16,9 @@ {AMLA_DEFAULT} cost=28 usage=fighter - description= _ "Captains are masters in life, but in death they may be slaves to a necromancer. Through sheer force of habit, an undead captain continues to exude authority even if all his other memories have been lost."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_SUBMERGE} + description= _ "Captains are masters in life, but in death they may be slaves to a necromancer. Through sheer force of habit, an undead captain continues to exude authority even if all his other memories have been lost." + {NOTE_LEADERSHIP} + {NOTE_SUBMERGE} die_sound=skeleton-big-die.ogg {DEFENSE_ANIM "units/bone-captain.png" "units/bone-captain.png" {SOUND_LIST:SKELETON_BIG_HIT} } [abilities] diff --git a/data/campaigns/Secrets_of_the_Ancients/units/Corpse_Shynal.cfg b/data/campaigns/Secrets_of_the_Ancients/units/Corpse_Shynal.cfg index 39afe5a24750..59898d5a5c2a 100644 --- a/data/campaigns/Secrets_of_the_Ancients/units/Corpse_Shynal.cfg +++ b/data/campaigns/Secrets_of_the_Ancients/units/Corpse_Shynal.cfg @@ -14,7 +14,8 @@ advances_to=Soulless cost=8 usage=fighter - description= _ "Walking Corpses are the bodies of the dead, re-animated by dark magic. Though not especially dangerous to a trained soldier, the sight of one’s former comrades amongst their number is frightening to say the least."+{SPECIAL_NOTES}+{SPECIAL_NOTES_PLAGUE} + description= _ "Walking Corpses are the bodies of the dead, re-animated by dark magic. Though not especially dangerous to a trained soldier, the sight of one’s former comrades amongst their number is frightening to say the least." + {NOTE_PLAGUE} die_sound={SOUND_LIST:ZOMBIE_WEAK_HIT} {DEFENSE_ANIM "units/delinquent/zombie-shynal-defend.png" "units/delinquent/zombie-shynal.png" {SOUND_LIST:ZOMBIE_WEAK_HIT} } hide_help=yes diff --git a/data/campaigns/Secrets_of_the_Ancients/units/Necro_Ancient_Lich.cfg b/data/campaigns/Secrets_of_the_Ancients/units/Necro_Ancient_Lich.cfg index abbbaeabe9b8..cb20f1d5653c 100644 --- a/data/campaigns/Secrets_of_the_Ancients/units/Necro_Ancient_Lich.cfg +++ b/data/campaigns/Secrets_of_the_Ancients/units/Necro_Ancient_Lich.cfg @@ -17,7 +17,11 @@ {AMLA_DEFAULT} cost=100 usage=mixed fighter - description= _ "An experienced lich can easily tap into the power of the spirit world and throw freezing lightning to devastating effect, or drain the very life force from a body. The power available to a lich like this is awesome to behold. Anyone who encounters an Ancient Lich likely has far worse things to worry about than death!"+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_DRAIN}+{SPECIAL_NOTES_ARCANE}+{SPECIAL_NOTES_SUBMERGE} + description= _ "An experienced lich can easily tap into the power of the spirit world and throw freezing lightning to devastating effect, or drain the very life force from a body. The power available to a lich like this is awesome to behold. Anyone who encounters an Ancient Lich likely has far worse things to worry about than death!" + {NOTE_MAGICAL} + {NOTE_DRAIN} + {NOTE_ARCANE} + {NOTE_SUBMERGE} die_sound=lich-die.ogg {DEFENSE_ANIM "units/ancient-lich/ancient-lich-defend.png" "units/ancient-lich/ancient-lich.png" {SOUND_LIST:LICH_HIT} } [movement_costs] diff --git a/data/campaigns/Secrets_of_the_Ancients/units/Orcish_Shaman.cfg b/data/campaigns/Secrets_of_the_Ancients/units/Orcish_Shaman.cfg index bdb4507780a5..5b045c9064f4 100644 --- a/data/campaigns/Secrets_of_the_Ancients/units/Orcish_Shaman.cfg +++ b/data/campaigns/Secrets_of_the_Ancients/units/Orcish_Shaman.cfg @@ -18,7 +18,8 @@ {AMLA_DEFAULT} cost=21 usage=mixed fighter - description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for Orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DRAIN} + description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for Orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life." + {NOTE_DRAIN} die_sound={SOUND_LIST:ORC_DIE} {DEFENSE_ANIM "units/orcish-shaman-defend-2.png" "units/orcish-shaman-defend-1.png" {SOUND_LIST:ORC_HIT} } [attack] diff --git a/data/campaigns/Secrets_of_the_Ancients/units/Sea_Captain.cfg b/data/campaigns/Secrets_of_the_Ancients/units/Sea_Captain.cfg index 8c006df21a98..cffbdadf817b 100644 --- a/data/campaigns/Secrets_of_the_Ancients/units/Sea_Captain.cfg +++ b/data/campaigns/Secrets_of_the_Ancients/units/Sea_Captain.cfg @@ -14,7 +14,8 @@ {AMLA_DEFAULT} cost=26 usage=fighter - description= _ "Aboard his vessel, the captain is the ultimate authority, and all his orders must be instantly obeyed. A passenger or crew member crosses the captain at their peril, for he is within his rights to summarily execute criminals or mutineers."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "Aboard his vessel, the captain is the ultimate authority, and all his orders must be instantly obeyed. A passenger or crew member crosses the captain at their peril, for he is within his rights to summarily execute criminals or mutineers." + {NOTE_LEADERSHIP} die_sound={SOUND_LIST:HUMAN_DIE} {DEFENSE_ANIM "units/sea-captain.png" "units/sea-captain.png" {SOUND_LIST:HUMAN_HIT} } [abilities] diff --git a/data/campaigns/Secrets_of_the_Ancients/units/SotA_Corpses.cfg b/data/campaigns/Secrets_of_the_Ancients/units/SotA_Corpses.cfg index d0093ce880d3..f8212b514f79 100644 --- a/data/campaigns/Secrets_of_the_Ancients/units/SotA_Corpses.cfg +++ b/data/campaigns/Secrets_of_the_Ancients/units/SotA_Corpses.cfg @@ -8,7 +8,8 @@ experience=24 alignment=chaotic usage=fighter - description= _ "Walking Corpses are the bodies of the dead, re-animated by dark magic. Though not especially dangerous to a trained soldier, the sight of one’s former comrades amongst their number is frightening to say the least."+{SPECIAL_NOTES}+{SPECIAL_NOTES_PLAGUE} + description= _ "Walking Corpses are the bodies of the dead, re-animated by dark magic. Though not especially dangerous to a trained soldier, the sight of one’s former comrades amongst their number is frightening to say the least." + {NOTE_PLAGUE} die_sound={SOUND_LIST:ZOMBIE_WEAK_HIT} [resistance] arcane=140 diff --git a/data/campaigns/Secrets_of_the_Ancients/units/SotA_Soulless.cfg b/data/campaigns/Secrets_of_the_Ancients/units/SotA_Soulless.cfg index aff1d00bacbd..934625a3e8a1 100644 --- a/data/campaigns/Secrets_of_the_Ancients/units/SotA_Soulless.cfg +++ b/data/campaigns/Secrets_of_the_Ancients/units/SotA_Soulless.cfg @@ -11,7 +11,8 @@ {AMLA_DEFAULT} cost=13 usage=fighter - description= _ "The technique of animating a dead body is unfortunately well-known in the dark arts; practitioners often use it to raise servants and soldiers from unwilling corpses. These shamblers are often numerous, but fragile; a touch of combat can waken them, though, making them far more formidable."+{SPECIAL_NOTES}+{SPECIAL_NOTES_PLAGUE} + description= _ "The technique of animating a dead body is unfortunately well-known in the dark arts; practitioners often use it to raise servants and soldiers from unwilling corpses. These shamblers are often numerous, but fragile; a touch of combat can waken them, though, making them far more formidable." + {NOTE_PLAGUE} die_sound={SOUND_LIST:ZOMBIE_WEAK_HIT} [resistance] arcane=140 diff --git a/data/campaigns/Son_Of_The_Black_Eye/units/Novice_Orcish_Shaman.cfg b/data/campaigns/Son_Of_The_Black_Eye/units/Novice_Orcish_Shaman.cfg index 04b169e739d5..2655e49821e4 100644 --- a/data/campaigns/Son_Of_The_Black_Eye/units/Novice_Orcish_Shaman.cfg +++ b/data/campaigns/Son_Of_The_Black_Eye/units/Novice_Orcish_Shaman.cfg @@ -17,7 +17,8 @@ {AMLA_DEFAULT} cost=21 usage=mixed fighter - description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for Orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life. Novice Shamans are still young and vigorous, but their spell-casting ability still needs improvement."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DRAIN} + description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for Orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life. Novice Shamans are still young and vigorous, but their spell-casting ability still needs improvement." + {NOTE_DRAIN} die_sound={SOUND_LIST:ORC_DIE} {DEFENSE_ANIM "units/novice-orcish-shaman-defend-2.png" "units/novice-orcish-shaman-defend-1.png" {SOUND_LIST:ORC_HIT} } [attack] diff --git a/data/campaigns/Son_Of_The_Black_Eye/units/Old_Orcish_Shaman.cfg b/data/campaigns/Son_Of_The_Black_Eye/units/Old_Orcish_Shaman.cfg index de5d9fb654d0..75f3b325f533 100644 --- a/data/campaigns/Son_Of_The_Black_Eye/units/Old_Orcish_Shaman.cfg +++ b/data/campaigns/Son_Of_The_Black_Eye/units/Old_Orcish_Shaman.cfg @@ -17,7 +17,8 @@ {AMLA_DEFAULT} cost=21 usage=mixed fighter - description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for Orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life. Old Orcish Shamans are shamans that have mastered magic, although their physical strength has declined with age."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DRAIN} + description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for Orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life. Old Orcish Shamans are shamans that have mastered magic, although their physical strength has declined with age." + {NOTE_DRAIN} die_sound={SOUND_LIST:ORC_DIE} {DEFENSE_ANIM "units/elder-orcish-shaman-defend-2.png" "units/elder-orcish-shaman-defend-1.png" {SOUND_LIST:ORC_HIT} } [attack] diff --git a/data/campaigns/Son_Of_The_Black_Eye/units/Orcish_Shaman.cfg b/data/campaigns/Son_Of_The_Black_Eye/units/Orcish_Shaman.cfg index c07955a2a454..f2ce13562b9b 100644 --- a/data/campaigns/Son_Of_The_Black_Eye/units/Orcish_Shaman.cfg +++ b/data/campaigns/Son_Of_The_Black_Eye/units/Orcish_Shaman.cfg @@ -17,7 +17,8 @@ {AMLA_DEFAULT} cost=21 usage=mixed fighter - description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for Orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DRAIN} + description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for Orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life." + {NOTE_DRAIN} die_sound={SOUND_LIST:ORC_DIE} {DEFENSE_ANIM "units/orcish-shaman-defend-2.png" "units/orcish-shaman-defend-1.png" {SOUND_LIST:ORC_HIT} } [attack] diff --git a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Annalist.cfg b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Annalist.cfg index 2a7f01e6e128..d8c7295cdde4 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Annalist.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Annalist.cfg @@ -18,7 +18,11 @@ usage=mixed fighter experience=80 advances_to=Dwarvish Loremaster - description= _ "Dwarvish Annalists are the historians of this ancient and proud race. They are few in number, and their very existence is not generally known to the other peoples of the Great Continent. To the abilities of the Witness they add, through the study of herb and mineral lore, the ability to cure poison."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_UNPOISON}+{SPECIAL_NOTES_INSPIRE}+{SPECIAL_NOTES_MAGICAL} + description= _ "Dwarvish Annalists are the historians of this ancient and proud race. They are few in number, and their very existence is not generally known to the other peoples of the Great Continent. To the abilities of the Witness they add, through the study of herb and mineral lore, the ability to cure poison." + {NOTE_SLOW} + {NOTE_UNPOISON} + {NOTE_INSPIRE} + {NOTE_MAGICAL} [abilities] {ABILITY_INSPIRE} {ABILITY_UNPOISON} diff --git a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Loremaster.cfg b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Loremaster.cfg index ab49971c92d1..3e207eaff279 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Loremaster.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Loremaster.cfg @@ -20,7 +20,12 @@ advances_to=null usage=mixed fighter {AMLA_DEFAULT} - description= _ "Loremasters are the sages of the dwarvish race. Their counsel is greatly valued by war-leaders and chieftains, and they are viewed with awe by ordinary dwarves, for they alone have plumbed the deepest and most closely-held secrets of dwarven knowledge. It is said that where a loremaster stands, there is the soul of the dwarves. To the abilities of the Annalist they add a limited ability to heal."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_UNPOISON}+{SPECIAL_NOTES_INSPIRE}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_HEALS} + description= _ "Loremasters are the sages of the dwarvish race. Their counsel is greatly valued by war-leaders and chieftains, and they are viewed with awe by ordinary dwarves, for they alone have plumbed the deepest and most closely-held secrets of dwarven knowledge. It is said that where a loremaster stands, there is the soul of the dwarves. To the abilities of the Annalist they add a limited ability to heal." + {NOTE_SLOW} + {NOTE_UNPOISON} + {NOTE_INSPIRE} + {NOTE_MAGICAL} + {NOTE_HEALS} [abilities] {ABILITY_INSPIRE} {ABILITY_UNPOISON} diff --git a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Berserker.cfg b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Berserker.cfg index 1317a9a40dea..d2718663241f 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Berserker.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Berserker.cfg @@ -15,7 +15,8 @@ cost=33 usage=fighter #textdomain wesnoth-units - description= _ "Berserkers are a rare caste of Dwarves, who work themselves into a towering rage before combat. These warriors disdain all notion of defense, thinking only of the unrelenting assaults for which they are legendary."+{SPECIAL_NOTES}+{SPECIAL_NOTES_BERSERK} + description= _ "Berserkers are a rare caste of Dwarves, who work themselves into a towering rage before combat. These warriors disdain all notion of defense, thinking only of the unrelenting assaults for which they are legendary." + {NOTE_BERSERK} die_sound={SOUND_LIST:DWARF_DIE} [standing_anim] start_time=0 diff --git a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Guardsman.cfg b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Guardsman.cfg index 9c1bc7f58e01..d24748af5eb0 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Guardsman.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Guardsman.cfg @@ -14,7 +14,8 @@ cost=19 usage=fighter #textdomain wesnoth-units - description= _ "The dwarven race has always been famed for its sturdiness of build, and many of their warriors outfit themselves to take advantage of this. Dwarven guardsmen march into battle with tower shields and spears. Most often, their role is to hold the line, and to take a heavy toll on those who try to break it. As the line marches forward, they act to secure its hard-won advance."+{SPECIAL_NOTES}+{SPECIAL_NOTES_STEADFAST} + description= _ "The dwarven race has always been famed for its sturdiness of build, and many of their warriors outfit themselves to take advantage of this. Dwarven guardsmen march into battle with tower shields and spears. Most often, their role is to hold the line, and to take a heavy toll on those who try to break it. As the line marches forward, they act to secure its hard-won advance." + {NOTE_STEADFAST} die_sound={SOUND_LIST:DWARF_DIE} [defense] mountains=40 diff --git a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Sentinel.cfg b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Sentinel.cfg index 3b7f845446d4..aa01f499b85b 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Sentinel.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Sentinel.cfg @@ -15,7 +15,8 @@ cost=41 usage=fighter #textdomain wesnoth-units - description= _ "Champions among their fellow troops, the dwarven sentinels form the bulwark of their battle lines. Leading a direct assault against a line that they fortify, is often out of the question; it tends toward being suicidal, rather than merely ineffectual. These dwarves are masters of the melee, and can hold a patch of earth with the single-minded tenacity of an oak."+{SPECIAL_NOTES}+{SPECIAL_NOTES_STEADFAST} + description= _ "Champions among their fellow troops, the dwarven sentinels form the bulwark of their battle lines. Leading a direct assault against a line that they fortify, is often out of the question; it tends toward being suicidal, rather than merely ineffectual. These dwarves are masters of the melee, and can hold a patch of earth with the single-minded tenacity of an oak." + {NOTE_STEADFAST} die_sound={SOUND_LIST:DWARF_DIE} {DEFENSE_ANIM "units/masked_sentinel_defend2.png" "units/masked_sentinel_defend1.png" {SOUND_LIST:DWARF_HIT} } [defense] diff --git a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Stalwart.cfg b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Stalwart.cfg index 0d9a31b24439..144662b61fa0 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Stalwart.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Stalwart.cfg @@ -14,7 +14,8 @@ cost=32 usage=fighter #textdomain wesnoth-units - description= _ "The wiles of experience and training turn guardsmen into worthy soldiers. These stalwart troops are equipped to match their skills, and can hold their ground against all but the most visceral assault. It is a dangerous thing to lose a foothold to one such as these, for it will not be easily reprised."+{SPECIAL_NOTES}+{SPECIAL_NOTES_STEADFAST} + description= _ "The wiles of experience and training turn guardsmen into worthy soldiers. These stalwart troops are equipped to match their skills, and can hold their ground against all but the most visceral assault. It is a dangerous thing to lose a foothold to one such as these, for it will not be easily reprised." + {NOTE_STEADFAST} die_sound={SOUND_LIST:DWARF_DIE} {DEFENSE_ANIM "units/masked_stalwart_defend2.png" "units/masked_stalwart_defend1.png" {SOUND_LIST:DWARF_HIT} } [defense] diff --git a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Ulfserker.cfg b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Ulfserker.cfg index 4c577c7f1277..b437084ddfb8 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Ulfserker.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Ulfserker.cfg @@ -15,7 +15,8 @@ cost=19 usage=fighter #textdomain wesnoth-units - description= _ "Dwarves are an ancient race of powerful fighters. Ulfserkers are the most ferocious of these; in battle, they will work themselves into a blind rage wherein they feel neither fear nor pain, and will pay no heed to any wounds they receive."+{SPECIAL_NOTES}+{SPECIAL_NOTES_BERSERK} + description= _ "Dwarves are an ancient race of powerful fighters. Ulfserkers are the most ferocious of these; in battle, they will work themselves into a blind rage wherein they feel neither fear nor pain, and will pay no heed to any wounds they receive." + {NOTE_BERSERK} die_sound={SOUND_LIST:DWARF_DIE} {DEFENSE_ANIM "units/masked_ulfserker.png" "units/masked_ulfserker.png" {SOUND_LIST:DWARF_HIT} } [defense] diff --git a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Rune_Lord.cfg b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Rune_Lord.cfg index 1f4d1d6e518e..14397a87183f 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Rune_Lord.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Rune_Lord.cfg @@ -24,7 +24,8 @@ {AMLA_DEFAULT} hide_help=yes do_not_list=yes - description= _ "Except for those with almost supernatural skill, the highest rank a runecrafter can rise to is that of the Dwarvish Runemaster. Striking blows nearly as powerful as those of the best warriors, they would be fearsome without their craft, but with it they are also nigh on invincible, since their runes cause the physical blows of their enemies to deal less damage than would be expected."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL} + description= _ "Except for those with almost supernatural skill, the highest rank a runecrafter can rise to is that of the Dwarvish Runemaster. Striking blows nearly as powerful as those of the best warriors, they would be fearsome without their craft, but with it they are also nigh on invincible, since their runes cause the physical blows of their enemies to deal less damage than would be expected." + {NOTE_MAGICAL} {DEFENSE_ANIM "units/karrag-defend.png" "units/karrag.png" {SOUND_LIST:DWARF_HIT} } die_sound={SOUND_LIST:DWARF_DIE} [attack] @@ -76,7 +77,9 @@ hide_help=no do_not_list=no #textdomain wesnoth-units - description= _ "Except for those with almost supernatural skill, the highest rank a runecrafter can rise to is that of the Dwarvish Runemaster. Striking blows nearly as powerful as those of the best warriors, they would be fearsome without their craft, but with it they are also nigh on invincible, since their runes cause the physical blows of their enemies to deal less damage than would be expected."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_ARCANE} + description= _ "Except for those with almost supernatural skill, the highest rank a runecrafter can rise to is that of the Dwarvish Runemaster. Striking blows nearly as powerful as those of the best warriors, they would be fearsome without their craft, but with it they are also nigh on invincible, since their runes cause the physical blows of their enemies to deal less damage than would be expected." + {NOTE_MAGICAL} + {NOTE_ARCANE} {DEFENSE_ANIM "units/karrag-defend.png" "units/karrag.png" {SOUND_LIST:LICH_HIT} } die_sound=lich-die.ogg # empty attack tag to prevent overwriting the hammer attack diff --git a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Witness.cfg b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Witness.cfg index e3f05a1f8eac..bee533c5960c 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Witness.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Witness.cfg @@ -24,7 +24,10 @@ usage=mixed fighter experience=32 advances_to=Dwarvish Annalist - description= _ "A Witness functions as the eyes of the dwarves’ history, a deep lore that they never share with outsiders. The presence of a Witness inspires dwarvish warriors with the knowledge that their deeds (and their deaths) will not go unrecorded. They learn a fighting style deliberately unlike that of their fellows, one designed to turn the vaunted strength of the dwarves against itself. The person of a Witness is considered sacred, and Witnesses are often used as envoys between dwarvish clans."+{SPECIAL_NOTES}+{SPECIAL_NOTES_INSPIRE}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_SLOW} + description= _ "A Witness functions as the eyes of the dwarves’ history, a deep lore that they never share with outsiders. The presence of a Witness inspires dwarvish warriors with the knowledge that their deeds (and their deaths) will not go unrecorded. They learn a fighting style deliberately unlike that of their fellows, one designed to turn the vaunted strength of the dwarves against itself. The person of a Witness is considered sacred, and Witnesses are often used as envoys between dwarvish clans." + {NOTE_INSPIRE} + {NOTE_MAGICAL} + {NOTE_SLOW} [abilities] {ABILITY_INSPIRE} [/abilities] diff --git a/data/campaigns/The_Hammer_of_Thursagan/utils/abilities.cfg b/data/campaigns/The_Hammer_of_Thursagan/utils/abilities.cfg index 6f3c6524abe1..fc00361b5392 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/utils/abilities.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/utils/abilities.cfg @@ -1,8 +1,10 @@ #textdomain wesnoth-thot -#define SPECIAL_NOTES_INSPIRE -_" -• The presence of this unit inspires own units next to it to deal more damage in combat, though this only applies to units of lower or equal level."#enddef +#define NOTE_INSPIRE +[special_note] + note=_"The presence of this unit inspires own units next to it to deal more damage in combat, though this only applies to units of lower or equal level." +[/special_note] +#enddef #define ABILITY_INSPIRE # Canned definition of the Inspire ability to be included in an diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg index 26210b557a47..85091f37030b 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg @@ -17,7 +17,8 @@ advances_to=Noble Lord cost=38 usage=mixed fighter - description= _ "The rank of a noble Commander is held by those who lead battle groups into combat. Possessing leadership skills, they give lower-level units in adjacent hexes improved performance in combat. Commanders are best skilled with the sword, although they also carry a bow to use when necessary. If the Commander is lost, so is the battle."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "The rank of a noble Commander is held by those who lead battle groups into combat. Possessing leadership skills, they give lower-level units in adjacent hexes improved performance in combat. Commanders are best skilled with the sword, although they also carry a bow to use when necessary. If the Commander is lost, so is the battle." + {NOTE_LEADERSHIP} die_sound={SOUND_LIST:HUMAN_DIE} {DEFENSE_ANIM_RANGE "units/noble-commander-defend.png" "units/noble-commander.png" {SOUND_LIST:HUMAN_HIT} melee} {DEFENSE_ANIM_RANGE "units/noble-commander-bow-defend.png" "units/noble-commander-bow.png" {SOUND_LIST:HUMAN_HIT} ranged} diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg index a4e630f30529..e1227608b2a5 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg @@ -18,7 +18,8 @@ {AMLA_DEFAULT} cost=60 usage=mixed fighter - description= _ "The noble leaders of many troops, Lords are especially strong in melee combat, and also possess skill with the bow. Like Commanders, Lords possess leadership skills, and improve the fighting ability of all adjacent lower-level units."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "The noble leaders of many troops, Lords are especially strong in melee combat, and also possess skill with the bow. Like Commanders, Lords possess leadership skills, and improve the fighting ability of all adjacent lower-level units." + {NOTE_LEADERSHIP} die_sound={SOUND_LIST:HUMAN_DIE} {DEFENSE_ANIM_RANGE "units/noble-lord-defend.png" "units/noble-lord.png" {SOUND_LIST:HUMAN_HIT} melee} {DEFENSE_ANIM_RANGE "units/noble-lord-bow-defend.png" "units/noble-lord-bow.png" {SOUND_LIST:HUMAN_HIT} ranged} diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg index 3af555320718..087993e9230b 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg @@ -16,7 +16,8 @@ {AMLA_DEFAULT} cost=60 usage=mixed fighter - description= _ "Cold and beautiful, she maintains her eternal youthful appearance drinking the blood of the living."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DRAIN} + description= _ "Cold and beautiful, she maintains her eternal youthful appearance drinking the blood of the living." + {NOTE_DRAIN} die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [attack] name=blood kiss diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg index 6b998bdfaf9e..2f8799ab96a5 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg @@ -8,7 +8,8 @@ [abilities] {ABILITY_LEADERSHIP} [/abilities] - description= _ "As the leaders of the human Kingdoms, Kings are responsible for ruling and protecting their subjects. Kings can coordinate the attacks of level 1 and 2 units, thereby increasing their fighting efficiency."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "As the leaders of the human Kingdoms, Kings are responsible for ruling and protecting their subjects. Kings can coordinate the attacks of level 1 and 2 units, thereby increasing their fighting efficiency." + {NOTE_LEADERSHIP} # This is a somewhat elderly royal warrior die_sound={SOUND_LIST:HUMAN_OLD_DIE} {DEFENSE_ANIM "units/human-loyalists/royal-warrior-defend.png" "units/human-loyalists/royal-warrior.png" {SOUND_LIST:HUMAN_OLD_HIT} } diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg index ff7698499dc9..e34ee2e0d116 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg @@ -18,7 +18,9 @@ advances_to=Wesfolk Leader cost=36 usage=mixed fighter - description= _ "Born in the Wesfolk aristocracy, she and her people were excluded from society by their lords, who betrayed their loyalty when a war against Haldric’s people was being lost. This outcast still conserves her nobleness in her veins and on the battlefield she has earned valuable experience, which continues increasing with time, as does her natural leadership."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DISTRACT}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "Born in the Wesfolk aristocracy, she and her people were excluded from society by their lords, who betrayed their loyalty when a war against Haldric’s people was being lost. This outcast still conserves her nobleness in her veins and on the battlefield she has earned valuable experience, which continues increasing with time, as does her natural leadership." + {NOTE_DISTRACT} + {NOTE_LEADERSHIP} die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [defend] hits=miss diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg index 568023db5457..d2f451bd0b18 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg @@ -19,7 +19,9 @@ {AMLA_DEFAULT} cost=60 usage=mixed fighter - description= _ "Born in the Wesfolk aristocracy, she and her people were excluded from society by their lords, who betrayed their loyalty when a war against Haldric’s people was being lost. This outcast still conserves her nobleness in her veins and on the battlefield she has earned valuable experience, which continues increasing with time, as does her natural leadership."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DISTRACT}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "Born in the Wesfolk aristocracy, she and her people were excluded from society by their lords, who betrayed their loyalty when a war against Haldric’s people was being lost. This outcast still conserves her nobleness in her veins and on the battlefield she has earned valuable experience, which continues increasing with time, as does her natural leadership." + {NOTE_DISTRACT} + {NOTE_LEADERSHIP} die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [defend] hits=miss diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg index 129cc6301fdd..90b758841a46 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg @@ -18,7 +18,9 @@ advances_to=Wesfolk Lady cost=18 usage=mixed fighter - description= _ "Born in the Wesfolk aristocracy, she and her people were excluded from society by their lords, who betrayed their loyalty when a war against Haldric’s people was being lost. This outcast still conserves her nobleness in her veins and on the battlefield she has earned valuable experience, which she can lend to her people for turning a fight in their favor."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DISTRACT}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "Born in the Wesfolk aristocracy, she and her people were excluded from society by their lords, who betrayed their loyalty when a war against Haldric’s people was being lost. This outcast still conserves her nobleness in her veins and on the battlefield she has earned valuable experience, which she can lend to her people for turning a fight in their favor." + {NOTE_DISTRACT} + {NOTE_LEADERSHIP} die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [defend] hits=miss diff --git a/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-abilities.cfg b/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-abilities.cfg index 8c8828457d55..a0114787b3d2 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-abilities.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-abilities.cfg @@ -12,6 +12,8 @@ [/skirmisher] #enddef -#define SPECIAL_NOTES_DISTRACT -_" -• This unit is capable of distracting opponents, allowing allied units to trespass their Zones of Control and move unhindered around them."#enddef +#define NOTE_DISTRACT +[special_note] + note=_"This unit is capable of distracting opponents, allowing allied units to trespass their Zones of Control and move unhindered around them." +[/special_note] +#enddef diff --git a/data/campaigns/The_South_Guard/units/Eyestalk.cfg b/data/campaigns/The_South_Guard/units/Eyestalk.cfg index 504b109759dc..416381a2e679 100644 --- a/data/campaigns/The_South_Guard/units/Eyestalk.cfg +++ b/data/campaigns/The_South_Guard/units/Eyestalk.cfg @@ -22,7 +22,10 @@ {AMLA_DEFAULT} cost=30 usage=mixed fighter - description= _ "Named ‘Eyestalks’ for obvious reasons, these plant-like creatures can focus their gaze onto an unsuspecting victim to draw life energy straight out of them to replenish their own. While almost defenseless against melee attacks, its deadly gaze from afar is not to be underestimated."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DRAIN}+{SPECIAL_NOTES_REGENERATES}+{SPECIAL_NOTES_ARCANE} + description= _ "Named ‘Eyestalks’ for obvious reasons, these plant-like creatures can focus their gaze onto an unsuspecting victim to draw life energy straight out of them to replenish their own. While almost defenseless against melee attacks, its deadly gaze from afar is not to be underestimated." + {NOTE_DRAIN} + {NOTE_REGENERATES} + {NOTE_ARCANE} {DEFENSE_ANIM "units/eyestalk-attack-1.png" "units/eyestalk.png" wose-hit.ogg } [abilities] {ABILITY_REGENERATES} diff --git a/data/campaigns/The_South_Guard/units/Horseman_Commander.cfg b/data/campaigns/The_South_Guard/units/Horseman_Commander.cfg index dbd43aed7dfb..ad93da05578b 100644 --- a/data/campaigns/The_South_Guard/units/Horseman_Commander.cfg +++ b/data/campaigns/The_South_Guard/units/Horseman_Commander.cfg @@ -22,7 +22,9 @@ [abilities] {ABILITY_LEADERSHIP} [/abilities] - description= _ "Leaders of the border guards, mounted commanders command the garrisons that keep peace in the outermost provinces of Wesnoth. As effective leaders and powerful warriors, these men patrol the countryside and eliminate any and all threats to peace in the frontier villages."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_CHARGE} + description= _ "Leaders of the border guards, mounted commanders command the garrisons that keep peace in the outermost provinces of Wesnoth. As effective leaders and powerful warriors, these men patrol the countryside and eliminate any and all threats to peace in the frontier villages." + {NOTE_LEADERSHIP} + {NOTE_CHARGE} die_sound=horse-die.ogg [attack] name=lance diff --git a/data/campaigns/The_South_Guard/units/Infantry_Commander.cfg b/data/campaigns/The_South_Guard/units/Infantry_Commander.cfg index 156c1c7c3956..f5769905e457 100644 --- a/data/campaigns/The_South_Guard/units/Infantry_Commander.cfg +++ b/data/campaigns/The_South_Guard/units/Infantry_Commander.cfg @@ -23,7 +23,9 @@ {ABILITY_LEADERSHIP} [/abilities] usage=fighter - description= _ "Veteran commanders have faced battle many times and led their men with steady hands and calm determination."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_SLOW} + description= _ "Veteran commanders have faced battle many times and led their men with steady hands and calm determination." + {NOTE_LEADERSHIP} + {NOTE_SLOW} die_sound={SOUND_LIST:HUMAN_DIE} [attack] name=glaive diff --git a/data/campaigns/The_South_Guard/units/Infantry_Lieutenant.cfg b/data/campaigns/The_South_Guard/units/Infantry_Lieutenant.cfg index 6d39ed92797c..7f46553c1510 100644 --- a/data/campaigns/The_South_Guard/units/Infantry_Lieutenant.cfg +++ b/data/campaigns/The_South_Guard/units/Infantry_Lieutenant.cfg @@ -22,7 +22,8 @@ {ABILITY_LEADERSHIP} [/abilities] usage=fighter - description= _ "Commanders of the infantry of Wesnoth are responsible for the garrison and defense of the border towns and villages. They are drawn from the ranks of veteran soldiers, not nobility, and all have shown leadership and courage in battle."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "Commanders of the infantry of Wesnoth are responsible for the garrison and defense of the border towns and villages. They are drawn from the ranks of veteran soldiers, not nobility, and all have shown leadership and courage in battle." + {NOTE_LEADERSHIP} die_sound={SOUND_LIST:HUMAN_DIE} [attack] name=glaive diff --git a/data/campaigns/The_South_Guard/units/Junior_Commander.cfg b/data/campaigns/The_South_Guard/units/Junior_Commander.cfg index 81650ef9fbf0..999db0338ab4 100644 --- a/data/campaigns/The_South_Guard/units/Junior_Commander.cfg +++ b/data/campaigns/The_South_Guard/units/Junior_Commander.cfg @@ -22,7 +22,8 @@ [abilities] {ABILITY_LEADERSHIP} [/abilities] - description= _ "At scarcely 17 or 18 years of age, squires are not yet full knights, but still have the knowledge and skill to master their mounts whilst in full panoply. Talented squires are sometimes given command of small units in Wesnoth' s army, where they gain experience leading fellow troops and honing their prowess in battle."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "At scarcely 17 or 18 years of age, squires are not yet full knights, but still have the knowledge and skill to master their mounts whilst in full panoply. Talented squires are sometimes given command of small units in Wesnoth' s army, where they gain experience leading fellow troops and honing their prowess in battle." + {NOTE_LEADERSHIP} die_sound=horse-die.ogg [attack] name=spear diff --git a/data/campaigns/The_South_Guard/units/Mounted_General.cfg b/data/campaigns/The_South_Guard/units/Mounted_General.cfg index abfa6beb9991..e2e918c63c2e 100644 --- a/data/campaigns/The_South_Guard/units/Mounted_General.cfg +++ b/data/campaigns/The_South_Guard/units/Mounted_General.cfg @@ -23,7 +23,9 @@ [abilities] {ABILITY_LEADERSHIP} [/abilities] - description= _ "Switching seamlessly between lance and mace, mounted generals boast tremendous skill in individual combat and can hold their own against even the most powerful opposition. They are masters of their mounts, able to cover great distances quickly on their patrols, and have keen eyes for detecting and eliminating all manner of perilous dangers. Their greatest strength, however, lies in their ability to inspire great courage in their men, who fight fearlessly and tenaciously under their command."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_CHARGE} + description= _ "Switching seamlessly between lance and mace, mounted generals boast tremendous skill in individual combat and can hold their own against even the most powerful opposition. They are masters of their mounts, able to cover great distances quickly on their patrols, and have keen eyes for detecting and eliminating all manner of perilous dangers. Their greatest strength, however, lies in their ability to inspire great courage in their men, who fight fearlessly and tenaciously under their command." + {NOTE_LEADERSHIP} + {NOTE_CHARGE} die_sound=horse-die.ogg [attack] name=lance diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg index 5ebb8b635f4f..ed5453bff190 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg @@ -1,7 +1,9 @@ #textdomain wesnoth-utbs #define UNDEAD_TROLL_DESCRIPTION -_ "These undead trolls fight again in death as they did in life, except this time they smell much worse."+{SPECIAL_NOTES}+{SPECIAL_NOTES_PLAGUE} #enddef +_ "These undead trolls fight again in death as they did in life, except this time they smell much worse." +{NOTE_PLAGUE} +#enddef [scenario] id=06a_In_the_Tunnels_of_the_Trolls diff --git a/data/campaigns/Under_the_Burning_Suns/units/humans/Human_Commander.cfg b/data/campaigns/Under_the_Burning_Suns/units/humans/Human_Commander.cfg index 80c2244697f0..0de0e95ae10e 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/humans/Human_Commander.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/humans/Human_Commander.cfg @@ -27,7 +27,8 @@ {ABILITY_LEADERSHIP} [/abilities] usage=fighter - description= _ "In this new harsh world, might often makes right and these commanders are strong enough to rise to positions of leadership. Leading small groups of warriors, commanders rally their troops around them and show no mercy to their enemies, striking fiercely with both sword and bow."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP} + description= _ "In this new harsh world, might often makes right and these commanders are strong enough to rise to positions of leadership. Leading small groups of warriors, commanders rally their troops around them and show no mercy to their enemies, striking fiercely with both sword and bow." + {NOTE_LEADERSHIP} die_sound={SOUND_LIST:HUMAN_DIE} [attack] name=sword diff --git a/data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Body.cfg b/data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Body.cfg index 52847c603a31..1ce6d979fde4 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Body.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Body.cfg @@ -36,7 +36,8 @@ cost=20 usage=fighter do_not_list=yes - description= _ "This thing is impossible to describe, no one has seen anything like it before."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL} + description= _ "This thing is impossible to describe, no one has seen anything like it before." + {NOTE_MAGICAL} {DEFENSE_ANIM_FILTERED ("units/alien/core-compact.png") ("units/alien/core-compact.png") ("wail.wav") (direction=n,ne,se,s)} {DEFENSE_ANIM_FILTERED ("units/alien/core-compact.png~FL(horiz)") ("units/alien/core-compact.png~FL(horiz)") ("wail.wav") (direction=nw,sw)} diff --git a/data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Spire.cfg b/data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Spire.cfg index 538f6f60bf36..6bdb5f2f671a 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Spire.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Spire.cfg @@ -30,7 +30,8 @@ cost=20 usage=fighter do_not_list=yes - description= _ "This thing is impossible to describe, no one has seen anything like it before."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL} + description= _ "This thing is impossible to describe, no one has seen anything like it before." + {NOTE_MAGICAL} die_sound=wail.wav {DEFENSE_ANIM_FILTERED ("units/alien/spire.png") ("units/alien/spire.png") ("wail-sml.wav") (direction=n,ne,se,s)} {DEFENSE_ANIM_FILTERED ("units/alien/spire.png~FL(horiz)") ("units/alien/spire.png~FL(horiz)") ("wail-sml.wav") (direction=nw,sw)} diff --git a/data/campaigns/Under_the_Burning_Suns/units/monsters/Dust_Devil.cfg b/data/campaigns/Under_the_Burning_Suns/units/monsters/Dust_Devil.cfg index 0a044539db93..2d74f57bd792 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/monsters/Dust_Devil.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/monsters/Dust_Devil.cfg @@ -12,7 +12,10 @@ hitpoints=36 alignment=neutral cost=20 - description= _ "A swirl of dust and desert sand, quick as a wind, impossible to spot when resting and as dangerous as sand storm when riled."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_SWARM}+{SPECIAL_NOTES_ARCANE} + description= _ "A swirl of dust and desert sand, quick as a wind, impossible to spot when resting and as dangerous as sand storm when riled." + {NOTE_MAGICAL} + {NOTE_SWARM} + {NOTE_ARCANE} {DEFENSE_ANIM "units/monsters/dust-devil.png" "units/monsters/dust-devil.png" wose-hit.ogg } die_sound=groan.wav movement_type=undeadfly diff --git a/data/campaigns/Under_the_Burning_Suns/units/monsters/Flesh_Golem.cfg b/data/campaigns/Under_the_Burning_Suns/units/monsters/Flesh_Golem.cfg index 40719822db23..401d1316c9f5 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/monsters/Flesh_Golem.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/monsters/Flesh_Golem.cfg @@ -21,7 +21,8 @@ advances_to=null cost=30 usage=fighter - description= _ "Incredibly strong constructs, flesh golems are created by powerful necromancers from the bodies of fallen warriors. Though these golems dutifully follow every command, and attack their enemies with ceaseless rage, the madness that possesses them has occasionally caused them to turn on their masters."+{SPECIAL_NOTES}+{SPECIAL_NOTES_BERSERK} + description= _ "Incredibly strong constructs, flesh golems are created by powerful necromancers from the bodies of fallen warriors. Though these golems dutifully follow every command, and attack their enemies with ceaseless rage, the madness that possesses them has occasionally caused them to turn on their masters." + {NOTE_BERSERK} {DEFENSE_ANIM "units/monsters/flesh-golem-defend.png" "units/monsters/flesh-golem.png" {SOUND_LIST:TROLL_HIT} } die_sound={SOUND_LIST:TROLL_HIT} [attack] diff --git a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Hunter.cfg b/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Hunter.cfg index 409576b0c69e..461f7101098e 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Hunter.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Hunter.cfg @@ -15,7 +15,8 @@ {AMLA_DEFAULT} cost=15 usage=archer - description= _ "Naga Hunters are Naga who are skilled at hunting with a bow. Since the naga are naturally resistant to poison, they have no qualms about hunting with poisoned arrows. These two foot long shafts, tipped with a potent poison, have been known to slay many kinds of prey."+{SPECIAL_NOTES}+{SPECIAL_NOTES_POISON} + description= _ "Naga Hunters are Naga who are skilled at hunting with a bow. Since the naga are naturally resistant to poison, they have no qualms about hunting with poisoned arrows. These two foot long shafts, tipped with a potent poison, have been known to slay many kinds of prey." + {NOTE_POISON} die_sound=naga-die.ogg {DEFENSE_ANIM_RANGE "units/nagas/hunter-melee-defend.png" "units/nagas/hunter-attack-melee-1.png" {SOUND_LIST:NAGA_HIT} melee} {DEFENSE_ANIM_RANGE "units/nagas/hunter-defend.png" "units/nagas/hunter.png" {SOUND_LIST:NAGA_HIT} ranged} diff --git a/data/campaigns/Under_the_Burning_Suns/units/orcs/Dark_Assassin1.cfg b/data/campaigns/Under_the_Burning_Suns/units/orcs/Dark_Assassin1.cfg index 733f93c3e14c..9ed1db2fd68f 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/orcs/Dark_Assassin1.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/orcs/Dark_Assassin1.cfg @@ -16,7 +16,8 @@ advances_to=null cost=25 usage=fighter - description= _ "The Dark Assassin appears and disappears at a moment’s notice. No one knows where he came from or why he acts the way he does, but the trail of death he leaves in his wake is unmistakeable."+{SPECIAL_NOTES}+{SPECIAL_NOTES_POISON} + description= _ "The Dark Assassin appears and disappears at a moment’s notice. No one knows where he came from or why he acts the way he does, but the trail of death he leaves in his wake is unmistakeable." + {NOTE_POISON} [defend] start_time=-150 sound_start_time=-25 diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Archer.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Archer.cfg index e114e6ea9de1..adca5a82ff57 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Archer.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Archer.cfg @@ -18,7 +18,8 @@ advances_to=Quenoth Marksman cost=18 usage=scout - description= _ "With the open sands providing much less protection than the old forests did, the wide ranks of elvish archers that once formed the core of the elvish military have all but disappeared. Instead, the few who still dedicate themselves to the traditional weapon of their ancestors practice the art from the saddle, allowing them to more easily avoid the perils of melee combat."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DISENGAGE} + description= _ "With the open sands providing much less protection than the old forests did, the wide ranks of elvish archers that once formed the core of the elvish military have all but disappeared. Instead, the few who still dedicate themselves to the traditional weapon of their ancestors practice the art from the saddle, allowing them to more easily avoid the perils of melee combat." + {NOTE_DISENGAGE} die_sound=horse-die.ogg [abilities] {ABILITY_DISENGAGE} diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Champion.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Champion.cfg index ff89edca1e50..0a9a1b5ee5b5 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Champion.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Champion.cfg @@ -21,7 +21,9 @@ {AMLA_DEFAULT} cost=15 usage=fighter - description= _ "Standing at the forefront of most Quenoth spear lines, Champions are those who have mastered the use of the glaive to near perfection. Perhaps only slightly lacking in finesse in strategy, these elves more than compensate with raw power and can force their way through all but the most secure of defenses."+{SPECIAL_NOTES}+{SPECIAL_NOTES_FORMATION}+{SPECIAL_NOTES_FIRSTSTRIKE} + description= _ "Standing at the forefront of most Quenoth spear lines, Champions are those who have mastered the use of the glaive to near perfection. Perhaps only slightly lacking in finesse in strategy, these elves more than compensate with raw power and can force their way through all but the most secure of defenses." + {NOTE_FORMATION} + {NOTE_FIRSTSTRIKE} die_sound={SOUND_LIST:ELF_HIT} [abilities] {ABILITY_FORMATION} diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Corrupted_Elf.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Corrupted_Elf.cfg index d0d6a58735c7..8e9e13dc3371 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Corrupted_Elf.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Corrupted_Elf.cfg @@ -16,7 +16,9 @@ cost=100 usage=fighter do_not_list=yes - description= _ "Imbued with a dark spirit these corrupted elves combine unhuman strength with potent magics to create formidable opponents. Though the elvish body often decays quickly, these abominations are potent weapons of the undead lords."+{SPECIAL_NOTES}+{SPECIAL_NOTES_FIRSTSTRIKE}+{SPECIAL_NOTES_MAGICAL} + description= _ "Imbued with a dark spirit these corrupted elves combine unhuman strength with potent magics to create formidable opponents. Though the elvish body often decays quickly, these abominations are potent weapons of the undead lords." + {NOTE_FIRSTSTRIKE} + {NOTE_MAGICAL} die_sound={SOUND_LIST:ELF_HIT} [attack] name=glaive diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Divine_Avatar.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Divine_Avatar.cfg index 9372e445a0a4..8eacd2ba25b5 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Divine_Avatar.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Divine_Avatar.cfg @@ -19,7 +19,9 @@ cost=10 usage=null do_not_list=yes - description= _ "Divine Avatars only appear in time of great need. Forms of the Gods themselves, made real in this world for a time, blessed are those who are lucky enough to view such images of power and perfection."+{SPECIAL_NOTES}+{SPECIAL_NOTES_ARCANE}+{SPECIAL_NOTES_MAGICAL} + description= _ "Divine Avatars only appear in time of great need. Forms of the Gods themselves, made real in this world for a time, blessed are those who are lucky enough to view such images of power and perfection." + {NOTE_ARCANE} + {NOTE_MAGICAL} {DEFENSE_ANIM "halo/eloh-halo-bottom.png~BLIT(halo/eloh-halo-back.png)~BLIT(units/quenoth/eloh.png,0,0)" "halo/eloh-halo-bottom.png~BLIT(halo/eloh-halo-back.png)~BLIT(units/quenoth/eloh.png,0,0)" magicmissile.wav} die_sound=magic-holy-miss-2.ogg [attack] diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Divine_Incarnation.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Divine_Incarnation.cfg index 2a71f911c458..559339ffe058 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Divine_Incarnation.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Divine_Incarnation.cfg @@ -10,7 +10,9 @@ experience=150 level=3 do_not_list=yes - description= _ "Divine Incarnations are said to be the closest thing to a god’s actual presence in this world. They can be both awe-inspiring and terrifying."+{SPECIAL_NOTES}+{SPECIAL_NOTES_ARCANE}+{SPECIAL_NOTES_MAGICAL} + description= _ "Divine Incarnations are said to be the closest thing to a god’s actual presence in this world. They can be both awe-inspiring and terrifying." + {NOTE_ARCANE} + {NOTE_MAGICAL} [attack] damage=9 [/attack] diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Druid.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Druid.cfg index 3933e4cf55cc..ec3c949973de 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Druid.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Druid.cfg @@ -19,7 +19,10 @@ [abilities] {UTBS_ABILITY_CURES} [/abilities] - description= _ "Worshippers of the Goddess of Light, Eloh, Druids are considered mysterious even by other elves of the same order. Part of this stems from the Druids’ unusual connection with nature, something nearly wholly absent in a world pervaded by scorched sand. In a brutish world where others train themselves for combat and survival, these elves are the few who remain as healers and caretakers."+{SPECIAL_NOTES}+{SPECIAL_NOTES_UTBS_CURES}+{SPECIAL_NOTES_DAZE}+{SPECIAL_NOTES_MAGICAL} + description= _ "Worshippers of the Goddess of Light, Eloh, Druids are considered mysterious even by other elves of the same order. Part of this stems from the Druids’ unusual connection with nature, something nearly wholly absent in a world pervaded by scorched sand. In a brutish world where others train themselves for combat and survival, these elves are the few who remain as healers and caretakers." + {NOTE_UTBS_CURES} + {NOTE_DAZE} + {NOTE_MAGICAL} die_sound={SOUND_LIST:ELF_FEMALE_HIT} [attack] name=staff diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Fighter.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Fighter.cfg index 54d6ce3994c2..258065ab6e53 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Fighter.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Fighter.cfg @@ -20,7 +20,9 @@ advances_to=Quenoth Warrior,Quenoth Flanker cost=15 usage=fighter - description= _ "Long ago, during more prosperous times, Elven warriors favored the use of swords as more elegant, versatile weapons compared to other melee armaments. However, in recent times, the dearth of supplies for smithing has reduced the availability of blade-crafting, necessitating the fashioning of cheaper, more easily repaired weaponry. Quenoth Fighters are remarkably skilled in coordinated groups, where they can counteract the lack of more sophisticated weaponry by forming robust spear ranks capable of repelling nearly any frontal assault."+{SPECIAL_NOTES}+{SPECIAL_NOTES_FORMATION}+{SPECIAL_NOTES_FIRSTSTRIKE} + description= _ "Long ago, during more prosperous times, Elven warriors favored the use of swords as more elegant, versatile weapons compared to other melee armaments. However, in recent times, the dearth of supplies for smithing has reduced the availability of blade-crafting, necessitating the fashioning of cheaper, more easily repaired weaponry. Quenoth Fighters are remarkably skilled in coordinated groups, where they can counteract the lack of more sophisticated weaponry by forming robust spear ranks capable of repelling nearly any frontal assault." + {NOTE_FORMATION} + {NOTE_FIRSTSTRIKE} die_sound={SOUND_LIST:ELF_HIT} [abilities] {ABILITY_FORMATION} diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flagbearer.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flagbearer.cfg index e8dd03fc702f..a26ae3462683 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flagbearer.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flagbearer.cfg @@ -29,7 +29,9 @@ {AMLA_DEFAULT} cost=18 usage=mixed fighter - description= _ "The prestigious Flagbearers spend years out in the open deserts leading their brethren on patrols and hunts, where they forage for supplies while defending their villages from brigands. They are invariably masters of skirmishes and tactics, highly proficient at roaming through the inhospitable sands. Rarely the leaders of large villages or armies, Flagbearers nonetheless have the skill and charisma to act as generals in times of need, when the elves are threatened by something more than mere scavengers or wild beasts."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_SHOCK} + description= _ "The prestigious Flagbearers spend years out in the open deserts leading their brethren on patrols and hunts, where they forage for supplies while defending their villages from brigands. They are invariably masters of skirmishes and tactics, highly proficient at roaming through the inhospitable sands. Rarely the leaders of large villages or armies, Flagbearers nonetheless have the skill and charisma to act as generals in times of need, when the elves are threatened by something more than mere scavengers or wild beasts." + {NOTE_LEADERSHIP} + {NOTE_SHOCK} die_sound="tauroch-hit-1.ogg,tauroch-hit-2.ogg,tauroch-hit-3.ogg" [abilities] {ABILITY_LEADERSHIP} diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flanker.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flanker.cfg index 2252c0ebddbc..afbc4946955c 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flanker.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flanker.cfg @@ -20,7 +20,9 @@ advances_to=Quenoth Ranger cost=15 usage=fighter - description= _ "Some fighters find that their true talents lie not within rigid spear ranks, but out in the sands, striking at the flanks and rear of enemy forces. Fast and nimble, these elves make use of the weaknesses in enemy formations to disrupt their lines and sow chaos on the battlefield. In more cutthroat conflicts, Flankers even rely on the use of poison — a tool whose use was frowned on by their ancestors — to cripple their foes before charging in for the finish."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SKIRMISHER}+{SPECIAL_NOTES_POISON} + description= _ "Some fighters find that their true talents lie not within rigid spear ranks, but out in the sands, striking at the flanks and rear of enemy forces. Fast and nimble, these elves make use of the weaknesses in enemy formations to disrupt their lines and sow chaos on the battlefield. In more cutthroat conflicts, Flankers even rely on the use of poison — a tool whose use was frowned on by their ancestors — to cripple their foes before charging in for the finish." + {NOTE_SKIRMISHER} + {NOTE_POISON} die_sound={SOUND_LIST:ELF_HIT} [abilities] {ABILITY_SKIRMISHER} diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Marksman.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Marksman.cfg index e7044f5fbc8f..b33090028c63 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Marksman.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Marksman.cfg @@ -21,7 +21,9 @@ usage=scout description= _ "In times past, the elves’ supremacy at archery was unquestioned among the other races of the Great Continent. With archery being less viable in a land of scarce cover, however, the skills of the few remaining elven bowmen became suspect, to the point that even their brethren began to believe that archery was more of an outdated relic than a practical tool for battle. -A simple glance at a Quenoth Marksman in action would be enough to dispel this foolish train of thought. Capable of the same legendary feats as their ancestors, these master archers can achieve the same speed and precision as the Sharpshooters of old, all while in full gallop on horseback."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DISENGAGE}+{SPECIAL_NOTES_MARKSMAN} +A simple glance at a Quenoth Marksman in action would be enough to dispel this foolish train of thought. Capable of the same legendary feats as their ancestors, these master archers can achieve the same speed and precision as the Sharpshooters of old, all while in full gallop on horseback." + {NOTE_DISENGAGE} + {NOTE_MARKSMAN} die_sound=horse-die.ogg [abilities] {ABILITY_DISENGAGE} diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Mystic.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Mystic.cfg index 4116893dc732..609c6cf9752f 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Mystic.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Mystic.cfg @@ -19,7 +19,9 @@ [abilities] {UTBS_ABILITY_HEALS} [/abilities] - description= _ "Like their ancestors, Quenoth Mystics are those who devote themselves to the natural energies that flow through body of Irdya. In the harsh, barren wastelands, however, these elves can no longer rely on the once vast forests from which their forebears drew much of their strength. Instead, sand and sun are the source of the elves’ new powers, which they employ to great effect in their homes in the deserts."+{SPECIAL_NOTES}+{SPECIAL_NOTES_UTBS_HEALS}+{SPECIAL_NOTES_DAZE} + description= _ "Like their ancestors, Quenoth Mystics are those who devote themselves to the natural energies that flow through body of Irdya. In the harsh, barren wastelands, however, these elves can no longer rely on the once vast forests from which their forebears drew much of their strength. Instead, sand and sun are the source of the elves’ new powers, which they employ to great effect in their homes in the deserts." + {NOTE_UTBS_HEALS} + {NOTE_DAZE} die_sound={SOUND_LIST:ELF_FEMALE_HIT} [attack] name=staff diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Outrider.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Outrider.cfg index d4a92574914c..21e36940005c 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Outrider.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Outrider.cfg @@ -19,7 +19,9 @@ {AMLA_DEFAULT} cost=18 usage=scout - description= _ "Described as riders who ‘rush like the wind’, Outriders breeze across the sands at unmatched speeds. Unlike their lesser brethren, Outriders train themselves for direct combat, wielding sword and bola to strike at injured units and exposed flanks where enemy lines are weakest. A group of these riders is especially dangerous, for against them, both retreat and attrition are futile, a prospect that is only ruinous in the inhospitable desert."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DISENGAGE}+{SPECIAL_NOTES_SLOW} + description= _ "Described as riders who ‘rush like the wind’, Outriders breeze across the sands at unmatched speeds. Unlike their lesser brethren, Outriders train themselves for direct combat, wielding sword and bola to strike at injured units and exposed flanks where enemy lines are weakest. A group of these riders is especially dangerous, for against them, both retreat and attrition are futile, a prospect that is only ruinous in the inhospitable desert." + {NOTE_DISENGAGE} + {NOTE_SLOW} die_sound=horse-die.ogg [abilities] {ABILITY_DISENGAGE} diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Pathfinder.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Pathfinder.cfg index 103441739eb7..6543b57cd2d8 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Pathfinder.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Pathfinder.cfg @@ -18,7 +18,9 @@ advances_to=Quenoth Outrider cost=18 usage=scout - description= _ "In times past, turning and fleeing from an engagement was a risky tactic, for there were few means to avoid or block enemy archers shooting from behind. In the desert, however, unstable footing and lack of cover make it far more challenging for most fighters to strike from range. The elusive Pathfinders make use of this by riding the exceptionally agile dustboks, who are highly adapted to traversing the dunes and can evade most attacks with their swift movements. The difficulty in pinning these riders down often tries the patience of their enemies, who are provoked into recklessly giving chase — inevitably into many a deadly trap."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DISENGAGE}+{SPECIAL_NOTES_SLOW} + description= _ "In times past, turning and fleeing from an engagement was a risky tactic, for there were few means to avoid or block enemy archers shooting from behind. In the desert, however, unstable footing and lack of cover make it far more challenging for most fighters to strike from range. The elusive Pathfinders make use of this by riding the exceptionally agile dustboks, who are highly adapted to traversing the dunes and can evade most attacks with their swift movements. The difficulty in pinning these riders down often tries the patience of their enemies, who are provoked into recklessly giving chase — inevitably into many a deadly trap." + {NOTE_DISENGAGE} + {NOTE_SLOW} die_sound=horse-die.ogg [abilities] {ABILITY_DISENGAGE} diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Protector.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Protector.cfg index 742f97446a07..640985bd08e4 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Protector.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Protector.cfg @@ -40,7 +40,8 @@ The orcs ambushed me near the oasis at twilight. I had to flee into the desert, ----------------------- -I woke up today in the village, tired, but alive. My friends told me that the Tauroch had carried me through the desert for many hours at no little cost to herself, for she was in worse condition than I by the time we had arrived. I can only be grateful that I managed to survive that dreadful night, for it is only by Eloh’s grace that I happened upon such a loyal companion. She is my savior, my watchful guardian, a blessing from the Goddess herself. I think I will call her Nala, meaning ‘Protector’ in our tongue. I am sure we will have many more adventures together."+{SPECIAL_NOTES}+{SPECIAL_NOTES_STEADFAST} +I woke up today in the village, tired, but alive. My friends told me that the Tauroch had carried me through the desert for many hours at no little cost to herself, for she was in worse condition than I by the time we had arrived. I can only be grateful that I managed to survive that dreadful night, for it is only by Eloh’s grace that I happened upon such a loyal companion. She is my savior, my watchful guardian, a blessing from the Goddess herself. I think I will call her Nala, meaning ‘Protector’ in our tongue. I am sure we will have many more adventures together." + {NOTE_STEADFAST} die_sound="tauroch-hit-1.ogg,tauroch-hit-2.ogg,tauroch-hit-3.ogg" [abilities] {ABILITY_STEADFAST} diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Ranger.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Ranger.cfg index 8d5fe48b81ca..39e7e9883dab 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Ranger.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Ranger.cfg @@ -21,7 +21,9 @@ {AMLA_DEFAULT} cost=50 usage=fighter - description= _ "The title ‘Ranger’ is a little misleading, for these agile elves have little in common with the more pacifistic explorers of nature that once bore the same title. They, instead, are expert fighters who specifically seek combat in order to better hone their skirmishing skills. While they do not possess the brute force of their warrior counterparts, Quenoth Rangers are more proficient at navigating through chaotic fights and are capable of darting in and out of enemy lines to assassinate injured targets. Their masterful use of poison and formidable swordsmanship make these elves especially deadly in the harsh desert terrain, where fewer options to retreat are available."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SKIRMISHER}+{SPECIAL_NOTES_POISON} + description= _ "The title ‘Ranger’ is a little misleading, for these agile elves have little in common with the more pacifistic explorers of nature that once bore the same title. They, instead, are expert fighters who specifically seek combat in order to better hone their skirmishing skills. While they do not possess the brute force of their warrior counterparts, Quenoth Rangers are more proficient at navigating through chaotic fights and are capable of darting in and out of enemy lines to assassinate injured targets. Their masterful use of poison and formidable swordsmanship make these elves especially deadly in the harsh desert terrain, where fewer options to retreat are available." + {NOTE_SKIRMISHER} + {NOTE_POISON} die_sound={SOUND_LIST:ELF_HIT} [abilities] {ABILITY_SKIRMISHER} diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Scout.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Scout.cfg index 4c169f2003ab..9efae95d247c 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Scout.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Scout.cfg @@ -15,7 +15,8 @@ advances_to=Quenoth Pathfinder,Quenoth Archer cost=17 usage=scout - description= _ "Riding the graceful, agile dustboks, Quenoth Scouts move with unmatched speed across the sands. Their practiced skill with sword and sling are useful abilities to harry enemies and allows them to act as effective hunters and patrolmen."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DISENGAGE} + description= _ "Riding the graceful, agile dustboks, Quenoth Scouts move with unmatched speed across the sands. Their practiced skill with sword and sling are useful abilities to harry enemies and allows them to act as effective hunters and patrolmen." + {NOTE_DISENGAGE} die_sound=horse-die.ogg [abilities] {ABILITY_DISENGAGE} diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Shaman.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Shaman.cfg index 1fd2245b9a5d..1ba09841b9a0 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Shaman.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Shaman.cfg @@ -19,7 +19,10 @@ [abilities] {UTBS_ABILITY_CURES} [/abilities] - description= _ "Like the elves of old, many Quenoth elves seek to study the art of medicine and healing rather than hone their abilities in direct battle. Shamans are highly knowledgeable about the sparse plant-life scattered across the deserts and even possess some ability to bolster crop growth, an invaluable skill in a land with few resources. The capacity to foster flora in such an inhospitable environment is a sign of hope as well, a chance that nature might one day rise from its sandy grave and bloom again."+{SPECIAL_NOTES}+{SPECIAL_NOTES_UTBS_CURES}+{SPECIAL_NOTES_DAZE}+{SPECIAL_NOTES_MAGICAL} + description= _ "Like the elves of old, many Quenoth elves seek to study the art of medicine and healing rather than hone their abilities in direct battle. Shamans are highly knowledgeable about the sparse plant-life scattered across the deserts and even possess some ability to bolster crop growth, an invaluable skill in a land with few resources. The capacity to foster flora in such an inhospitable environment is a sign of hope as well, a chance that nature might one day rise from its sandy grave and bloom again." + {NOTE_UTBS_CURES} + {NOTE_DAZE} + {NOTE_MAGICAL} die_sound={SOUND_LIST:ELF_FEMALE_HIT} [attack] name=staff diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Shyde.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Shyde.cfg index 5c4828639dfa..de4074393069 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Shyde.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Shyde.cfg @@ -22,7 +22,10 @@ [/abilities] description= _ "From the teachings of Analia, the healer of the Emerald Blossom: -“... by embracing the path to the faerie, we must step past the boundary of flesh and magic to become a being of them both. As surely as the physical form binds the blood that gives us life, it must bind the energy that governs our world, that which is the flowing wind, the cycle of day and night, the endless march of time... We are the physical form, but we are timeless spirits as well, beings touched by that which is faerie. That realm is one that endures through the aeons, whether it takes on the form of nature, of fire, or of sand, it is always there. As it is mutable, so must we be, for the power of faerie is that to transmute the flesh of our world, from sand to earth, from scorched wasteland to life.”"+{SPECIAL_NOTES}+{SPECIAL_NOTES_UTBS_CURES}+{SPECIAL_NOTES_DAZE}+{SPECIAL_NOTES_MAGICAL} +“... by embracing the path to the faerie, we must step past the boundary of flesh and magic to become a being of them both. As surely as the physical form binds the blood that gives us life, it must bind the energy that governs our world, that which is the flowing wind, the cycle of day and night, the endless march of time... We are the physical form, but we are timeless spirits as well, beings touched by that which is faerie. That realm is one that endures through the aeons, whether it takes on the form of nature, of fire, or of sand, it is always there. As it is mutable, so must we be, for the power of faerie is that to transmute the flesh of our world, from sand to earth, from scorched wasteland to life.”" + {NOTE_UTBS_CURES} + {NOTE_DAZE} + {NOTE_MAGICAL} die_sound={SOUND_LIST:ELF_FEMALE_HIT} [attack] name=staff diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Stalwart.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Stalwart.cfg index 1c4a7633b4c7..98d25cd76645 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Stalwart.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Stalwart.cfg @@ -33,7 +33,8 @@ advances_to=Tauroch Protector cost=18 usage=mixed fighter - description= _ "When encountering wild Taurochs, Quenoth hunters often observe the curious behavior of particularly stubborn beasts, who will brace their rugged bodies and absolutely refuse to budge when provoked. Though difficult to placate, these Taurochs are sometimes selected by skilled riders for their exceptional resilience. Any warrior who finds their advance blocked by a Stalwart would undoubtedly be wise to seek another path, for trying to displace the beast would be akin to trying to fight a stone wall."+{SPECIAL_NOTES}+{SPECIAL_NOTES_STEADFAST} + description= _ "When encountering wild Taurochs, Quenoth hunters often observe the curious behavior of particularly stubborn beasts, who will brace their rugged bodies and absolutely refuse to budge when provoked. Though difficult to placate, these Taurochs are sometimes selected by skilled riders for their exceptional resilience. Any warrior who finds their advance blocked by a Stalwart would undoubtedly be wise to seek another path, for trying to displace the beast would be akin to trying to fight a stone wall." + {NOTE_STEADFAST} die_sound="tauroch-hit-1.ogg,tauroch-hit-2.ogg,tauroch-hit-3.ogg" [abilities] {ABILITY_STEADFAST} diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg index 569861052cea..53d04671bd3c 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg @@ -19,7 +19,9 @@ [abilities] {UTBS_ABILITY_HEALS} [/abilities] - description= _ "Faerie and elven magic have oft been aptly associated with life, from which they draw the majority of their power. However, with the death of much of Irdya’s wildlife, the Quenoth Elves were forced to seek another source for their sorcery. In time, they learned how to harness the power of the twin suns, Sela and Naia, which razed the once sprawling forests of Irdya to ashes, but still spring the energy that sparks all life. Those who master this new form of magic sing of the dual nature of these embodiments of fire: flames that are both life and life’s demise."+{SPECIAL_NOTES}+{SPECIAL_NOTES_UTBS_HEALS}+{SPECIAL_NOTES_MAGICAL} + description= _ "Faerie and elven magic have oft been aptly associated with life, from which they draw the majority of their power. However, with the death of much of Irdya’s wildlife, the Quenoth Elves were forced to seek another source for their sorcery. In time, they learned how to harness the power of the twin suns, Sela and Naia, which razed the once sprawling forests of Irdya to ashes, but still spring the energy that sparks all life. Those who master this new form of magic sing of the dual nature of these embodiments of fire: flames that are both life and life’s demise." + {NOTE_UTBS_HEALS} + {NOTE_MAGICAL} die_sound={SOUND_LIST:ELF_FEMALE_HIT} [attack] name=touch diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Sylph.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Sylph.cfg index 0cddc44459a9..0cf9523b5fbe 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Sylph.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Sylph.cfg @@ -22,7 +22,10 @@ {UTBS_ABILITY_HEALS} {ABILITY_ILLUMINATES} [/abilities] - description= _ "In times past, those who stepped beyond the boundary of the worlds of elf and faerie were called Sylphs, mystics with unparalleled knowledge of the secrets of the natural sphere. However, in the harsh new world, the path into the realm of the faerie became no longer a journey into the heart of nature, but a diverging path between light and darkness. Those elves who embrace the burning suns as the fulcrum of life and death learn also to harness their power, transforming into beings imbued with radiant fire. These Sun Sylphs very much embody the power that they wield: light that heals and protects, and flames that smolder with destruction."+{SPECIAL_NOTES}+{SPECIAL_NOTES_UTBS_HEALS}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_ILLUMINATES} + description= _ "In times past, those who stepped beyond the boundary of the worlds of elf and faerie were called Sylphs, mystics with unparalleled knowledge of the secrets of the natural sphere. However, in the harsh new world, the path into the realm of the faerie became no longer a journey into the heart of nature, but a diverging path between light and darkness. Those elves who embrace the burning suns as the fulcrum of life and death learn also to harness their power, transforming into beings imbued with radiant fire. These Sun Sylphs very much embody the power that they wield: light that heals and protects, and flames that smolder with destruction." + {NOTE_UTBS_HEALS} + {NOTE_MAGICAL} + {NOTE_ILLUMINATES} die_sound={SOUND_LIST:ELF_FEMALE_HIT} [attack] name=touch diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Vanguard.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Vanguard.cfg index 26d197653104..c0e49bd1934a 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Vanguard.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Vanguard.cfg @@ -28,7 +28,9 @@ advances_to=Tauroch Flagbearer cost=18 usage=mixed fighter - description= _ "The massive and fearless Taurochs are often employed not only to charge and break through enemy formations, but to rally and inspire infantry to hold their ground. Vanguards are hardy riders, adept at surviving in the thick of battle and leading their brethren from the front lines. Towering above the rolling dunes, the Vanguards bear great flags that fly brightly in the desert skies, a distinctive sight even from far away across the sands. The presence of these riders is a heartening one for most elves and a deterrent for the many pillagers that rove the deserts."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_SHOCK} + description= _ "The massive and fearless Taurochs are often employed not only to charge and break through enemy formations, but to rally and inspire infantry to hold their ground. Vanguards are hardy riders, adept at surviving in the thick of battle and leading their brethren from the front lines. Towering above the rolling dunes, the Vanguards bear great flags that fly brightly in the desert skies, a distinctive sight even from far away across the sands. The presence of these riders is a heartening one for most elves and a deterrent for the many pillagers that rove the deserts." + {NOTE_LEADERSHIP} + {NOTE_SHOCK} die_sound="tauroch-hit-1.ogg,tauroch-hit-2.ogg,tauroch-hit-3.ogg" [abilities] {ABILITY_LEADERSHIP} diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Warrior.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Warrior.cfg index 9ec1f4ea83b3..1bffe68aa9dc 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Warrior.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Warrior.cfg @@ -20,7 +20,9 @@ advances_to=Quenoth Champion cost=15 usage=fighter - description= _ "When compared to a spear, a glaive is often a shorter weapon with less reach, but more versatile in use. An experienced fighter can use the head to hook or pin enemy weapons and strike from unusual angles, allowing them to catch an unwary opponent by surprise. In formation, Quenoth Warriors bear these somewhat unorthodox weapons to both strike with great power and to support their nearby brethren."+{SPECIAL_NOTES}+{SPECIAL_NOTES_FORMATION}+{SPECIAL_NOTES_FIRSTSTRIKE} + description= _ "When compared to a spear, a glaive is often a shorter weapon with less reach, but more versatile in use. An experienced fighter can use the head to hook or pin enemy weapons and strike from unusual angles, allowing them to catch an unwary opponent by surprise. In formation, Quenoth Warriors bear these somewhat unorthodox weapons to both strike with great power and to support their nearby brethren." + {NOTE_FORMATION} + {NOTE_FIRSTSTRIKE} die_sound={SOUND_LIST:ELF_HIT} [abilities] {ABILITY_FORMATION} diff --git a/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Ghost.cfg b/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Ghost.cfg index b8c9b46927b7..da512f1af87c 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Ghost.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Ghost.cfg @@ -15,5 +15,9 @@ advances_to=EWraith,EShadow description= _ "It is one of the greater mercies of creation that a human soul is immutable, and cannot be destroyed. However, the many things a necromancer can do, despite this, are entirely horrifying. -Trapped within a shroud of vile enchantments, a spirit likens unto the wind in the sails of a ship. The contrivance that results from this prison is an unfailing servant, which can be bound to whatever task their master sees fit."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DRAIN}+{SPECIAL_NOTES_SPIRIT}+{SPECIAL_NOTES_ARCANE}+_"SPECIAL_NOTE^ This unit is able to move through solid stone walls." +Trapped within a shroud of vile enchantments, a spirit likens unto the wind in the sails of a ship. The contrivance that results from this prison is an unfailing servant, which can be bound to whatever task their master sees fit." + {NOTE_DRAIN} + {NOTE_SPIRIT} + {NOTE_ARCANE} + {NOTE_ETHEREAL} [/unit_type] diff --git a/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Nightgaunt.cfg b/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Nightgaunt.cfg index 2639baf0d7cf..0b127bfeb792 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Nightgaunt.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Nightgaunt.cfg @@ -17,5 +17,12 @@ __remove=yes [/hides] [/abilities] - description= _ "The purpose of the masks that these creatures wear is unknown, as is the countenance that they obscure. These terrible forms are rarely seen by the living, and those who live to speak of them had no leisure to study their foe."+{SPECIAL_NOTES}+{SPECIAL_NOTES_BACKSTAB}+{SPECIAL_NOTES_SPIRIT}+{SPECIAL_NOTES_SKIRMISHER}+_"SPECIAL_NOTE^ This unit is able to move through solid stone walls."+_"SPECIAL_NOTE^ Unlike normal Nightgaunts, Ethereal Nightgaunts cannot hide at night." + description= _ "The purpose of the masks that these creatures wear is unknown, as is the countenance that they obscure. These terrible forms are rarely seen by the living, and those who live to speak of them had no leisure to study their foe." + {NOTE_BACKSTAB} + {NOTE_SPIRIT} + {NOTE_SKIRMISHER} + {NOTE_ETHEREAL} + [special_note] + note=_"SPECIAL_NOTE^Unlike normal Nightgaunts, Ethereal Nightgaunts cannot hide at night." + [/special_note] [/unit_type] diff --git a/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Shadow.cfg b/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Shadow.cfg index cf72bd66d868..0df9f2faa0b7 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Shadow.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Shadow.cfg @@ -20,5 +20,12 @@ advances_to=ENightgaunt description= _ "When light came into the world and gave form to the unknown, fear was forced to retreat into darkness. Since that day, the shadows of the world have held terror for humanity, though it knows not why. -That is a question which is easily answered by a necromancer."+{SPECIAL_NOTES}+{SPECIAL_NOTES_BACKSTAB}+{SPECIAL_NOTES_SPIRIT}+{SPECIAL_NOTES_SKIRMISHER}+_"SPECIAL_NOTE^ This unit is able to move through solid stone walls."+_"SPECIAL_NOTE^ Unlike normal Shadows, Ethereal Shadows cannot hide at night." +That is a question which is easily answered by a necromancer." + {NOTE_BACKSTAB} + {NOTE_SPIRIT} + {NOTE_SKIRMISHER} + {NOTE_ETHEREAL} + [special_note] + note=_"SPECIAL_NOTE^ Unlike normal Shadows, Ethereal Shadows cannot hide at night." + [/special_note] [/unit_type] diff --git a/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Spectre.cfg b/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Spectre.cfg index f4149f383af6..34dcbf9a452e 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Spectre.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Spectre.cfg @@ -13,5 +13,8 @@ [/defense] description= _ "Sometimes called the ‘hollow men’, spectres form the right arm of their master’s power. These abominations are a rightful terror to the living, and keep a sleepless vigil over their master’s domain. -The creation of these is no mean feat; the real danger in encountering one is that it is likely only the harbinger of a much more dangerous force that will follow in its wake."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DRAIN}+{SPECIAL_NOTES_SPIRIT}+_"SPECIAL_NOTE^ This unit is able to move through solid stone walls." +The creation of these is no mean feat; the real danger in encountering one is that it is likely only the harbinger of a much more dangerous force that will follow in its wake." + {NOTE_DRAIN} + {NOTE_SPIRIT} + {NOTE_ETHEREAL} [/unit_type] diff --git a/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Wraith.cfg b/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Wraith.cfg index 183c2205efe0..791da24c12b3 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Wraith.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Wraith.cfg @@ -14,5 +14,8 @@ advances_to=ESpectre description= _ "These tortured forms of what were once warriors are among the most terrifying things a necromancer can create, for a sword will cleave right through them, as through air itself. What inspires such fear is the thought that these beasts are invincible, a belief that is actually far from the truth. -Because of this, a means was made by which the enchantments that drive these creatures could renew themselves through the very thing which threatened them."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DRAIN}+{SPECIAL_NOTES_SPIRIT}+_"SPECIAL_NOTE^ This unit is able to move through solid stone walls." +Because of this, a means was made by which the enchantments that drive these creatures could renew themselves through the very thing which threatened them." + {NOTE_DRAIN} + {NOTE_SPIRIT} + {NOTE_ETHEREAL} [/unit_type] diff --git a/data/campaigns/Under_the_Burning_Suns/units/undead/Haunt.cfg b/data/campaigns/Under_the_Burning_Suns/units/undead/Haunt.cfg index cd54ed0c910a..8949c94af0b2 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/undead/Haunt.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/undead/Haunt.cfg @@ -13,5 +13,8 @@ deep_water={UNREACHABLE} [/movement_costs] experience=30 - description= _ "Haunts are the tortured souls of those who have died suddenly and never been laid to rest. Paralyzed by the shock of their death, they are cursed to forever haunt the place of their death and relive their final moments over and over and over."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DRAIN}+{SPECIAL_NOTES_SPIRIT}+{SPECIAL_NOTES_ARCANE} + description= _ "Haunts are the tortured souls of those who have died suddenly and never been laid to rest. Paralyzed by the shock of their death, they are cursed to forever haunt the place of their death and relive their final moments over and over and over." + {NOTE_DRAIN} + {NOTE_SPIRIT} + {NOTE_ARCANE} [/unit_type] diff --git a/data/campaigns/Under_the_Burning_Suns/units/undead/Spider_Lich.cfg b/data/campaigns/Under_the_Burning_Suns/units/undead/Spider_Lich.cfg index 656f93b09bf8..3d54ee265e0d 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/undead/Spider_Lich.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/undead/Spider_Lich.cfg @@ -15,7 +15,10 @@ advances_to=null cost=62 usage=fighter - description= _ "No one is quite sure how spider liches are created, but they are a horrific sight to behold. Crawling around on huge skeletal legs, and wielding huge magical staves, these abominations are fearsome undead foes. "+{SPECIAL_NOTES}+{SPECIAL_NOTES_DRAIN}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_ARCANE} + description= _ "No one is quite sure how spider liches are created, but they are a horrific sight to behold. Crawling around on huge skeletal legs, and wielding huge magical staves, these abominations are fearsome undead foes. " + {NOTE_DRAIN} + {NOTE_MAGICAL} + {NOTE_ARCANE} die_sound=lich-die.ogg [attack] name=touch diff --git a/data/campaigns/Under_the_Burning_Suns/utils/abilities.cfg b/data/campaigns/Under_the_Burning_Suns/utils/abilities.cfg index 63cd45d56af4..dd77bc883e2f 100644 --- a/data/campaigns/Under_the_Burning_Suns/utils/abilities.cfg +++ b/data/campaigns/Under_the_Burning_Suns/utils/abilities.cfg @@ -61,13 +61,23 @@ A poisoned unit cannot be cured of its poison by a healer, and must seek the car #textdomain wesnoth-utbs -#define SPECIAL_NOTES_UTBS_HEALS -_" -• This unit is capable of basic healing and slowing dehydration."#enddef +#define NOTE_UTBS_HEALS +[special_note] + note=_"This unit is capable of basic healing and slowing dehydration." +[/special_note] +#enddef -#define SPECIAL_NOTES_UTBS_CURES -_" -• This unit is capable of healing those around it, slowing dehydration, and curing them of poison."#enddef +#define NOTE_UTBS_CURES +[special_note] + note=_"This unit is capable of healing those around it, slowing dehydration, and curing them of poison." +[/special_note] +#enddef + +#define NOTE_ETHEREAL +[special_note] + note=_"SPECIAL_NOTE^This unit is able to move through solid stone walls." +[/special_note] +#enddef # This is the Teaching ability owned by Garak @@ -177,25 +187,35 @@ Marksman attacks are only affected if the chance to hit is greater than 60%." [/dummy] #enddef -#define SPECIAL_NOTES_SHOCK -_" -• This unit’s melee attack can overwhelm the defenses of enemies, preventing them from retaliating as effectively."#enddef +#define NOTE_SHOCK +[special_note] + note=_"This unit’s melee attack can overwhelm the defenses of enemies, preventing them from retaliating as effectively." +[/special_note] +#enddef -#define SPECIAL_NOTES_FORMATION -_" -• Groups of units of this type are able to shield each other in combat."#enddef +#define NOTE_FORMATION +[special_note] + note=_"Groups of units of this type are able to shield each other in combat." +[/special_note] +#enddef -#define SPECIAL_NOTES_DISENGAGE -_" -• This unit can move either before or after attacking."#enddef +#define NOTE_DISENGAGE +[special_note] + note=_"This unit can move either before or after attacking." +[/special_note] +#enddef -#define SPECIAL_NOTES_DAZE -_" -• This unit can daze its enemies, reducing their accuracy and defense until they end a turn."#enddef +#define NOTE_DAZE +[special_note] + note=_"This unit can daze its enemies, reducing their accuracy and defense until they end a turn." +[/special_note] +#enddef -#define SPECIAL_NOTES_DISTRACT -_" -• This unit is capable of distracting opponents, allowing allied units to trespass their Zones of Control and move unhindered around them."#enddef +#define NOTE_DISTRACT +[special_note] + note=_"This unit is capable of distracting opponents, allowing allied units to trespass their Zones of Control and move unhindered around them." +[/special_note] +#enddef #define ABILITY_DISENGAGE_EVENTS [event] diff --git a/data/campaigns/Wings_of_Victory/units/Gorer.cfg b/data/campaigns/Wings_of_Victory/units/Gorer.cfg index 0c6b18fae09d..bc77730e3103 100644 --- a/data/campaigns/Wings_of_Victory/units/Gorer.cfg +++ b/data/campaigns/Wings_of_Victory/units/Gorer.cfg @@ -31,7 +31,8 @@ undead_variation=wolf cost=32 usage=fighter - description=_ "As Tuskers age, their already formidable teeth grow longer and more numerous. A mature boar gorer is a valuable asset to any farmer. An angry boar gorer is a challenge even to the best hunters"+{SPECIAL_NOTES}+{SPECIAL_NOTES_CHARGE} + description=_ "As Tuskers age, their already formidable teeth grow longer and more numerous. A mature boar gorer is a valuable asset to any farmer. An angry boar gorer is a challenge even to the best hunters" + {NOTE_CHARGE} die_sound=tusker-die.ogg [movement_anim] [frame] diff --git a/data/campaigns/Wings_of_Victory/units/Tusker.cfg b/data/campaigns/Wings_of_Victory/units/Tusker.cfg index d11b7fbc5e4a..708ec0bd2ca1 100644 --- a/data/campaigns/Wings_of_Victory/units/Tusker.cfg +++ b/data/campaigns/Wings_of_Victory/units/Tusker.cfg @@ -31,7 +31,8 @@ undead_variation=wolf cost=22 usage=fighter - description=_ "Tuskers are hardy livestock. Their powerful limbs make them good beasts of burden. Their thick wool and hides make coarse, but serviceable clothing and their meat is tough, but filling. But an angry or wild tusker is not to be trifled with."+{SPECIAL_NOTES}+{SPECIAL_NOTES_CHARGE} + description=_ "Tuskers are hardy livestock. Their powerful limbs make them good beasts of burden. Their thick wool and hides make coarse, but serviceable clothing and their meat is tough, but filling. But an angry or wild tusker is not to be trifled with." + {NOTE_CHARGE} die_sound=tusker-die.ogg [movement_anim] [frame] diff --git a/data/campaigns/tutorial/units/Quintain.cfg b/data/campaigns/tutorial/units/Quintain.cfg index f9937182a8e2..3d4202b4b378 100644 --- a/data/campaigns/tutorial/units/Quintain.cfg +++ b/data/campaigns/tutorial/units/Quintain.cfg @@ -13,7 +13,8 @@ usage=fighter movement_type=treefolk alignment=neutral - description= _ "Quintains are used to practice swordplay and jousting on. It would be extremely unusual to be attacked by one."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL} + description= _ "Quintains are used to practice swordplay and jousting on. It would be extremely unusual to be attacked by one." + {NOTE_MAGICAL} [resistance] blade=100 pierce=100 diff --git a/data/schema/units/types.cfg b/data/schema/units/types.cfg index b5b4571ea73c..4f5e60cbb9fe 100644 --- a/data/schema/units/types.cfg +++ b/data/schema/units/types.cfg @@ -67,7 +67,10 @@ [/tag] [tag] name="special_note" +<<<<<<< HEAD max="infinite" +======= +>>>>>>> special_notes {REQUIRED_KEY note t_string} [/tag] {LINK_TAG "units/movetype/resistance"}