From 73afb645f294f4bf9b988c19e6ac9fb84e084a32 Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Thu, 12 Sep 2019 21:12:53 -0400 Subject: [PATCH] DW: Update special notes syntax --- data/campaigns/Dead_Water/units/Brawler.cfg | 3 ++- data/campaigns/Dead_Water/units/Kraken.cfg | 4 +++- data/campaigns/Dead_Water/units/Soldier_King.cfg | 3 ++- data/campaigns/Dead_Water/units/Warrior_King.cfg | 3 ++- data/campaigns/Dead_Water/units/Young_King.cfg | 3 ++- data/campaigns/Dead_Water/utils/specials.cfg | 8 +++++--- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/data/campaigns/Dead_Water/units/Brawler.cfg b/data/campaigns/Dead_Water/units/Brawler.cfg index ef1def40d6b..6905eb2c513 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 85632de9d9c..b83ac1ee9ff 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 69c75f6919a..b103bd98bda 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 2803f37c6b1..fa9219deffe 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 d89649d30b5..3fdd85a3fd4 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 ba34659beaa..34b4060ea2e 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]