Revert ([part] caption= in storyscreens)...

...and replace with the mainline CAPTION macro. Converted existing
mainline WML.

Reverts 2009-08-14T08:44:26Z!guillaume.melquiond@gmail.com, 2009-08-14T08:44:41Z!guillaume.melquiond@gmail.com, 2009-08-16T13:24:39Z!guillaume.melquiond@gmail.com

Also, replaced the former color (*green*!?) with the usual color used in
character messages.
This commit is contained in:
Ignacio R. Morelle 2009-08-17 12:15:49 +00:00
parent 4080ef1523
commit d9c29930c6
7 changed files with 113 additions and 237 deletions

View file

@ -20,80 +20,65 @@
[/part]
[part]
background=story/portraits/garard-large.png
caption= _ "King Garard"
story= _ "We have assembled here with good and bad news: The good news is that the orcs have been defeated decisively. Their Great Chief is dead and their army has been scattered. We owe much of this great victory to Delfador."
story={CAPTION ( _ "King Garard")} + _ "We have assembled here with good and bad news: The good news is that the orcs have been defeated decisively. Their Great Chief is dead and their army has been scattered. We owe much of this great victory to Delfador."
[/part]
[part]
background=story/portraits/young_delfador-large.png
caption= _ "Delfador"
story= _ "I did very little, sire. It was actually the elves who saved us on that day."
story={CAPTION ( _ "Delfador")} + _ "I did very little, sire. It was actually the elves who saved us on that day."
[/part]
[part]
background=story/portraits/lionel-large.png
caption= _ "Lionel"
story= _ "We owe the elves nothing, sire. They refused to send their archers when we needed them!"
story={CAPTION ( _ "Lionel")} + _ "We owe the elves nothing, sire. They refused to send their archers when we needed them!"
[/part]
[part]
background=story/portraits/garard-large.png
caption= _ "King Garard"
story= _ "Peace, Lionel. The elves fought well and have earned Our respect. But this council is here to address an alarming matter. Young master Delfador here reports of an undead threat. He was able to fight them off at Parthyn Ford, but more are coming."
story={CAPTION ( _ "King Garard")} + _ "Peace, Lionel. The elves fought well and have earned Our respect. But this council is here to address an alarming matter. Young master Delfador here reports of an undead threat. He was able to fight them off at Parthyn Ford, but more are coming."
[/part]
[part]
background=story/portraits/lionel-large.png
caption= _ "Lionel"
story= _ "With your permission, sire, I will take some picked men north and crush these abominations."
story={CAPTION ( _ "Lionel")} + _ "With your permission, sire, I will take some picked men north and crush these abominations."
[/part]
[part]
background=story/portraits/young_delfador-large.png
caption= _ "Delfador"
story= _ "Your majesty, these are no stray undead; This lunatic, Iliah-Malal, has opened a portal to the Land of the Dead. Unless we close this portal soon, the relatively small numbers of enemy troops he now commands will swell into an endless stream of undead. And our army, having equipped and trained primarily to fight raiding orcs, is not well suited to fight even the forces he fields now. Mages, in combination with heavy infantry are most effective against them."
story={CAPTION ( _ "Delfador")} + _ "Your majesty, these are no stray undead; This lunatic, Iliah-Malal, has opened a portal to the Land of the Dead. Unless we close this portal soon, the relatively small numbers of enemy troops he now commands will swell into an endless stream of undead. And our army, having equipped and trained primarily to fight raiding orcs, is not well suited to fight even the forces he fields now. Mages, in combination with heavy infantry are most effective against them."
[/part]
[part]
background=story/portraits/sagus.png
caption= _ "Sagus"
story= _ "I think our young and inexperienced friend overestimates the powers of the enemy. I'm sure they'll be no match for Wesnothian troops."
story={CAPTION ( _ "Sagus")} + _ "I think our young and inexperienced friend overestimates the powers of the enemy. I'm sure they'll be no match for Wesnothian troops."
[/part]
[part]
background=story/portraits/young_delfador-large.png
caption= _ "Delfador"
story= _ "I have fought these things, and I know what I am talking about. This is a deadly serious threat."
story={CAPTION ( _ "Delfador")} + _ "I have fought these things, and I know what I am talking about. This is a deadly serious threat."
[/part]
[part]
background="portraits/humans/transparent/mage-red.png"
#background=story/portraits/Artuman.png
caption= _ "Artuman"
story= _ "Are you saying Master Sagus speaks idly? Somebody needs to teach you respect!"
story={CAPTION ( _ "Artuman")} + _ "Are you saying Master Sagus speaks idly? Somebody needs to teach you respect!"
[/part]
[part]
background=story/portraits/garard-large.png
caption= _ "King Garard"
story= _ "You have proven your bravery, young Delfador, but I think you underestimate the might of our army."
story={CAPTION ( _ "King Garard")} + _ "You have proven your bravery, young Delfador, but I think you underestimate the might of our army."
[/part]
[part]
background=story/portraits/lionel-large.png
caption= _ "Lionel"
story= _ "Sire, may I lead some part of your army to crush the undead?"
story={CAPTION ( _ "Lionel")} + _ "Sire, may I lead some part of your army to crush the undead?"
[/part]
[part]
background=story/portraits/garard-large.png
caption= _ "King Garard"
story= _ "No, Lionel. This should be too simple a task for my best general. I will send Dudpon, instead with most of my army."
story={CAPTION ( _ "King Garard")} + _ "No, Lionel. This should be too simple a task for my best general. I will send Dudpon, instead with most of my army."
[/part]
[part]
background=story/portraits/lionel-large.png
caption= _ "Lionel"
story= _ "What are my orders, then?"
story={CAPTION ( _ "Lionel")} + _ "What are my orders, then?"
[/part]
[part]
background=story/portraits/garard-large.png
caption= _ "King Garard"
story= _ "As a reward for Delfador's bravery, I am temporarily appointing you and your men to be his personal guard. Make sure nothing untoward happens to him, as the circumstances of Leollyn's death are not fully clear."
story={CAPTION ( _ "King Garard")} + _ "As a reward for Delfador's bravery, I am temporarily appointing you and your men to be his personal guard. Make sure nothing untoward happens to him, as the circumstances of Leollyn's death are not fully clear."
[/part]
[part]
background=story/portraits/lionel-large.png
caption= _ "Lionel"
story= _ "As you command, sire!"
story={CAPTION ( _ "Lionel")} + _ "As you command, sire!"
[/part]
[/story]
@ -105,53 +90,43 @@
[/part]
[part]
background=story/portraits/garard-large.png
caption= _ "King Garard"
story= _ "This is a disaster. I should have led the army myself and died with them. And I should have listened to you, Delfador."
story={CAPTION ( _ "King Garard")} + _ "This is a disaster. I should have led the army myself and died with them. And I should have listened to you, Delfador."
[/part]
[part]
background=story/portraits/lionel-large.png
caption= _ "Lionel"
story= _ "We will fight till the last man, my King."
story={CAPTION ( _ "Lionel")} + _ "We will fight till the last man, my King."
[/part]
[part]
background=story/portraits/young_delfador-large.png
caption= _ "Delfador"
story= _ "My Lord, things are very grave indeed, but all is not yet lost. There is still hope if we do not falter."
story={CAPTION ( _ "Delfador")} + _ "My Lord, things are very grave indeed, but all is not yet lost. There is still hope if we do not falter."
[/part]
[part]
background=story/portraits/garard-large.png
caption= _ "King Garard"
story= _ "Yes, Delfador. This time we will follow your advice."
story={CAPTION ( _ "King Garard")} + _ "Yes, Delfador. This time we will follow your advice."
[/part]
[part]
background=story/portraits/young_delfador-large.png
caption= _ "Delfador"
story= _ "There are three things we must do. First, we must organize our defenses as best we can. Second, we need to ask the elves to create a diversion, to distract and delay Iliah-Malal. The elves will not be able to fight the undead head on on the field, but they can harass them by striking from forests where the undead dare not follow. And last, I have been studying and I think I now know how to close Iliah-Malal's portal to the Land of the Dead. I will need a small escort, but this must be done immediately."
story={CAPTION ( _ "Delfador")} + _ "There are three things we must do. First, we must organize our defenses as best we can. Second, we need to ask the elves to create a diversion, to distract and delay Iliah-Malal. The elves will not be able to fight the undead head on on the field, but they can harass them by striking from forests where the undead dare not follow. And last, I have been studying and I think I now know how to close Iliah-Malal's portal to the Land of the Dead. I will need a small escort, but this must be done immediately."
[/part]
[part]
background=story/portraits/lionel-large.png
caption= _ "Lionel"
story= _ "My Lord, I can arrange the defenses around the city."
story={CAPTION ( _ "Lionel")} + _ "My Lord, I can arrange the defenses around the city."
[/part]
[part]
background=story/portraits/garard-large.png
caption= _ "King Garard"
story= _ "Very well, Lionel, take command."
story={CAPTION ( _ "King Garard")} + _ "Very well, Lionel, take command."
[/part]
[part]
background=story/portraits/young_delfador-large.png
caption= _ "Delfador"
story= _ "These are only the first steps. If we are to defeat the undead, we need to use and train the army differently than we have. First, you must recall every mage in Wesnoth, from Alduin and elsewhere. And you must prepare more heavy infantry."
story={CAPTION ( _ "Delfador")} + _ "These are only the first steps. If we are to defeat the undead, we need to use and train the army differently than we have. First, you must recall every mage in Wesnoth, from Alduin and elsewhere. And you must prepare more heavy infantry."
[/part]
[part]
background=story/portraits/lionel-large.png
caption= _ "Lionel"
story= _ "But heavy infantry is too slow! And mages in the army? Who can command these know-it-alls?"
story={CAPTION ( _ "Lionel")} + _ "But heavy infantry is too slow! And mages in the army? Who can command these know-it-alls?"
[/part]
[part]
background=story/portraits/garard-large.png
caption= _ "King Garard"
story= _ "Delfador could. You will command the heavy infantry. Make sure to shield the mages in battle, for they are precious. Now, go, close the portal and come back soon!"
story={CAPTION ( _ "King Garard")} + _ "Delfador could. You will command the heavy infantry. Make sure to shield the mages in battle, for they are precious. Now, go, close the portal and come back soon!"
[/part]
[/story]

