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

Switch from numeric to symbolic palette IDs everywhere.

Browse source 
The C++ doesn't care, it treated them as strings anyway.
This commit is contained in:
Eric S. Raymond 2007-07-02 20:42:59 +00:00
parent 5cddc61d2c
commit f78741dabf
34 changed files with 112 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/campaigns/Descent_Into_Darkness/_main.cfg
View file

@ -6,14 +6,14 @@
id=descent
rank=50
#textdomain wesnoth-did
icon=units/undead-necromancers/dark-sorcerer.png~RC(magenta>5)
icon=units/undead-necromancers/dark-sorcerer.png~RC(magenta>black)
name=_ "Descent Into Darkness"
define=CAMPAIGN_DESCENT
first_scenario=Saving_Halal
difficulties=EASY,NORMAL,HARD
difficulty_descriptions={MENU_IMG_TXT2 "units/undead-necromancers/adept.png~RC(magenta>5)" _"Neophyte" _"(Normal)"} +
";*" + {MENU_IMG_TXT2 "units/undead-necromancers/dark-sorcerer.png~RC(magenta>5)" _"Evoker" _"(Challenging)"} +
";" + {MENU_IMG_TXT2 "units/undead-necromancers/lich.png~RC(magenta>5)" _"Summoner" _"(Difficult)"}
difficulty_descriptions={MENU_IMG_TXT2 "units/undead-necromancers/adept.png~RC(magenta>black)" _"Neophyte" _"(Normal)"} +
";*" + {MENU_IMG_TXT2 "units/undead-necromancers/dark-sorcerer.png~RC(magenta>black)" _"Evoker" _"(Challenging)"} +
";" + {MENU_IMG_TXT2 "units/undead-necromancers/lich.png~RC(magenta>black)" _"Summoner" _"(Difficult)"}
description=_ "Learn the dark arts of necromancy in order to save your people from an orcish incursion.
(Expert level, 11 scenarios.)

2
data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
View file

@ -30,7 +30,7 @@
[side]
side=2
colour=2
colour=green
controller=ai
team_name=defenders
type=General

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

@ -105,7 +105,7 @@
[side]
# mirror
side=6
colour=5
colour=black
controller=ai
no_leader=yes
ai_algorithm=idle_ai

8
data/campaigns/Eastern_Invasion/_main.cfg
View file

@ -5,14 +5,14 @@
[campaign]
rank=30
#textdomain wesnoth-ei
icon=units/human-loyalists/general.png~RC(magenta>1)
icon=units/human-loyalists/general.png~RC(magenta>red)
name= _ "The Eastern Invasion"
define=CAMPAIGN_EASTERN_INVASION
first_scenario=The_Outpost
difficulties=EASY,NORMAL,HARD
difficulty_descriptions={MENU_IMG_TXT2 "units/human-loyalists/spearman.png~RC(magenta>1)" _"Spearman" _"(Easy)"} +
";*" + {MENU_IMG_TXT2 "units/human-loyalists/swordsman.png~RC(magenta>1)" _"Swordsman" _"(Normal)"} +
";" + {MENU_IMG_TXT2 "units/human-loyalists/royalguard.png~RC(magenta>1)" _"Royal Guard" _"(Challenging)"}
difficulty_descriptions={MENU_IMG_TXT2 "units/human-loyalists/spearman.png~RC(magenta>red)" _"Spearman" _"(Easy)"} +
";*" + {MENU_IMG_TXT2 "units/human-loyalists/swordsman.png~RC(magenta>red)" _"Swordsman" _"(Normal)"} +
";" + {MENU_IMG_TXT2 "units/human-loyalists/royalguard.png~RC(magenta>red)" _"Royal Guard" _"(Challenging)"}
description= _ "There are rumors of undead attacks on the eastern border of Wesnoth. You, an officer in the Royal Army, have been sent to the eastern front to protect the villagers and find out what is happening.
(Intermediate level, 18 scenarios.)"

6
data/campaigns/Heir_To_The_Throne/_main.cfg
View file

