0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move loyal overlays to the loyal trait

Browse source 
since the recent changes to overlays= in particular 1a7724e547,
e71033374c and b2cd1cf6c [unit]overlays= is no longer the
recommended way to add an overlay and the use of the
apply_to=overlay effect is reccomended instead, so adding it
to the [trait] is the most natural option here.

this in particular fixes #4058 . Also people simply forgetting the
IS_LOYAL macro was a not-so-uncommon cause of bugs.

In some cases people want to give the LOYAL trait without giving the
loyal overlays for those cases i added a optional OVERLAY parameter to
the {TRAIT_LOYAL} macro, also heroes should now use {TRAIT_LOYAL_HERO}
instead which uses the hero overlay. The IS_LOYAL and IS_HERO macros are
no longer needed in combination with those traits.
This commit is contained in:
gfgtdf 2019-05-20 17:51:32 +02:00
parent 26c2f941f2
commit 5cb93694c6
102 changed files with 122 additions and 414 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg
View file

@ -52,9 +52,8 @@
side=1 side=1
x=19 x=19
y=23 y=23
{IS_HERO}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
[/unit] [/unit]

2
data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg
View file

@ -72,7 +72,7 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
facing=ne facing=ne
[/unit] [/unit]
[/side] [/side]

5
data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg
View file

@ -115,7 +115,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
facing=sw facing=sw
[/unit] [/unit]
@ -135,7 +134,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
facing=sw facing=sw
[/unit] [/unit]
@ -155,7 +153,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
facing=sw facing=sw
[/unit] [/unit]
@ -175,7 +172,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
facing=sw facing=sw
[/unit] [/unit]
@ -195,7 +191,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
facing=sw facing=sw
[/unit] [/unit]

4
data/campaigns/Dead_Water/scenarios/01_Invasion.cfg
View file

@ -221,7 +221,7 @@
[unit] [unit]
type=Mermaid Priestess type=Mermaid Priestess
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
id=Cylanna id=Cylanna
@ -230,7 +230,6 @@
side=1 side=1
x=21 x=21
y=9 y=9
{IS_HERO}
unrenamable=yes unrenamable=yes
[/unit] [/unit]
@ -312,7 +311,6 @@
[/modifications] [/modifications]
facing=se facing=se
animate=yes animate=yes
{IS_LOYAL}
profile=portraits/gwabbo.png profile=portraits/gwabbo.png
[/unit] [/unit]

3
data/campaigns/Dead_Water/scenarios/02_Flight.cfg
View file

@ -463,7 +463,6 @@ _f, _f, _f, _f, _f, _f, _f
side=1 side=1
x=$x1 x=$x1
y=$y1 y=$y1
{IS_LOYAL}
[/unit] [/unit]
[if] [if]
@ -590,7 +589,6 @@ _f, _f, _f, _f, _f, _f, _f
side=1 side=1
x=$x1 x=$x1
y=$y1 y=$y1
{IS_LOYAL}
[/unit] [/unit]
[if] [if]
@ -733,7 +731,6 @@ _f, _f, _f, _f, _f, _f, _f
side=1 side=1
x=$x1 x=$x1
y=$y1 y=$y1
{IS_LOYAL}
[/unit] [/unit]
[if] [if]

3
data/campaigns/Dead_Water/scenarios/04_Slavers.cfg
View file

@ -335,7 +335,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
@ -627,7 +626,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
@ -691,7 +689,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[if] [if]

2
data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
View file

@ -182,7 +182,7 @@
x={X} x={X}
y={Y} y={Y}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL OVERLAY=""}
{TRAIT_FEARLESS} {TRAIT_FEARLESS}
[/modifications] [/modifications]
moves=0 moves=0

1
data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg
View file

@ -280,7 +280,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_HEALTHY} {TRAIT_HEALTHY}
[/modifications] [/modifications]
{IS_LOYAL}
animate=yes animate=yes
[/unit] [/unit]
[message] [message]

3
data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg
View file

@ -383,10 +383,9 @@
name= _ "Caladon" name= _ "Caladon"
unrenamable=yes unrenamable=yes
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_HERO}
profile=portraits/caladon.png profile=portraits/caladon.png
[/unit] [/unit]

3
data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
View file

@ -451,7 +451,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_DEXTROUS} {TRAIT_DEXTROUS}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
type=Thug type=Thug
@ -464,7 +463,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
type=Thug type=Thug
@ -477,7 +475,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
{CLEAR_VARIABLE Siddry_stored} {CLEAR_VARIABLE Siddry_stored}

2
data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg
View file

@ -40,7 +40,7 @@
canrecruit=yes canrecruit=yes
type=Mermaid Diviner type=Mermaid Diviner
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL OVERLAY=""}
{TRAIT_DEXTROUS} {TRAIT_DEXTROUS}
[/modifications] [/modifications]
[ai] [ai]

3
data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
View file

@ -406,7 +406,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
side=1 side=1
@ -419,7 +418,6 @@
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
experience=10 experience=10
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
side=1 side=1
@ -432,7 +430,6 @@
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
experience=32 experience=32
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
speaker=Nebthun speaker=Nebthun

2
data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
View file

@ -613,7 +613,6 @@
name= _ "Theorin" name= _ "Theorin"
side=1 side=1
x,y=31,9 x,y=31,9
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
@ -684,7 +683,6 @@
name= _ "Stanis" name= _ "Stanis"
side=1 side=1
x,y=29,25 x,y=29,25
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}

6
data/campaigns/Delfadors_Memoirs/utils/characters.cfg
View file

@ -87,9 +87,8 @@
type=General type=General
profile="portraits/lionel.png" profile="portraits/lionel.png"
unrenamable=yes unrenamable=yes
{IS_HERO}
[modifications] [modifications]
{OBJECT_LOYAL} {TRAIT_LOYAL_HERO_NOSLOT}
{TRAIT_FEARLESS} {TRAIT_FEARLESS}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
@ -112,9 +111,8 @@
name= _ "Relgorn" name= _ "Relgorn"
type=Dwarvish Fighter type=Dwarvish Fighter
unrenamable=yes # Shows up in HttT S14 unrenamable=yes # Shows up in HttT S14
{IS_HERO}
[modifications] [modifications]
{OBJECT_LOYAL} {TRAIT_LOYAL_HERO_NOSLOT}
{TRAIT_STRONG} {TRAIT_STRONG}
{TRAIT_HEALTHY} {TRAIT_HEALTHY}
[/modifications] [/modifications]

