diff --git a/data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg b/data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg index e1b1de6255bb..fdcbb88b22f1 100644 --- a/data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg +++ b/data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg @@ -52,9 +52,8 @@ side=1 x=19 y=23 - {IS_HERO} [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_INTELLIGENT} [/modifications] [/unit] diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg index 44926257431a..6fd828d96436 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg @@ -72,7 +72,7 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} + facing=ne [/unit] [/side] diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg index 87ee8df15a2f..7839814aa26d 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg @@ -115,7 +115,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} facing=sw [/unit] @@ -135,7 +134,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} facing=sw [/unit] @@ -155,7 +153,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} facing=sw [/unit] @@ -175,7 +172,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} facing=sw [/unit] @@ -195,7 +191,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} facing=sw [/unit] diff --git a/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg b/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg index 7a90671213e9..e808348c5de8 100644 --- a/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg +++ b/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg @@ -221,7 +221,7 @@ [unit] type=Mermaid Priestess [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_RESILIENT} [/modifications] id=Cylanna @@ -230,7 +230,6 @@ side=1 x=21 y=9 - {IS_HERO} unrenamable=yes [/unit] @@ -312,7 +311,6 @@ [/modifications] facing=se animate=yes - {IS_LOYAL} profile=portraits/gwabbo.png [/unit] diff --git a/data/campaigns/Dead_Water/scenarios/02_Flight.cfg b/data/campaigns/Dead_Water/scenarios/02_Flight.cfg index 185d7851c382..083ecdf8bd71 100644 --- a/data/campaigns/Dead_Water/scenarios/02_Flight.cfg +++ b/data/campaigns/Dead_Water/scenarios/02_Flight.cfg @@ -463,7 +463,6 @@ _f, _f, _f, _f, _f, _f, _f side=1 x=$x1 y=$y1 - {IS_LOYAL} [/unit] [if] @@ -590,7 +589,6 @@ _f, _f, _f, _f, _f, _f, _f side=1 x=$x1 y=$y1 - {IS_LOYAL} [/unit] [if] @@ -733,7 +731,6 @@ _f, _f, _f, _f, _f, _f, _f side=1 x=$x1 y=$y1 - {IS_LOYAL} [/unit] [if] diff --git a/data/campaigns/Dead_Water/scenarios/04_Slavers.cfg b/data/campaigns/Dead_Water/scenarios/04_Slavers.cfg index 42c6fb914464..d9129510d0df 100644 --- a/data/campaigns/Dead_Water/scenarios/04_Slavers.cfg +++ b/data/campaigns/Dead_Water/scenarios/04_Slavers.cfg @@ -335,7 +335,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [message] @@ -627,7 +626,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] [message] @@ -691,7 +689,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [if] diff --git a/data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg b/data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg index 23388ba1646a..f9e83262f518 100644 --- a/data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg +++ b/data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg @@ -182,7 +182,7 @@ x={X} y={Y} [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL OVERLAY=""} {TRAIT_FEARLESS} [/modifications] moves=0 diff --git a/data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg b/data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg index 1178c348a3fe..680c12a71fed 100644 --- a/data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg +++ b/data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg @@ -280,7 +280,6 @@ {TRAIT_LOYAL} {TRAIT_HEALTHY} [/modifications] - {IS_LOYAL} animate=yes [/unit] [message] diff --git a/data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg b/data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg index 932f41bd1f71..492093f98a6a 100644 --- a/data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg +++ b/data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg @@ -383,10 +383,9 @@ name= _ "Caladon" unrenamable=yes [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_QUICK} [/modifications] - {IS_HERO} profile=portraits/caladon.png [/unit] diff --git a/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg b/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg index d21bcd1a2c9a..b55f16990bf3 100644 --- a/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg +++ b/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg @@ -451,7 +451,6 @@ {TRAIT_LOYAL} {TRAIT_DEXTROUS} [/modifications] - {IS_LOYAL} [/unit] [unit] type=Thug @@ -464,7 +463,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [unit] type=Thug @@ -477,7 +475,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] {CLEAR_VARIABLE Siddry_stored} diff --git a/data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg b/data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg index 361b4b95563a..85985c67dfb2 100644 --- a/data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg +++ b/data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg @@ -40,7 +40,7 @@ canrecruit=yes type=Mermaid Diviner [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL OVERLAY=""} {TRAIT_DEXTROUS} [/modifications] [ai] diff --git a/data/campaigns/Dead_Water/scenarios/12_Revenge.cfg b/data/campaigns/Dead_Water/scenarios/12_Revenge.cfg index 0cbc908ba6f3..732865b43fc0 100644 --- a/data/campaigns/Dead_Water/scenarios/12_Revenge.cfg +++ b/data/campaigns/Dead_Water/scenarios/12_Revenge.cfg @@ -406,7 +406,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [unit] side=1 @@ -419,7 +418,6 @@ {TRAIT_INTELLIGENT} [/modifications] experience=10 - {IS_LOYAL} [/unit] [unit] side=1 @@ -432,7 +430,6 @@ {TRAIT_STRONG} [/modifications] experience=32 - {IS_LOYAL} [/unit] [message] speaker=Nebthun diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg index 46734d7d4ee3..1f4606c38a71 100644 --- a/data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg +++ b/data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg @@ -613,7 +613,6 @@ name= _ "Theorin" side=1 x,y=31,9 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_INTELLIGENT} @@ -684,7 +683,6 @@ name= _ "Stanis" side=1 x,y=29,25 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_STRONG} diff --git a/data/campaigns/Delfadors_Memoirs/utils/characters.cfg b/data/campaigns/Delfadors_Memoirs/utils/characters.cfg index d34908197104..777c067ceb4f 100644 --- a/data/campaigns/Delfadors_Memoirs/utils/characters.cfg +++ b/data/campaigns/Delfadors_Memoirs/utils/characters.cfg @@ -87,9 +87,8 @@ type=General profile="portraits/lionel.png" unrenamable=yes - {IS_HERO} [modifications] - {OBJECT_LOYAL} + {TRAIT_LOYAL_HERO_NOSLOT} {TRAIT_FEARLESS} {TRAIT_STRONG} [/modifications] @@ -112,9 +111,8 @@ name= _ "Relgorn" type=Dwarvish Fighter unrenamable=yes # Shows up in HttT S14 - {IS_HERO} [modifications] - {OBJECT_LOYAL} + {TRAIT_LOYAL_HERO_NOSLOT} {TRAIT_STRONG} {TRAIT_HEALTHY} [/modifications] diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg index abfbc611ec6e..0e4d29952988 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg @@ -3540,7 +3540,6 @@ And the tongue of fire begets ashen repose." [/effect] [/object] [/modifications] - {IS_LOYAL} [/unit] [delay] diff --git a/data/campaigns/Descent_Into_Darkness/utils/characters.cfg b/data/campaigns/Descent_Into_Darkness/utils/characters.cfg index 00bb677b3064..6c07e35a95f0 100644 --- a/data/campaigns/Descent_Into_Darkness/utils/characters.cfg +++ b/data/campaigns/Descent_Into_Darkness/utils/characters.cfg @@ -38,7 +38,6 @@ profile=portraits/darken_volk.png unrenamable=yes random_traits=no - {IS_HERO} [modifications] # NOTE: if you change these, make sure you don't break the # removal of the loyal trait in 'Alone at Last' @@ -49,6 +48,14 @@ [effect] apply_to=loyal [/effect] + [effect] + apply_to=ellipse + ellipse=misc/ellipse-hero + [/effect] + [effect] + apply_to=overlay + add=misc/hero-icon.png + [/effect] [/trait] {TRAIT_QUICK} [object] diff --git a/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg b/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg index f763896800bf..a6df4c8de905 100644 --- a/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg +++ b/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg @@ -229,7 +229,6 @@ x,y=$prison_locations[$i].x,$prison_locations[$i].y random_traits=no facing=sw - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TEAM_COLOR_OVERRIDE () white} diff --git a/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg b/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg index 23e861798ec3..0aa5fd995654 100644 --- a/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg +++ b/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg @@ -434,10 +434,9 @@ type=$stored_Owaec.type experience=$stored_Owaec.experience profile=portraits/owaec.png - {IS_HERO} random_traits=no [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] [/unit] diff --git a/data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg b/data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg index 86f7ef02add9..17e831b99b3f 100644 --- a/data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg +++ b/data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg @@ -372,7 +372,6 @@ side=1 canrecruit=no - {IS_LOYAL} [modifications] {TRAIT_LOYAL} diff --git a/data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg b/data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg index ef737f6533fb..62ede3414368 100644 --- a/data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg +++ b/data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg @@ -191,7 +191,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [message] speaker=Dacyn diff --git a/data/campaigns/Eastern_Invasion/scenarios/16_Weldyn_under_Attack.cfg b/data/campaigns/Eastern_Invasion/scenarios/16_Weldyn_under_Attack.cfg index c7912bf5ed41..7ac924cdf991 100644 --- a/data/campaigns/Eastern_Invasion/scenarios/16_Weldyn_under_Attack.cfg +++ b/data/campaigns/Eastern_Invasion/scenarios/16_Weldyn_under_Attack.cfg @@ -208,11 +208,10 @@ id=Konrad name= _ "Konrad II" profile=portraits/konrad_II.png - {IS_HERO} type=General random_traits=no [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] side=1 x=21 diff --git a/data/campaigns/Eastern_Invasion/utils/character-definitions.cfg b/data/campaigns/Eastern_Invasion/utils/character-definitions.cfg index a17df7097339..35c25999264c 100644 --- a/data/campaigns/Eastern_Invasion/utils/character-definitions.cfg +++ b/data/campaigns/Eastern_Invasion/utils/character-definitions.cfg @@ -13,12 +13,11 @@ type=White Mage id=Dacyn name= _ "Dacyn" - {IS_HERO} profile=portraits/dacyn.png random_traits=no unrenamable=yes [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TEAM_COLOR_OVERRIDE () teal} [/modifications] #enddef diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg index bf1696463077..b65af18c1c1a 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg @@ -133,7 +133,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] type=Swordsman @@ -146,7 +145,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] {NEED_DELFADOR placement=leader} @@ -237,7 +235,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] [message] speaker=Haldiel @@ -272,7 +269,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] type=Horseman @@ -286,7 +282,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] type=Horseman @@ -300,7 +295,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] type=Knight @@ -314,7 +308,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] type=Knight @@ -328,7 +321,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] type=Knight @@ -343,7 +335,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] [message] speaker=Kaylan @@ -389,7 +380,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] type=Horseman @@ -403,7 +393,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] type=Horseman @@ -417,7 +406,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] type=Knight @@ -431,7 +419,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] type=Knight @@ -445,7 +432,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] type=Knight @@ -460,7 +446,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] [redraw] [/redraw] @@ -493,7 +478,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] [message] speaker=Simyr diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg index 60452a7bdf57..db3ee1cbb6ad 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg @@ -225,7 +225,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [message] @@ -277,7 +276,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] # The guy does not show up on the screen without some help diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg index 42277de689b5..fbf3c9245ac0 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg @@ -142,7 +142,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] #ifdef EASY @@ -159,7 +158,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] #ifdef HARD @@ -176,7 +174,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] {OBJ_TRIDENT_STORM 5 4 bop_stormtrident} @@ -323,7 +320,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] [unit] side=1 @@ -336,7 +332,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] [unit] side=1 @@ -349,7 +344,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] #ifdef EASY @@ -364,7 +358,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] #endif [message] @@ -396,7 +389,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] #ifdef EASY @@ -411,7 +403,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] [unit] side=1 @@ -424,7 +415,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] #else [unit] @@ -438,7 +428,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] #endif [message] @@ -470,7 +459,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] #ifdef EASY @@ -485,7 +473,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] #endif @@ -518,7 +505,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] [unit] side=1 @@ -531,7 +517,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] #ifdef EASY @@ -546,7 +531,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] #endif [message] @@ -578,7 +562,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [unit] side=1 @@ -591,7 +574,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] [unit] side=1 @@ -604,7 +586,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] #ifdef EASY [unit] @@ -618,7 +599,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] [unit] side=1 @@ -631,7 +611,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] #else [unit] @@ -645,7 +624,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] #endif diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg index 48b3955e7e4f..e31de06311b8 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg @@ -321,7 +321,6 @@ [/object] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] #set the variable to say the Moremirmu is alive [set_variable] @@ -369,7 +368,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] {LOYAL_UNIT 2 (Walking Corpse) ({X}) ({Y})} diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg index 0ceb92048232..83d5dfb35d6a 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg @@ -253,7 +253,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -268,7 +267,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] id=Gamlel @@ -282,7 +280,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [redraw] @@ -411,7 +408,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -426,7 +422,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] id=Gamlel @@ -440,7 +435,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] id=Darglen @@ -453,7 +447,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] #dialog [message] @@ -529,7 +522,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -544,7 +536,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -559,7 +550,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] #create terrain [terrain] diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg index 7d06e330842b..28919190d861 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg @@ -334,7 +334,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [object] diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg index d6be6032a040..73d3f5ae64dc 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg @@ -277,7 +277,6 @@ [/object] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] {LOYAL_UNIT 1 (White Mage) 20 48} diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg index be4085141050..5487c09502f9 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg @@ -172,7 +172,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] #enddef diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg index 99461464762f..cba496b35ac8 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg @@ -123,7 +123,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] generate_name=yes @@ -135,7 +134,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] generate_name=yes @@ -147,7 +145,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] generate_name=yes @@ -159,7 +156,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] generate_name=yes @@ -171,7 +167,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] generate_name=yes @@ -183,7 +178,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] generate_name=yes @@ -195,7 +189,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] id=rider @@ -208,7 +201,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] generate_name=yes @@ -220,7 +212,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] generate_name=yes @@ -232,7 +223,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] {FLAG_VARIANT knalgan} [/side] diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg index 8eabd6790a64..c2c30bdb40ec 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg @@ -193,7 +193,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [teleport] [filter] @@ -436,7 +435,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] #ifdef EASY @@ -454,7 +452,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [/event] diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg index 2ea7400f275c..f02de2e338d1 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg @@ -181,7 +181,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [redraw] [/redraw] @@ -203,7 +202,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [redraw] [/redraw] @@ -402,9 +400,8 @@ [/filter] side=1 canrecruit=no - {IS_HERO} [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] [/modify_unit] [/event] diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg index 03a68d5c0955..11599a1a909d 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg @@ -226,7 +226,6 @@ {TRAIT_LOYAL} {TRAIT_FEARLESS} [/modifications] - {IS_LOYAL} [status] poisoned=yes [/status] @@ -815,7 +814,6 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des {TRAIT_LOYAL} {TRAIT_FEARLESS} [/modifications] - {IS_LOYAL} [status] poisoned=yes [/status] diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg index a64f32b27bb0..8a8092e64a0c 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg @@ -412,7 +412,6 @@ {TRAIT_LOYAL} {TRAIT_DEXTROUS} [/modifications] - {IS_LOYAL} [/unit] [redraw] diff --git a/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg index e7a80fc3e3bc..954052df7a52 100644 --- a/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg +++ b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg @@ -690,9 +690,8 @@ fire: +10%" unrenamable=yes type=Elder Mage {PLACEMENT} - {IS_HERO} [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_INTELLIGENT} [/modifications] [/unit] @@ -706,10 +705,9 @@ fire: +10%" unrenamable=yes type=Elvish Lord {PLACEMENT} - {IS_HERO} random_traits=no [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] [/unit] #enddef @@ -722,10 +720,9 @@ fire: +10%" unrenamable=yes type=Princess {PLACEMENT} - {IS_HERO} random_traits=no [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] [/unit] #enddef diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg index 3ce7cd72c4d4..900529891e50 100644 --- a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg +++ b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg @@ -135,7 +135,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} facing=nw id=guard2 x=24 @@ -169,7 +168,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] )} diff --git a/data/campaigns/Legend_of_Wesmere/utils/characters.cfg b/data/campaigns/Legend_of_Wesmere/utils/characters.cfg index 11e6a973f189..fa05ee7646bb 100644 --- a/data/campaigns/Legend_of_Wesmere/utils/characters.cfg +++ b/data/campaigns/Legend_of_Wesmere/utils/characters.cfg @@ -36,7 +36,7 @@ [modifications] {TRAIT_QUICK} {TRAIT_RESILIENT} - {TRAIT_LOYAL} + {TRAIT_LOYAL OVERLAY=""} [/modifications] #enddef @@ -58,7 +58,6 @@ {TRAIT_RESILIENT} {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} #enddef #define SCOUT @@ -71,7 +70,6 @@ {TRAIT_RESILIENT} {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} #enddef #define LANDAR @@ -90,7 +88,7 @@ [modifications] {TRAIT_DEXTROUS} {TRAIT_RESILIENT} - {TRAIT_LOYAL} + {TRAIT_LOYAL OVERLAY=""} [/modifications] #enddef @@ -126,7 +124,7 @@ [modifications] {TRAIT_QUICK} {TRAIT_RESILIENT} - {TRAIT_LOYAL} + {TRAIT_LOYAL OVERLAY=""} [/modifications] #enddef @@ -140,7 +138,6 @@ {TRAIT_INTELLIGENT} {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} #enddef #define TAMERIL_ISIMERIL @@ -153,7 +150,6 @@ {TRAIT_RESILIENT} {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} #enddef #define OLURF @@ -202,7 +198,6 @@ {TRAIT_RESILIENT} {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -218,7 +213,6 @@ {TRAIT_RESILIENT} {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -262,7 +256,6 @@ {TRAIT_HEALTHY} {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -345,7 +338,6 @@ {TRAIT_DEXTROUS} {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} #enddef #define ARKILDUR @@ -358,7 +350,6 @@ {TRAIT_STRONG} {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} #enddef #TODO bring the macro to use. diff --git a/data/campaigns/Liberty/scenarios/01_The_Raid.cfg b/data/campaigns/Liberty/scenarios/01_The_Raid.cfg index 01f92d1838b0..89d111c432ae 100644 --- a/data/campaigns/Liberty/scenarios/01_The_Raid.cfg +++ b/data/campaigns/Liberty/scenarios/01_The_Raid.cfg @@ -238,9 +238,8 @@ #textdomain wesnoth-l [/effect] [/object] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] - {IS_HERO} unrenamable=yes [/unit] diff --git a/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg b/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg index b0d355aae3b8..3039e0a6ca79 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg @@ -110,7 +110,6 @@ id=Zlex name= _ "Zlex" x,y=6,24 - {IS_LOYAL} role=Supporter [modifications] {TRAIT_LOYAL} diff --git a/data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg b/data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg index a2c46a454fcc..9ad8222e0fa1 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg @@ -42,10 +42,9 @@ name= _ "Hamel" profile=portraits/Hamel.png # This nice macro gives the unit silver crown. - {IS_HERO} x,y=6,23 [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_STRONG} [/modifications] [/unit] diff --git a/data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg b/data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg index 7e2834339924..f83698597419 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg @@ -1565,7 +1565,6 @@ name= _ "Dulcatas" side=1 x,y=4,8 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_HEALTHY} @@ -1578,7 +1577,6 @@ name= _ "Antolos" side=1 x,y=7,10 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_STRONG} @@ -1591,7 +1589,6 @@ name= _ "Varem" side=1 x,y=6,13 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -2054,7 +2051,6 @@ id=Abhai name= _ "Abhai" # profile=Abhai.png - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_INTELLIGENT} diff --git a/data/campaigns/Northern_Rebirth/scenarios/05a_02_Dealings.cfg b/data/campaigns/Northern_Rebirth/scenarios/05a_02_Dealings.cfg index 35b0e1455906..4534053cf131 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/05a_02_Dealings.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/05a_02_Dealings.cfg @@ -69,7 +69,7 @@ name= _ "Galim" x,y=12,11 facing=se - {IS_LOYAL} + # todo: is the unit loyal or not? before it had the {IS_LOYAL} but without the real loyal trait. [/unit] [/side] diff --git a/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg b/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg index be126e448ef5..92263e69c107 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg @@ -965,6 +965,7 @@ [foreach] array=new_companions [do] + ## TODO: does this still work after the overlays= change? {VARIABLE this_item.side 1} {VARIABLE this_item.canrecruit no} # We'll be unstoring these units onto the recall list, which won't heal them automatically, so we do it here. @@ -998,7 +999,7 @@ name=this_item.modifications mode=replace [literal] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_UNDEAD} [/literal] [/set_variables] diff --git a/data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg b/data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg index fb13801a65da..ab048dafa0ee 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg @@ -234,7 +234,6 @@ {TRAIT_LOYAL} {TRAIT_HEALTHY} [/modifications] - {IS_LOYAL} [/unit] [/else] [/if] @@ -258,9 +257,8 @@ x,y=15,2 side=1 [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] - {IS_HERO} [/unit] [/else] [/if] @@ -284,9 +282,8 @@ x,y=15,2 side=1 [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] - {IS_HERO} [/unit] [/else] [/if] @@ -385,7 +382,6 @@ {TRAIT_LOYAL} {TRAIT_DEXTROUS} [/modifications] - {IS_LOYAL} [/unit] [message] diff --git a/data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg b/data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg index bb5ab8eed062..02aa01bbdb93 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg @@ -270,7 +270,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} id=Abhai name= _ "Abhai" #profile=Abhai.png diff --git a/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg b/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg index b9bdbdafd788..787a6192410b 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg @@ -597,7 +597,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [move_unit_fake] @@ -617,7 +616,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] [message] diff --git a/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg b/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg index ccb8a7e7de0c..2fff82a69f5d 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg @@ -592,7 +592,6 @@ [/filter] canrecruit=no {TRAIT_LOYAL} - {IS_LOYAL} [/modify_unit] [message] diff --git a/data/campaigns/Northern_Rebirth/utils/characters.cfg b/data/campaigns/Northern_Rebirth/utils/characters.cfg index 0e3982e8f56b..1fc2a3b398aa 100644 --- a/data/campaigns/Northern_Rebirth/utils/characters.cfg +++ b/data/campaigns/Northern_Rebirth/utils/characters.cfg @@ -25,7 +25,6 @@ id=Camerin name= _ "Camerin" profile=portraits/Camerin.png - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_STRONG} @@ -37,7 +36,6 @@ id=Father Morvin name= _ "Father Morvin" profile=portraits/Father_Morvin.png - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -50,7 +48,6 @@ id=Sister Thera name= _ "Sister Thera" profile=portraits/Sister_Thera.png - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_QUICK} @@ -62,7 +59,6 @@ id=Elenia name= _ "Elenia" profile=portraits/Elenia.png - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_HEALTHY} @@ -73,7 +69,6 @@ type=Drake Burner id=Krash name= _ "Krash" - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg index 2a5ea1b60783..534f1ef62fbc 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg @@ -328,32 +328,36 @@ type=Caravan side=1 facing=ne - upkeep=free - {IS_HERO} + [modifications] + {TRAIT_LOYAL_HERO_NOSLOT} + [/modifications] [/unit] [unit] x,y=6,29 type=Caravan side=1 facing=ne - upkeep=free - {IS_HERO} + [modifications] + {TRAIT_LOYAL_HERO_NOSLOT} + [/modifications] [/unit] [unit] x,y=6,28 type=Caravan side=1 facing=ne - upkeep=free - {IS_HERO} + [modifications] + {TRAIT_LOYAL_HERO_NOSLOT} + [/modifications] [/unit] [unit] x,y=7,28 type=Caravan side=1 facing=ne - upkeep=free - {IS_HERO} + [modifications] + {TRAIT_LOYAL_HERO_NOSLOT} + [/modifications] [/unit] #ifdef HARD [unit] @@ -361,8 +365,9 @@ type=Caravan side=1 facing=ne - upkeep=free - {IS_HERO} + [modifications] + {TRAIT_LOYAL_HERO_NOSLOT} + [/modifications] [/unit] #endif [unit] @@ -373,10 +378,9 @@ name= _ "Alanin" unrenamable=yes facing=ne - {IS_HERO} profile=portraits/alanin.png [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_RESILIENT} [/modifications] [/unit] diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg index 088a12bc96cf..7338960a2f6b 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg @@ -275,11 +275,10 @@ id=Baglur name= _ "Baglur" unrenamable=yes - {IS_HERO} profile=portraits/baglur.png facing=sw [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_RESILIENT} [/modifications] [/unit] diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg index 7b21b26038f1..4c05e34bf36f 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg @@ -66,7 +66,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [unit] x,y=13,11 @@ -79,7 +78,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [unit] x,y=9,13 @@ -91,7 +89,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] [unit] x,y=11,14 @@ -103,7 +100,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] [/event] diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg index ea02ffc12c7a..f7c17bc330e3 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg @@ -333,11 +333,10 @@ id=Krawg name= _ "Krawg" unrenamable=yes - {IS_HERO} x,y=5,24 side=1 [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_INTELLIGENT} [/modifications] [/unit] @@ -500,12 +499,11 @@ id=Thursagan name= _ "Thursagan" unrenamable=yes - {IS_HERO} profile=portraits/thursagan.png advances_to=Dwarvish Arcanister max_experience=210 [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_STRONG} [/modifications] [/unit] diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg index 06bba49043a4..3ba15f9ef265 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg @@ -61,7 +61,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [unit] x,y=13,12 @@ -73,7 +72,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [unit] x,y=9,13 @@ -85,7 +83,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] [unit] x,y=11,14 @@ -97,7 +94,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] [/event] @@ -228,7 +224,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [unit] type=Dwarvish Runesmith @@ -240,7 +235,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [message] speaker=narrator diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg index dbb772fccbec..6c3844622b83 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg @@ -61,7 +61,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [unit] x,y=10,9 @@ -73,7 +72,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [unit] x,y=8,10 @@ -85,7 +83,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] [unit] x,y=10,12 @@ -97,7 +94,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [/event] diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg index beaa8683b5e0..8a0cf1f90192 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg @@ -199,11 +199,10 @@ name= _ "Durstorn" unrenamable=yes side=1 - {IS_HERO} profile=portraits/durstorn-insane.png random_traits=no [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] [/unit] [unit] @@ -216,7 +215,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] [unit] x,y=11,1 @@ -228,7 +226,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] #alanin, baglur, krawg and thursagan [recall] diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg index c7d70b36799f..0cc33011ae60 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg @@ -367,7 +367,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [message] speaker=Rolin # wmllint: ignore @@ -393,7 +392,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] {RANDOM "Spearman,Bowman"} @@ -407,7 +405,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] {CLEAR_VARIABLE random} @@ -558,7 +555,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [message] speaker=Hadlin # wmllint: ignore diff --git a/data/campaigns/Secrets_of_the_Ancients/utils/characters.cfg b/data/campaigns/Secrets_of_the_Ancients/utils/characters.cfg index 01eed0dbe038..d3e5a432f2db 100644 --- a/data/campaigns/Secrets_of_the_Ancients/utils/characters.cfg +++ b/data/campaigns/Secrets_of_the_Ancients/utils/characters.cfg @@ -53,7 +53,6 @@ type=Bone Captain id=Bone Captain name= _ "Rudic" - {IS_LOYAL} [modifications] {TRAIT_LOYAL} [/modifications] @@ -63,7 +62,6 @@ type=SotA Ruffian id=Carcyn name= _ "Carcyn" - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_STRONG} @@ -75,7 +73,6 @@ id=Shynal name= _ "Shynal" gender=female - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -124,7 +121,6 @@ type=Saurian Soothsayer id=Vendraxis name= _ "Vendraxis" - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg index d260207e8492..2043400caf99 100644 --- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg +++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg @@ -261,9 +261,8 @@ profile=portraits/gruu.png facing=sw random_traits=no - {IS_HERO} [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [object] [effect] apply_to=image_mod diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg index 128fa81f4292..e1739d99b835 100644 --- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg +++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg @@ -472,7 +472,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [allow_recruit] @@ -622,7 +621,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [allow_recruit] diff --git a/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg b/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg index c3343d8e0fca..07f1ba0bf78d 100644 --- a/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg +++ b/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg @@ -11,9 +11,8 @@ x={X} y={Y} random_traits=no - {IS_HERO} [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] [/unit] #enddef @@ -29,9 +28,8 @@ x={X} y={Y} random_traits=no - {IS_HERO} [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] [/unit] #enddef @@ -47,9 +45,8 @@ x={X} y={Y} random_traits=no - {IS_HERO} [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] [/unit] #enddef diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg index 4f1f16b52ee3..4e09ae981811 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg @@ -53,7 +53,6 @@ id=Pelmathidrol name= _ "Pelmathidrol" x,y=1,15 - {IS_LOYAL} facing=se [modifications] {TRAIT_LOYAL} @@ -144,7 +143,6 @@ x,y=45,29 id=Movrur name= _ "Movrur" - {IS_LOYAL} [modifications] {TRAIT_LOYAL} [/modifications] diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/09_The_Underlevels.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/09_The_Underlevels.cfg index 2ac993b87c3c..4c283ddc08af 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/09_The_Underlevels.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/09_The_Underlevels.cfg @@ -40,7 +40,7 @@ x={X} y={Y} [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL OVERLAY=""} [/modifications] ai_special=guardian random_traits=yes diff --git a/data/campaigns/The_Hammer_of_Thursagan/utils/characters.cfg b/data/campaigns/The_Hammer_of_Thursagan/utils/characters.cfg index 130f2a76b422..ef8ac429515f 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/utils/characters.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/utils/characters.cfg @@ -19,9 +19,8 @@ name= _ "Angarthing" profile=portraits/angarthing.png unrenamable=yes - {IS_HERO} [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_QUICK} [/modifications] #enddef @@ -32,9 +31,8 @@ profile=portraits/ratheln.png name= _ "Ratheln" unrenamable=yes - {IS_HERO} [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_STRONG} [/modifications] #enddef @@ -58,9 +56,8 @@ name= _ "Dulcatulos" profile=portraits/dulcatulos.png unrenamable=yes - {IS_HERO} - upkeep=free [modifications] + {TRAIT_LOYAL_HERO_NOSLOT} {TRAIT_QUICK} {TRAIT_HEALTHY} [/modifications] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg index 42e24976c18c..6721bc1efa88 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg @@ -128,7 +128,6 @@ {TRAIT_LOYAL} {SECOND_TRAIT_WML} [/modifications] - {IS_LOYAL} [/unit] #enddef @@ -332,7 +331,7 @@ random_traits=no profile=portraits/lady_outlaw.png [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] [/unit] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg index cdbe24e7f332..2d141550f30e 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg @@ -171,7 +171,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] [message] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg index a2a413d0ed98..42baa52427c2 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg @@ -367,7 +367,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] [message] speaker=Minister Edren @@ -541,7 +540,6 @@ Enter at Your Own Risk!" {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [redraw] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg index d7f3077a48ed..5f226156f9f8 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg @@ -362,7 +362,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [redraw] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg index ee31ca974ea6..c87aea971c8f 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg @@ -274,7 +274,7 @@ random_traits=no profile=portraits/jessica.png [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] [/unit] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg index 73952e348576..f0e44009abe1 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg @@ -963,7 +963,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [message] @@ -1102,7 +1101,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [message] @@ -1223,7 +1221,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [scroll_to_unit] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg b/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg index e03ae0fc9291..f420c3477332 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg @@ -18,11 +18,10 @@ side={SIDE} x={X} y={Y} - {IS_HERO} unrenamable=yes random_traits=no [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] [/unit] #enddef @@ -41,7 +40,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] #enddef @@ -58,7 +56,6 @@ {TRAIT_UNDEAD} {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] #enddef @@ -75,7 +72,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] #enddef @@ -95,6 +91,5 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] #enddef diff --git a/data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg b/data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg index c92aa1200fe7..9958c1e0f5c5 100644 --- a/data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg +++ b/data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg @@ -191,7 +191,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [message] @@ -257,10 +256,9 @@ name= _ "Sir Gerrick" unrenamable=yes profile=portraits/sir-gerrick.png - {IS_HERO} x,y=10,9 [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_RESILIENT} [/modifications] [/unit] @@ -425,7 +423,6 @@ {TRAIT_INTELLIGENT} [/modifications] x,y=5,11 - {IS_LOYAL} [/unit] [unit] side=1 @@ -445,7 +442,6 @@ {TRAIT_QUICK} [/modifications] x,y=5,10 - {IS_LOYAL} [/unit] [message] @@ -549,7 +545,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [message] @@ -586,7 +581,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] [message] @@ -799,10 +793,9 @@ name= _ "Sir Gerrick" unrenamable=yes profile=portraits/sir-gerrick.png - {IS_HERO} x,y=10,9 [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_RESILIENT} [/modifications] [/unit] diff --git a/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg b/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg index 32b5112cabfd..e63fd3ca1f9d 100644 --- a/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg +++ b/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg @@ -317,11 +317,10 @@ profile=portraits/hylas.png name= _ "Minister Hylas" unrenamable=yes - {IS_HERO} side=1 x,y=21,14 [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_INTELLIGENT} [/modifications] [/unit] @@ -480,7 +479,6 @@ {TRAIT_STRONG} [/modifications] x,y=14,21 - {IS_LOYAL} [/unit] [message] @@ -515,7 +513,6 @@ {TRAIT_INTELLIGENT} [/modifications] x,y=14,21 - {IS_LOYAL} [/unit] [unit] side=1 @@ -535,7 +532,6 @@ {TRAIT_QUICK} [/modifications] x,y=15,21 - {IS_LOYAL} [/unit] [message] diff --git a/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg b/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg index ff0d5ea35a2b..123393266d99 100644 --- a/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg +++ b/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg @@ -162,11 +162,10 @@ name= _ "Ethiliel" unrenamable=yes profile=portraits/ethiliel.png - {IS_HERO} x,y=recall,recall random_traits=no [modifications] - # Loyal trait is given later + {TRAIT_LOYAL_HERO_NOSLOT} {TRAIT_QUICK} [/modifications] [/unit] @@ -299,7 +298,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [message] @@ -545,18 +543,18 @@ {VARIABLE EthilielV.x recall} {VARIABLE EthilielV.y recall} {CLEAR_VARIABLE EthilielV.modifications} - + [set_variables] name=EthilielV.modifications mode=insert [value] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_QUICK} [/value] [/set_variables] - - {CLEAR_VARIABLE EthilielV.upkeep} - + + {CLEAR_VARIABLE EthilielV.upkeep} + [unstore_unit] variable=EthilielV [/unstore_unit] diff --git a/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg b/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg index fae082fce290..d34f4a5ea786 100644 --- a/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg +++ b/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg @@ -486,7 +486,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} to_variable=ranger [/unit] [if] diff --git a/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg b/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg index 2e6443b1ae96..034c8575e046 100644 --- a/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg +++ b/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg @@ -798,9 +798,8 @@ moves=$this_unit.max_moves profile=portraits/urza-afalas.png canrecruit=no - {IS_HERO} [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] [/modify_unit] diff --git a/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg b/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg index 3c2ffcd57dd5..462c4d7f0412 100644 --- a/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg +++ b/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg @@ -473,11 +473,10 @@ _f, _f, Re, _f name= _ "Urza Afalas" unrenamable=yes profile=portraits/urza-afalas.png - {IS_HERO} x,y=recall,recall random_traits=no [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} [/modifications] [/unit] [/then] diff --git a/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg b/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg index 9383868084a5..4433944b6208 100644 --- a/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg +++ b/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg @@ -666,7 +666,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} )} {UNIT 1 (White Mage) 9 2 ( generate_name=yes @@ -675,7 +674,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} )} [/event] diff --git a/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg b/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg index 64fe9b25115c..62208608bc1a 100644 --- a/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg +++ b/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg @@ -542,7 +542,6 @@ Besides... I want my brother back." {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} )} [message] diff --git a/data/campaigns/Two_Brothers/utils/characters.cfg b/data/campaigns/Two_Brothers/utils/characters.cfg index 3df85f2802a1..56df220dc3be 100644 --- a/data/campaigns/Two_Brothers/utils/characters.cfg +++ b/data/campaigns/Two_Brothers/utils/characters.cfg @@ -130,10 +130,9 @@ type=Red Mage profile=portraits/baran.png side=1 - {IS_HERO} {PLACEMENT} [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_INTELLIGENT} [/modifications] [/unit] diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg index 5c5b4b7cb7d9..b8d198161bc5 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg @@ -1004,7 +1004,6 @@ gender=$elf_pool[$random_elf_pool_index].gender random_traits=yes #ifdef EASY - {IS_LOYAL} [modifications] {TRAIT_LOYAL} [/modifications] @@ -1410,7 +1409,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} #endif [/unit] [/do] diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg index b08ae9ce6f7c..a319c2262885 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg @@ -745,7 +745,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} x=$x1 y=$y1 [/unit] @@ -1036,7 +1035,6 @@ [/effect] [/object] [/modifications] - {IS_LOYAL} x="$($x1 - 2)" y="$($y1 - 4)" side=1 diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg index 2746af8d7ff0..8b599c5bdfd5 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg @@ -452,7 +452,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [/then] [/if] @@ -1830,7 +1829,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} role=ally [/unit] @@ -1846,7 +1844,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} role=ally [/unit] @@ -1862,7 +1859,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} role=ally [/unit] @@ -1879,7 +1875,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} role=ally [/unit] #endif @@ -1896,7 +1891,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} role=ally [/unit] @@ -1945,7 +1939,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} role=ally placement=map passable=yes @@ -1963,7 +1956,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} role=ally placement=map passable=yes @@ -1981,7 +1973,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} role=ally placement=map passable=yes @@ -1999,7 +1990,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} role=ally placement=map passable=yes @@ -2019,7 +2009,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} role=ally placement=map passable=yes 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 ede42da4770f..8bf46b1054f4 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 @@ -303,7 +303,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -318,7 +317,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] #ifdef HARD @@ -361,7 +359,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim [/effect] [/object] [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -387,7 +384,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim [/effect] [/object] [/modifications] - {IS_LOYAL} [/unit] # reveal a bit of the escape passage to the player @@ -719,7 +715,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [remove_shroud] @@ -1273,7 +1268,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] [kill] @@ -1308,7 +1302,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] #endif @@ -1395,7 +1388,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [message] diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg index 6ed07fc55a3b..1c2e78c748c0 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg @@ -753,7 +753,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] [message] diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg index 13580f2f6da7..d4145275bad1 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg @@ -188,7 +188,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -203,7 +202,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -218,7 +216,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -233,7 +230,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -248,7 +244,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -263,7 +258,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -278,7 +272,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -293,7 +286,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -308,7 +300,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -323,7 +314,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [/event] diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/07b_Talking_with_Trolls.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/07b_Talking_with_Trolls.cfg index 97af50d937dc..4fd7c1a07bdf 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/07b_Talking_with_Trolls.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/07b_Talking_with_Trolls.cfg @@ -167,7 +167,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [/else] [/if] @@ -187,7 +186,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -202,7 +200,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -218,7 +215,6 @@ {TRAIT_LOYAL} {TRAIT_STRONG} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -233,7 +229,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -248,7 +243,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -263,7 +257,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -278,7 +271,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -293,7 +285,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -308,7 +299,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -323,7 +313,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [/event] diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg index 8cf4f4d859fe..73ef3cff005d 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg @@ -4456,7 +4456,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [delay] diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg index c7bd2fbb5f60..1c612a93a663 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg @@ -818,7 +818,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [if] [variable] @@ -872,7 +871,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [if] [variable] @@ -927,7 +925,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [if] [variable] @@ -977,7 +974,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [if] [variable] @@ -1052,7 +1048,6 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - {IS_LOYAL} [/unit] [message] speaker=We-jial @@ -2394,7 +2389,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} [/unit] [message] speaker=Hekuba diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg index d64673b0be09..0e2bfa391bcd 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg @@ -315,7 +315,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] # recall heroes @@ -467,7 +466,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] [unit] @@ -478,7 +476,6 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - {IS_LOYAL} ai_special=guardian [/unit] [/event] @@ -1198,7 +1195,6 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - {IS_LOYAL} [/unit] [message] diff --git a/data/campaigns/Under_the_Burning_Suns/utils/character-definitions.cfg b/data/campaigns/Under_the_Burning_Suns/utils/character-definitions.cfg index 13641e904e46..09491ff5e7ee 100644 --- a/data/campaigns/Under_the_Burning_Suns/utils/character-definitions.cfg +++ b/data/campaigns/Under_the_Burning_Suns/utils/character-definitions.cfg @@ -19,10 +19,9 @@ profile=portraits/nym.png upkeep=loyal [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_DEXTROUS} [/modifications] - {IS_HERO} #enddef #define GARAK @@ -32,7 +31,7 @@ profile=portraits/garak.png unrenamable=yes [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_STRONG} [object] [effect] @@ -47,7 +46,6 @@ [/effect] [/object] [/modifications] - {IS_HERO} #enddef #define ZHUL @@ -57,7 +55,7 @@ profile=portraits/zhul.png unrenamable=yes [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_INTELLIGENT} [object] [effect] @@ -69,5 +67,4 @@ [/effect] [/object] [/modifications] - {IS_HERO} #enddef diff --git a/data/campaigns/Wings_of_Victory/scenarios/03_The_Contention.cfg b/data/campaigns/Wings_of_Victory/scenarios/03_The_Contention.cfg index be4721574a10..64fafd47efc5 100644 --- a/data/campaigns/Wings_of_Victory/scenarios/03_The_Contention.cfg +++ b/data/campaigns/Wings_of_Victory/scenarios/03_The_Contention.cfg @@ -82,9 +82,8 @@ [/leader] [unit] type=Sky Drake - {IS_HERO} [modifications] - {OBJECT_LOYAL} + {TRAIT_LOYAL_HERO_NOSLOT} {TRAIT_STRONG} {TRAIT_RESILIENT} [/modifications] diff --git a/data/campaigns/Wings_of_Victory/scenarios/06_The_Three_Sisters.cfg b/data/campaigns/Wings_of_Victory/scenarios/06_The_Three_Sisters.cfg index e645c833c4cb..da646f83e607 100644 --- a/data/campaigns/Wings_of_Victory/scenarios/06_The_Three_Sisters.cfg +++ b/data/campaigns/Wings_of_Victory/scenarios/06_The_Three_Sisters.cfg @@ -87,7 +87,6 @@ [unit] type=Giant Scorpion ai_special=guardian - {IS_LOYAL} [modifications] {TRAIT_LOYAL} [/modifications] @@ -97,7 +96,6 @@ [unit] type=Giant Scorpion ai_special=guardian - {IS_LOYAL} [modifications] {TRAIT_LOYAL} [/modifications] diff --git a/data/campaigns/Wings_of_Victory/scenarios/11_Fire_Meets_Steel.cfg b/data/campaigns/Wings_of_Victory/scenarios/11_Fire_Meets_Steel.cfg index 07545e048dfe..de123fd6a09d 100644 --- a/data/campaigns/Wings_of_Victory/scenarios/11_Fire_Meets_Steel.cfg +++ b/data/campaigns/Wings_of_Victory/scenarios/11_Fire_Meets_Steel.cfg @@ -81,7 +81,6 @@ [unit] type=Dwarvish Dragonguard ai_special=guardian - {IS_LOYAL} [modifications] {TRAIT_LOYAL} [/modifications] @@ -91,7 +90,6 @@ [unit] type=Dwarvish Dragonguard ai_special=guardian - {IS_LOYAL} [modifications] {TRAIT_LOYAL} [/modifications] diff --git a/data/campaigns/Wings_of_Victory/scenarios/12_Confrontation.cfg b/data/campaigns/Wings_of_Victory/scenarios/12_Confrontation.cfg index 97982644ae08..326b93118ce1 100644 --- a/data/campaigns/Wings_of_Victory/scenarios/12_Confrontation.cfg +++ b/data/campaigns/Wings_of_Victory/scenarios/12_Confrontation.cfg @@ -70,16 +70,17 @@ [/leader] [unit] {GRIBBEL} - {IS_HERO} experience=35 # Intended to cover what he could have earned in previous appearance plus some. moves=0 x,y=2,35 facing=ne + [+modifications] + {TRAIT_LOYAL_HERO} + [/modifications] [/unit] [unit] type=Drake Warden ai_special=guardian - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_QUICK} @@ -90,7 +91,6 @@ [unit] type=Drake Enforcer ai_special=guardian - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_QUICK} diff --git a/data/campaigns/Wings_of_Victory/utils/characters.cfg b/data/campaigns/Wings_of_Victory/utils/characters.cfg index 5fb232519eac..16a620388fc5 100644 --- a/data/campaigns/Wings_of_Victory/utils/characters.cfg +++ b/data/campaigns/Wings_of_Victory/utils/characters.cfg @@ -52,9 +52,8 @@ name= _ "Vank" unrenamable=yes type=Drake Glider - {IS_HERO} [modifications] - {OBJECT_LOYAL} + {TRAIT_LOYAL_HERO_NOSLOT} {TRAIT_QUICK} {TRAIT_RESILIENT} [/modifications] @@ -75,7 +74,6 @@ name= _ "Gribbel" type=Drake Flameheart [modifications] - {OBJECT_LOYAL} {TRAIT_STRONG} {TRAIT_RESILIENT} [/modifications] @@ -96,9 +94,8 @@ id=Krenix name= _ "Krenix" type=Saurian Soothsayer - {IS_HERO} [modifications] - {TRAIT_LOYAL} + {TRAIT_LOYAL_HERO} {TRAIT_RESILIENT} [/modifications] #enddef diff --git a/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg b/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg index 9a79f66a05af..2411f57ccd1d 100644 --- a/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg +++ b/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg @@ -77,8 +77,8 @@ x,y=13,5 random_traits=no facing=nw - {IS_HERO} [modifications] + {TRAIT_LOYAL_HERO_NOSLOT} {TRAIT_INTELLIGENT} [object] [effect] @@ -521,7 +521,7 @@ message= _"To attack the quintain, first select the attacker (Li’sar), then the target (the quintain). You will see an attack description. Click Attack when you’re ready." [/message] )} - + [disallow_end_turn] reason=_"You cannot end your turn until you have attacked the dummy!" [/disallow_end_turn] diff --git a/data/core/macros/deprecated-utils.cfg b/data/core/macros/deprecated-utils.cfg index 381200ef0d7b..505fd408018d 100644 --- a/data/core/macros/deprecated-utils.cfg +++ b/data/core/macros/deprecated-utils.cfg @@ -164,7 +164,6 @@ _"No gold carried over to the next scenario."#enddef {TRAIT_UNDEAD} {TRAIT_LOYAL} [/modifications] - {IS_LOYAL} [/unit] #enddef diff --git a/data/core/macros/image-utils.cfg b/data/core/macros/image-utils.cfg index 9ee534ba5d00..9ae15fc0d94f 100644 --- a/data/core/macros/image-utils.cfg +++ b/data/core/macros/image-utils.cfg @@ -15,6 +15,8 @@ color="255,255,255" #enddef +## TODO: this was moved to the loyal trait but a few codes used with witouht the loyal trait, +## so i'll leave it for now. since this icon is afaik not transparent though should not be a problem. #define IS_HERO # Embed this into a unit declaration to add a hero icon to the unit. overlays="misc/hero-icon.png" diff --git a/data/core/macros/traits.cfg b/data/core/macros/traits.cfg index 5504ad5682ba..895c86de8782 100644 --- a/data/core/macros/traits.cfg +++ b/data/core/macros/traits.cfg @@ -2,6 +2,10 @@ # Traits for the [modifications] clause of SingleWML descriptions #define TRAIT_LOYAL +#arg OVERLAY +"misc/loyal-icon.png" +#endarg + # Units with trait Loyal have no upkeep. [trait] id=loyal @@ -14,6 +18,32 @@ During campaigns, certain units may opt to join the player’s forces of their o [effect] apply_to=loyal [/effect] + [effect] + apply_to=overlay + add={OVERLAY} + [/effect] + [/trait] +#enddef + +#define TRAIT_LOYAL_HERO + {TRAIT_LOYAL OVERLAY="misc/hero-icon.png"} + [+trait] + [effect] + apply_to=ellipse + ellipse=misc/ellipse-hero + [/effect] + [/trait] +#enddef + +#define TRAIT_LOYAL_HERO_NOSLOT + # loyal hero unit where for some reason we don't + # want the loyal to appear in the traits list, i + # really think its be better if stayed consitent and decided for + # one way and removed either this or TRAIT_LOYAL_HERO + {TRAIT_LOYAL_HERO} + [+trait] + male_name="" + female_name="" [/trait] #enddef diff --git a/data/core/macros/unit-utils.cfg b/data/core/macros/unit-utils.cfg index 0f7151bd0268..a30da4b7477a 100644 --- a/data/core/macros/unit-utils.cfg +++ b/data/core/macros/unit-utils.cfg @@ -78,7 +78,6 @@ [modifications] {TRAIT_LOYAL} [/modifications] - overlays="misc/loyal-icon.png" [/unit] #enddef @@ -176,9 +175,9 @@ # Meant to be used as a suffix to a unit-generating macro call. # Use this when you don't want to use up a traits slot. [+unit] - upkeep=loyal - # It's questionable whether we should do this here... - overlays="misc/loyal-icon.png" + [+modifications] + {TRAIT_LOYAL_HERO_NOSLOT} + [/modifications] [/unit] #enddef diff --git a/data/multiplayer/scenarios/2p_Hornshark_Island.cfg b/data/multiplayer/scenarios/2p_Hornshark_Island.cfg index 1ee514ad5a63..7d53d81641a2 100644 --- a/data/multiplayer/scenarios/2p_Hornshark_Island.cfg +++ b/data/multiplayer/scenarios/2p_Hornshark_Island.cfg @@ -88,7 +88,6 @@ type=Young Ogre name= _ "Big Baby Bo" x,y=24,4 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -101,7 +100,6 @@ type=Drake Fighter name= _ "Rawffus the Dim" x,y=1,1 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_SLOW} @@ -115,7 +113,6 @@ side=1 type=Saurian Skirmisher x,y=1,2 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_DEXTROUS} @@ -127,7 +124,6 @@ side=1 type=Saurian Augur x,y=26,3 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_HEALTHY} @@ -141,7 +137,6 @@ side=1 type=Thug x,y=1,1 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_DIM} @@ -153,7 +148,6 @@ type=Dwarvish Scout name= _ "Kolbur" x,y=2,2 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_HEALTHY} @@ -165,7 +159,6 @@ type=Young Ogre name= _ "Big Baby Bo" x,y=24,4 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -178,7 +171,6 @@ type=Dwarvish Scout name= _ "Vilhelm Viskitynnyri" x,y=26,3 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_HEALTHY} @@ -204,7 +196,6 @@ type=Young Ogre name= _ "Big Baby Bo" x,y=24,4 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -226,7 +217,6 @@ side=1 type=Sergeant x,y=25,5 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_SLOW} @@ -259,7 +249,6 @@ side=1 type=Bowman x,y=1,1 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -276,7 +265,6 @@ type=Young Ogre name= _ "Big Baby Bo" x,y=24,4 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -288,7 +276,6 @@ side=1 type=Goblin Impaler x,y=25,5 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -301,7 +288,6 @@ id=Neki the Brutal name= _ "Neki the Brutal" x,y=1,5 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_INTELLIGENT} @@ -313,7 +299,6 @@ side=1 type=Naga Fighter x,y=1,2 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -329,7 +314,6 @@ type=Young Ogre name= _ "Big Baby Bo" x,y=24,4 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -342,7 +326,6 @@ type=Elvish Fighter name= _ "Drowsk Calbeht" x,y=25,3 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -354,7 +337,6 @@ side=1 type=Mermaid Initiate x,y=4,1 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -369,7 +351,6 @@ side=1 type=Elvish Archer x,y=1,1 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_STRONG} @@ -383,7 +364,6 @@ x,y=23,3 side=1 type=Ghoul - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_STRONG} @@ -407,7 +387,6 @@ side=1 type=Soulless variation=saurian - {IS_LOYAL} [abilities] {ABILITY_AMBUSH} [/abilities] @@ -424,7 +403,6 @@ side=1 type=Soulless variation=dwarf - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_QUICK} @@ -446,7 +424,6 @@ x,y=2,1 side=1 type=Skeleton - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_FEARLESS} @@ -461,7 +438,6 @@ type=Young Ogre name= _ "Big Baby Bo" x,y=24,4 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -482,7 +458,6 @@ side=1 type=Troll Whelp x,y=25,5 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_INTELLIGENT} @@ -502,7 +477,6 @@ side=1 type=Fire Guardian x,y=2,1 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_FEARLESS} @@ -513,7 +487,6 @@ side=1 type=Giant Scorpion x,y=1,1 - {IS_LOYAL} [modifications] {TRAIT_MECHANICAL} {TRAIT_LOYAL} @@ -533,7 +506,6 @@ type=Young Ogre name= _ "Big Baby Dro" x,y=7,21 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -546,7 +518,6 @@ type=Drake Fighter name= _ "Gawffus the Dim" x,y=29,27 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_SLOW} @@ -560,7 +531,6 @@ side=2 type=Saurian Skirmisher x,y=30,27 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_DEXTROUS} @@ -572,7 +542,6 @@ side=2 type=Saurian Augur x,y=7,22 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_HEALTHY} @@ -586,7 +555,6 @@ side=2 type=Thug x,y=30,27 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_DIM} @@ -598,7 +566,6 @@ type=Dwarvish Scout name= _ "Rublok" x,y=7,21 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_HEALTHY} @@ -610,7 +577,6 @@ type=Young Ogre name= _ "Big Baby Dro" x,y=6,20 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -623,7 +589,6 @@ type=Dwarvish Scout name= _ "Ulysses Mantyjuuri" x,y=29,26 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_HEALTHY} @@ -649,7 +614,6 @@ type=Young Ogre name= _ "Big Baby Dro" x,y=6,20 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -671,7 +635,6 @@ side=2 type=Sergeant x,y=7,21 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_SLOW} @@ -704,7 +667,6 @@ side=2 type=Bowman x,y=28,24 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -721,7 +683,6 @@ type=Young Ogre name= _ "Big Baby Dro" x,y=6,20 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -733,7 +694,6 @@ side=2 type=Goblin Impaler x,y=7,21 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -745,7 +705,6 @@ type=Orcish Leader name= _ "Neki the Brute" x,y=30,24 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_INTELLIGENT} @@ -757,7 +716,6 @@ side=2 type=Naga Fighter x,y=28,27 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -773,7 +731,6 @@ type=Young Ogre name= _ "Big Baby Dro" x,y=6,20 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -786,7 +743,6 @@ type=Elvish Fighter name= _ "Claiomh Dubh" x,y=7,21 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -798,7 +754,6 @@ side=2 type=Mermaid Initiate x,y=27,27 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -813,7 +768,6 @@ side=2 type=Elvish Archer x,y=30,27 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_STRONG} @@ -827,7 +781,6 @@ x,y=6,20 side=2 type=Ghoul - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_STRONG} @@ -851,7 +804,6 @@ side=2 type=Soulless variation=saurian - {IS_LOYAL} [abilities] {ABILITY_AMBUSH} [/abilities] @@ -868,7 +820,6 @@ side=2 type=Soulless variation=dwarf - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_QUICK} @@ -890,7 +841,6 @@ x,y=27,27 side=2 type=Skeleton - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_FEARLESS} @@ -905,7 +855,6 @@ type=Young Ogre name= _ "Big Baby Dro" x,y=7,20 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_RESILIENT} @@ -926,7 +875,6 @@ side=2 type=Troll Whelp x,y=9,23 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_INTELLIGENT} @@ -937,7 +885,6 @@ side=2 type=Fire Guardian x,y=30,27 - {IS_LOYAL} [modifications] {TRAIT_LOYAL} {TRAIT_FEARLESS} @@ -957,7 +904,6 @@ side=2 type=Giant Scorpion x,y=28,24 - {IS_LOYAL} [modifications] {TRAIT_MECHANICAL} {TRAIT_LOYAL}