@ -10,9 +10,9 @@
define=CAMPAIGN_HEIR_TO_THE_THRONE
first_scenario=01_The_Elves_Besieged
difficulties=EASY,NORMAL,HARD
difficulty_descriptions={MENU_IMG_TXT2 "units/elves-wood/fighter.png~RC(magenta>1)" _"Fighter" _"(Beginner)"} +
";*" + {MENU_IMG_TXT2 "units/elves-wood/hero.png~RC(magenta>1)" _"Hero" _"(Easy)"} + ";" +
{MENU_IMG_TXT2 "units/elves-wood/champion.png~RC(magenta>1)" _"Champion" _"(Normal)"}
difficulty_descriptions={MENU_IMG_TXT2 "units/elves-wood/fighter.png~RC(magenta>red)" _"Fighter" _"(Beginner)"} +
";*" + {MENU_IMG_TXT2 "units/elves-wood/hero.png~RC(magenta>red)" _"Hero" _"(Easy)"} + ";" +
{MENU_IMG_TXT2 "units/elves-wood/champion.png~RC(magenta>red)" _"Champion" _"(Normal)"}
description= _ "Fight to regain the throne of Wesnoth, of which you are the legitimate heir.
(Novice level, 25 scenarios.)"

8
data/campaigns/Northern_Rebirth/_main.cfg
View file

@ -9,10 +9,10 @@
first_scenario=chain_break
define=CAMPAIGN_NORTHERN_REBIRTH
difficulties=NEWBIE,EASY,NORMAL,HARD
difficulty_descriptions={MENU_IMG_TXT2 "units/human-peasants/peasant.png~RC(magenta>1)" _"Peasant" _"(Normal)"} + ";" +
{MENU_IMG_TXT2 "units/human-loyalists/spearman.png~RC(magenta>1)" _"Spearman" _"(Challenging)"} + ";" +
{MENU_IMG_TXT2 "units/human-loyalists/swordsman.png~RC(magenta>1)" _"Swordsman" _"(Difficult)"} + ";" +
{MENU_IMG_TXT2 "units/human-loyalists/royalguard.png~RC(magenta>1)" _"Royal Guard" _"(Nightmare)"}
difficulty_descriptions={MENU_IMG_TXT2 "units/human-peasants/peasant.png~RC(magenta>red)" _"Peasant" _"(Normal)"} + ";" +
{MENU_IMG_TXT2 "units/human-loyalists/spearman.png~RC(magenta>red)" _"Spearman" _"(Challenging)"} + ";" +
{MENU_IMG_TXT2 "units/human-loyalists/swordsman.png~RC(magenta>red)" _"Swordsman" _"(Difficult)"} + ";" +
{MENU_IMG_TXT2 "units/human-loyalists/royalguard.png~RC(magenta>red)" _"Royal Guard" _"(Nightmare)"}
description= _ "For the people of Dwarven Doors the choice was stark: either drudge as downtrodden slaves for the orcs until the end of their brief and miserable lives, or risk all for freedom and rise up against their cruel overlords. Little did they suspect that their struggle would be the hinge of great events that might either restore the Northlands to the glory they had once known, or doom them to an eternity of bloody chaos.

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

@ -135,7 +135,7 @@
name=start
# Override Tallin's team color so he has a distinctive purple shirt.
{TEAM_COLOR_OVERRIDE description=Tallin 4}
{TEAM_COLOR_OVERRIDE description=Tallin purple}
[unit]
type=Peasant

6
data/campaigns/Sceptre_of_Fire/_main.cfg
View file

@ -9,9 +9,9 @@
define="CAMPAIGN_SCEPTRE_FIRE"
first_scenario="1_A_Bargain_is_Struck"
difficulties=EASY,NORMAL,HARD
difficulty_descriptions={MENU_IMG_TXT2 "units/dwarves/fighter.png~RC(magenta>1)" _"Fighter" _"(Normal)"} +
";*" + {MENU_IMG_TXT2 "units/dwarves/steelclad.png~RC(magenta>1)" _"Steelclad" _"(Challenging)"} +
";" + {MENU_IMG_TXT2 "units/dwarves/lord.png~RC(magenta>1)" (_"Lord") _"(Difficult)"}
difficulty_descriptions={MENU_IMG_TXT2 "units/dwarves/fighter.png~RC(magenta>red)" _"Fighter" _"(Normal)"} +
";*" + {MENU_IMG_TXT2 "units/dwarves/steelclad.png~RC(magenta>red)" _"Steelclad" _"(Challenging)"} +
";" + {MENU_IMG_TXT2 "units/dwarves/lord.png~RC(magenta>red)" (_"Lord") _"(Difficult)"}
description= _ "The land of Wesnoth's banner bold
Comes not from its own land;
It comes from Dwarfdom, grim and old