1
data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
View file

@ -3540,7 +3540,6 @@ And the tongue of fire begets ashen repose.</i>"
[/effect] [/effect]
[/object] [/object]
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[delay] [delay]

9
data/campaigns/Descent_Into_Darkness/utils/characters.cfg
View file

@ -38,7 +38,6 @@
profile=portraits/darken_volk.png profile=portraits/darken_volk.png
unrenamable=yes unrenamable=yes
random_traits=no random_traits=no
{IS_HERO}
[modifications] [modifications]
# NOTE: if you change these, make sure you don't break the # NOTE: if you change these, make sure you don't break the
# removal of the loyal trait in 'Alone at Last' # removal of the loyal trait in 'Alone at Last'
@ -49,6 +48,14 @@
[effect] [effect]
apply_to=loyal apply_to=loyal
[/effect] [/effect]
[effect]
apply_to=ellipse
ellipse=misc/ellipse-hero
[/effect]
[effect]
apply_to=overlay
add=misc/hero-icon.png
[/effect]
[/trait] [/trait]
{TRAIT_QUICK} {TRAIT_QUICK}
[object] [object]

1
data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg
View file

@ -229,7 +229,6 @@
x,y=$prison_locations[$i].x,$prison_locations[$i].y x,y=$prison_locations[$i].x,$prison_locations[$i].y
random_traits=no random_traits=no
facing=sw facing=sw
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TEAM_COLOR_OVERRIDE () white} {TEAM_COLOR_OVERRIDE () white}

3
data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg
View file

@ -434,10 +434,9 @@
type=$stored_Owaec.type type=$stored_Owaec.type
experience=$stored_Owaec.experience experience=$stored_Owaec.experience
profile=portraits/owaec.png profile=portraits/owaec.png
{IS_HERO}
random_traits=no random_traits=no
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
[/unit] [/unit]

1
data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg
View file

@ -372,7 +372,6 @@
side=1 side=1
canrecruit=no canrecruit=no
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}

1
data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg
View file

@ -191,7 +191,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
speaker=Dacyn speaker=Dacyn

3
data/campaigns/Eastern_Invasion/scenarios/16_Weldyn_under_Attack.cfg
View file

@ -208,11 +208,10 @@
id=Konrad id=Konrad
name= _ "Konrad II" name= _ "Konrad II"
profile=portraits/konrad_II.png profile=portraits/konrad_II.png
{IS_HERO}
type=General type=General
random_traits=no random_traits=no
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
side=1 side=1
x=21 x=21

3
data/campaigns/Eastern_Invasion/utils/character-definitions.cfg
View file

@ -13,12 +13,11 @@
type=White Mage type=White Mage
id=Dacyn id=Dacyn
name= _ "Dacyn" name= _ "Dacyn"
{IS_HERO}
profile=portraits/dacyn.png profile=portraits/dacyn.png
random_traits=no random_traits=no
unrenamable=yes unrenamable=yes
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TEAM_COLOR_OVERRIDE () teal} {TEAM_COLOR_OVERRIDE () teal}
[/modifications] [/modifications]
#enddef #enddef

16
data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
View file

@ -133,7 +133,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
type=Swordsman type=Swordsman
@ -146,7 +145,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
{NEED_DELFADOR placement=leader} {NEED_DELFADOR placement=leader}
@ -237,7 +235,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
speaker=Haldiel speaker=Haldiel
@ -272,7 +269,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
type=Horseman type=Horseman
@ -286,7 +282,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
type=Horseman type=Horseman
@ -300,7 +295,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
type=Knight type=Knight
@ -314,7 +308,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
type=Knight type=Knight
@ -328,7 +321,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
type=Knight type=Knight
@ -343,7 +335,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
speaker=Kaylan speaker=Kaylan
@ -389,7 +380,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
type=Horseman type=Horseman
@ -403,7 +393,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
type=Horseman type=Horseman
@ -417,7 +406,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
type=Knight type=Knight
@ -431,7 +419,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
type=Knight type=Knight
@ -445,7 +432,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
type=Knight type=Knight
@ -460,7 +446,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[redraw] [redraw]
[/redraw] [/redraw]
@ -493,7 +478,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
speaker=Simyr speaker=Simyr

2
data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
View file

@ -225,7 +225,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
@ -277,7 +276,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
# The guy does not show up on the screen without some help # The guy does not show up on the screen without some help

22
data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
View file

@ -142,7 +142,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
#ifdef EASY #ifdef EASY
@ -159,7 +158,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
#ifdef HARD #ifdef HARD
@ -176,7 +174,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
{OBJ_TRIDENT_STORM 5 4 bop_stormtrident} {OBJ_TRIDENT_STORM 5 4 bop_stormtrident}
@ -323,7 +320,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
side=1 side=1
@ -336,7 +332,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
side=1 side=1
@ -349,7 +344,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#ifdef EASY #ifdef EASY
@ -364,7 +358,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#endif #endif
[message] [message]
@ -396,7 +389,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#ifdef EASY #ifdef EASY
@ -411,7 +403,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
side=1 side=1
@ -424,7 +415,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#else #else
[unit] [unit]
@ -438,7 +428,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#endif #endif
[message] [message]
@ -470,7 +459,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#ifdef EASY #ifdef EASY
@ -485,7 +473,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#endif #endif
@ -518,7 +505,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
side=1 side=1
@ -531,7 +517,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#ifdef EASY #ifdef EASY
@ -546,7 +531,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#endif #endif
[message] [message]
@ -578,7 +562,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
side=1 side=1
@ -591,7 +574,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
side=1 side=1
@ -604,7 +586,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#ifdef EASY #ifdef EASY
[unit] [unit]
@ -618,7 +599,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
side=1 side=1
@ -631,7 +611,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#else #else
[unit] [unit]
@ -645,7 +624,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#endif #endif

2
data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
View file

