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

Make systematic use of the loyalty overlay.

Browse source
This commit is contained in:
Eric S. Raymond 2009-12-15 19:40:40 +00:00
parent 798327b2c3
commit b0076f17b9
57 changed files with 214 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -209,6 +209,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[/then]

1
data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg
View file

@ -318,6 +318,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
{CLEAR_VARIABLE grug}

1
data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg
View file

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

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

@ -125,6 +125,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
type=Swordsman
@ -137,6 +138,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[recall]
@ -221,6 +223,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
[message]
speaker=Haldiel
@ -250,6 +253,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
type=Horseman
@ -263,6 +267,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
type=Horseman
@ -276,6 +281,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
type=Knight
@ -289,6 +295,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
type=Knight
@ -302,6 +309,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
type=Knight
@ -315,6 +323,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[message]
speaker=Kaylan
@ -354,6 +363,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
type=Horseman
@ -367,6 +377,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
type=Horseman
@ -380,6 +391,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
type=Knight
@ -392,7 +404,8 @@
facing=sw
[modifications]
{TRAIT_LOYAL}
[/modifications]
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
type=Knight
@ -406,6 +419,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
type=Knight
@ -419,6 +433,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[redraw]
[/redraw]

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

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

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

@ -137,6 +137,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
#ifdef EASY
@ -153,6 +154,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
#ifdef HARD
@ -169,6 +171,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
{OBJ_TRIDENT_STORM 5 4 bop_stormtrident}
@ -320,6 +323,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
side=1
@ -333,6 +337,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
side=1
@ -346,6 +351,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
#ifdef EASY
@ -361,6 +367,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
#endif
[message]
@ -392,6 +399,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
#ifdef EASY
@ -407,6 +415,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
side=1
@ -420,6 +429,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
#else
[unit]
@ -434,6 +444,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
#endif
[message]
@ -465,6 +476,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
#ifdef EASY
@ -480,6 +492,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
#endif
@ -512,6 +525,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
side=1
@ -525,6 +539,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
#ifdef EASY
@ -540,6 +555,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
#endif
[message]
@ -571,6 +587,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
side=1
@ -584,6 +601,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
side=1
@ -597,6 +615,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
#ifdef EASY
[unit]
@ -611,6 +630,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
side=1
@ -624,6 +644,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
#else
[unit]
@ -638,6 +659,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
#endif
@ -686,6 +708,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[message]
speaker=Delfador
@ -798,6 +821,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
#if neither of the enemies is dead, automatically lose

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

@ -268,6 +268,7 @@
[/object]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
#set the variable to say the Moremirmu is alive
[set_variable]
@ -313,6 +314,7 @@
{TRAIT_UNDEAD}
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
{LOYAL_UNDEAD_UNIT 2 (Walking Corpse) ({X}) ({Y})}

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

@ -216,6 +216,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -229,6 +230,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
id=Gamlel
@ -241,6 +243,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[redraw]
@ -356,6 +359,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -369,6 +373,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
id=Gamlel
@ -381,6 +386,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
id=Darglen
@ -392,6 +398,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
#dialog
[message]
@ -450,6 +457,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -463,6 +471,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -476,6 +485,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
#create terrain
[terrain]

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

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

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

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

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

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

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

@ -113,6 +113,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
generate_name=yes
@ -124,6 +125,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
generate_name=yes
@ -135,6 +137,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
generate_name=yes
@ -146,6 +149,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
generate_name=yes
@ -157,6 +161,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
generate_name=yes
@ -168,6 +173,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
generate_name=yes
@ -179,6 +185,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
id=rider
@ -191,6 +198,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
generate_name=yes
@ -202,6 +210,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
generate_name=yes
@ -213,6 +222,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[/side]

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

@ -184,6 +184,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
# wmllint: recognize Ulfdain
[teleport]
@ -392,6 +393,7 @@
{TRAIT_UNDEAD}
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
#ifdef EASY
@ -410,6 +412,7 @@
{TRAIT_UNDEAD}
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[/event]

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

@ -179,6 +179,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[redraw]
[/redraw]
@ -200,6 +201,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[redraw]
[/redraw]

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

@ -267,6 +267,7 @@
{TRAIT_LOYAL}
{TRAIT_FEARLESS}
[/modifications]
{IS_LOYAL}
[status]
poisoned=on
[/status]

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

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

1
data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg
View file

@ -86,6 +86,7 @@ This is the story of Kalenz, and of the Elves in the days of the humans in Wesno
{TRAIT_INTELLIGENT}
# {TEAM_COLOR_LOYAL}
[/modifications]
{IS_LOYAL}
find_vacant=yes
[/unit]
[/side]

1
data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg
View file

@ -930,6 +930,7 @@
{TRAIT_LOYAL}
{TEAM_COLOR_LOYAL}
[/modifications]
{IS_LOYAL}
facing=se
[/unit]