4
data/campaigns/Son_Of_The_Black_Eye/_main.cfg
View file

@ -9,12 +9,12 @@
define=CAMPAIGN_SON_OF_THE_BLACK_EYE
difficulties=EASY,NORMAL,HARD
difficulty_descriptions={MENU_IMG_TXT2 "units/orcs/grunt.png~RC(magenta>1)" _"Grunt" _"(Challenging)"} + ";" + {MENU_IMG_TXT2 "units/orcs/warrior.png~RC(magenta>1)" _"Warrior" _"(Difficult)"} + ";" + {MENU_IMG_TXT2 "units/orcs/warlord.png~RC(magenta>1)" _"Warlord" _"(Nightmare)"}
difficulty_descriptions={MENU_IMG_TXT2 "units/orcs/grunt.png~RC(magenta>red)" _"Grunt" _"(Challenging)"} + ";" + {MENU_IMG_TXT2 "units/orcs/warrior.png~RC(magenta>red)" _"Warrior" _"(Difficult)"} + ";" + {MENU_IMG_TXT2 "units/orcs/warlord.png~RC(magenta>red)" _"Warlord" _"(Nightmare)"}
description= _ "Your father Karun Black-Eye was the greatest orcish leader that ever lived and now, as his son, it's up to you to thwart the selfish designs of the humans who have broken the old agreements with the orcs and are bent upon taking your lands. Unite the warring orcish tribes, bring together the Orcish Council and call up the Great Horde to send the human-worms and their tree-shagger allies to the land of the dead!
(Expert level, 18 scenarios.)"
icon=units/orcs/ruler.png~RC(magenta>1)
icon=units/orcs/ruler.png~RC(magenta>red)
image=SotBE_campaign_image.png
#textdomain wesnoth

2
data/campaigns/The_South_Guard/_main.cfg
View file

@ -18,7 +18,7 @@
(Novice level, 8 scenarios.)"
difficulties=EASY,NORMAL,HARD
difficulty_descriptions="*" + {MENU_IMG_TXT2 "units/human-peasants/peasant.png~RC(magenta>1)" _"Civilian" _"(Beginner)"} + ";" + {MENU_IMG_TXT2 "units/human-loyalists/spearman.png~RC(magenta>1)" _"Recruit" _"(Easy)"} + ";" + {MENU_IMG_TXT2 "units/human-loyalists/javelineer.png~RC(magenta>1)" _"Soldier" _"(Normal)"}
difficulty_descriptions="*" + {MENU_IMG_TXT2 "units/human-peasants/peasant.png~RC(magenta>red)" _"Civilian" _"(Beginner)"} + ";" + {MENU_IMG_TXT2 "units/human-loyalists/spearman.png~RC(magenta>red)" _"Recruit" _"(Easy)"} + ";" + {MENU_IMG_TXT2 "units/human-loyalists/javelineer.png~RC(magenta>red)" _"Soldier" _"(Normal)"}
first_scenario=1_Born_To_The_Banner

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

@ -263,7 +263,7 @@
#ifdef EASY
[message]
speaker=narrator
image="gerrick/infantry-commander.png~RC(magenta>1)"
image="gerrick/infantry-commander.png~RC(magenta>red)"
message= _ "Sir Gerrick is an infantry commander. He is a strong warrior in his own right, but when he is near less experienced troops, he makes their attack better too!"
[/message]
@ -333,12 +333,12 @@
[/message]
[message]
speaker=narrator
image="human-loyalists/bowman-ranged-7.png~RC(magenta>1)"
image="human-loyalists/bowman-ranged-7.png~RC(magenta>red)"
message= _ "Bowmen have a strong ranged attack, and are very effective against units that lack a ranged attack, like Thieves and Thugs. They also carry a sword and can defend themselves against melee attacks."
[/message]
[message]
speaker=narrator
image="human-loyalists/spearman-defend.png~RC(magenta>1)"
image="human-loyalists/spearman-defend.png~RC(magenta>red)"
message= _ "Spearmen have a strong melee attack, and are effective against most units. They also have a weak ranged attack. They form the backbone of the South Guard."
[/message]
[message]
@ -466,7 +466,7 @@
#ifdef EASY
[message]
speaker=narrator
image="merfolk/hunter-defend.png~RC(magenta>1)"
image="merfolk/hunter-defend.png~RC(magenta>red)"
message= _ "You may now recruit Merman Hunters. Mermen are aquatic creatures. Keep them in rivers and swamps and they will fight well! Put them on dry land and they're in trouble!"
[/message]
#endif
@ -627,7 +627,7 @@
[/scroll_to_unit]
[message]
speaker=narrator
image="human-outlaws/bandit.png~RC(magenta>1)"
image="human-outlaws/bandit.png~RC(magenta>red)"
message= _ "Remember, your job is to defeat Urza Mathin. He should be your main target. Archers will be especially effective against him, because he has no ranged attack. Surround him, and kill him!"
[/message]
[/then]