@ -321,7 +321,6 @@
[/object] [/object]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#set the variable to say the Moremirmu is alive #set the variable to say the Moremirmu is alive
[set_variable] [set_variable]
@ -369,7 +368,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
{LOYAL_UNIT 2 (Walking Corpse) ({X}) ({Y})} {LOYAL_UNIT 2 (Walking Corpse) ({X}) ({Y})}

10
data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
View file

@ -253,7 +253,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -268,7 +267,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
id=Gamlel id=Gamlel
@ -282,7 +280,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[redraw] [redraw]
@ -411,7 +408,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -426,7 +422,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
id=Gamlel id=Gamlel
@ -440,7 +435,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
id=Darglen id=Darglen
@ -453,7 +447,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#dialog #dialog
[message] [message]
@ -529,7 +522,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -544,7 +536,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -559,7 +550,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#create terrain #create terrain
[terrain] [terrain]

1
data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
View file

@ -334,7 +334,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[object] [object]

1
data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
View file

@ -277,7 +277,6 @@
[/object] [/object]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
{LOYAL_UNIT 1 (White Mage) 20 48} {LOYAL_UNIT 1 (White Mage) 20 48}

1
data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
View file

@ -172,7 +172,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#enddef #enddef

10
data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg
View file

@ -123,7 +123,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
generate_name=yes generate_name=yes
@ -135,7 +134,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
generate_name=yes generate_name=yes
@ -147,7 +145,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
generate_name=yes generate_name=yes
@ -159,7 +156,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
generate_name=yes generate_name=yes
@ -171,7 +167,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
generate_name=yes generate_name=yes
@ -183,7 +178,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
generate_name=yes generate_name=yes
@ -195,7 +189,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
id=rider id=rider
@ -208,7 +201,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
generate_name=yes generate_name=yes
@ -220,7 +212,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
generate_name=yes generate_name=yes
@ -232,7 +223,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
{FLAG_VARIANT knalgan} {FLAG_VARIANT knalgan}
[/side] [/side]

3
data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
View file

@ -193,7 +193,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[teleport] [teleport]
[filter] [filter]
@ -436,7 +435,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
#ifdef EASY #ifdef EASY
@ -454,7 +452,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[/event] [/event]

5
data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
View file

@ -181,7 +181,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[redraw] [redraw]
[/redraw] [/redraw]
@ -203,7 +202,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[redraw] [redraw]
[/redraw] [/redraw]
@ -402,9 +400,8 @@
[/filter] [/filter]
side=1 side=1
canrecruit=no canrecruit=no
{IS_HERO}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
[/modify_unit] [/modify_unit]
[/event] [/event]

2
data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
View file

@ -226,7 +226,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_FEARLESS} {TRAIT_FEARLESS}
[/modifications] [/modifications]
{IS_LOYAL}
[status] [status]
poisoned=yes poisoned=yes
[/status] [/status]
@ -815,7 +814,6 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_FEARLESS} {TRAIT_FEARLESS}
[/modifications] [/modifications]
{IS_LOYAL}
[status] [status]
poisoned=yes poisoned=yes
[/status] [/status]

1
data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
View file

@ -412,7 +412,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_DEXTROUS} {TRAIT_DEXTROUS}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[redraw] [redraw]

9
data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg
View file

@ -690,9 +690,8 @@ fire: +10%"
unrenamable=yes unrenamable=yes
type=Elder Mage type=Elder Mage
{PLACEMENT} {PLACEMENT}
{IS_HERO}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
[/unit] [/unit]
@ -706,10 +705,9 @@ fire: +10%"
unrenamable=yes unrenamable=yes
type=Elvish Lord type=Elvish Lord
{PLACEMENT} {PLACEMENT}
{IS_HERO}
random_traits=no random_traits=no
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
[/unit] [/unit]
#enddef #enddef
@ -722,10 +720,9 @@ fire: +10%"
unrenamable=yes unrenamable=yes
type=Princess type=Princess
{PLACEMENT} {PLACEMENT}
{IS_HERO}
random_traits=no random_traits=no
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
[/unit] [/unit]
#enddef #enddef

2
data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
View file

@ -135,7 +135,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
facing=nw facing=nw
id=guard2 id=guard2
x=24 x=24
@ -169,7 +168,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
)} )}

15
data/campaigns/Legend_of_Wesmere/utils/characters.cfg
View file

@ -36,7 +36,7 @@
[modifications] [modifications]
{TRAIT_QUICK} {TRAIT_QUICK}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
{TRAIT_LOYAL} {TRAIT_LOYAL OVERLAY=""}
[/modifications] [/modifications]
#enddef #enddef
@ -58,7 +58,6 @@
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
#enddef #enddef
#define SCOUT #define SCOUT
@ -71,7 +70,6 @@
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
#enddef #enddef
#define LANDAR #define LANDAR
@ -90,7 +88,7 @@
[modifications] [modifications]
{TRAIT_DEXTROUS} {TRAIT_DEXTROUS}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
{TRAIT_LOYAL} {TRAIT_LOYAL OVERLAY=""}
[/modifications] [/modifications]
#enddef #enddef
@ -126,7 +124,7 @@
[modifications] [modifications]
{TRAIT_QUICK} {TRAIT_QUICK}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
{TRAIT_LOYAL} {TRAIT_LOYAL OVERLAY=""}
[/modifications] [/modifications]
#enddef #enddef
@ -140,7 +138,6 @@
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
#enddef #enddef
#define TAMERIL_ISIMERIL #define TAMERIL_ISIMERIL
@ -153,7 +150,6 @@
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
#enddef #enddef
#define OLURF #define OLURF
@ -202,7 +198,6 @@
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -218,7 +213,6 @@
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -262,7 +256,6 @@
{TRAIT_HEALTHY} {TRAIT_HEALTHY}
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -345,7 +338,6 @@
{TRAIT_DEXTROUS} {TRAIT_DEXTROUS}
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
#enddef #enddef
#define ARKILDUR #define ARKILDUR
@ -358,7 +350,6 @@
{TRAIT_STRONG} {TRAIT_STRONG}
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
#enddef #enddef
#TODO bring the macro to use. #TODO bring the macro to use.

3
data/campaigns/Liberty/scenarios/01_The_Raid.cfg
View file