View file

@ -20,52 +20,38 @@
#Iradia
background="story/characters/highlord.png"
scale_background=no
# title= _ "Iradia"
caption= _ "Iradia"
story= _ "Kalenz, you have won a great victory! Wesmere is safe. But...for what cause have you invited a dwarf to the elvish council? This is most unusual!"
story={CAPTION ( _ "Iradia")} + _ "Kalenz, you have won a great victory! Wesmere is safe. But...for what cause have you invited a dwarf to the elvish council? This is most unusual!"
[/part]
[part]
background="story/characters/kalenz.png"
scale_background=no
# title= _ "Kalenz"
caption= _ "Kalenz"
story= _ "My lords, this is Olurf. He and his dwarves have fought by our side and have well earned a place in this meeting. The war that comes upon us must be met by all in Wesnoth, Elves, Dwarves and Humans."
story={CAPTION ( _ "Kalenz")} + _ "My lords, this is Olurf. He and his dwarves have fought by our side and have well earned a place in this meeting. The war that comes upon us must be met by all in Wesnoth, Elves, Dwarves and Humans."
[/part]
[part]
#Uripur
background="story/characters/lord.png"
scale_background=no
# title= _ "Uripur"
caption= _ "Uripur"
story= _ "Leave the humans out of this. King Haldric has broken the treaty we signed with him eleven years ago, and has sent back all our emissaries. When he arrived on our shore he was very humble, but now his arrogance knows no bounds. He believes the orcs will not dare to fight him."
story={CAPTION ( _ "Uripur")} + _ "Leave the humans out of this. King Haldric has broken the treaty we signed with him eleven years ago, and has sent back all our emissaries. When he arrived on our shore he was very humble, but now his arrogance knows no bounds. He believes the orcs will not dare to fight him."
[/part]
[part]
background="story/characters/kalenz.png"
scale_background=no
# title= _ "Kalenz"
caption= _ "Kalenz"
story= _ "My lords, the orcs have been pushed out of Wesmere, but they are far from defeated. We must take the fight to them, recover our lost lands and smash their great horde beyond possibility that it will threaten us again."
story={CAPTION ( _ "Kalenz")} + _ "My lords, the orcs have been pushed out of Wesmere, but they are far from defeated. We must take the fight to them, recover our lost lands and smash their great horde beyond possibility that it will threaten us again."
[/part]
[part]
background="story/characters/legmir.png"
scale_background=no
# title= _ "Legmir"
caption= _ "Legmir"
story= _ "Too many elves have died already. To take the war to the orcs, we would have to risk all our remaining fighters on one throw. And we are not as skilled in fighting outside our forests. We have already shown the orcs that attacking us is folly; the prudent course would be to rebuild our strength."
story={CAPTION ( _ "Legmir")} + _ "Too many elves have died already. To take the war to the orcs, we would have to risk all our remaining fighters on one throw. And we are not as skilled in fighting outside our forests. We have already shown the orcs that attacking us is folly; the prudent course would be to rebuild our strength."
[/part]
[part]
background="story/characters/landar.png"
scale_background=no
# title= _ "Landar"
caption= _ "Landar"
story= _ "Those of us who follow Kalenz have shown it can be done. We have been fighting ever since we were forced out of our home country, in all kinds of lands. And, we are willing to die in order to defeat foul orcs!"
story={CAPTION ( _ "Landar")} + _ "Those of us who follow Kalenz have shown it can be done. We have been fighting ever since we were forced out of our home country, in all kinds of lands. And, we are willing to die in order to defeat foul orcs!"
[/part]
[part]
background="story/characters/highlord.png"
scale_background=no
# title= _ "Iradia"
caption= _ "Iradia"
story= _ "Our answer is still no. Prepare our defenses as best you can, but do not renew offensive war. This is the council's decision."
story={CAPTION ( _ "Iradia")} + _ "Our answer is still no. Prepare our defenses as best you can, but do not renew offensive war. This is the council's decision."
[/part]
[part]
@ -77,51 +63,37 @@
# TODO replace with angry portrait?
background="story/characters/kalenz.png"
scale_background=no
# title= _ "Kalenz"
caption= _ "Kalenz"
story= _ "This is madness! The orcs will but regain their strength and attack again, if we give them the time! We must have some other sort of help. Olurf, can we perhaps make a war-pact with the dwarves?"
story={CAPTION ( _ "Kalenz")} + _ "This is madness! The orcs will but regain their strength and attack again, if we give them the time! We must have some other sort of help. Olurf, can we perhaps make a war-pact with the dwarves?"
[/part]
[part]
background="story/characters/olurf.png"
scale_background=no
# title= _ "Olurf"
caption= _ "Olurf"
story= _ "I dinna' think it can be, Kalenz. My people are too suspicious of you elves. But it may be there is something else we can do. I ha' heard tale of a powerful mage in the mountains who helped our people before. Maybe he will aid us again."
story={CAPTION ( _ "Olurf")} + _ "I dinna' think it can be, Kalenz. My people are too suspicious of you elves. But it may be there is something else we can do. I ha' heard tale of a powerful mage in the mountains who helped our people before. Maybe he will aid us again."
[/part]
[part]
background="story/characters/kalenz.png"
scale_background=no
# title= _ "Kalenz"
caption= _ "Kalenz"
story= _ "And where do we find this mage, if he exists?"
story={CAPTION ( _ "Kalenz")} + _ "And where do we find this mage, if he exists?"
[/part]
[part]
background="story/characters/olurf.png"
scale_background=no
# title= _ "Olurf"
caption= _ "Olurf"
story= _ "It willna' be easy. He lives in the mountains of Thoria and he never helps anyone for free. Thoria is very dangerous, especially for elves. Even dwarves and trolls dinna' go there lightly."
story={CAPTION ( _ "Olurf")} + _ "It willna' be easy. He lives in the mountains of Thoria and he never helps anyone for free. Thoria is very dangerous, especially for elves. Even dwarves and trolls dinna' go there lightly."
[/part]
[part]
background="story/characters/kalenz.png"
scale_background=no
# title= _ "Kalenz"
caption= _ "Kalenz"
story= _ "I think the orcs will be in no position to attack us for some time. Maybe we should go see this mage. Olurf, can you take us there?"
story={CAPTION ( _ "Kalenz")} + _ "I think the orcs will be in no position to attack us for some time. Maybe we should go see this mage. Olurf, can you take us there?"
[/part]
[part]
background="story/characters/olurf.png"
scale_background=no
# title= _ "Olurf"
caption= _ "Olurf"
story= _ "I think I can. But dangerous this will be!"
story={CAPTION ( _ "Olurf")} + _ "I think I can. But dangerous this will be!"
[/part]
[part]
background="story/characters/kalenz.png"
scale_background=no
# title= _ "Kalenz"
caption= _ "Kalenz"
story= _ "Very well. We shall leave our best troops and gold here in case the orcs attack Wesmere again."
story={CAPTION ( _ "Kalenz")} + _ "Very well. We shall leave our best troops and gold here in case the orcs attack Wesmere again."
[/part]
[/story]