2
data/campaigns/The_South_Guard/scenarios/02_Proven_By_The_Sword.cfg
View file

@ -466,7 +466,7 @@
#ifdef EASY
[message]
speaker=narrator
image="human-magi/white-mage-magic-1.png~RC(magenta>1)"
image="human-magi/white-mage-magic-1.png~RC(magenta>red)"
message= _ "Not only will Minister Hylas's Holy attack melt undead bones, but he can also heal wounded units near him."
[/message]
#endif

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

@ -204,7 +204,7 @@
[message]
speaker=narrator
image="human-loyalists/cavalryman-attack.png~RC(magenta>1)"
image="human-loyalists/cavalryman-attack.png~RC(magenta>red)"
message= _ "You may now recruit Cavalrymen. They are fast and deadly on grassland, but weak in forests and hills. They can keep up with Deoran, so use them to guard him!"
[/message]

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

@ -217,12 +217,12 @@
#ifdef EASY
[message]
speaker=narrator
image="elves-wood/fighter-melee-2.png~RC(magenta>1)"
image="elves-wood/fighter-melee-2.png~RC(magenta>red)"
message= _ "Elvish Fighters are at home in the thick forests. They have both a sword and a bow and are deadly with both. They are quick and can hold their own against just about anything."
[/message]
[message]
speaker=narrator
image="elves-wood/shaman-heal7.png~RC(magenta>1)"
image="elves-wood/shaman-heal7.png~RC(magenta>red)"
message= _ "Elvish Shamans are no match for most enemies in single combat. They do, however, heal units next to them every turn. Use them to bolster your weakening lines and heal wounded soldiers."
[/message]
#endif

6
data/campaigns/Two_Brothers/_main.cfg
View file

@ -6,14 +6,14 @@
id=Two_Brothers
rank=1
#textdomain wesnoth-tb
icon="units/human-loyalists/knight.png~RC(magenta>1)"
icon="units/human-loyalists/knight.png~RC(magenta>red)"
image=TB_campaign_image.png
name= _ "A Tale Of Two Brothers"
define="CAMPAIGN_TWO_BROTHERS"
first_scenario="1_Rooting_Out_A_Mage"
difficulties=EASY,HARD
difficulty_descriptions={MENU_IMG_TXT2 "units/human-loyalists/horseman-moving.png~RC(magenta>1)" _"Horseman" _"(Beginner)"} +
";" + {MENU_IMG_TXT2 "units/human-loyalists/grand-knight.png~RC(magenta>1)" _"Knight" _"(Challenging)"}
difficulty_descriptions={MENU_IMG_TXT2 "units/human-loyalists/horseman-moving.png~RC(magenta>red)" _"Horseman" _"(Beginner)"} +
";" + {MENU_IMG_TXT2 "units/human-loyalists/grand-knight.png~RC(magenta>red)" _"Knight" _"(Challenging)"}
description= _ "A Black Mage is threatening the local village and its inhabitants. When their leader Bjarn sends for aid from his brother Arne, he is victorious, but Bjarn himself is kidnapped. Can you rescue him?
(Novice level, 4 scenarios; the 'Hard' version may challenge more experienced players.)"

70
data/campaigns/Under_the_Burning_Suns/scenarios/06a_Hunting_Trolls.cfg
View file

