mail[Wesnoth-commits] r28728 - in /trunk/data/campaigns/Descent_Into_Darkness: scenarios/ utils/


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by lari . nieminen on August 18, 2008 - 21:36:
Author: zookeeper
Date: Mon Aug 18 21:19:37 2008
New Revision: 28728

URL: http://svn.gna.org/viewcvs/wesnoth?rev=28728&view=rev
Log:
Finished merging dialogue and story text into the scenario .cfg's and finally 
removed story.cfg.

Removed:
    trunk/data/campaigns/Descent_Into_Darkness/utils/story.cfg
Modified:
    trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
    
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg?rev=28728&r1=28727&r2=28728&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg 
(original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg 
Mon Aug 18 21:19:37 2008
@@ -219,7 +219,17 @@
         [allow_undo][/allow_undo]
     [/event]
 
-    {EVENT_SH_EE}
+    [event]
+        name=moveto
+        [filter]
+            x,y=24,20
+        [/filter]
+        [message]
+            speaker=narrator
+            message=_ "Fear is the path to the dark side. Fear leads to 
anger. Anger leads to hate. Hate leads to suffering."
+            image=wesnoth-icon.png
+        [/message]
+    [/event]
 
     # Defeat Conditions
     [event]

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg?rev=28728&r1=28727&r2=28728&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg 
(original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg 
Mon Aug 18 21:19:37 2008
@@ -278,7 +278,26 @@
         [/message]
     [/event]
 
-    {DIALOGUE_PV_EE}
+    [event]
+        name=moveto
+        [filter]
+            type=Walking Corpse
+            x,y=4,1
+        [/filter]
+        {LOYAL_UNIT 2 (Goblin Spearman) 3 2 Shaun (_ "Shaun")}
+        {LOYAL_UNIT 2 (Goblin Spearman) 5 2 Ed (_ "Ed")}
+        {SPEAK Ed (_ "Any zombies out there?")}
+        {SPEAK Shaun (_ "Don't say that!")}
+        {SPEAK Ed (_ "What?")}
+        {SPEAK Shaun (_ "That!")}
+        {SPEAK Ed (_ "What?")}
+        {SPEAK Shaun (_ "The 'zed' word. Don't say it!")}
+        {SPEAK Ed (_ "Why not?")}
+        {SPEAK Shaun (_ "Because it's ridiculous")}
+        {SPEAK Ed (_ "Well... are there any?")}
+        {SPEAK Shaun (_ "I don't see any. Maybe it's not as bad as all 
that.")}
+        {SPEAK Shaun (_ "Oh, no, wait, there they are.")}
+    [/event]
 
     # Defeat Conditions
     {MALIN_DEATH}

Removed: trunk/data/campaigns/Descent_Into_Darkness/utils/story.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/utils/story.cfg?rev=28727&view=auto
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/utils/story.cfg (original)
+++ trunk/data/campaigns/Descent_Into_Darkness/utils/story.cfg (removed)
@@ -1,143 +1,0 @@
-#textdomain wesnoth-did
-# All of the story parts and dialogue are stored here as macros.  This 
greatly shortens the scenario files, and makes editing the storyline for tone 
and consistency much easier.
-
-# ----- Forever and Ever, Amen -------------------------------------------
-#define STORY_FOREVER_AND_EVER_AMEN
-    [story]
-        [part]
-            story=_ "Years pass. Every summer when the mountain passes 
become clear, the lich sends his soldiers to attack the orcs, removing any 
human, elven, or dwarvish patrols that get in the way. Every year the undead 
inflict some damage before being repelled and retreating to the caves."
-        [/part]
-        [part]
-            story=_ "Rumors circulate of a lich that preys on scouting 
patrols. A hero, gathering his loyal troops to him, decides to put an end to 
the evil."
-        [/part]
-    [/story]
-#enddef
-
-#define DIALOGUE_FAEA_START0
-    [message]
-        speaker=Foolish Hero
-        message=_ "Your doom is at hand, foul lich! I shall bring you down 
by my own hand."
-    [/message]
-    [message]
-        speaker=Mal Keshar
-        message=_ "The only doom at hand is yours, if you do not leave now. 
Go back to your manors and taverns, and do not trouble me further."
-    [/message]
-#enddef
-
-#define DIALOGUE_FAEA_START1
-    [message]
-        speaker=Foolish Hero
-        message=_ "You have preyed on too many of my boys. I have come here 
to end this, once and for all."
-    [/message]
-    [message]
-        speaker=Mal Keshar
-        message=_ "Not even real soldiers. I will sweep you aside."
-    [/message]
-#enddef
-
-#define DIALOGUE_FAEA_START2
-    [message]
-        speaker=Foolish Hero
-        message=_ "Your kind is an abomination. I am here to see that you 
inflict no more harm on the spirits that have passed on."
-    [/message]
-    [message]
-        speaker=Mal Keshar
-        message=_ "Fool! By leaving your forests and coming into my domain, 
you have sacrificed your own spirits."
-    [/message]
-#enddef
-
-#define DIALOGUE_FAEA_START3
-    [message]
-        speaker=Foolish Hero
-        message=_ "I've been itching for a chance to break some bones with 
my hammer, and now you've given me cause. Goodness knows you've got plenty of 
bones over there."
-    [/message]
-    [message]
-        speaker=Mal Keshar
-        message=_ "Go back to your tunnels and your mines, and do not 
trouble me unless you want your hammers to work for me once you are dead."
-    [/message]
-    [message]
-        speaker=Foolish Hero
-        message=_ "Hear that boys, he's threatening us! It's time he learned 
what real dwarves are made of."
-    [/message]
-#enddef
-
-#define DIALOGUE_FAEA_START4
-    [message]
-        speaker=Foolish Hero
-        message=_ "So, I've finally found your lair, Lich. You, who have 
been attacking the orcs for years and have destroyed many of our tribes."
-    [/message]
-    [message]
-        speaker=Mal Keshar
-        message=_ "Orcs? It is you who have forced me to choose the dark 
path, and it is you who ended my mortal life and made me turn into a Lich. I 
am actually grateful to you for coming here, foolish hero. My hatred toward 
your race makes me stronger and I again get a chance to kill orcs!"
-    [/message]
-    [message]
-        speaker=Foolish Hero
-        message=_ "Nothing will stop me from taking revenge for my father 
who died at your hand and for the rest of my people you and your minions have 
killed, Lich. Orcs, attack! The one who brings me his scull gets a bag of 
gold."
-    [/message]
-#enddef
-
-#define DIALOGUE_FAEA_SASS1
-    [message]
-        speaker=Mal Keshar
-        message=_ "Is there an endless supply of foolish heroes with 
deathwishes? Honestly, where do you all come from?"
-    [/message]
-#enddef
-
-#define DIALOGUE_FAEA_END
-    [message]
-        speaker=Foolish Hero
-        message=_ "Well, that is the end of his evil ways."
-    [/message]
-    [message]
-        role=second
-        message=_ "I wonder who he was in life, before fell into the evil 
ways that led him to today."
-    [/message]
-    [message]
-        speaker=Foolish Hero
-        message=_ "Once he chose this un-life for himself and his soldiers, 
he forfeited any claim to our compassion. Does it even matter who he was?"
-    [/message]
-    [message]
-        role=second
-        message=_ "No, I suppose it does not."
-    [/message]
-#enddef
-
-# ----- Easter Eggs ------------------------------------------------------
-# Yes it's kind of silly to label a section as such, but they've got to go 
somewhere
-
-#define EVENT_SH_EE
-    [event]
-        name=moveto
-        [filter]
-            x,y=24,20
-        [/filter]
-        [message]
-            speaker=narrator
-            message=_ "Fear is the path to the dark side. Fear leads to 
anger. Anger leads to hate. Hate leads to suffering."
-            image=wesnoth-icon.png
-        [/message]
-    [/event]
-#enddef
-
-#define DIALOGUE_PV_EE
-    [event]
-        name=moveto
-        [filter]
-            type=Walking Corpse
-            x,y=4,1
-        [/filter]
-        {LOYAL_UNIT 2 (Goblin Spearman) 3 2 Shaun (_ "Shaun")}
-        {LOYAL_UNIT 2 (Goblin Spearman) 5 2 Ed (_ "Ed")}
-        {SPEAK Ed (_ "Any zombies out there?")}
-        {SPEAK Shaun (_ "Don't say that!")}
-        {SPEAK Ed (_ "What?")}
-        {SPEAK Shaun (_ "That!")}
-        {SPEAK Ed (_ "What?")}
-        {SPEAK Shaun (_ "The 'zed' word. Don't say it!")}
-        {SPEAK Ed (_ "Why not?")}
-        {SPEAK Shaun (_ "Because it's ridiculous")}
-        {SPEAK Ed (_ "Well... are there any?")}
-        {SPEAK Shaun (_ "I don't see any. Maybe it's not as bad as all 
that.")}
-        {SPEAK Shaun (_ "Oh, no, wait, there they are.")}
-    [/event]
-#enddef




Related Messages


Powered by MHonArc, Updated Mon Aug 18 21:40:55 2008