wesnoth-cvs-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Wesnoth-cvs-commits] wesnoth/data/scenarios/Son_Of_The_Black_Eye The...


From: ott
Subject: [Wesnoth-cvs-commits] wesnoth/data/scenarios/Son_Of_The_Black_Eye The...
Date: Mon, 13 Jun 2005 16:49:12 -0400

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/06/13 20:49:12

Modified files:
        data/scenarios/Son_Of_The_Black_Eye: The_Siege_Of_Barag_Gor.cfg 

Log message:
        simplify scenario WML, make better use of objectives and filters

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg.diff?tr1=1.25&tr2=1.26&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg
diff -u 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg:1.25 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg:1.26
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg:1.25 
Wed May 25 19:38:55 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg      
Mon Jun 13 20:49:12 2005
@@ -21,15 +21,10 @@
        name=prestart
                [objectives]
                side=1
-               summary=_ "Rescue the Shamans"
                        [objective]
                        condition=win
-                       description=_ "Bring the Shamans and Kapou'e to the 
sign post"
+                       description=_ "Rescue the Shamans"
                        [/objective]
-#                      [objective]
-#                      condition=win
-#                      description=_ "Defeat the enemy leader"
-#                      [/objective]
                        [objective]
                        condition=lose
                        description=_ "Death of Kapou'e"
@@ -50,48 +45,48 @@
        [/event]
 
        [side]
-       type=Orcish Leader
-       description=Kapou'e
-       user_description= _ "Kapou'e"
-       side=1
-       canrecruit=1
-       controller=human
-       recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer
-       team_name=Kapoue
-       gold=100
-       {BLACK_FLAG}
+               type=Orcish Leader
+               description=Kapou'e
+               user_description= _ "Kapou'e"
+               side=1
+               canrecruit=1
+               controller=human
+               recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer
+               team_name=Kapoue
+               gold=100
+               {BLACK_FLAG}
        [/side]
 
        [side]
-       race=Elf
-       type=Elvish Marshal
-       description=Etheliel
-       user_description= _ "Etheliel"
-       side=2
-       team_name=Elves
-       canrecruit=1
+               race=Elf
+               type=Elvish Marshal
+               description=Etheliel
+               user_description= _ "Etheliel"
+               side=2
+               team_name=Elves
+               canrecruit=1
                [ai]
-               aggression=1.0
-               village_value=0.0
-               leader_value=50.0
-               recruitment_pattern=fighter,archer,fighter,archer,scout
+                       aggression=1.0
+                       village_value=0.0
+                       leader_value=50.0
+                       recruitment_pattern=fighter,archer,fighter,archer,scout
                [/ai]
-       recruit=Elvish Archer, Elvish Scout, Elvish Fighter
-       {GOLD 100 120 160}
+               recruit=Elvish Archer, Elvish Scout, Elvish Fighter
+               {GOLD 100 120 160}
        [/side]
 
        [side]
-       race=Orc
-       type=Orcish Slayer
-       description=Rugh
-       user_description= _ "Rugh"
-       side=3
-       team_name=Kapoue
-       canrecruit=0
+               race=Orc
+               type=Orcish Slayer
+               description=Rugh
+               user_description= _ "Rugh"
+               side=3
+               team_name=Kapoue
+               canrecruit=0
                [ai]
-               aggression=-1.0
+                       aggression=-1.0
                [/ai]
-       gold=0
+               gold=0
        [/side]
 
        [story]
@@ -156,7 +151,7 @@
 
                [message]
                        description=Kapou'e
-                       message= _ "Here is Barag Gor."
+                       message= _ "Here is Barag Gór."
                [/message]
                [message]
                        description=Kapou'e
@@ -180,7 +175,7 @@
                [/message]
                [message]
                        speaker=narrator
-                       message= _ "Then, Kapou'e launched his desperate attack 
to stop the siege of Barag Gor."
+                       message= _ "Then, Kapou'e launched his desperate attack 
to stop the siege of Barag Gór."
                [/message]
 
        [/event]
@@ -198,20 +193,20 @@
                [/filter]
 
                [unit]
-               description=Jetto
-               user_description= _ "Jetto"
-               side=1
-               type=Orcish Assassin
-               x=7
-               y=30
-               [modifications]
-                       {TRAIT_LOYAL}
-               [/modifications]
+                       description=Jetto
+                       user_description= _ "Jetto"
+                       side=1
+                       type=Orcish Assassin
+                       x=7
+                       y=30
+                       [modifications]
+                               {TRAIT_LOYAL}
+                       [/modifications]
                [/unit]
 
                [allow_recruit]
-               side=1
-               type=Orcish Assassin
+                       side=1
+                       type=Orcish Assassin
                [/allow_recruit]
 
                [message]
@@ -225,21 +220,21 @@
        name=die
        first_time_only=no
                [filter]
-               type=Elvish Fighter
+               type=Elvish Fighter,Elvish Archer
                [/filter]
                [command]
-       [set_variable]
-       name=elvish_casualties
-       add=1
-       [/set_variable]
+               [set_variable]
+                       name=elvish_casualties
+                       add=1
+               [/set_variable]
                [/command]
                [command]
                [if]
-       [variable]
-               name=elvish_casualties
-               numerical_equals=6
-       [/variable]
-       [then]
+               [variable]
+                       name=elvish_casualties
+                       numerical_equals=6
+               [/variable]
+               [then]
                        [role]
                        role=shaman
                        type=Orcish Shaman,Old Orcish Shaman,Novice Orcish 
Shaman
@@ -264,54 +259,30 @@
                        role=shaman
                        message= _ "Excellent. This is a dangerous journey, as 
we have to take a road near the elvish forest. This is the road near that 
yellow farm."
                        [/message]
-               [/then]
-               [/if]
-               [/command]
-       [/event]
 
-       [event]
-       name=die
-       first_time_only=no
-               [filter]
-               type=Elvish Archer
-               [/filter]
-               [command]
-       [set_variable]
-       name=elvish_casualties
-       add=1
-       [/set_variable]
-               [/command]
-               [command]
-               [if]
-       [variable]
-               name=elvish_casualties
-               numerical_equals=6
-       [/variable]
-       [then]
-                       [role]
-                       role=shaman
-                       type=Orcish Shaman,Old Orcish Shaman,Novice Orcish 
Shaman
-                       [/role]
-                       [message]
-                       role=shaman
-                       message= _ "They are retreating at last!"
-                       [/message]
-                       [message]
-                       description=Kapou'e
-                       message= _ "We're not out of the woods yet. I can see 
that more are pouring from the forest. We are not yet safe."
-                       [/message]
-                       [message]
-                       role=shaman
-                       message= _ "You are right, we have to leave to a safer 
place. You have helped us. Would you help us again and escort us to the Harbour 
of Tirigaz?"
-                       [/message]
-                       [message]
-                       description=Kapou'e
-                       message= _ "Yes, I need to ask for assistance from the 
whole council. I'm with you."
-                       [/message]
-                       [message]
-                       role=shaman
-                       message= _ "Excellent. This is a dangerous journey, as 
we have to take a road near the elvish forest. This is the road near that 
yellow farm."
-                       [/message]
+                       [objectives]
+                       side=1
+                               [objective]
+                               condition=win
+                               description=_ "Bring the Shamans and then 
Kapou'e to the signpost"
+                               [/objective]
+                               [objective]
+                               condition=lose
+                               description=_ "Death of Kapou'e"
+                               [/objective]
+                               [objective]
+                               condition=lose
+                               description=_ "Death of Grüü"
+                               [/objective]
+                               [objective]
+                               condition=lose
+                               description=_ "Death of a Shaman"
+                               [/objective]
+                               [objective]
+                               condition=lose
+                               description=_ "Turns run out"
+                               [/objective]
+                       [/objectives]
                [/then]
                [/if]
                [/command]
@@ -339,6 +310,25 @@
                        speaker=unit
                        message= _ "We're safe, finally. Hurry up Kapou'e, come 
with us, we need to reach Tirigaz as soon as possible."
                        [/message]
+                       [objectives]
+                       side=1
+                               [objective]
+                               condition=win
+                               description=_ "Bring Kapou'e to the sign post"
+                               [/objective]
+                               [objective]
+                               condition=lose
+                               description=_ "Death of Kapou'e"
+                               [/objective]
+                               [objective]
+                               condition=lose
+                               description=_ "Death of Grüü"
+                               [/objective]
+                               [objective]
+                               condition=lose
+                               description=_ "Turns run out"
+                               [/objective]
+                       [/objectives]
                [/then]
        [/if]
        [kill]
@@ -384,7 +374,6 @@
                [/filter]
        [if]
                [variable]
-               #if num_pilgrims >= 3 then victory
                name=num_pilgrims
                numerical_equals=3
                [/variable]
@@ -423,29 +412,12 @@
                [/role]
                [message]
                        role=hero
-                       message= _ "At your service, Etheliel. Let push these 
evil creatures back to their quag!"
+                       message= _ "At your service, Etheliel. Let us push 
these evil creatures back to their quag!"
                [/message]
        [/command]
        
        [/event]
 
-# remove remaining shamans if enemy leader was defeated
-# comment for now; let's try victory_when_enemies_defeated=no
-#      [event]
-#              name=die
-#              [filter]
-#                      description=Etheliel
-#              [/filter]
-#              [kill]
-#                      type="Orcish Shaman,Old Orcish Shaman,Novice Orcish 
Shaman"
-#              [/kill]
-#              [endlevel]
-#                      result=victory
-#                      bonus=yes
-#              [/endlevel]
-#      [/event]
-
        {scenarios/Son_Of_The_Black_Eye/utils/deaths.cfg}
        
 [/scenario]
-




reply via email to

[Prev in Thread] Current Thread [Next in Thread]