@ -40,6 +40,7 @@
[side]
side=1
colour=red
description=Kaleh
type=Desert Fighter
canrecruit=1
@ -54,7 +55,7 @@
#Side=2 dwarf 1 (dwarf allies)
[side]
side=2
colour=7
colour=orange
no_leader=yes
gold=0
income=0
@ -67,6 +68,7 @@
#Side=3 troll 1 (advance guard trolls at outpost)
[side]
side=3
colour=green
no_leader=yes
gold=0
income=0
@ -108,43 +110,10 @@
[/ai]
[/side]
#Side=4 empty side
#Side=4 troll 2 (elite trolls in main lair)
[side]
side=4
no_leader=yes
gold=0
income=0
controller=ai
shroud=no
fog=no
[/side]
#Side=5 empty side
[side]
side=5
no_leader=yes
gold=0
income=0
controller=ai
shroud=no
fog=no
[/side]
#Side=6 empty side
[side]
side=6
no_leader=yes
gold=0
income=0
controller=ai
shroud=no
fog=no
[/side]
#Side=7 troll 2 (elite trolls in main lair)
[side]
side=7
colour=6
colour=brown
no_leader=yes
gold=0
income=0
@ -176,9 +145,10 @@
[/ai]
[/side]
#Side=8 fire guardians (white)
#Side=5 fire guardians
[side]
side=8
side=5
color=white
no_leader=yes
gold=0
income=0
@ -549,7 +519,7 @@
user_description= _ "Troll High Shaman"
x=16
y=22
side=7
side=4
ai_special=guardian
[modifications]
{TRAIT_INTELLIGENT}
@ -563,7 +533,7 @@
user_description= _ "Troll High Shaman"
x=18
y=23
side=7
side=4
ai_special=guardian
[modifications]
{TRAIT_RESILIENT}
@ -1048,7 +1018,7 @@
y=11-27
terrain=Yl
[filter]
side=1,3,7
side=1,3,4
[not]
type=Zhul Shyde,Zhul Star,Desert Shyde,Desert Star
[/not]
@ -1858,7 +1828,7 @@
user_description= _ "Troll High Shaman"
x=16
y=22
side=7
side=4
[modifications]
{TRAIT_INTELLIGENT}
{TRAIT_LOYAL}
@ -1892,7 +1862,7 @@
user_description= _ "Troll High Shaman"
x=26
y=28
side=7
side=4
[modifications]
{TRAIT_RESILIENT}
{TRAIT_LOYAL}
@ -1916,7 +1886,7 @@
[then]
[modify_side]
side=7
side=4
income=0
gold=0
[/modify_side]
@ -1949,7 +1919,7 @@
upkeep=full
x=46
y=22
side=7
side=4
[modifications]
{TRAIT_STRONG}
{TRAIT_RESILIENT}
@ -1957,7 +1927,7 @@
[/unit]
[modify_side]
side=7
side=4
#ifdef EASY
income=2
@ -1977,7 +1947,7 @@
[capture_village]
x,y=39-49,20-29
side=7
side=4
[/capture_village]
[/event]
@ -2017,7 +1987,7 @@
upkeep=free
x=45
y=24
side=7
side=4
ai_special=guardian
[modifications]
{TRAIT_LOYAL}
@ -2145,12 +2115,12 @@
[/message]
[message]
side=7
side=4
message= _ "Da big troll is dead. Run for your lives!"
[/message]
[kill]
side=7
side=4
animate=no
[/kill]

2
data/campaigns/Under_the_Burning_Suns/scenarios/06b_Hunting_Dwarves.cfg
View file

@ -49,7 +49,7 @@
#Side=2 dwarf 1 (guarding advance base)
[side]
side=2
colour=7
colour=orange
no_leader=yes
gold=0
income=0

6
data/campaigns/tutorial/scenarios/2_Speaking.cfg
View file

@ -34,7 +34,7 @@ You can press 'u' to undo most things: useful to correct mistakes.")}
# Pretend this is narrator, since otherwise we scroll back.
[message]
speaker=narrator
image=units/elves-wood/captain.png~RC(magenta>3)
image=units/elves-wood/captain.png~RC(magenta>green)
message=_ "*Galdrad" + "
" + {MESSAGE}
[/message]
@ -44,7 +44,7 @@ You can press 'u' to undo most things: useful to correct mistakes.")}
# Pretend this is narrator, since otherwise we scroll back.
[message]
speaker=narrator
image=units/elves-wood/captain.png~RC(magenta>3)
image=units/elves-wood/captain.png~RC(magenta>green)
message=_ "*Galdrad" + "
" + {MESSAGE}
[/message]
@ -57,7 +57,7 @@ You can press 'u' to undo most things: useful to correct mistakes.")}
# Pretend this is narrator, since otherwise we scroll back.
[message]
speaker=narrator
image=units/elves-wood/captain.png~RC(magenta>3)
image=units/elves-wood/captain.png~RC(magenta>green)
message=_ "*Galdrad" + "
" + {MESSAGE}
[/message]

20
data/core/team-colors.cfg
View file

@ -1,59 +1,59 @@
# Each Team-color definition is made up of 4 hexidesmal colors:
# Each Team-color definition is made up of 4 hexidecimal colors:
# 1) the average shade of a units TColor portions
# 2) the maximum highlight shade of a units TColor portions
# 3) the maximum shadow shade of a units TColor portions
# 4) the color of the markers on the mini-map.
[color_range]
id=1
id=red
rgb=FF0000,FFFFFF,000000,FF0000
name= _ "Red"
[/color_range]
[color_range]
id=2
id=blue
rgb=2E419B,FFFFFF,0F0F0F,0000FF
name= _ "Blue"
[/color_range]
[color_range]
id=3
id=green
rgb=62B664,FFFFFF,000000,00FF00
name= _ "Green"
[/color_range]
[color_range]
id=4
id=purple
rgb=93009D,FFFFFF,000000,FF00FF
name= _ "Purple"
[/color_range]
[color_range]
id=7
id=orange
rgb=F07200,F0F0F0,000000,FFAA00
name= _ "Orange"
[/color_range]
[color_range]
id=5
id=black
rgb=5A5A5A,FFFFFF,000000,000000
name= _ "Black"
[/color_range]
[color_range]
id=8
id=white
rgb=E1E1E1,FFFFFF,1E1E1E,FFFFFF
name= _ "White"
[/color_range]
[color_range]
id=6
id=brown
rgb=945027,FFFFFF,000000,AA4600
name= _ "Brown"
[/color_range]
[color_range]
id=9
id=teal
rgb=30CBC0,FFFFFF,000000,00F0C8
name= _ "Teal"
[/color_range]

2
data/multiplayer/factions/alliance_of_darkness.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth
[multiplayer_side]
id=Alliance of Darkness
name={MENU_IMG_TXT "undead-necromancers/dark-sorcerer.png~RC(magenta>1)" (_"Alliance of Darkness")}
name={MENU_IMG_TXT "undead-necromancers/dark-sorcerer.png~RC(magenta>red)" (_"Alliance of Darkness")}
type=Dark Sorcerer
leader=Dark Sorcerer,Revenant,Bone Shooter,Deathblade,Orcish Warrior,Troll,Troll Rocklobber,Orcish Crossbowman,Orcish Slayer,Rogue,Bandit,Trapper,Saurian Oracle,Saurian Soothsayer
random_leader=Dark Sorcerer,Revenant,Bone Shooter,Deathblade,Orcish Warrior,Troll,Troll Rocklobber,Orcish Crossbowman,Orcish Slayer,Rogue,Bandit,Trapper

2
data/multiplayer/factions/knalgans-aoh.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth
[multiplayer_side]
id=Knalgan Alliance
name={MENU_IMG_TXT "dwarves/lord.png~RC(magenta>1)" (_"Knalgan Alliance")}
name={MENU_IMG_TXT "dwarves/lord.png~RC(magenta>red)" (_"Knalgan Alliance")}
type=Dwarvish Lord
leader=Dwarvish Lord,Dwarvish Dragonguard,Dwarvish Sentinel,Assassin,Trapper
random_leader=Dwarvish Lord,Dwarvish Dragonguard,Assassin