View file

@ -12,278 +12,232 @@
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "So you are the ones who defeated Aquagar and his drakes. Olurf, I know you; you were here before when we were both much younger. But Elves never come to Thoria. Yet these are no ordinary times for this land. I know all; I have foreseen this would happen."
story={CAPTION ( _ "Crelanu")} + _ "So you are the ones who defeated Aquagar and his drakes. Olurf, I know you; you were here before when we were both much younger. But Elves never come to Thoria. Yet these are no ordinary times for this land. I know all; I have foreseen this would happen."
[/part]
[part]
background=story/characters/olurf.png
scale_background=no
caption= _ "Olurf"
story= _ "This is Kalenz, leader of the elves. I have brought him here to ask for your advice and your aid in dealing with the orcs."
story={CAPTION ( _ "Olurf")} + _ "This is Kalenz, leader of the elves. I have brought him here to ask for your advice and your aid in dealing with the orcs."
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "Elves, you have fought valiantly and have won a great victory at the forest of Wesmere. Yet the forces ranged against you are not yet defeated. Indeed, they grow stronger every day. You contend against destiny. But for the moment you have diverted the orcs' attention."
story={CAPTION ( _ "Crelanu")} + _ "Elves, you have fought valiantly and have won a great victory at the forest of Wesmere. Yet the forces ranged against you are not yet defeated. Indeed, they grow stronger every day. You contend against destiny. But for the moment you have diverted the orcs' attention."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "What do you mean, 'diverted their attention'?"
story={CAPTION ( _ "Kalenz")} + _ "What do you mean, 'diverted their attention'?"
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "You cannot even imagine it. Why do you suppose orcs came all the way here to attack you?"
story={CAPTION ( _ "Crelanu")} + _ "You cannot even imagine it. Why do you suppose orcs came all the way here to attack you?"
[/part]
[part]
background=story/characters/landar.png
scale_background=no
caption= _ "Landar"
story= _ "Because they are orcs! Look old man, can you help us beat them or not?"
story={CAPTION ( _ "Landar")} + _ "Because they are orcs! Look old man, can you help us beat them or not?"
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "You must be Landar. Very brave, but also very brash."
story={CAPTION ( _ "Crelanu")} + _ "You must be Landar. Very brave, but also very brash."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "Landar is brash, but he does speak plainly why we came here. I do not understand what you are talking about, either. Olurf tells me you are very wise, but only help for a price. We will pay any price within our power; just name it."
story={CAPTION ( _ "Kalenz")} + _ "Landar is brash, but he does speak plainly why we came here. I do not understand what you are talking about, either. Olurf tells me you are very wise, but only help for a price. We will pay any price within our power; just name it."
[/part]
[part]
background=story/characters/cleodil.png
scale_background=no
caption= _ "Cleodil"
story= _ "Are you saying the orcs attacked us looking for something?"
story={CAPTION ( _ "Cleodil")} + _ "Are you saying the orcs attacked us looking for something?"
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "Yes, that is what I am saying."
story={CAPTION ( _ "Crelanu")} + _ "Yes, that is what I am saying."
[/part]
[part]
background=story/characters/cleodil.png
scale_background=no
caption= _ "Cleodil"
story= _ "It makes sense now. The Saurians were asking about a dastone, and also after we won in Wesmere there was an Orc mumbling something about a dastone..."
story={CAPTION ( _ "Cleodil")} + _ "It makes sense now. The Saurians were asking about a dastone, and also after we won in Wesmere there was an Orc mumbling something about a dastone..."
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "It's not a dastone, it's the stone: They mean the Ruby of Fire..."
story={CAPTION ( _ "Crelanu")} + _ "It's not a dastone, it's the stone: They mean the Ruby of Fire..."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "What's that, and what does it have to do with us?"
story={CAPTION ( _ "Kalenz")} + _ "What's that, and what does it have to do with us?"
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "It's the source of your troubles. It is a very powerful magical artifact. The tyrant Haldric has it, but he has fooled the orcs into believing that the elves are hiding it. But now, they suspect they have been fooled. Haldric and his people will pay for his arrogance."
story={CAPTION ( _ "Crelanu")} + _ "It's the source of your troubles. It is a very powerful magical artifact. The tyrant Haldric has it, but he has fooled the orcs into believing that the elves are hiding it. But now, they suspect they have been fooled. Haldric and his people will pay for his arrogance."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "Hmm... You seem to love king Haldric even less than the elf-lords of the Ka'lian do...How do you know all this of him?"
story={CAPTION ( _ "Kalenz")} + _ "Hmm... You seem to love king Haldric even less than the elf-lords of the Ka'lian do...How do you know all this of him?"
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "I once counted Haldric a friend, but he was the one who banished me from Wesnoth. He charged me with trying to steal the Ruby, seeking its power for myself...but the truth is that the Ruby is warping Haldric's mind, making him ever more surly and suspicious of those he once counted allies. Anyone can wield the Ruby in battle when his anger merges with the fiery nature of the gem, but only a true master of magic, or one who is uncommonly pure in heart, can safely handle it outside of battle. Unshielded, its magical radiance changes Haldric a little every time he comes close to it."
story={CAPTION ( _ "Crelanu")} + _ "I once counted Haldric a friend, but he was the one who banished me from Wesnoth. He charged me with trying to steal the Ruby, seeking its power for myself...but the truth is that the Ruby is warping Haldric's mind, making him ever more surly and suspicious of those he once counted allies. Anyone can wield the Ruby in battle when his anger merges with the fiery nature of the gem, but only a true master of magic, or one who is uncommonly pure in heart, can safely handle it outside of battle. Unshielded, its magical radiance changes Haldric a little every time he comes close to it."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "So the orcs will, seeking the Ruby, now attack the humans?"
story={CAPTION ( _ "Kalenz")} + _ "So the orcs will, seeking the Ruby, now attack the humans?"
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "Yes. But after they win, your people will be next. And after you, the dwarves."
story={CAPTION ( _ "Crelanu")} + _ "Yes. But after they win, your people will be next. And after you, the dwarves."
[/part]
[part]
background=story/characters/landar.png
scale_background=no
caption= _ "Landar"
story= _ "Don't worry overmuch about us. It is clear you have troubles of your own."
story={CAPTION ( _ "Landar")} + _ "Don't worry overmuch about us. It is clear you have troubles of your own."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "We are grateful for this counsel. But can you help us directly? Is there a way to stop the orcs?"
story={CAPTION ( _ "Kalenz")} + _ "We are grateful for this counsel. But can you help us directly? Is there a way to stop the orcs?"
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "You cannot defeat them with the forces you can now muster. You can only gain time, in the hope that you can use it to grow strong again."
story={CAPTION ( _ "Crelanu")} + _ "You cannot defeat them with the forces you can now muster. You can only gain time, in the hope that you can use it to grow strong again."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "How? Don't tell me we had to fight the saurians, cross Arkan-Thoria, contend against the river monsters, and fight trolls and yetis to come here for nothing!"
story={CAPTION ( _ "Kalenz")} + _ "How? Don't tell me we had to fight the saurians, cross Arkan-Thoria, contend against the river monsters, and fight trolls and yetis to come here for nothing!"
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "You need to kill their Great Chief and make it look like he was murdered by orcs. That way the orcs will start a civil war for succession, for many yearn to take their Great Chief's place. You will be safe until a new leader arises strong enough to unite them again."
story={CAPTION ( _ "Crelanu")} + _ "You need to kill their Great Chief and make it look like he was murdered by orcs. That way the orcs will start a civil war for succession, for many yearn to take their Great Chief's place. You will be safe until a new leader arises strong enough to unite them again."
[/part]
[part]
background=story/characters/olurf.png
scale_background=no
caption= _ "Olurf"
story= _ "Kill an orcish Great Chieftain? But he's guarded better than a Troll hole!"
story={CAPTION ( _ "Olurf")} + _ "Kill an orcish Great Chieftain? But he's guarded better than a Troll hole!"
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "Indeed, it will not be at all easy. But maybe I can help you..."
story={CAPTION ( _ "Crelanu")} + _ "Indeed, it will not be at all easy. But maybe I can help you..."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "But you want something in return..."
story={CAPTION ( _ "Kalenz")} + _ "But you want something in return..."
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "It is as you say. These drakes were after my book. This book has all the magic and spells I know in it. They are very powerful, but the one enemy they cannot defeat is old age. The knowledge tempts me to prolong my life by evil and dark means... But this is the work of my life and I can no more destroy it than I could slay my own child. Aquagar is slain, but more will come. One of my allies has betrayed me, and now too many know of this book."
story={CAPTION ( _ "Crelanu")} + _ "It is as you say. These drakes were after my book. This book has all the magic and spells I know in it. They are very powerful, but the one enemy they cannot defeat is old age. The knowledge tempts me to prolong my life by evil and dark means... But this is the work of my life and I can no more destroy it than I could slay my own child. Aquagar is slain, but more will come. One of my allies has betrayed me, and now too many know of this book."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "If you come with us, we will protect you..."
story={CAPTION ( _ "Kalenz")} + _ "If you come with us, we will protect you..."
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "No, my time is done... But the charge I lay on you, Kalenz, is to take my book and keep it from unworthy hands. Find someone to hold it who will not be corrupted by its power. And then find someone worthy not merely to hold it, but to use it!"
story={CAPTION ( _ "Crelanu")} + _ "No, my time is done... But the charge I lay on you, Kalenz, is to take my book and keep it from unworthy hands. Find someone to hold it who will not be corrupted by its power. And then find someone worthy not merely to hold it, but to use it!"
[/part]
[part]
background=story/characters/landar.png
scale_background=no
caption= _ "Landar"
story= _ "If your book is as powerful as you say, why not use it against the orcs?"
story={CAPTION ( _ "Landar")} + _ "If your book is as powerful as you say, why not use it against the orcs?"
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "Because the book is like the Ruby of Fire. Any fool can use the magic in the book, but only a master can vanquish the lust for power that it will bring out in him. He who fails will turn into something like Haldric, or worse..."
story={CAPTION ( _ "Crelanu")} + _ "Because the book is like the Ruby of Fire. Any fool can use the magic in the book, but only a master can vanquish the lust for power that it will bring out in him. He who fails will turn into something like Haldric, or worse..."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "Cleodil is pure in heart. Perhaps she can guard your book without being corrupted by its secrets..."
story={CAPTION ( _ "Kalenz")} + _ "Cleodil is pure in heart. Perhaps she can guard your book without being corrupted by its secrets..."
[/part]
[part]
background=story/characters/cleodil.png
scale_background=no
caption= _ "Cleodil"
story= _ "I am sure all these secrets are far beyond my art. My art is the healing kind and I..."
story={CAPTION ( _ "Cleodil")} + _ "I am sure all these secrets are far beyond my art. My art is the healing kind and I..."
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "There is no other option."
story={CAPTION ( _ "Crelanu")} + _ "There is no other option."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "Very well, suppose Cleodil accepts the guardianship of your book. How will you then help us slay the orcish Great Chief?"
story={CAPTION ( _ "Kalenz")} + _ "Very well, suppose Cleodil accepts the guardianship of your book. How will you then help us slay the orcish Great Chief?"
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "There is a way, but it will be very dangerous. Two of you must enter the orcish camp by stealth and kill the Great Chief. There is a potion that will make you invisible for some time."
story={CAPTION ( _ "Crelanu")} + _ "There is a way, but it will be very dangerous. Two of you must enter the orcish camp by stealth and kill the Great Chief. There is a potion that will make you invisible for some time."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "The elves have legends of such things. I suppose you have this potion, then?"
story={CAPTION ( _ "Kalenz")} + _ "The elves have legends of such things. I suppose you have this potion, then?"
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "Indeed I do, but it is perilous to use. It is made from the eyes of a powerful undead lich. It will make you invisible, but it is likely also to have undesirable effects, some temporary, some permanent!"
story={CAPTION ( _ "Crelanu")} + _ "Indeed I do, but it is perilous to use. It is made from the eyes of a powerful undead lich. It will make you invisible, but it is likely also to have undesirable effects, some temporary, some permanent!"
[/part]
[part]
background=story/characters/cleodil.png
scale_background=no
caption= _ "Cleodil"
story= _ "No! This is too dark and dangerous! I fear for you, Kalenz! I...would not see you come to harm."
story={CAPTION ( _ "Cleodil")} + _ "No! This is too dark and dangerous! I fear for you, Kalenz! I...would not see you come to harm."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "What undesirable effects?"
story={CAPTION ( _ "Kalenz")} + _ "What undesirable effects?"
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "Your physical strength will decrease, though in return you will be able to use magic more easily and powerfully. Cleodil will show you. But the real danger will be the touch of the lich's evil nature stealing through your veins. You will need to fight and master this evil in yourself, else you might slowly turn into a lesser demilich yourself. This is why you must take only a small dose and finish the job quickly. Delay and you will fail in your mission; take too large a dose, and you will become as the lich was."
story={CAPTION ( _ "Crelanu")} + _ "Your physical strength will decrease, though in return you will be able to use magic more easily and powerfully. Cleodil will show you. But the real danger will be the touch of the lich's evil nature stealing through your veins. You will need to fight and master this evil in yourself, else you might slowly turn into a lesser demilich yourself. This is why you must take only a small dose and finish the job quickly. Delay and you will fail in your mission; take too large a dose, and you will become as the lich was."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "It is a dark and desperate course you set before me, but I see no other way; we must stop the orcs. As leader I cannot ask my men to run a risk I will not take myself, so I will be one of the two who will go to kill the Great Chief. But I will not compel anyone else to come with me, not at peril of being overwhelmed from within by evil magic. Does anyone volunteer?"
story={CAPTION ( _ "Kalenz")} + _ "It is a dark and desperate course you set before me, but I see no other way; we must stop the orcs. As leader I cannot ask my men to run a risk I will not take myself, so I will be one of the two who will go to kill the Great Chief. But I will not compel anyone else to come with me, not at peril of being overwhelmed from within by evil magic. Does anyone volunteer?"
[/part]
[part]
background=story/characters/landar.png
scale_background=no
caption= _ "Landar"
story= _ "I will come with you. We shall not fail!"
story={CAPTION ( _ "Landar")} + _ "I will come with you. We shall not fail!"
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "This does not seem the wisest of choices."
story={CAPTION ( _ "Crelanu")} + _ "This does not seem the wisest of choices."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "Landar may be impetuous, but he is a great fighter and my trusted friend. We should be about our task now, I think. Crelanu, your book will be safe with us. Cleodil will guard it until we find a worthy keeper."
story={CAPTION ( _ "Kalenz")} + _ "Landar may be impetuous, but he is a great fighter and my trusted friend. We should be about our task now, I think. Crelanu, your book will be safe with us. Cleodil will guard it until we find a worthy keeper."
[/part]
[part]
background=story/characters/crelanu.png
scale_background=no
caption= _ "Crelanu"
story= _ "Come, I will give you and Landar the potion and show you a safe point to cross the river."
story={CAPTION ( _ "Crelanu")} + _ "Come, I will give you and Landar the potion and show you a safe point to cross the river."
[/part]
[/story]

View file

@ -11,81 +11,68 @@
[part]
background=story/characters/haldric-ii.png
scale_background=no
caption= _ "Haldric II"
story= _ "Friends, today we have won a great victory, though it lost us good men. Let this be the beginning of a new alliance between our people."
story={CAPTION ( _ "Haldric II")} + _ "Friends, today we have won a great victory, though it lost us good men. Let this be the beginning of a new alliance between our people."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "King Haldric II, I am very pleased to hear these words. We are facing dangerous adversaries. We intend to put an end to this threat and we will welcome any ally against it."
story={CAPTION ( _ "Kalenz")} + _ "King Haldric II, I am very pleased to hear these words. We are facing dangerous adversaries. We intend to put an end to this threat and we will welcome any ally against it."
[/part]
[part]
background=story/characters/landar.png
scale_background=no
caption= _ "Landar"
story= _ "What? We cannot trust these humans! Where were they when we fought the orcs alone? This King is bound to betray us just as his father did!"
story={CAPTION ( _ "Landar")} + _ "What? We cannot trust these humans! Where were they when we fought the orcs alone? This King is bound to betray us just as his father did!"
[/part]
[part]
background=story/characters/aldar.png
scale_background=no
caption= _ "Aldar"
story= _ "Silence! How dare you talk this way to the King!"
story={CAPTION ( _ "Aldar")} + _ "Silence! How dare you talk this way to the King!"
[/part]
[part]
background=story/characters/haldric-ii.png
scale_background=no
caption= _ "Haldric II"
story= _ "Calm down, Aldar! The elf is right to reproach us. My father did not help when the orcs attacked you. But my father is dead. There are a lot of things my father did that I can not understand; he grew suspicious and strange in his last days. But *I* am the King of Wesnoth now, not my father! And it is my intention to renew our alliance by signing a new treaty here, with you."
story={CAPTION ( _ "Haldric II")} + _ "Calm down, Aldar! The elf is right to reproach us. My father did not help when the orcs attacked you. But my father is dead. There are a lot of things my father did that I can not understand; he grew suspicious and strange in his last days. But *I* am the King of Wesnoth now, not my father! And it is my intention to renew our alliance by signing a new treaty here, with you."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "The King speaks wisdom. We cannot undo the past. And we need each other to fight the orcs. I will sign the treaty on behalf of the Elves."
story={CAPTION ( _ "Kalenz")} + _ "The King speaks wisdom. We cannot undo the past. And we need each other to fight the orcs. I will sign the treaty on behalf of the Elves."
[/part]
[part]
background=story/characters/cleodil.png
scale_background=no
caption= _ "Cleodil"
story= _ "Your father had a certain stone, the Ruby of Fire. Do you still have it?"
story={CAPTION ( _ "Cleodil")} + _ "Your father had a certain stone, the Ruby of Fire. Do you still have it?"
[/part]
[part]
background=story/characters/haldric-ii.png
scale_background=no
caption= _ "Haldric II"
story= _ "How is it that you know about the Ruby of Fire?"
story={CAPTION ( _ "Haldric II")} + _ "How is it that you know about the Ruby of Fire?"
[/part]
[part]
background=story/characters/cleodil.png
scale_background=no
caption= _ "Cleodil"
story= _ "We have learned, oh King, that the energy suffusing the Ruby can have evil effects on its wielders. It may well be this was the reason your father grew closed in upon himself. For your own sake and that of your kingdom, we advise you to enclose it in a net or filigree of pure gold charged with the magic of light."
story={CAPTION ( _ "Cleodil")} + _ "We have learned, oh King, that the energy suffusing the Ruby can have evil effects on its wielders. It may well be this was the reason your father grew closed in upon himself. For your own sake and that of your kingdom, we advise you to enclose it in a net or filigree of pure gold charged with the magic of light."
[/part]
[part]
background=story/characters/haldric-ii.png
scale_background=no
caption= _ "Haldric II"
story= _ "Yes...this would explain many things. It shall be as you say, and I am grateful for the warning."
story={CAPTION ( _ "Haldric II")} + _ "Yes...this would explain many things. It shall be as you say, and I am grateful for the warning."
[/part]
[part]
background=story/characters/kalenz.png
scale_background=no
caption= _ "Kalenz"
story= _ "Now that we have signed the Treaty, let us put it into action. We will take the fight to the orcs before winter falls; we need you to demonstrate against them, drawing them away from the roads north. Can we count on you?"
story={CAPTION ( _ "Kalenz")} + _ "Now that we have signed the Treaty, let us put it into action. We will take the fight to the orcs before winter falls; we need you to demonstrate against them, drawing them away from the roads north. Can we count on you?"
[/part]
[part]
background=story/characters/haldric-ii.png
scale_background=no
caption= _ "Haldric II"
story= _ "I am not sure... My late father did not pay too much attention to army matters and we have already lost very many men..."
story={CAPTION ( _ "Haldric II")} + _ "I am not sure... My late father did not pay too much attention to army matters and we have already lost very many men..."
[/part]
[part]
background=story/characters/landar.png
scale_background=no
caption= _ "Landar"
story= _ "I knew it! I always told you we stand alone!"
story={CAPTION ( _ "Landar")} + _ "I knew it! I always told you we stand alone!"
[/part]
[/story]

