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

tweaks to 'home of the north elves' scenario

Browse source
This commit is contained in:
uid68803 2004-01-29 18:24:20 +00:00
parent 5b9da65d56
commit 4d0e4f42a6
4 changed files with 102 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
data/scenarios/Home_North_Elves.cfg
View file

@ -40,6 +40,7 @@ Defeat:
side=1
canrecruit=1
controller=human
fog=yes
[/side]
[side]
@ -114,6 +115,42 @@ Defeat:
[/target]
[/side]
[event]
name=sighted
[filter]
side=4
[/filter]
[message]
speaker=unit
id=nelves_found
message="There you are! You must come quickly to the home of the Elves to the East!"
[/message]
[/event]
[event]
name=sighted
[filter]
side=3
[/filter]
[message]
speaker=unit
id=nelves_human_found
message="There they are! Charge!"
[/message]
[/event]
[event]
name=sighted
[filter]
side=2
[/filter]
[message]
description=Delfador
id=nelves_orcs_found
message="There are some Orcs! We must let them fight the men of Wesnoth, and avoid engaging them at all costs!"
[/message]
[/event]
[event]
name=start
[recall]
@ -137,34 +174,14 @@ Defeat:
message="After being in this wilderness for so long, it will be good to get some rest!"
[/message]
[message]
id=nelves_3
id=nelves_3a
description=Konrad
message="But look to the south! There is an army of men. They fly the banner of Wesnoth!"
message="But around us, there is once again a great fog. We do not know what dangers may still lay ahead of us!"
[/message]
[message]
id=nelves_4
description=Herbert
message="There they are at last! We have come all this way to stop you, you rogue!"
[/message]
[message]
id=nelves_5
description=Delfador
message="Asheviere has sent more men after us. They are bold to have come this far, and it looks like a large host."
[/message]
[message]
id=nelves_6
description=Konrad
message="And, I guess you'd be on their side, right princess?"
[/message]
[message]
id=nelves_7
description=Li'sar
message="I am an honorable princess, not some rogue! I gave my word that I would be in alliance with you until we escape from these wretched north lands, and keep to my word I will!"
[/message]
[message]
id=nelves_8
description=Delfador
message="It is difficult to see how one who was raised by Asheviere has such honor."
id=nelves_4a
description=Kalenz
message="So long as we move ahead without abandoning caution and prudence, I am sure we will reach the safety and hospitality of the Elves."
[/message]
[sound]
@ -201,25 +218,67 @@ Defeat:
[message]
id=nelves_11
description=Eonihar
message="When my lord learnt of your coming, he sent riders out looking for you! There is trouble afoot. To the south the men of Wesnoth come looking for you, and northward the Orcs stand to oppose them!"
message="When my lord learnt of your coming, he sent riders out looking for you! There is trouble afoot!"
[/message]
[message]
id=nelves_12
description=Kior-Dal
message="How dare these men of Wesnoth march into our land. Come mighty Orcs, we will drive them back into the great river from whence they came!"
id=nelves_12a
description=Konrad
message="Trouble? What kind of trouble?"
[/message]
[message]
id=nelves_13
id=nelves_13a
description=Eonihar
message="It is not safe for you here in the open. You must make haste to the East, into the forest. Try to reach Emetria, where my lord awaits you. Even now, he is preparing a party of Elves to come and ensure your arrival."
message="We have sighted a great host to the South. A host of the men of Wesnoth, we believe they are looking for you! There is not a moment to lose: you must make haste to the Elven forest, only there will you be safe!"
[/message]
[message]
id=nelves_14
description=Delfador
message="Each force is a host too big for us to fight. Come, we must make haste to the forest! Let the Orcs and Men fight each other while we pass."
id=nelves_14a
description=Konrad
message="I only hope we can avoid them, we will have to bear North-East."
[/message]
[message]
id=nelves_15a
description=Eonihar
message="That is not all, my lord. The foul Orcs of these rugged lands have heard of the coming of these men, and are even now gathering a great host to oppose them. A host to the north! It is now certain that there will be a great battle."
[/message]
[message]
id=nelves_16a
description=Li'sar
message="This sounds very dangerous. Perhaps we should retreat to the West, and hide until the battle is over?"
[/message]
[message]
id=nelves_17a
description=Konrad
message="I think these wild lands are too dangerous for that! Anyhow, I thought you would be on the side of Wesnoth, would you not, princess?"
[/message]
[message]
id=nelves_18a
description=Li'sar
message="I am an honorable princess, not an imposter like you! I promised that I would be on your side until we make it out of these lands, and keep my promise I will!"
[/message]
[message]
id=nelves_19a
description=Eonihar
message="Sir, madam, there is no time to lose! You must make it East, to the home of my people. Only there will you be safe!"
[/message]
[message]
id=nelves_20a
description=Li'sar
message="Come then, Konrad, let us go."
[/message]
[message]
id=nelves_21a
description=Eonihar
message="My lord has begun assembling a party of Elves to come and escort you into the forest. Beware, for we are all in great danger!"
[/message]
[/event]
@ -231,12 +290,12 @@ Defeat:
y=8-9,7-9,8-10,8-9,8-10,8-9
[/filter]
[message]
id=nelves_15
id=nelves_22
description=El'rien
message="Greetings, Elf-friend! Welcome to Emetria. You must take shelter here until the battle passes. Hold with me here for a little while longer, and we will be safe."
[/message]
[message]
id=nelves_16
id=nelves_23
description=Konrad
message="Thank you, lord El'rien. The hospitality of the North Elves is as good as the ones in the South! My men will help you hold out against our enemies."
[/message]
@ -268,17 +327,17 @@ Defeat:
[event]
name=victory
[message]
id=nelves_17
id=nelves_24
description=El'rien
message="Elf-friends, you have made it to safety!"
[/message]
[message]
id=nelves_18
id=nelves_25
description=Kalenz
message="El'rien, we have the Sceptre of Fire with us! We must escort them to Elensia!"
[/message]
[message]
id=nelves_19
id=nelves_26
description=El'rien
message="Indeed. We will escort you to our capital, where we will make Council."
[/message]

3
src/font.cpp
View file

@ -260,11 +260,9 @@ SDL_Rect draw_text(display* gui, const SDL_Rect& area, int size,
} else if(*i1 == BAD_TEXT) {
col = BAD_COLOUR;
++i1;
continue;
} else if(*i1 == GOOD_TEXT) {
col = GOOD_COLOUR;
++i1;
continue;
} else if(*i1 == NORMAL_TEXT) {
col = NORMAL_COLOUR;
++i1;
@ -283,7 +281,6 @@ SDL_Rect draw_text(display* gui, const SDL_Rect& area, int size,
continue;
} else if(*i1 == NULL_MARKUP) {
++i1;
continue;
} else if(*i1 >= 1 && *i1 <= 9) {
col = get_side_colour(*i1);
++i1;

2
src/playturn.cpp
View file

@ -1272,7 +1272,7 @@ void turn_info::recruit()
std::stringstream description;
description << font::IMAGE << type.image() << "," << prefix << font::LARGE_TEXT << type.language_name() << "\n"
description << font::IMAGE << type.image() << "," << font::LARGE_TEXT << prefix << type.language_name() << "\n"
<< prefix << type.cost() << " " << string_table["gold"];
items.push_back(description.str());
sample_units.push_back(unit(&type,team_num_));

6
src/unit.cpp
View file

@ -724,7 +724,7 @@ void unit::add_modification(const std::string& type,
const std::string& violate_max = (**i.first)["violate_maximum"];
if(increase_total.empty() == false) {
description << (increase_total[0] != '-' ? font::LARGE_TEXT : font::NULL_MARKUP) << increase_total << translate_string("hp");
description << (increase_total[0] != '-' ? "+" : "") << increase_total << translate_string("hp");
//a percentage on the end means increase by that many percent
if(increase_total[increase_total.size()-1] == '%') {
@ -757,7 +757,7 @@ void unit::add_modification(const std::string& type,
const std::string& set_to = (**i.first)["set"];
if(increase.empty() == false) {
description << (increase[0] != '-' ? font::LARGE_TEXT : font::NULL_MARKUP) << increase << translate_string("moves");
description << (increase[0] != '-' ? "+" : "") << increase << translate_string("moves");
if(increase[increase.size()-1] == '%') {
const std::string inc(increase.begin(),increase.end()-1);
@ -780,7 +780,7 @@ void unit::add_modification(const std::string& type,
const std::string& increase = (**i.first)["increase"];
if(increase.empty() == false) {
description << (increase[0] != '-' ? font::LARGE_TEXT : font::NULL_MARKUP) << increase << translate_string("xp");
description << (increase[0] != '-' ? "+" : "") << increase << translate_string("xp");
if(increase[increase.size()-1] == '%') {
const std::string inc(increase.begin(),increase.end()-1);
maxExperience_ += (maxExperience_*atoi(inc.c_str()))/100;