Merge 2006-07-22T00:24:04Z!lari.nieminen@iki.fi

data/campaigns/Eastern_Invasion.cfg

@@ -15,7 +15,7 @@ difficulty_descriptions={MENU_IMG_TXT2 "units/human-loyalists/spearman.png~TC(1,
 	";*" + {MENU_IMG_TXT "units/human-loyalists/swordsman.png~TC(1,magenta)" _"Swordsman"} +
 	";" + {MENU_IMG_TXT2 "units/human-loyalists/royalguard.png~TC(1,magenta)" (_"Royal Guard") _"(hardest)"}
 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."
-image=portraits/gweddry.png
+image=EI_campaign_image.png
 
 	#textdomain wesnoth
 	[about]
@@ -35,10 +35,13 @@ image=portraits/gweddry.png
 [/campaign]
 
 [binary_path]
-path=data/campaigns/Eastern_Invasion
+path=data/campaigns/Eastern_Invasion/external_binary_data
 [/binary_path]
 
 #ifdef CAMPAIGN_EASTERN_INVASION
+[binary_path]
+path=data/campaigns/Eastern_Invasion
+[/binary_path]
 [+units]
 {campaigns/Eastern_Invasion/units}
 [/units]

data/campaigns/Heir_To_The_Throne.cfg

@@ -5,7 +5,7 @@
 	id=heir_throne
 	rank=10
 	#textdomain wesnoth-httt
-	icon=konrad-lord-leading.png
+	icon=HttT_campaign_icon.png
 	name= _ "Heir to the Throne"
 	define=CAMPAIGN_HEIR_TO_THE_THRONE
 	first_scenario=01_The_Elves_Besieged
@@ -14,7 +14,7 @@
 	 ";*" + {MENU_IMG_TXT "units/elves-wood/hero.png~TC(1,magenta)" _"Hero"} + ";" +
 	 {MENU_IMG_TXT2 "units/elves-wood/champion.png~TC(1,magenta)" _"Champion" _"(hardest)"}
 	description= _ "Fight to regain the throne of Wesnoth, of which you are the legitimate heir."
-	image=portraits/konrad.png
+	image=HttT_campaign_image.png
 
 	[about]
 		images = maps/wesnoth.png,story/httt_story1.jpg,story/httt_story2.jpg,story/httt_story3.jpg,story/httt_story4.jpg,story/httt_story5.jpg,story/httt_story6.jpg,story/httt_story7.jpg,story/httt_story8.jpg
@@ -43,10 +43,13 @@ Neoriceisgood (?)"
 [/campaign]
 
 [binary_path]
-path=data/campaigns/Heir_To_The_Throne
+path=data/campaigns/Heir_To_The_Throne/external_binary_data
 [/binary_path]
 
 #ifdef CAMPAIGN_HEIR_TO_THE_THRONE
+[binary_path]
+path=data/campaigns/Heir_To_The_Throne
+[/binary_path]
 [+units]
 {campaigns/Heir_To_The_Throne/units}
 [/units]

data/campaigns/The_Rise_Of_Wesnoth.cfg

@@ -9,12 +9,12 @@
 	define=CAMPAIGN_THE_RISE_OF_WESNOTH
 	first_scenario=A_Summer_of_Storms
 	difficulties=EASY,NORMAL,HARD
-	difficulty_descriptions={MENU_IMG_TXT2 noble-fighter.png _"Fighter" _"(easiest)"} +
-		";*" + {MENU_IMG_TXT noble-commander.png _"Commander"} +
-		";" + {MENU_IMG_TXT2 noble-lord.png _"Lord" _"(hardest)"}
-	icon=noble-lord.png
+	difficulty_descriptions={MENU_IMG_TXT2 TRoW_difficulty_easy.png _"Fighter" _"(easiest)"} +
+		";*" + {MENU_IMG_TXT TRoW_difficulty_normal.png _"Commander"} +
+		";" + {MENU_IMG_TXT2 TRoW_difficulty_hard.png _"Lord" _"(hardest)"}
+	icon=TRoW_campaign_icon.png
 	description= _ "Lead Prince Haldric through the destruction of the Green Isle and across the Ocean to establish the very kingdom of Wesnoth itself. The confrontation with Lich-Lord Jevyan awaits..."
-	image=story/the_duel.png
+	image=TRoW_campaign_image.png
 
 #textdomain wesnoth
 	[about]
@@ -37,10 +37,13 @@
 [/campaign]
 
 [binary_path]
-path=data/campaigns/The_Rise_Of_Wesnoth
+path=data/campaigns/The_Rise_Of_Wesnoth/external_binary_data
 [/binary_path]
 
 #ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
+[binary_path]
+path=data/campaigns/The_Rise_Of_Wesnoth
+[/binary_path]
 [+units]
 {campaigns/The_Rise_Of_Wesnoth/units}
 [/units]

data/campaigns/The_South_Guard.cfg

@@ -11,8 +11,8 @@
 	define=CAMPAIGN_THE_SOUTH_GUARD
 	rank=5
 
-	icon=deoran/horseman-commander-defend.png
-	image=portraits/deoran.png
+	icon=TSG_campaign_icon.png
+	image=TSG_campaign_image.png
 	description= _ "A young Knight, Deoran, is dispatched to take command of the South Guard...  Note:  This campaign is designed as an introduction to Wesnoth.  The 'Civilian' difficulty level is aimed at first-time players."
 
 	difficulties=EASY,NORMAL,HARD
@@ -44,14 +44,16 @@ this list is very incomplete
 
 [/campaign]
 
-### Add the South Guard campaign files ###
-
 [binary_path]
-	path=data/campaigns/The_South_Guard/
+	path=data/campaigns/The_South_Guard/external_binary_data
 [/binary_path]
 
 #ifdef CAMPAIGN_THE_SOUTH_GUARD
 
+[binary_path]
+	path=data/campaigns/The_South_Guard
+[/binary_path]
+
 ### Directory Layout Abstraction ###
 
 #define SG_MAP NAME

data/campaigns/Two_Brothers.cfg

@@ -7,7 +7,7 @@ name="wesnoth-tb"
 	rank=1
 	#textdomain wesnoth-tb
 	icon="units/human-loyalists/knight.png~TC(1,magenta)"
-	image="arne.png"
+	image=TB_campaign_image.png
 	name= _ "A Tale Of Two Brothers"
 	define="CAMPAIGN_TWO_BROTHERS"
 	first_scenario="1_Rooting_Out_A_Mage"
@@ -42,9 +42,12 @@ And special thanks to everyone else who I forgot to mention."
 [/campaign]
 
 [binary_path]
-path=data/campaigns/Two_Brothers/
+path=data/campaigns/Two_Brothers/external_binary_data
 [/binary_path]
 
 #ifdef CAMPAIGN_TWO_BROTHERS
+[binary_path]
+path=data/campaigns/Two_Brothers
+[/binary_path]
 {campaigns/Two_Brothers/scenarios}
 #endif

data/campaigns/Under_the_Burning_Suns.cfg

@@ -9,18 +9,18 @@
 
 [campaign]
 	#textdomain wesnoth-utbs
-	icon=newelves/kaleh.png
+	icon=UtBS_campaign_icon.png
 	name= _ "Under the Burning Suns"
 	rank=35
 	define=CAMPAIGN_DESERT
 	first_scenario=1_MorningAfter
 	difficulties=EASY,NORMAL,HARD
-	difficulty_descriptions={MENU_IMG_TXT2 newelves/desert-elvish-hunter.png (_"Desert Hunter") _"(Normal)"} +
-";*" + {MENU_IMG_TXT2 newelves/desert-elvish-sentinel.png (_"Desert Sentinel") _"(Challenging)"} +
-";" + {MENU_IMG_TXT2 newelves/desert-elvish-prowler.png (_"Desert Prowler") _"(Very Hard)"}
+	difficulty_descriptions={MENU_IMG_TXT2 UtBS_difficulty_normal.png (_"Desert Hunter") _"(Normal)"} +
+";*" + {MENU_IMG_TXT2 UtBS_difficulty_challenging.png (_"Desert Sentinel") _"(Challenging)"} +
+";" + {MENU_IMG_TXT2 UtBS_difficulty_hard.png (_"Desert Prowler") _"(Very Hard)"}
 
 	description= _ "In the distant future a small band of elves struggles to survive amidst the ruins of fallen empires. Lead your people out of the desert on an epic journey to find a new home."
-	image=portraits/kaleh.png
+	image=UtBS_campaign_image.png
 
 	# UTBS credits
 	#textdomain wesnoth
@@ -53,15 +53,18 @@
 
  [/campaign]
 
-# Append Images and Sounds
 
  [binary_path]
- path=data/campaigns/Under_the_Burning_Suns
+ path=data/campaigns/Under_the_Burning_Suns/external_binary_data
  [/binary_path]
 
 
 #ifdef CAMPAIGN_DESERT
 
+[binary_path]
+path=data/campaigns/Under_the_Burning_Suns
+[/binary_path]
+
 # used to load maps
 #define DESERTMAP DATA_NAME
 	map_data="{campaigns/Under_the_Burning_Suns/maps/{DATA_NAME}}"