3
data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg
View file

@ -189,6 +189,7 @@
{TRAIT_LOYAL}
{TEAM_COLOR_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
id=Tameril-Isimeril
@ -203,6 +204,7 @@
{TRAIT_LOYAL}
{TEAM_COLOR_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
#ifdef EASY
[unit]
@ -217,6 +219,7 @@
{TRAIT_LOYAL}
{TEAM_COLOR_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
#endif
[message]

1
data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg
View file

@ -60,6 +60,7 @@
[not]
id=Kalenz
[/not]
# wmllint: recognize Anduilas
[not]
id=Anduilas
[/not]

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

@ -169,6 +169,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
role=Supporter
[/unit]

2
data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg
View file

@ -253,6 +253,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
side=1
x=1
y=1
@ -721,6 +722,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
[message]
speaker=Camerin

1
data/campaigns/Northern_Rebirth/scenarios/03_To_The_Mines.cfg
View file

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

8
data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg
View file

@ -545,6 +545,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
# Some dialogue
[message]
@ -661,6 +662,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[message]
speaker=Sister Thera
@ -756,6 +758,7 @@
{TRAIT_LOYAL}
{TRAIT_HEALTHY}
[/modifications]
{IS_LOYAL}
[/unit]
[message]
speaker=unit
@ -910,6 +913,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
# I'm not checking for existence of Camerin since the
# dialogue still looks decent without his lines.
@ -1069,6 +1073,7 @@
{TRAIT_LOYAL}
{TRAIT_HEALTHY}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
type=Dwarvish Thunderguard
@ -1081,6 +1086,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
type=Dwarvish Fighter
@ -1093,6 +1099,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[message]
speaker=Dulcatas
@ -2049,6 +2056,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
id=Abhai
name= _ "Abhai"
#profile=Abhai.png

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

@ -231,6 +231,7 @@
{TRAIT_LOYAL}
{TRAIT_HEALTHY}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
type=Ancient Lich
@ -243,6 +244,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
type=Lich
@ -255,6 +257,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
{GENERIC_UNIT 3 "Orcish Warlord" 10 13}
@ -494,6 +497,7 @@
{TRAIT_LOYAL}
{TRAIT_DEXTROUS}
[/modifications]
{IS_LOYAL}
[/unit]
[message]
id=Eryssa

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

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

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

@ -681,6 +681,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[move_unit_fake]
type=Drake Fighter
@ -700,6 +701,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
{CLEAR_VARIABLE krash_flies_away}
[message]

2
data/campaigns/Northern_Rebirth/utils/herodeaths.cfg
View file

@ -390,6 +390,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
{CLEAR_VARIABLE respawn_point}
{CLEAR_VARIABLE type_check}
@ -675,6 +676,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
{CLEAR_VARIABLE type_check}
{CLEAR_VARIABLE respawn_point}

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

@ -300,6 +300,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[message]
speaker=Alanin

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

@ -61,6 +61,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
x,y=13,11
@ -73,6 +74,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
x,y=9,13
@ -84,6 +86,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
x,y=11,14
@ -95,6 +98,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
[item]

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

@ -56,6 +56,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
x,y=13,12
@ -67,6 +68,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
x,y=9,13
@ -78,6 +80,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
x,y=11,14
@ -89,6 +92,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
[item]
@ -239,6 +243,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
type=Dwarvish Runesmith
@ -250,6 +255,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[message]
speaker=narrator

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

@ -57,6 +57,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
x,y=10,9
@ -68,6 +69,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
x,y=8,10
@ -79,6 +81,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
x,y=10,12
@ -90,6 +93,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[item]

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

@ -167,6 +167,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
x,y=11,1
@ -177,6 +178,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
#alanin, baglur, krawg and thursagan
[recall]

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

@ -213,6 +213,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[message]
speaker=Rolin # wmllint: ignore
@ -238,6 +239,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
{RANDOM "Spearman,Bowman"}
@ -251,6 +253,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[/event]
@ -274,6 +277,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[message]
speaker=Hadlin # wmllint: ignore

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

@ -471,6 +471,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[allow_recruit]
@ -663,6 +664,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[allow_recruit]

1
data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_The_East_Gate.cfg
View file

@ -87,6 +87,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
x,y=1,15
[/unit]

2
data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg
View file

@ -97,6 +97,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -109,6 +110,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
[objectives]

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

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

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

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

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

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

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

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

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

@ -832,6 +832,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
# Omitting {IS_LOYAL} deliberately
[/unit]
[message]
@ -899,6 +900,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
# Omitting {IS_LOYAL} deliberately
[/unit]
[message]
@ -966,6 +968,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
# Omitting {IS_LOYAL} deliberately
[/unit]
[message]

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

@ -45,6 +45,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
#enddef
@ -62,6 +63,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
#enddef
@ -78,6 +80,7 @@
{TRAIT_UNDEAD}
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
#enddef
@ -94,6 +97,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
#enddef
@ -137,6 +141,7 @@
{TRAIT_UNDEAD}
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
{CLEAR_VARIABLE dead_store}

5
data/campaigns/The_South_Guard/scenarios/01_Born_To_The_Banner.cfg
View file

@ -169,6 +169,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[message]
@ -422,6 +423,7 @@
{TRAIT_INTELLIGENT}
[/modifications]
x,y=7,11
{IS_LOYAL}
[/unit]
[unit]
side=1
@ -441,6 +443,7 @@
{TRAIT_QUICK}
[/modifications]
x,y=5,10
{IS_LOYAL}
[/unit]
[message]
@ -488,6 +491,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[message]
@ -524,6 +528,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
[message]

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

@ -387,6 +387,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
{VARIABLE_OP number add 1}

1
data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg
View file

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

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

@ -931,6 +931,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
#endif
[/unit]
@ -1019,6 +1020,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
#endif
[/unit]
{NEXT i}

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

@ -979,6 +979,7 @@
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
x=$x1
y=$y1
[/unit]
@ -1359,6 +1360,7 @@
[/effect]
[/object]
[/modifications]
{IS_LOYAL}
x=$x_coord
y=$y_coord
side=1

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

@ -643,6 +643,7 @@
{TRAIT_LOYAL}
{TRAIT_DEXTROUS}
[/modifications]
{IS_LOYAL}
[/unit]
[/else]
[/if]
@ -1812,6 +1813,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -1841,6 +1843,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -2567,6 +2570,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -2580,6 +2584,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -2593,6 +2598,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
#ifdef HARD
@ -2608,6 +2614,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
#endif
@ -2622,6 +2629,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[role]
@ -2665,6 +2673,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -2678,6 +2687,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -2691,6 +2701,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -2704,6 +2715,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
#ifdef HARD
@ -2720,6 +2732,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[role]

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

@ -466,6 +466,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -480,6 +481,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
#ifdef HARD
@ -524,6 +526,7 @@
[/effect]
[/object]
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -550,6 +553,7 @@
[/effect]
[/object]
[/modifications]
{IS_LOYAL}
[/unit]
# reveal a bit of the escape passage to the player
@ -937,6 +941,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[remove_shroud]
@ -1842,6 +1847,7 @@
[/effect]
[/object]
[/modifications]
{IS_LOYAL}
[/unit]
[kill]
@ -1888,8 +1894,9 @@
[/movement_costs]
[/effect]
[/object]
[/modifications]
[/unit]
[/modifications]
{IS_LOYAL}
[/unit]
#endif
[/event]
@ -2014,6 +2021,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[message]

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

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

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

@ -256,7 +256,7 @@
value=Jarl
[/set_variable]
# Jarl's traits are is intentionally inferior to Rogrimir's
# Jarl's traits are intentionally inferior to Rogrimir's
[unit]
type=Dwarvish Stalwart
id=Jarl
@ -290,6 +290,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -305,6 +306,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -320,6 +322,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -335,6 +338,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -350,6 +354,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -365,6 +370,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -380,6 +386,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -395,6 +402,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -410,6 +418,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -425,6 +434,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[/event]

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

@ -276,6 +276,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[/else]
[/if]
@ -296,6 +297,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -311,6 +313,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -326,6 +329,7 @@
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -341,6 +345,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -356,6 +361,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -371,6 +377,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -386,6 +393,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -401,6 +409,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -416,6 +425,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
@ -431,6 +441,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[/event]

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

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

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

@ -142,6 +142,7 @@
{TRAIT_STRONG}
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
{GOLD 75 100 125}
{INCOME 5 6 7}
controller=ai
@ -805,6 +806,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
# conversation between Tanstafaal, Eloh and Elves
@ -1366,6 +1368,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[if]
[variable]
@ -1464,6 +1467,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[if]
[variable]
@ -1563,6 +1567,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[if]
[variable]
@ -1658,6 +1663,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[if]
[variable]
@ -1780,6 +1786,7 @@
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[message]
speaker=We-jial
@ -2746,6 +2753,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
[/unit]
[message]
speaker=Hekuba

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

@ -666,6 +666,7 @@
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
ai_special=guardian
[/unit]
[/event]
@ -1614,6 +1615,7 @@
{TRAIT_LOYAL}
{TRAIT_QUICK}
[/modifications]
{IS_LOYAL}
[/unit]
[message]

3
players_changelog
View file

@ -9,6 +9,9 @@ Version 1.7.10+svn:
* User interface:
* Scrollbar buttons now keep scrolling when kept pressed down.
* Graphics:
* Mainline now consistently uses the loyalty overlay from Dead Water.
Version 1.7.10-1.8beta3:
* Campaigns:
* Under the Burning Suns: