[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth data/utils.cfg data/scenarios/Heir_To_T...
From: |
David White |
Subject: |
[Wesnoth-cvs-commits] wesnoth data/utils.cfg data/scenarios/Heir_To_T... |
Date: |
Sat, 28 Aug 2004 19:05:04 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: David White <address@hidden> 04/08/28 23:00:13
Modified files:
data : utils.cfg
data/scenarios/Heir_To_The_Throne: Battle_for_Wesnoth.cfg
Crossroads.cfg
src : game.cpp intro.cpp intro.hpp
Added files:
data/scenarios/Heir_To_The_Throne: Epilogue.cfg
data/units : Dark_Queen.cfg
Log message:
added ending sequence for 'Heir to the Throne'
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/utils.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Epilogue.cfg?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dark_Queen.cfg?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.118&tr2=1.119&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/intro.cpp.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/intro.hpp.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
Patches:
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:1.1
wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:1.2
--- wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:1.1
Sat Aug 28 19:34:02 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg Sat Aug
28 23:00:13 2004
@@ -3,7 +3,7 @@
name= _ "The Battle for Wesnoth"
map_data="{maps/Heir_To_The_Throne/Battle_for_Wesnoth}"
turns=60
- next_scenario=null
+ next_scenario=httt_epilogue
[story]
[part]
@@ -52,8 +52,6 @@
{FIRST_WATCH}
{SECOND_WATCH}
- next_scenario=null
-
music="wesnoth-1.ogg"
objectives= _ "
@@ -68,7 +66,7 @@
{BIGMAP_BATTLE_FOR_WESNOTH}
- {STARTING_VILLAGES 6 10}
+ {STARTING_VILLAGES 5 40}
[side]
type=Fighter
@@ -118,7 +116,7 @@
[/side]
[side]
- type=Princess
+ type=Dark Queen
description=Asheviere
side=5
canrecruit=1
@@ -126,4 +124,29 @@
{GOLD 300 400 500}
team_name=evil
[/side]
+
+ [event]
+ name=start
+ {MESSAGE Asheviere ("So, these rebels come at last to face me,
while most of my army is off fighting the fickle clans.")}
+ {MESSAGE Li'sar ("Surrender, mother. The land's blood is spent.
I have come to take my rightful place.")}
+ {MESSAGE Asheviere ("Ahh. My own daughter, a turncoat. So it is
true. Such treason my reign must endure! But endure it will.")}
+ {MESSAGE Delfador ("How long must the people endure your rule?
Give the throne to your daughter. She is the rightful heir. We even hold the
scepter to prove it!")}
+ {MESSAGE Asheviere ("Delfador! My old tormentor! Treason! Men!
Sieze them! Kill them! Kill them all!")}
+ [/event]
+
+ [event]
+ name=die
+ [filter]
+ description=Asheviere
+ [/filter]
+ {MESSAGE Asheviere ("Treason! The evil ones have slain me!")}
+ {MESSAGE Delfador ("And so passes Asheviere, the dark queen of
Wesnoth.")}
+ {MESSAGE Konrad ("We have won at last! Li'sar! You will be
queen!")}
+ {MESSAGE Li'sar ("Yes, but I won't ever forget what you have
done for me, Konrad, Delfador, and Kalenz.")}
+ [endlevel]
+ result=continue
+ [/endlevel]
+ [/event]
+
+ {scenarios/Heir_To_The_Throne/deaths.cfg}
[/scenario]
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.13
wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.14
--- wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.13 Sat Aug
7 22:57:52 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg Sat Aug 28
23:00:13 2004
@@ -60,7 +60,7 @@
controller=ai
canrecruit=1
recruit=Orcish Grunt,Wolf Rider,Orcish Archer,Troll Whelp
- {GOLD 150 250 400}
+ {GOLD 120 180 300}
team_name=orcs
{CROSSROADS_AI_PARAMS}
[/side]
@@ -73,7 +73,7 @@
controller=ai
canrecruit=1
recruit=Orcish Grunt,Wolf Rider,Orcish Archer,Troll Whelp
- {GOLD 150 250 400}
+ {GOLD 100 200 300}
team_name=orcs
{CROSSROADS_AI_PARAMS}
[/side]
Index: wesnoth/data/utils.cfg
diff -u wesnoth/data/utils.cfg:1.9 wesnoth/data/utils.cfg:1.10
--- wesnoth/data/utils.cfg:1.9 Wed Jul 28 17:49:03 2004
+++ wesnoth/data/utils.cfg Sat Aug 28 23:00:12 2004
@@ -162,3 +162,10 @@
[/event]
#enddef
+#define MESSAGE SPEAKER MSG
+ [message]
+ speaker={SPEAKER}
+ message= _ {MSG}
+ [/message]
+#enddef
+
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.118 wesnoth/src/game.cpp:1.119
--- wesnoth/src/game.cpp:1.118 Sat Aug 28 04:17:59 2004
+++ wesnoth/src/game.cpp Sat Aug 28 23:00:13 2004
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.118 2004/08/28 04:17:59 Sirp Exp $ */
+/* $Id: game.cpp,v 1.119 2004/08/28 23:00:13 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -32,6 +32,7 @@
#include "game_events.hpp"
#include "gamestatus.hpp"
#include "hotkeys.hpp"
+#include "intro.hpp"
#include "key.hpp"
#include "language.hpp"
#include "log.hpp"
@@ -1098,10 +1099,8 @@
try {
const LEVEL_RESULT result =
play_game(disp,state,game_config,units_data,video);
if(result == VICTORY) {
- gui::show_dialog(disp,NULL,
- _("The End"),
- _("You have reached the end of the currently
playable levels"),
- gui::OK_ONLY);
+ the_end(disp);
+ about::show_about(disp);
}
} catch(gamestatus::load_game_exception& e) {
Index: wesnoth/src/intro.cpp
diff -u wesnoth/src/intro.cpp:1.58 wesnoth/src/intro.cpp:1.59
--- wesnoth/src/intro.cpp:1.58 Wed Aug 25 20:57:09 2004
+++ wesnoth/src/intro.cpp Sat Aug 28 23:00:13 2004
@@ -1,4 +1,4 @@
-/* $Id: intro.cpp,v 1.58 2004/08/25 20:57:09 cedricd Exp $ */
+/* $Id: intro.cpp,v 1.59 2004/08/28 23:00:13 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -300,3 +300,32 @@
return true;
}
+
+void the_end(display& screen)
+{
+ SDL_Rect area = screen.screen_area();
+ SDL_FillRect(screen.video().getSurface(),&area,0);
+
+ update_whole_screen();
+ screen.video().flip();
+
+ const std::string text = _("The End");
+ const size_t font_size = 24;
+
+ area = font::text_area(text,font_size);
+ area.x = screen.screen_area().w/2 - area.w/2;
+ area.y = screen.screen_area().h/2 - area.h/2;
+
+ for(size_t n = 0; n < 255; n += 5) {
+ const SDL_Color col = {n,n,n,n};
+ font::draw_text(&screen,area,font_size,col,text,area.x,area.y);
+ update_rect(area);
+ screen.video().flip();
+
+ SDL_FillRect(screen.video().getSurface(),&area,0);
+
+ SDL_Delay(10);
+ }
+
+ SDL_Delay(4000);
+}
Index: wesnoth/src/intro.hpp
diff -u wesnoth/src/intro.hpp:1.16 wesnoth/src/intro.hpp:1.17
--- wesnoth/src/intro.hpp:1.16 Wed Jul 28 17:48:28 2004
+++ wesnoth/src/intro.hpp Sat Aug 28 23:00:13 2004
@@ -1,4 +1,4 @@
-/* $Id: intro.hpp,v 1.16 2004/07/28 17:48:28 isaaccp Exp $ */
+/* $Id: intro.hpp,v 1.17 2004/08/28 23:00:13 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -34,4 +34,6 @@
//user able to go to the next part, or skip it entirely.
void show_intro(display& screen, const config& data, const config& level);
+void the_end(display& screen);
+
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth data/utils.cfg data/scenarios/Heir_To_T...,
David White <=