@ -238,9 +238,8 @@
#textdomain wesnoth-l #textdomain wesnoth-l
[/effect] [/effect]
[/object] [/object]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
{IS_HERO}
unrenamable=yes unrenamable=yes
[/unit] [/unit]

1
data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
View file

@ -110,7 +110,6 @@
id=Zlex id=Zlex
name= _ "Zlex" name= _ "Zlex"
x,y=6,24 x,y=6,24
{IS_LOYAL}
role=Supporter role=Supporter
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}

3
data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg
View file

@ -42,10 +42,9 @@
name= _ "Hamel" name= _ "Hamel"
profile=portraits/Hamel.png profile=portraits/Hamel.png
# This nice macro gives the unit silver crown. # This nice macro gives the unit silver crown.
{IS_HERO}
x,y=6,23 x,y=6,23
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
[/unit] [/unit]

4
data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
View file

@ -1565,7 +1565,6 @@
name= _ "Dulcatas" name= _ "Dulcatas"
side=1 side=1
x,y=4,8 x,y=4,8
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_HEALTHY} {TRAIT_HEALTHY}
@ -1578,7 +1577,6 @@
name= _ "Antolos" name= _ "Antolos"
side=1 side=1
x,y=7,10 x,y=7,10
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
@ -1591,7 +1589,6 @@
name= _ "Varem" name= _ "Varem"
side=1 side=1
x,y=6,13 x,y=6,13
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
@ -2054,7 +2051,6 @@
id=Abhai id=Abhai
name= _ "Abhai" name= _ "Abhai"
# profile=Abhai.png # profile=Abhai.png
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}

2
data/campaigns/Northern_Rebirth/scenarios/05a_02_Dealings.cfg
View file

@ -69,7 +69,7 @@
name= _ "Galim" name= _ "Galim"
x,y=12,11 x,y=12,11
facing=se facing=se
{IS_LOYAL} # todo: is the unit loyal or not? before it had the {IS_LOYAL} but without the real loyal trait.
[/unit] [/unit]
[/side] [/side]

3
data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
View file

@ -965,6 +965,7 @@
[foreach] [foreach]
array=new_companions array=new_companions
[do] [do]
## TODO: does this still work after the overlays= change?
{VARIABLE this_item.side 1} {VARIABLE this_item.side 1}
{VARIABLE this_item.canrecruit no} {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. # 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 name=this_item.modifications
mode=replace mode=replace
[literal] [literal]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_UNDEAD} {TRAIT_UNDEAD}
[/literal] [/literal]
[/set_variables] [/set_variables]

8
data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
View file

@ -234,7 +234,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_HEALTHY} {TRAIT_HEALTHY}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[/else] [/else]
[/if] [/if]
@ -258,9 +257,8 @@
x,y=15,2 x,y=15,2
side=1 side=1
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
{IS_HERO}
[/unit] [/unit]
[/else] [/else]
[/if] [/if]
@ -284,9 +282,8 @@
x,y=15,2 x,y=15,2
side=1 side=1
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
{IS_HERO}
[/unit] [/unit]
[/else] [/else]
[/if] [/if]
@ -385,7 +382,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_DEXTROUS} {TRAIT_DEXTROUS}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]

1
data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg
View file

@ -270,7 +270,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
id=Abhai id=Abhai
name= _ "Abhai" name= _ "Abhai"
#profile=Abhai.png #profile=Abhai.png

2
data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
View file

@ -597,7 +597,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[move_unit_fake] [move_unit_fake]
@ -617,7 +616,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]

1
data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
View file

@ -592,7 +592,6 @@
[/filter] [/filter]
canrecruit=no canrecruit=no
{TRAIT_LOYAL} {TRAIT_LOYAL}
{IS_LOYAL}
[/modify_unit] [/modify_unit]
[message] [message]

5
data/campaigns/Northern_Rebirth/utils/characters.cfg
View file

@ -25,7 +25,6 @@
id=Camerin id=Camerin
name= _ "Camerin" name= _ "Camerin"
profile=portraits/Camerin.png profile=portraits/Camerin.png
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
@ -37,7 +36,6 @@
id=Father Morvin id=Father Morvin
name= _ "Father Morvin" name= _ "Father Morvin"
profile=portraits/Father_Morvin.png profile=portraits/Father_Morvin.png
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
@ -50,7 +48,6 @@
id=Sister Thera id=Sister Thera
name= _ "Sister Thera" name= _ "Sister Thera"
profile=portraits/Sister_Thera.png profile=portraits/Sister_Thera.png
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
@ -62,7 +59,6 @@
id=Elenia id=Elenia
name= _ "Elenia" name= _ "Elenia"
profile=portraits/Elenia.png profile=portraits/Elenia.png
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_HEALTHY} {TRAIT_HEALTHY}
@ -73,7 +69,6 @@
type=Drake Burner type=Drake Burner
id=Krash id=Krash
name= _ "Krash" name= _ "Krash"
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}

28
data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
View file

@ -328,32 +328,36 @@
type=Caravan type=Caravan
side=1 side=1
facing=ne facing=ne
upkeep=free [modifications]
{IS_HERO} {TRAIT_LOYAL_HERO_NOSLOT}
[/modifications]
[/unit] [/unit]
[unit] [unit]
x,y=6,29 x,y=6,29
type=Caravan type=Caravan
side=1 side=1
facing=ne facing=ne
upkeep=free [modifications]
{IS_HERO} {TRAIT_LOYAL_HERO_NOSLOT}
[/modifications]
[/unit] [/unit]
[unit] [unit]
x,y=6,28 x,y=6,28
type=Caravan type=Caravan
side=1 side=1
facing=ne facing=ne
upkeep=free [modifications]
{IS_HERO} {TRAIT_LOYAL_HERO_NOSLOT}
[/modifications]
[/unit] [/unit]
[unit] [unit]
x,y=7,28 x,y=7,28
type=Caravan type=Caravan
side=1 side=1
facing=ne facing=ne
upkeep=free [modifications]
{IS_HERO} {TRAIT_LOYAL_HERO_NOSLOT}
[/modifications]
[/unit] [/unit]
#ifdef HARD #ifdef HARD
[unit] [unit]
@ -361,8 +365,9 @@
type=Caravan type=Caravan
side=1 side=1
facing=ne facing=ne
upkeep=free [modifications]
{IS_HERO} {TRAIT_LOYAL_HERO_NOSLOT}
[/modifications]
[/unit] [/unit]
#endif #endif
[unit] [unit]
@ -373,10 +378,9 @@
name= _ "Alanin" name= _ "Alanin"
unrenamable=yes unrenamable=yes
facing=ne facing=ne
{IS_HERO}
profile=portraits/alanin.png profile=portraits/alanin.png
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
[/unit] [/unit]

