Author: shadowmaster
Date: Wed Sep 3 00:27:35 2008
New Revision: 29224
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29224&view=rev
Log:
* In scenario 4, removed "Holly [...]" in a dialogue line, per request by ESR
* Optimized start/prestart/die events in first four scenarios
Modified:
trunk/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/03_To_The_Mines.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg
Modified:
trunk/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg?rev=29224&r1=29223&r2=29224&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
Wed Sep 3 00:27:35 2008
@@ -335,14 +335,20 @@
# Death of Tallin. Equals defeat.
[event]
+ name=last breath
+ [filter]
+ id=Tallin
+ [/filter]
+ [message]
+ speaker=Tallin
+ message= _ "I die now, you orcish scum, but I die free! More will
come after me. We will rise again and again until we work a fitting vengeance
on you!"
+ [/message]
+ [/event]
+ [event]
name=die
[filter]
id=Tallin
[/filter]
- [message]
- speaker=Tallin
- message= _ "I die now, you orcish scum, but I die free! More will
come after me. We will rise again and again until we work a fitting vengeance
on you!"
- [/message]
[message]
speaker="Al'Tar"
message= _ "Pahh! Grunts, put the rest of those peasant rabble
back in chains."
@@ -354,7 +360,7 @@
# Death of side 2 leader. Flavour event.
[event]
- name=die
+ name=last breath
[filter]
id="Al'Tar"
[/filter]
@@ -370,6 +376,12 @@
speaker=unit
message= _ "Ugh!"
[/message]
+ [/event]
+ [event]
+ name=die
+ [filter]
+ id="Al'Tar"
+ [/filter]
[message]
speaker=second_unit
message= _ "Not a very bright one, was he?"
@@ -378,7 +390,7 @@
# Death of side 3 leader. Flavour event.
[event]
- name=die
+ name=last breath
[filter]
id=Garrugch
[/filter]
@@ -386,6 +398,12 @@
speaker=unit
message= _ "No! I have failed in my mission!"
[/message]
+ [/event]
+ [event]
+ name=die
+ [filter]
+ id=Garrugch
+ [/filter]
[message]
speaker=second_unit
message= _ "Mission? What mission?"
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg?rev=29224&r1=29223&r2=29224&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg Wed
Sep 3 00:27:35 2008
@@ -143,24 +143,10 @@
side=9
[/side]
- # Start event - place some dwarven guards to increase the survivability of
the allied AI, set objectives, execute the
- # flavour bat encounter.
- [event]
- name=start
-
- # SUPPORTER is a special macro defined in campaign /utils it chooses
an unit from peasant advancement tree and sets
- # him an supporter role.
- [role]
- [filter_wml]
- [variables]
- role=Supporter
- [/variables]
- [/filter_wml]
- role=Supporter
- [/role]
- [recall]
- role=Supporter
- [/recall]
+ # Prestart event - place some dwarven guards to increase the survivability
of the allied AI
+ # and set player objectives.
+ [event]
+ name=prestart
{NOTRAIT_UNIT 4 "Dwarvish Stalwart" 30 25}
[+unit]
ai_special=guardian
@@ -177,6 +163,49 @@
[+unit]
ai_special=guardian
[/unit]
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Find the Dwarves"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Clear the Caves"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Tallin"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Hamel"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
+
+ # SUPPORTER is a special macro defined in campaign /utils it chooses
an unit from peasant advancement tree and sets
+ # him an supporter role.
+ [role]
+ [filter_wml]
+ [variables]
+ role=Supporter
+ [/variables]
+ [/filter_wml]
+ role=Supporter
+ [/role]
+ [recall]
+ role=Supporter
+ [/recall]
+ [/event]
+
+ # Start event - execute the flavour bat encounter.
+ [event]
+ name=start
[message]
role=Supporter
message= _ "So here we are..."
@@ -208,29 +237,6 @@
speaker=Tallin
message= _ "Calm down. Come what may, we'll handle them. Come on
now, let's find those dwarves!"
[/message]
- [objectives]
- side=1
- [objective]
- description= _ "Find the Dwarves"
- condition=win
- [/objective]
- [objective]
- description= _ "Clear the Caves"
- condition=win
- [/objective]
- [objective]
- description= _ "Death of Tallin"
- condition=lose
- [/objective]
- [objective]
- description= _ "Death of Hamel"
- condition=lose
- [/objective]
- [objective]
- description= _ "Turns run out"
- condition=lose
- [/objective]
- [/objectives]
[/event]
# Find Camerin event
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/03_To_The_Mines.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/03_To_The_Mines.cfg?rev=29224&r1=29223&r2=29224&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/03_To_The_Mines.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/03_To_The_Mines.cfg Wed Sep
3 00:27:35 2008
@@ -105,23 +105,9 @@
[/side]
[event]
- name=start
+ name=prestart
+
{PLACE_IMAGE scenery/dwarven-doors-closed.png 18 3}
-
- [role]
- [filter_wml]
- [variables]
- role=Supporter
- [/variables]
- [/filter_wml]
- role=Supporter
- [/role]
- [recall]
- role=Supporter
- [/recall]
- [recall]
- id=Camerin
- [/recall]
# Since in last scenario Hamel was AI controled we need to place him
again to have him in this and future scenarios
[unit]
@@ -138,6 +124,49 @@
{TRAIT_STRONG}
[/modifications]
[/unit]
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Get into the mines or..."
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Just kill the annoying little puppies"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Tallin"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Hamel"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
+
+ [role]
+ [filter_wml]
+ [variables]
+ role=Supporter
+ [/variables]
+ [/filter_wml]
+ role=Supporter
+ [/role]
+ [recall]
+ role=Supporter
+ [/recall]
+ [recall]
+ id=Camerin
+ [/recall]
+ [/event]
+
+ [event]
+ name=start
[message]
speaker=narrator
message= _ "Hoping to bypass the monsters which seemed to lurk at
every corner in the caves, the humans and the dwarves returned to the surface
hoping to speedily reach the mines. However, once they left the caves they
found that they faced a new threat."
@@ -151,29 +180,6 @@
role=Supporter
message= _ "I don't think so, buddy."
[/message]
- [objectives]
- side=1
- [objective]
- description= _ "Get into the mines or..."
- condition=win
- [/objective]
- [objective]
- description= _ "Just kill the annoying little puppies"
- condition=win
- [/objective]
- [objective]
- description= _ "Death of Tallin"
- condition=lose
- [/objective]
- [objective]
- description= _ "Death of Hamel"
- condition=lose
- [/objective]
- [objective]
- description= _ "Turns run out"
- condition=lose
- [/objective]
- [/objectives]
[/event]
# Two events ending the scenario, there is no chance of both of them
occuring in the same game. You can either kill
Modified:
trunk/data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg?rev=29224&r1=29223&r2=29224&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg
Wed Sep 3 00:27:35 2008
@@ -87,20 +87,11 @@
user_team_name=_"Undead"
[/side]
- # Prestart event - hide Malifor for the great and dramatic entrance later
+ # Prestart event - hide Malifor for the great and dramatic entrance later,
+ # and place his army of guardian skeletons; also recall
+ # player units.
[event]
name=prestart
-
- [hide_unit]
- x=33
- y=6
- [/hide_unit]
- [/event]
-
- # Start event - recall some units, perform initial dialogue and place an
army of guardian skeletons
- [event]
- name=start
-
[role]
[filter_wml]
[variables]
@@ -320,6 +311,37 @@
ai_special=guardian
[/unit]
+ # Set initial objectives.
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Clear the Mines"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Tallin"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Hamel"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns Run Out"
+ condition=lose
+ [/objective]
+ [/objectives]
+
+ # Hide Malifor
+ [hide_unit]
+ x=33
+ y=6
+ [/hide_unit]
+ [/event]
+
+ # Start event - recall some units, perform initial dialogue and place an
army of guardian skeletons
+ [event]
+ name=start
[message]
speaker=narrator
message= _ "When the party finally reached the mines they were not
disappointed."
@@ -544,25 +566,6 @@
# [/command]
# [/option]
# [/message]
- [objectives]
- side=1
- [objective]
- description= _ "Clear the Mines"
- condition=win
- [/objective]
- [objective]
- description= _ "Death of Tallin"
- condition=lose
- [/objective]
- [objective]
- description= _ "Death of Hamel"
- condition=lose
- [/objective]
- [objective]
- description= _ "Turns Run Out"
- condition=lose
- [/objective]
- [/objectives]
[/event]
# Turn 20 - since the army of skeletons is obviously not enough change the
moat to swamp and send in an army of ghouls.
@@ -641,16 +644,15 @@
{NOTRAIT_UNIT 2 Necrophage 27 21}
{NOTRAIT_UNIT 2 Necrophage 24 21}
{NOTRAIT_UNIT 2 Necrophage 28 10}
- # wmllint: recognize Necrophage
-
- [message]
- speaker=Necrophage
+
+ [message]
+ type=Necrophage
message= _ "FOOOOOOOD!"
[/message]
[message]
role=Supporter
- message= _ "Holly Lords of Light, what kind of vile creation are
those things!"
+ message= _ "Lords of Light, what kind of vile creation are those
things!"
[/message]
# Camerin might be dead by now, but in that case message with
unmatched description will not display anyway. It would
# be completely different thing if we used speaker=Camerin.
@@ -670,7 +672,7 @@
# Victory and death events - liches grand exit
[event]
- name=die
+ name=last breath
[filter]
id=Malifor
[/filter]
@@ -679,7 +681,13 @@
speaker=Malifor
message= _ "HAHAHAHA, you puny weaklings think you can destroy me?
FOOLS! You will all soon be serving me!"
[/message]
- {FLASH_RED ()}
+ {FLASH_RED (
+ [kill]
+ id=Malifor
+ fire_event=yes # probably required if he's the last enemy
leader
+ animate=no
+ [/kill]
+ )}
[message]
speaker=second_unit
message= _ "Oh no, he just.... disappeared."
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