2
data/multiplayer/factions/knalgans-default.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth
[multiplayer_side]
id=Knalgan Alliance
name={MENU_IMG_TXT "dwarves/steelclad.png~RC(magenta>1)" (_"Knalgan Alliance")}
name={MENU_IMG_TXT "dwarves/steelclad.png~RC(magenta>red)" (_"Knalgan Alliance")}
type=Dwarvish Steelclad
leader=Dwarvish Steelclad,Dwarvish Thunderguard,Dwarvish Stalwart,Rogue,Trapper
random_leader=Dwarvish Steelclad,Dwarvish Thunderguard,Rogue,Trapper

2
data/multiplayer/factions/loyalists-aoh.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth
[multiplayer_side]
id=Loyalists
name={MENU_IMG_TXT "human-loyalists/general.png~RC(magenta>1)" _"Loyalists"}
name={MENU_IMG_TXT "human-loyalists/general.png~RC(magenta>red)" _"Loyalists"}
type=General
leader=General,Royal Guard,Halbardier,Iron Mauler,Master Bowman,Mage of Light,Arch Mage,Silver Mage,Javelineer
random_leader=General,Royal Guard,Halbardier,Master Bowman,Arch Mage,Silver Mage

2
data/multiplayer/factions/loyalists-default.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth
[multiplayer_side]
id=Loyalists
name={MENU_IMG_TXT "human-loyalists/lieutenant.png~RC(magenta>1)" _"Loyalists"}
name={MENU_IMG_TXT "human-loyalists/lieutenant.png~RC(magenta>red)" _"Loyalists"}
type=Lieutenant
leader=Lieutenant,Swordsman,Pikeman,Javelineer,Shock Trooper,Longbowman,White Mage,Red Mage
random_leader=Lieutenant,Swordsman,Pikeman,Javelineer,Longbowman,Red Mage

2
data/multiplayer/factions/northerners-aoh.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth
[multiplayer_side]
id=Northerners
name={MENU_IMG_TXT "orcs/warlord.png~RC(magenta>1)" _"Northerners"}
name={MENU_IMG_TXT "orcs/warlord.png~RC(magenta>red)" _"Northerners"}
type=Orcish Warlord
leader=Orcish Warlord,Troll Warrior,Orcish Slurbow,Orcish Slayer
random_leader=Orcish Warlord,Troll Warrior,Orcish Slurbow

2
data/multiplayer/factions/northerners-default.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth
[multiplayer_side]
id=Northeners
name={MENU_IMG_TXT "orcs/warrior.png~RC(magenta>1)" _"Northerners"}
name={MENU_IMG_TXT "orcs/warrior.png~RC(magenta>red)" _"Northerners"}
type=Orcish Warrior
leader=Orcish Warrior,Troll,Troll Rocklobber,Orcish Crossbowman,Orcish Slayer
recruit=Orcish Grunt,Troll Whelp,Wolf Rider,Orcish Archer,Orcish Assassin,Naga Fighter,Goblin Spearman

2
data/multiplayer/factions/rebels-aoh.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth
[multiplayer_side]
id=Rebels
name={MENU_IMG_TXT "elves-wood/marshal.png~RC(magenta>1)" _"Rebels"}
name={MENU_IMG_TXT "elves-wood/marshal.png~RC(magenta>red)" _"Rebels"}
type=Elvish Marshal
leader=Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Mage of Light,Arch Mage,Silver Mage,Elvish Shyde,Elvish Enchantress,Ancient Wose
random_leader=Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Arch Mage,Silver Mage,Elvish Shyde,Elvish Enchantress

2
data/multiplayer/factions/rebels-default.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth
[multiplayer_side]
id=Rebels
name={MENU_IMG_TXT "elves-wood/captain.png~RC(magenta>1)" _"Rebels"}
name={MENU_IMG_TXT "elves-wood/captain.png~RC(magenta>red)" _"Rebels"}
type=Elvish Captain
leader=Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,White Mage,Red Mage,Elder Wose
random_leader=Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Red Mage

2
data/multiplayer/factions/undead-aoh.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth
[multiplayer_side]
id=Undead
name={MENU_IMG_TXT "undead-necromancers/lich.png~RC(magenta>1)" _"Undead"}
name={MENU_IMG_TXT "undead-necromancers/lich.png~RC(magenta>red)" _"Undead"}
type=Lich
leader=Lich,Necromancer,Draug,Soul Shooter,Necrophage,Deathblade
random_leader=Lich,Necromancer,Draug,Soul Shooter