3
data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
View file

@ -275,11 +275,10 @@
id=Baglur id=Baglur
name= _ "Baglur" name= _ "Baglur"
unrenamable=yes unrenamable=yes
{IS_HERO}
profile=portraits/baglur.png profile=portraits/baglur.png
facing=sw facing=sw
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
[/unit] [/unit]

4
data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg
View file

@ -66,7 +66,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
x,y=13,11 x,y=13,11
@ -79,7 +78,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
x,y=9,13 x,y=9,13
@ -91,7 +89,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
x,y=11,14 x,y=11,14
@ -103,7 +100,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[/event] [/event]

6
data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
View file

@ -333,11 +333,10 @@
id=Krawg id=Krawg
name= _ "Krawg" name= _ "Krawg"
unrenamable=yes unrenamable=yes
{IS_HERO}
x,y=5,24 x,y=5,24
side=1 side=1
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
[/unit] [/unit]
@ -500,12 +499,11 @@
id=Thursagan id=Thursagan
name= _ "Thursagan" name= _ "Thursagan"
unrenamable=yes unrenamable=yes
{IS_HERO}
profile=portraits/thursagan.png profile=portraits/thursagan.png
advances_to=Dwarvish Arcanister advances_to=Dwarvish Arcanister
max_experience=210 max_experience=210
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
[/unit] [/unit]

6
data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg
View file

@ -61,7 +61,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
x,y=13,12 x,y=13,12
@ -73,7 +72,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
x,y=9,13 x,y=9,13
@ -85,7 +83,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
x,y=11,14 x,y=11,14
@ -97,7 +94,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[/event] [/event]
@ -228,7 +224,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
type=Dwarvish Runesmith type=Dwarvish Runesmith
@ -240,7 +235,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
speaker=narrator speaker=narrator

4
data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg
View file

@ -61,7 +61,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
x,y=10,9 x,y=10,9
@ -73,7 +72,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
x,y=8,10 x,y=8,10
@ -85,7 +83,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
x,y=10,12 x,y=10,12
@ -97,7 +94,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[/event] [/event]

5
data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
View file

@ -199,11 +199,10 @@
name= _ "Durstorn" name= _ "Durstorn"
unrenamable=yes unrenamable=yes
side=1 side=1
{IS_HERO}
profile=portraits/durstorn-insane.png profile=portraits/durstorn-insane.png
random_traits=no random_traits=no
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
[/unit] [/unit]
[unit] [unit]
@ -216,7 +215,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
x,y=11,1 x,y=11,1
@ -228,7 +226,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#alanin, baglur, krawg and thursagan #alanin, baglur, krawg and thursagan
[recall] [recall]

4
data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg
View file

@ -367,7 +367,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
speaker=Rolin # wmllint: ignore speaker=Rolin # wmllint: ignore
@ -393,7 +392,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
{RANDOM "Spearman,Bowman"} {RANDOM "Spearman,Bowman"}
@ -407,7 +405,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
{CLEAR_VARIABLE random} {CLEAR_VARIABLE random}
@ -558,7 +555,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
speaker=Hadlin # wmllint: ignore speaker=Hadlin # wmllint: ignore

4
data/campaigns/Secrets_of_the_Ancients/utils/characters.cfg
View file

@ -53,7 +53,6 @@
type=Bone Captain type=Bone Captain
id=Bone Captain id=Bone Captain
name= _ "Rudic" name= _ "Rudic"
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
@ -63,7 +62,6 @@
type=SotA Ruffian type=SotA Ruffian
id=Carcyn id=Carcyn
name= _ "Carcyn" name= _ "Carcyn"
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
@ -75,7 +73,6 @@
id=Shynal id=Shynal
name= _ "Shynal" name= _ "Shynal"
gender=female gender=female
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
@ -124,7 +121,6 @@
type=Saurian Soothsayer type=Saurian Soothsayer
id=Vendraxis id=Vendraxis
name= _ "Vendraxis" name= _ "Vendraxis"
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}

3
data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg
View file

@ -261,9 +261,8 @@
profile=portraits/gruu.png profile=portraits/gruu.png
facing=sw facing=sw
random_traits=no random_traits=no
{IS_HERO}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[object] [object]
[effect] [effect]
apply_to=image_mod apply_to=image_mod

2
data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg
View file

@ -472,7 +472,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[allow_recruit] [allow_recruit]
@ -622,7 +621,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[allow_recruit] [allow_recruit]

9
data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
View file

@ -11,9 +11,8 @@
x={X} x={X}
y={Y} y={Y}
random_traits=no random_traits=no
{IS_HERO}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
[/unit] [/unit]
#enddef #enddef
@ -29,9 +28,8 @@
x={X} x={X}
y={Y} y={Y}
random_traits=no random_traits=no
{IS_HERO}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
[/unit] [/unit]
#enddef #enddef
@ -47,9 +45,8 @@
x={X} x={X}
y={Y} y={Y}
random_traits=no random_traits=no
{IS_HERO}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
[/unit] [/unit]
#enddef #enddef

2
data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg
View file

@ -53,7 +53,6 @@
id=Pelmathidrol id=Pelmathidrol
name= _ "Pelmathidrol" name= _ "Pelmathidrol"
x,y=1,15 x,y=1,15
{IS_LOYAL}
facing=se facing=se
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
@ -144,7 +143,6 @@
x,y=45,29 x,y=45,29
id=Movrur id=Movrur
name= _ "Movrur" name= _ "Movrur"
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]

2
data/campaigns/The_Hammer_of_Thursagan/scenarios/09_The_Underlevels.cfg
View file

@ -40,7 +40,7 @@
x={X} x={X}
y={Y} y={Y}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL OVERLAY=""}
[/modifications] [/modifications]
ai_special=guardian ai_special=guardian
random_traits=yes random_traits=yes

9
data/campaigns/The_Hammer_of_Thursagan/utils/characters.cfg
View file

@ -19,9 +19,8 @@
name= _ "Angarthing" name= _ "Angarthing"
profile=portraits/angarthing.png profile=portraits/angarthing.png
unrenamable=yes unrenamable=yes
{IS_HERO}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
#enddef #enddef
@ -32,9 +31,8 @@
profile=portraits/ratheln.png profile=portraits/ratheln.png
name= _ "Ratheln" name= _ "Ratheln"
unrenamable=yes unrenamable=yes
{IS_HERO}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
#enddef #enddef
@ -58,9 +56,8 @@
name= _ "Dulcatulos" name= _ "Dulcatulos"
profile=portraits/dulcatulos.png profile=portraits/dulcatulos.png
unrenamable=yes unrenamable=yes
{IS_HERO}
upkeep=free
[modifications] [modifications]
{TRAIT_LOYAL_HERO_NOSLOT}
{TRAIT_QUICK} {TRAIT_QUICK}
{TRAIT_HEALTHY} {TRAIT_HEALTHY}
[/modifications] [/modifications]

3
data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
View file

@ -128,7 +128,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{SECOND_TRAIT_WML} {SECOND_TRAIT_WML}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#enddef #enddef
@ -332,7 +331,7 @@
random_traits=no random_traits=no
profile=portraits/lady_outlaw.png profile=portraits/lady_outlaw.png
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
[/unit] [/unit]

1
data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg
View file

@ -171,7 +171,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg
View file

@ -367,7 +367,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
speaker=Minister Edren speaker=Minister Edren
@ -541,7 +540,6 @@ Enter at Your Own Risk!"
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[redraw] [redraw]

1
data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
View file

@ -362,7 +362,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[redraw] [redraw]

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
View file

@ -274,7 +274,7 @@
random_traits=no random_traits=no
profile=portraits/jessica.png profile=portraits/jessica.png
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
[/unit] [/unit]

3
data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg
View file

@ -963,7 +963,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
@ -1102,7 +1101,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
@ -1223,7 +1221,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[scroll_to_unit] [scroll_to_unit]

7
data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg
View file

@ -18,11 +18,10 @@
side={SIDE} side={SIDE}
x={X} x={X}
y={Y} y={Y}
{IS_HERO}
unrenamable=yes unrenamable=yes
random_traits=no random_traits=no
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
[/unit] [/unit]
#enddef #enddef
@ -41,7 +40,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#enddef #enddef
@ -58,7 +56,6 @@
{TRAIT_UNDEAD} {TRAIT_UNDEAD}
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#enddef #enddef
@ -75,7 +72,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#enddef #enddef
@ -95,6 +91,5 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#enddef #enddef

11
data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
View file

@ -191,7 +191,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
@ -257,10 +256,9 @@
name= _ "Sir Gerrick" name= _ "Sir Gerrick"
unrenamable=yes unrenamable=yes
profile=portraits/sir-gerrick.png profile=portraits/sir-gerrick.png
{IS_HERO}
x,y=10,9 x,y=10,9
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
[/unit] [/unit]
@ -425,7 +423,6 @@
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
x,y=5,11 x,y=5,11
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
side=1 side=1
@ -445,7 +442,6 @@
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
x,y=5,10 x,y=5,10
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
@ -549,7 +545,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
@ -586,7 +581,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
@ -799,10 +793,9 @@
name= _ "Sir Gerrick" name= _ "Sir Gerrick"
unrenamable=yes unrenamable=yes
profile=portraits/sir-gerrick.png profile=portraits/sir-gerrick.png
{IS_HERO}
x,y=10,9 x,y=10,9
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
[/unit] [/unit]

6
data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
View file

@ -317,11 +317,10 @@
profile=portraits/hylas.png profile=portraits/hylas.png
name= _ "Minister Hylas" name= _ "Minister Hylas"
unrenamable=yes unrenamable=yes
{IS_HERO}
side=1 side=1
x,y=21,14 x,y=21,14
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
[/unit] [/unit]
@ -480,7 +479,6 @@
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
x,y=14,21 x,y=14,21
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
@ -515,7 +513,6 @@
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
x,y=14,21 x,y=14,21
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
side=1 side=1
@ -535,7 +532,6 @@
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
x,y=15,21 x,y=15,21
{IS_LOYAL}
[/unit] [/unit]
[message] [message]

14
data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
View file

@ -162,11 +162,10 @@
name= _ "Ethiliel" name= _ "Ethiliel"
unrenamable=yes unrenamable=yes
profile=portraits/ethiliel.png profile=portraits/ethiliel.png
{IS_HERO}
x,y=recall,recall x,y=recall,recall
random_traits=no random_traits=no
[modifications] [modifications]
# Loyal trait is given later {TRAIT_LOYAL_HERO_NOSLOT}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
[/unit] [/unit]
@ -299,7 +298,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
@ -545,18 +543,18 @@
{VARIABLE EthilielV.x recall} {VARIABLE EthilielV.x recall}
{VARIABLE EthilielV.y recall} {VARIABLE EthilielV.y recall}
{CLEAR_VARIABLE EthilielV.modifications} {CLEAR_VARIABLE EthilielV.modifications}
[set_variables] [set_variables]
name=EthilielV.modifications name=EthilielV.modifications
mode=insert mode=insert
[value] [value]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_QUICK} {TRAIT_QUICK}
[/value] [/value]
[/set_variables] [/set_variables]
{CLEAR_VARIABLE EthilielV.upkeep} {CLEAR_VARIABLE EthilielV.upkeep}
[unstore_unit] [unstore_unit]
variable=EthilielV variable=EthilielV
[/unstore_unit] [/unstore_unit]

1
data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
View file

@ -486,7 +486,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
to_variable=ranger to_variable=ranger
[/unit] [/unit]
[if] [if]

3
data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
View file

@ -798,9 +798,8 @@
moves=$this_unit.max_moves moves=$this_unit.max_moves
profile=portraits/urza-afalas.png profile=portraits/urza-afalas.png
canrecruit=no canrecruit=no
{IS_HERO}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
[/modify_unit] [/modify_unit]

3
data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
View file

@ -473,11 +473,10 @@ _f, _f, Re, _f
name= _ "Urza Afalas" name= _ "Urza Afalas"
unrenamable=yes unrenamable=yes
profile=portraits/urza-afalas.png profile=portraits/urza-afalas.png
{IS_HERO}
x,y=recall,recall x,y=recall,recall
random_traits=no random_traits=no
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
[/modifications] [/modifications]
[/unit] [/unit]
[/then] [/then]

2
data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
View file

@ -666,7 +666,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
)} )}
{UNIT 1 (White Mage) 9 2 ( {UNIT 1 (White Mage) 9 2 (
generate_name=yes generate_name=yes
@ -675,7 +674,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
)} )}
[/event] [/event]

1
data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
View file

@ -542,7 +542,6 @@ Besides... I want my brother back."
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
)} )}
[message] [message]

3
data/campaigns/Two_Brothers/utils/characters.cfg
View file

@ -130,10 +130,9 @@
type=Red Mage type=Red Mage
profile=portraits/baran.png profile=portraits/baran.png
side=1 side=1
{IS_HERO}
{PLACEMENT} {PLACEMENT}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
[/unit] [/unit]

2
data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
View file

@ -1004,7 +1004,6 @@
gender=$elf_pool[$random_elf_pool_index].gender gender=$elf_pool[$random_elf_pool_index].gender
random_traits=yes random_traits=yes
#ifdef EASY #ifdef EASY
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
@ -1410,7 +1409,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
#endif #endif
[/unit] [/unit]
[/do] [/do]

2
data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
View file

@ -745,7 +745,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
x=$x1 x=$x1
y=$y1 y=$y1
[/unit] [/unit]
@ -1036,7 +1035,6 @@
[/effect] [/effect]
[/object] [/object]
[/modifications] [/modifications]
{IS_LOYAL}
x="$($x1 - 2)" x="$($x1 - 2)"
y="$($y1 - 4)" y="$($y1 - 4)"
side=1 side=1

11
data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
View file

@ -452,7 +452,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[/then] [/then]
[/if] [/if]
@ -1830,7 +1829,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
role=ally role=ally
[/unit] [/unit]
@ -1846,7 +1844,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
role=ally role=ally
[/unit] [/unit]
@ -1862,7 +1859,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
role=ally role=ally
[/unit] [/unit]
@ -1879,7 +1875,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
role=ally role=ally
[/unit] [/unit]
#endif #endif
@ -1896,7 +1891,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
role=ally role=ally
[/unit] [/unit]
@ -1945,7 +1939,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
role=ally role=ally
placement=map placement=map
passable=yes passable=yes
@ -1963,7 +1956,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
role=ally role=ally
placement=map placement=map
passable=yes passable=yes
@ -1981,7 +1973,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
role=ally role=ally
placement=map placement=map
passable=yes passable=yes
@ -1999,7 +1990,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
role=ally role=ally
placement=map placement=map
passable=yes passable=yes
@ -2019,7 +2009,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
role=ally role=ally
placement=map placement=map
passable=yes passable=yes

8
data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
View file

@ -303,7 +303,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -318,7 +317,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#ifdef HARD #ifdef HARD
@ -361,7 +359,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim
[/effect] [/effect]
[/object] [/object]
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -387,7 +384,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim
[/effect] [/effect]
[/object] [/object]
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
# reveal a bit of the escape passage to the player # 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_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[remove_shroud] [remove_shroud]
@ -1273,7 +1268,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[kill] [kill]
@ -1308,7 +1302,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#endif #endif
@ -1395,7 +1388,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]

1
data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
View file

@ -753,7 +753,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]

10
data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg
View file

@ -188,7 +188,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -203,7 +202,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -218,7 +216,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -233,7 +230,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -248,7 +244,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -263,7 +258,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -278,7 +272,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -293,7 +286,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -308,7 +300,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -323,7 +314,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[/event] [/event]

11
data/campaigns/Under_the_Burning_Suns/scenarios/07b_Talking_with_Trolls.cfg
View file

@ -167,7 +167,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[/else] [/else]
[/if] [/if]
@ -187,7 +186,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -202,7 +200,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -218,7 +215,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -233,7 +229,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -248,7 +243,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -263,7 +257,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -278,7 +271,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -293,7 +285,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -308,7 +299,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -323,7 +313,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[/event] [/event]

1
data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
View file

@ -4456,7 +4456,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[delay] [delay]

6
data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
View file

@ -818,7 +818,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[if] [if]
[variable] [variable]
@ -872,7 +871,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[if] [if]
[variable] [variable]
@ -927,7 +925,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[if] [if]
[variable] [variable]
@ -977,7 +974,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[if] [if]
[variable] [variable]
@ -1052,7 +1048,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
speaker=We-jial speaker=We-jial
@ -2394,7 +2389,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]
speaker=Hekuba speaker=Hekuba

4
data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
View file

@ -315,7 +315,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
# recall heroes # recall heroes
@ -467,7 +466,6 @@
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[unit] [unit]
@ -478,7 +476,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{IS_LOYAL}
ai_special=guardian ai_special=guardian
[/unit] [/unit]
[/event] [/event]
@ -1198,7 +1195,6 @@
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
[message] [message]

9
data/campaigns/Under_the_Burning_Suns/utils/character-definitions.cfg
View file

@ -19,10 +19,9 @@
profile=portraits/nym.png profile=portraits/nym.png
upkeep=loyal upkeep=loyal
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_DEXTROUS} {TRAIT_DEXTROUS}
[/modifications] [/modifications]
{IS_HERO}
#enddef #enddef
#define GARAK #define GARAK
@ -32,7 +31,7 @@
profile=portraits/garak.png profile=portraits/garak.png
unrenamable=yes unrenamable=yes
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_STRONG} {TRAIT_STRONG}
[object] [object]
[effect] [effect]
@ -47,7 +46,6 @@
[/effect] [/effect]
[/object] [/object]
[/modifications] [/modifications]
{IS_HERO}
#enddef #enddef
#define ZHUL #define ZHUL
@ -57,7 +55,7 @@
profile=portraits/zhul.png profile=portraits/zhul.png
unrenamable=yes unrenamable=yes
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[object] [object]
[effect] [effect]
@ -69,5 +67,4 @@
[/effect] [/effect]
[/object] [/object]
[/modifications] [/modifications]
{IS_HERO}
#enddef #enddef