View file

@ -20,59 +20,43 @@
[part]
background="story/characters/legmir.png"
scale_background=no
title= _ "Legmir"
caption= _ "Legmir"
story= _ "Kalenz, the council has called you here to demand that you apologize for your actions. You took the decision to help the humans at Tath, and hence risk further war with the Orcs; to strike at the orcs north; and last to attack the Saurians. These were decisions to be taken by the council, not by a field commander! "
story={CAPTION ( _ "Legmir")} + _ "Kalenz, the council has called you here to demand that you apologize for your actions. You took the decision to help the humans at Tath, and hence risk further war with the Orcs; to strike at the orcs north; and last to attack the Saurians. These were decisions to be taken by the council, not by a field commander! "
[/part]
[part]
background="story/characters/kalenz.png"
scale_background=no
title= _ "Kalenz"
caption= _ "Kalenz"
story= _ "With all respect my lords, we were and still are in a war. We could not spare the time to consult with you, lest our opportunities slip from our grasp and make the war longer and more costly. Besides, all our actions have been beneficial to our cause: The orcs are now in a civil war for succession, the North Elves are free and the Saurians are no longer a threat."
story={CAPTION ( _ "Kalenz")} + _ "With all respect my lords, we were and still are in a war. We could not spare the time to consult with you, lest our opportunities slip from our grasp and make the war longer and more costly. Besides, all our actions have been beneficial to our cause: The orcs are now in a civil war for succession, the North Elves are free and the Saurians are no longer a threat."
[/part]
[part]
background="story/characters/lord.png"
scale_background=no
title= _ "Uripur"
caption= _ "Uripur"
story= _ "The council is not blind to these benefits. But, still, you cannot decide high matters of statecraft on behalf of the Elves. We cannot allow it."
story={CAPTION ( _ "Uripur")} + _ "The council is not blind to these benefits. But, still, you cannot decide high matters of statecraft on behalf of the Elves. We cannot allow it."
[/part]
[part]
background="story/characters/galtrid.png"
scale_background=no
title= _ "Galtrid"
caption= _ "Galtrid"
story= _ "If it weren't for Kalenz and his men, none of us would be here to argue the point today. "
story={CAPTION ( _ "Galtrid")} + _ "If it weren't for Kalenz and his men, none of us would be here to argue the point today. "
[/part]
[part]
background="story/characters/uradredia.png"
scale_background=no
title= _ "Uradredia"
caption= _ "Uradredia"
story= _ "I agree. What's done is done. Let us concentrate on the future, not the past. "
story={CAPTION ( _ "Uradredia")} + _ "I agree. What's done is done. Let us concentrate on the future, not the past. "
[/part]
[part]
background="story/characters/highlord.png"
scale_background=no
title= _ "Iradia"
caption= _ "Iradia"
story= _ "Kalenz, the council has decided that you are to be stripped of all military authority. You may now go."
story={CAPTION ( _ "Iradia")} + _ "Kalenz, the council has decided that you are to be stripped of all military authority. You may now go."
[/part]
[part]
background="story/characters/kalenz.png"
scale_background=no
title= _ "Kalenz"
caption= _ "Kalenz"
story= _ "I lay down my burden humbly and gladly. But we need to have a strong army, as the orcs will return!"
story={CAPTION ( _ "Kalenz")} + _ "I lay down my burden humbly and gladly. But we need to have a strong army, as the orcs will return!"
[/part]
[part]
background="story/characters/landar.png"
scale_background=no
title= _ "Landar"
caption= _ "Landar"
story= _ "Cowards and traitors!"
story={CAPTION ( _ "Landar")} + _ "Cowards and traitors!"
[/part]
[/story]

View file

@ -506,3 +506,10 @@
#define ASIDE TEXT
"<i>(" + {TEXT} + ")</i>"#enddef
# Encapsulate text in conventional markup similar to how standard
# character message dialogs are rendered. Intended for story screens
# mainly.
#define CAPTION TEXT
"<span color='#bcb088'><b>" + {TEXT} + "</b></span>
"#enddef

View file

@ -177,9 +177,6 @@ void part::resolve_wml(const vconfig &cfg)
}
if(cfg.has_attribute("story")) {
text_ = cfg["story"];
if (cfg.has_attribute("caption")) {
text_ = "<span color='green'>" + cfg["caption"] + "</span>\n\n" + text_;
}
}
if(cfg.has_attribute("title")) {
text_title_ = cfg["title"];