2
data/multiplayer/factions/undead-default.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth
[multiplayer_side]
id=Undead
name={MENU_IMG_TXT "undead-necromancers/dark-sorcerer.png~RC(magenta>1)" _"Undead"}
name={MENU_IMG_TXT "undead-necromancers/dark-sorcerer.png~RC(magenta>red)" _"Undead"}
type=Dark Sorcerer
leader=Dark Sorcerer,Revenant,Deathblade,Bone Shooter,Necrophage
random_leader=Dark Sorcerer,Revenant,Deathblade,Bone Shooter,Necrophage

4
data/multiplayer/scenarios/2p_Caves_of_the_Basilisk.cfg
View file

@ -39,6 +39,7 @@
villages_per_scout=8
[/ai]
side=1
colour=red
canrecruit=1
controller=human
team_name=north
@ -50,6 +51,7 @@
villages_per_scout=8
[/ai]
side=2
colour=green
canrecruit=1
controller=human
team_name=south
@ -58,7 +60,7 @@
[side]
side=7
colour=5
colour=black
canrecruit=0
controller=null
allow_player=no

4
data/multiplayer/scenarios/2p_Sullas_Ruins.cfg
View file

@ -41,6 +41,7 @@
villages_per_scout=8
[/ai]
side=1
colour=red
canrecruit=1
controller=human
team_name=south
@ -52,6 +53,7 @@
villages_per_scout=8
[/ai]
side=2
colour=green
canrecruit=1
controller=human
team_name=north
@ -60,7 +62,7 @@
[side]
side=3
colour=5
colour=black
canrecruit=0
controller=null
allow_player=no

6
data/scenario-test.cfg
View file

@ -227,7 +227,7 @@ Xu , Qxu , Qxu , Ql , Ql , Ql
[item]
x,y=12,6
image="terrain/color-hex.png~RC(red>4)~RC(blue>5)"
image="terrain/color-hex.png~RC(red>purple)~RC(blue>black)"
[/item]
[label]
x,y=12,6
@ -247,7 +247,7 @@ Xu , Qxu , Qxu , Ql , Ql , Ql
[filter]
type="Thief"
[/filter]
{RANDOM "RC(thief>1)","RC(thief>2)","RC(thief>3)","RC(thief>blonde)","RC(thief>mauve_troll)","donothing()"}
{RANDOM "RC(thief>red)","RC(thief>green)","RC(thief>blue)","RC(thief>blonde)","RC(thief>mauve_troll)","donothing()"}
[object]
silent=yes
[effect]
@ -335,7 +335,7 @@ Xu , Qxu , Qxu , Ql , Ql , Ql
[/filter]
[message]
speaker=narrator
image=units/elves-wood/captain.png~RC(magenta>3)
image=units/elves-wood/captain.png~RC(magenta>green)
message="Send me a thief to spy on the blondes"
[/message]
[/event]

23
data/tools/wmllint
View file

@ -223,9 +223,30 @@ filemoves = {
("sounds/dragonstick-hit.ogg", "sounds/dragonstick-hit-1.ogg"),
("sounds/dragonstick-miss.ogg", "sounds/dragonstick-miss.wav"),
),
"1.3.4" : (
# This release changed from numeric to string palette IDs
("RC(magenta>1)", "RC(magenta>red)"),
("RC(magenta>2)", "RC(magenta>green)"),
("RC(magenta>3)", "RC(magenta>blue)"),
("RC(magenta>4)", "RC(magenta>purple)"),
("RC(magenta>5)", "RC(magenta>black)"),
("RC(magenta>6)", "RC(magenta>brown)"),
("RC(magenta>7)", "RC(magenta>orange)"),
("RC(magenta>8)", "RC(magenta>white)"),
("RC(magenta>9)", "RC(magenta>teal)"),
("colour=1", "colour=red"),
("colour=2", "colour=green"),
("colour=3", "colour=blue"),
("colour=4", "colour=purple"),
("colour=5", "colour=black"),
("colour=6", "colour=brown"),
("colour=7", "colour=orange"),
("colour=8", "colour=white"),
("colour=9", "colour=teal"),
)
# An empty sentinel value at end is required.
# Always have the current version here.
"1.3.4" : ()
"1.3.5" : ()
}
# Turn all the filemove string substition pairs into nearly equivalent