3
data/campaigns/Wings_of_Victory/scenarios/03_The_Contention.cfg
View file

@ -82,9 +82,8 @@
[/leader] [/leader]
[unit] [unit]
type=Sky Drake type=Sky Drake
{IS_HERO}
[modifications] [modifications]
{OBJECT_LOYAL} {TRAIT_LOYAL_HERO_NOSLOT}
{TRAIT_STRONG} {TRAIT_STRONG}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]

2
data/campaigns/Wings_of_Victory/scenarios/06_The_Three_Sisters.cfg
View file

@ -87,7 +87,6 @@
[unit] [unit]
type=Giant Scorpion type=Giant Scorpion
ai_special=guardian ai_special=guardian
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
@ -97,7 +96,6 @@
[unit] [unit]
type=Giant Scorpion type=Giant Scorpion
ai_special=guardian ai_special=guardian
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]

2
data/campaigns/Wings_of_Victory/scenarios/11_Fire_Meets_Steel.cfg
View file

@ -81,7 +81,6 @@
[unit] [unit]
type=Dwarvish Dragonguard type=Dwarvish Dragonguard
ai_special=guardian ai_special=guardian
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
@ -91,7 +90,6 @@
[unit] [unit]
type=Dwarvish Dragonguard type=Dwarvish Dragonguard
ai_special=guardian ai_special=guardian
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]

6
data/campaigns/Wings_of_Victory/scenarios/12_Confrontation.cfg
View file

@ -70,16 +70,17 @@
[/leader] [/leader]
[unit] [unit]
{GRIBBEL} {GRIBBEL}
{IS_HERO}
experience=35 # Intended to cover what he could have earned in previous appearance plus some. experience=35 # Intended to cover what he could have earned in previous appearance plus some.
moves=0 moves=0
x,y=2,35 x,y=2,35
facing=ne facing=ne
[+modifications]
{TRAIT_LOYAL_HERO}
[/modifications]
[/unit] [/unit]
[unit] [unit]
type=Drake Warden type=Drake Warden
ai_special=guardian ai_special=guardian
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}
@ -90,7 +91,6 @@
[unit] [unit]
type=Drake Enforcer type=Drake Enforcer
ai_special=guardian ai_special=guardian
{IS_LOYAL}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL}
{TRAIT_QUICK} {TRAIT_QUICK}

7
data/campaigns/Wings_of_Victory/utils/characters.cfg
View file

@ -52,9 +52,8 @@
name= _ "Vank" name= _ "Vank"
unrenamable=yes unrenamable=yes
type=Drake Glider type=Drake Glider
{IS_HERO}
[modifications] [modifications]
{OBJECT_LOYAL} {TRAIT_LOYAL_HERO_NOSLOT}
{TRAIT_QUICK} {TRAIT_QUICK}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
@ -75,7 +74,6 @@
name= _ "Gribbel" name= _ "Gribbel"
type=Drake Flameheart type=Drake Flameheart
[modifications] [modifications]
{OBJECT_LOYAL}
{TRAIT_STRONG} {TRAIT_STRONG}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
@ -96,9 +94,8 @@
id=Krenix id=Krenix
name= _ "Krenix" name= _ "Krenix"
type=Saurian Soothsayer type=Saurian Soothsayer
{IS_HERO}
[modifications] [modifications]
{TRAIT_LOYAL} {TRAIT_LOYAL_HERO}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
#enddef #enddef

4
data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
View file

@ -77,8 +77,8 @@
x,y=13,5 x,y=13,5
random_traits=no random_traits=no
facing=nw facing=nw
{IS_HERO}
[modifications] [modifications]
{TRAIT_LOYAL_HERO_NOSLOT}
{TRAIT_INTELLIGENT} {TRAIT_INTELLIGENT}
[object] [object]
[effect] [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 <b>Attack</b> when you’re ready." message= _"To attack the quintain, first select the attacker (Li’sar), then the target (the quintain). You will see an attack description. Click <b>Attack</b> when you’re ready."
[/message] [/message]
)} )}
[disallow_end_turn] [disallow_end_turn]
reason=_"You cannot end your turn until you have attacked the dummy!" reason=_"You cannot end your turn until you have attacked the dummy!"
[/disallow_end_turn] [/disallow_end_turn]

1
data/core/macros/deprecated-utils.cfg
View file

@ -164,7 +164,6 @@ _"No gold carried over to the next scenario."#enddef
{TRAIT_UNDEAD} {TRAIT_UNDEAD}
{TRAIT_LOYAL} {TRAIT_LOYAL}
[/modifications] [/modifications]
{IS_LOYAL}
[/unit] [/unit]
#enddef #enddef

2
data/core/macros/image-utils.cfg
View file

@ -15,6 +15,8 @@
color="255,255,255" color="255,255,255"
#enddef #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 #define IS_HERO
# Embed this into a unit declaration to add a hero icon to the unit. # Embed this into a unit declaration to add a hero icon to the unit.
overlays="misc/hero-icon.png" overlays="misc/hero-icon.png"

30
data/core/macros/traits.cfg
View file

@ -2,6 +2,10 @@
# Traits for the [modifications] clause of SingleWML descriptions # Traits for the [modifications] clause of SingleWML descriptions
#define TRAIT_LOYAL #define TRAIT_LOYAL
#arg OVERLAY
"misc/loyal-icon.png"
#endarg
# Units with trait Loyal have no upkeep. # Units with trait Loyal have no upkeep.
[trait] [trait]
id=loyal id=loyal
@ -14,6 +18,32 @@ During campaigns, certain units may opt to join the player’s forces of their o
[effect] [effect]
apply_to=loyal apply_to=loyal
[/effect] [/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] [/trait]
#enddef #enddef

Some files were not shown because too many files have changed in this diff Show more