mail[Wesnoth-commits] r20500 - /trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg


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

Header


Content

Posted by ravanrooke on September 17, 2007 - 18:48:
Author: rhuvaen
Date: Mon Sep 17 18:48:25 2007
New Revision: 20500

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20500&view=rev
Log:
Fixed some dialogue problems (spelling and otherwise), cleaned up a lot of 
obsolete comments, adjusted monster AI for difficulty.

Modified:
    trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg

Modified: 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg?rev=20500&r1=20499&r2=20500&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg 
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg 
Mon Sep 17 18:48:25 2007
@@ -87,8 +87,6 @@
             aggression=0.8
             caution=0.2
 
-            # AI will attack a weak unit with a max of 3,4,5 units
-            # depending on the difficulty (default=5)
             {ATTACK_DEPTH 3 4 5}
 
             [target]
@@ -112,15 +110,18 @@
         shroud=no
         fog=no
         team_name=monsters
-
-        #monsters are aggressive
         [ai]
             aggression=1.0
             caution=0.00
-
-            # AI will attack a weak unit with a max of 4,5,6 units
-            # depending on the difficulty (default=5)
-            {ATTACK_DEPTH 3 4 5}
+#ifdef EASY
+            # monsters are extra dumb
+            simple_targetting=yes
+            grouping=no
+#endif
+#ifdef NORMAL
+            grouping=no
+#endif
+            {ATTACK_DEPTH 2 3 4}
 
             [target]
                 side=1
@@ -144,16 +145,12 @@
         shroud=no
         fog=no
         team_name=undead
-
         [ai]
-            #undead are aggressive
             aggression=1.0
             caution=0.0
 
             grouping=no
 
-            # AI will attack a weak unit with a max of 2,3,4 units
-            # depending on the difficulty (default=5)
             {ATTACK_DEPTH 2 3 4}
 
             [target]
@@ -173,6 +170,7 @@
 
         [/ai]
     [/side]
+
 
     # prestart events:
     # Set starting scenario objectives
@@ -281,7 +279,7 @@
         #!***Extended message -> Hints about new ambush logic and the need 
of scouting***
         [message]
             description=Garak
-            message= _ "I've seen the ancient remains of stone castles and 
markers in the sands. The paths of the ancients may serve us yet again. If we 
follow the paths from oasis to oasis, we may be able to survive the thirst 
and heat of the desert. But there are worse dangers in these sands than 
thirst, we must be wary and scout our way carefuly."
+            message= _ "I've seen the ancient remains of stone castles and 
markers in the sands. The paths of the ancients may serve us yet again. If we 
follow the paths from oasis to oasis, we may be able to survive the thirst 
and heat of the desert. But there are worse dangers in these sands than 
thirst, we must be wary and scout our way carefully."
         [/message]
 
         [message]
@@ -295,8 +293,6 @@
             message= _ "During the daytime (Dawn, Morning, Mid-day, 
Afternoon, and Dusk) at the beginning of each your turns, every unit in a 
sand, road, rubble or sand dune hex will suffer from thirst, losing 
$dehydration_loss hitpoints and weaking attack damage. Your shamans cannot 
heal this damage. Only by refreshing at an oasis (any shallow water hex) at 
the start of your turn, your units will regain full attack strength and some 
of the lost hitpoints."
             image=wesnoth-icon.png
         [/message]
-
-        # Deleted message -> druids no longer prevent dehydration effects
 
         [message]
             description=Nym
@@ -321,11 +317,8 @@
              {VARIABLE max_ghosts 8}
              {VARIABLE max_per_turn 3}
 #endif
-
     [/event]
 
-    #!***Scraped clock-> This can be achieved without dedicated event***
-    #!***Scraped bandit gold check -> Can be done by using gold in caling 
event***
 
 # This sets up some unit variables for sides that
 # will suffer thirst
@@ -391,14 +384,8 @@
 
     # Encounter 1: Scorpions attack
 
-    #!***Rewriten -> revised ambush logic, switched outcome to random 
placement on fixed area***
-
     [event]
         name=moveto
-
-        #!***Event centered on 25,64***
-        #!***Inner trigger area 31-36,58-64***
-        #!***Outer trigger area 20-36,53-69***
 
         [filter]
             side=1
@@ -406,11 +393,7 @@
             y=59-70
         [/filter]
 
-        #!***Created -> Macro scorpion placement, avoid redundant text in 
file
-
 #define SCORPION_PLACEMENT
-
-    #Easy 3 scorpions, Medium 5, Hard 6
 
     {RANDOM_PLACEMENT 29 62 2 ({CREATE_UNIT 3 "Giant Scorpion" 1 1 
"Scorpion" (user_description=_"Scorpion"
     ai_special="guardian")})}
@@ -418,6 +401,8 @@
     ai_special="guardian")})}
     {RANDOM_PLACEMENT 29 62 2 ({CREATE_UNIT 3 "Giant Scorpion" 1 1 
"Scorpion" (user_description=_"Scorpion"
     ai_special="guardian")})}
+    {RANDOM_PLACEMENT 29 62 2 ({CREATE_UNIT 3 "Giant Scorpion" 1 1 
"Scorpion" (user_description=_"Scorpion"
+    ai_special="guardian")})}
 
 #ifdef NORMAL
 
@@ -427,21 +412,17 @@
     ai_special="guardian")})}
 
 #endif
-
 #ifdef HARD
 
     {RANDOM_PLACEMENT 29 62 2 ({CREATE_UNIT 3 "Giant Scorpion" 1 1 
"Scorpion" (user_description=_"Scorpion"
     ai_special="guardian")})}
     {RANDOM_PLACEMENT 29 62 2 ({CREATE_UNIT 3 "Giant Scorpion" 1 1 
"Scorpion" (user_description=_"Scorpion"
     ai_special="guardian")})}
-    {RANDOM_PLACEMENT 29 62 2 ({CREATE_UNIT 3 "Giant Scorpion" 1 1 
"Scorpion" (user_description=_"Scorpion"
-    ai_special="guardian")})}
 
 #endif
 
 #enddef
 
-        #!***Moved and turned to macro -> allows seting up without extra 
variables ***
 #define RING_PICKUP X Y
     [event]
         name=moveto
@@ -477,7 +458,6 @@
         {CLEAR_VARIABLE tempx}
         {CLEAR_VARIABLE tempy}
     [/event]
-
 #enddef
 
         #!***Check if unit is scout type***
@@ -552,7 +532,6 @@
                 [/then]
 
                 [else]
-                    #!***create a ring (immune to dehydration effect) as a 
reward
 
                     [item]
                         x=$x1
@@ -560,8 +539,6 @@
                         image=items/ring-white.png
                     [/item]
 
-                    #!***Doesn't matter who kills the scorpion, ring is 
inside the husk anyway***
-
                     [message]
                         speaker=Kaleh
                         message= _ "The scorpions were devouring some poor 
person's body. There doesn't seem to be much of him or her left, but 
wait...what's this? It looks like a tiny gold ring. I think I see elvish 
runes on the inside, but I can barely make them out. This seems to be a ring 
of travel! Those who wear it will not suffer from thirst or hunger, nor cold, 
nor heat. I've heard tales of such magical items, and we can certainly use it 
now."
@@ -582,12 +559,8 @@
         #undef RING_PICKUP
     [/event]
 
-    #!***Death event incorporated into ambush setting event***
-    #!***Ring handling event incorporated into ambush setting event***
 
     #Encounter 1.5: Second Oasis, remind player of healing properties
-    #!***Resized trigger area -> prevents nonscouting units trigger the 
event without actualy seeing the oasis***
-    #!***Message changed -> reflects change in dehydration***
     [event]
         name=moveto
 
@@ -601,18 +574,10 @@
             speaker=unit
             message= _ "Look, an oasis! Its refreshing water will allow our 
people to regain strength and rest safely on the grass during the heat of the 
day."
         [/message]
-
-        #!***Scraped allow_undo -> if it's negated then get rid of it
-        # usually player sets off scorpion encounter at the same time, so 
this
-        # undo is negated
     [/event]
 
-    #Encounter #2 Ogre Ambush
-    #!***Rewriten -> to reflect new ambush logic***
-    #!***Outcome changed -> to random placement on fixed area***
-    #!***Added reward -> to encourage playing along***
-
-    #!***Outer trigger area 16-30,46-60***
+
+    #Encounter 2 Ogre Ambush
     [event]
         name=moveto
 
@@ -622,10 +587,7 @@
             side=1
         [/filter]
 
-        #!***Created -> Ogre placement as macro***
 #define OGRE_PLACEMENT
-
-    #Easy: 1 ogre, 4 young ogres
 
     {RANDOM_PLACEMENT 17 49 2 ({CREATE_UNIT 3 "Ogre" 1 1 "Hunting Ogre" 
(user_description=_"Hunting Ogre"
       role="Hunting Ogre"
@@ -652,10 +614,7 @@
       ai_special="guardian")})}
 
 #endif
-
 #ifdef NORMAL
-
-    #Medium: 2 ogres, 3 young ogres
 
     {RANDOM_PLACEMENT 17 49 2 ({CREATE_UNIT 3 "Ogre" 1 1 "Hunting Ogre" 
(user_description=_"Hunting Ogre"
       role="Hunting Ogre"
@@ -663,9 +622,6 @@
       ai_special="guardian")})}
 
 #endif
-
-    #Hard: 3 Ogres: 3 young ogres
-
 #ifdef HARD
 
     {RANDOM_PLACEMENT 17 49 2 ({CREATE_UNIT 3 "Ogre" 1 1 "Hunting Ogre" 
(user_description=_"Hunting Ogre"
@@ -694,7 +650,7 @@
                 [/message]
                 [message]
                     speaker=unit
-                    message=_ "We would have to cover extra distance in 
difficult terrain. If you want to bypas them I suggest going straight north 
and hope to find third oasis."
+                    message=_ "We would have to cover extra distance in 
difficult terrain. If you want to bypas them I suggest going straight north 
in the hopes of finding an oasis there."
                 [/message]
 
                 {OGRE_PLACEMENT}
@@ -717,8 +673,6 @@
 
             [else]
                 [event]
-                    #!***Inner trigger area 16-41***
-
                     name=moveto
 
                     [filter]
@@ -749,7 +703,6 @@
 
         {SETUP_ENEMY_THIRST 3}
 
-        #!***Created -> Set ogre die event
         [event]
             name=die
             first_time_only=no
@@ -765,7 +718,6 @@
                 [/not]
 
                 [then]
-                    #!***Modified -> Nothing to raid in the desert***
                     [message]
                         speaker=Kaleh
                         message= _ "That's the last of them. This looks like 
a hunting party, they must have a camp around here somewhere."
@@ -868,7 +820,7 @@
 
                     [message]
                         description=Zhul
-                        message=_"No buts, girl, I told you not to open it. 
Let's go; I'd really like to get to an oasis soon."
+                        message=_"Girl, I told you not to open it. Let's go; 
I'd really like to get to an oasis soon."
                     [/message]
                 [/then]
             [/if]
@@ -877,28 +829,9 @@
         #undef OGRE_PLACEMENT
     [/event]
 
-    #!***Scraped tripping ogre encounter -> Rewritwen as above***
-    #!***Scraped ogre placement event -> Rewriten as macro***
-    #!***Scraped $number_ogres -> Can be checked by have_unit***
-
-    #Encounter #3: Black Hand Ambush
-    #!***Rewritten -> changed from ambush to patrol arrival at first dusk***
-
+    #Encounter 3: Black Hand Ambush
     [event]
         name=turn 5
-
-        #x coor: 1 to 12-14
-        #y coor: 40-42 to 46-48
-
-        #All: 1 trapper, 2 thugs, 2 poachers
-        #Easy: +1 thug, +1 poacher
-        #Medium: +1 bandit, +1 thug, +1 poacher
-        #Hard: +1 trapper, +2 bandits
-
-        #totals:
-        #Easy: 1 trapper, 3 thugs, 3 poachers
-        #Medium: 1 trapper, 1 bandit, 3 thugs, 3 poachers
-        #Hard: 2 trappers, 2 bandits, 2 thugs, 2 poachers
 
         {RANDOM_PLACEMENT 6 43 3 ({CREATE_UNIT 2 "Trapper" 1 1 "Black 
Lieutenant" (user_description=_"Black Lieutenant"
           role="Black Lieutenant"
@@ -1018,9 +951,9 @@
                       [/then]
                     [/if]
                 [/event]
-                # events that spark off Bandit mobility
-                # a fight between one of the bandits
-                # and a player unit
+                # events that spark off Bandit mobility:
+                # - a fight between one of the bandits
+                # - and a player unit dying
                 [event]
                   name=attack
                   [filter]
@@ -1106,17 +1039,9 @@
         [/if]
     [/event]
 
-    #Encounter #4 Undead Fire Mage combat
+
+    #Encounter 4 Undead Fire Mage combat
     #y coor: 1 to (35-39)
-
-    #Easy: 2 Skeletons, 1 Revenant, 2 Skeleton Archers, 1 Bone Shooter
-    #Medium: 1 Skeletons, 2 Revenants, 1 Skeleton Archers, 2 Bone Shooters
-    #Hard: 1 Skeleton, 1 Revenant, 1 Draug, 1 Skeleton Archer, 2 Bone 
Shooters
-
-    #All: 1 Skeleton, 1 Skeleton Archer, 1 Revenant, 1 Bone Shooter
-    #Easy: +1 Skeleton, +1 Skeleton Archer,
-    #Medium: +1 Revenant, +1 Skeleton Archer
-    #Hard: +1 Revenant, +1 Bone Shooters
 
     #Encounter happens right after player moves to the location
 
@@ -1129,16 +1054,12 @@
             side=1
         [/filter]
 
-        #!***Undead will be created form 3 to 7 hexes up and right from the 
unit***
-        #!***Elyssa will be placed 4 hexes up and 2 left***
-
         {VARIABLE x_coord $x1}
         {VARIABLE y_coord $y1}
 
         {ADD x_coord -2}
         {ADD y_coord -4}
 
-        #Create Red Mage
         [unit]
             # Elyssa used to have her own unit type.  This was
             # unnecessary except as a hook to hang her portrait on.
@@ -1166,9 +1087,6 @@
         {ADD x_coord 7}
         {ADD y_coord -1}
 
-        #all difficulties: create 1 skeleton, 1 revenant (Go'hag),
-        # 1 skele archer and 1 bone shooter
-
         {RANDOM_PLACEMENT $x_coord $y_coord 3 ({CREATE_UNIT 4 "Skeleton" 1 1 
"Undead Raider" (user_description=_"Undead Raider"
         role="ElyssaUndead")})}
         {RANDOM_PLACEMENT $x_coord $y_coord 3 ({CREATE_UNIT 4 "Revenant" 1 1 
"Go'hag" (user_description=_"Go'hag"
@@ -1178,7 +1096,6 @@
         {RANDOM_PLACEMENT $x_coord $y_coord 3 ({CREATE_UNIT 4 "Bone Shooter" 
1 1 "Undead Raider" (user_description=_"Undead Raider"
         role="ElyssaUndead")})}
 
-        #EASY: create 1 Skeleton, 1 Skeleton Archer
 #ifdef EASY
 
         {RANDOM_PLACEMENT $x_coord $y_coord 3 ({CREATE_UNIT 4 "Skeleton" 1 1 
"Undead Raider" (user_description=_"Undead Raider"
@@ -1187,9 +1104,6 @@
         role="ElyssaUndead")})}
 
 #endif
-
-        #NORMAL: +1 Revenant, +1 Skeleton Archer
-
 #ifdef NORMAL
 
         {RANDOM_PLACEMENT $x_coord $y_coord 3 ({CREATE_UNIT 4 "Revenant" 1 1 
"Undead Raider" (user_description=_"Undead Raider"
@@ -1198,8 +1112,6 @@
         role="ElyssaUndead")})}
 
 #endif
-
-        #HARD: create 1 Revenant, and 1 Bone Shooter
 #ifdef HARD
 
         {RANDOM_PLACEMENT $x_coord $y_coord 3 ({CREATE_UNIT 4 "Revenant" 1 1 
"Undead Raider" (user_description=_"Undead Raider"
@@ -1313,16 +1225,9 @@
         [/event]
     [/event]
 
-    #!***Scraped -> Macro no longer needed as conversation used in one place 
only***
-    #!***Merged, Incorporated -> Moved die event into Elyssa encounter to be 
set when needed only***
-
-    #Encounter #5 Castle/Orge Camp
-    #x coor: 25-27 to 40
-    #y coor: 22-23 to 31-33
+
+    #Encounter 5 Castle/Ogre Camp
     #Encounter happens right after player moves near castle
-
-    #ogrecastle_appeared
-    #wraithcastle_appreared
 
     [event]
         name=moveto
@@ -1382,7 +1287,6 @@
                     [/ai]
                 [/modify_side]
 
-                #create wraith and 2 ghosts
                 [unit]
                     type=Wraith
                     description=Vengeful Lord
@@ -1394,7 +1298,6 @@
                     role=wraith
                 [/unit]
 
-                #extra ghosts only on med and hard
                 {CREATE_UNIT 4 "Ghost" 33 25 "Honor Guard" 
(user_description=_"Honor Guard"
                 role=Wraith)}
                 {CREATE_UNIT 4 "Ghost" 35 25 "Honor Guard" 
(user_description=_"Honor Guard"
@@ -1462,15 +1365,6 @@
 
             #!***Do ogre event***
             [else]
-                #x coor: 25-27 to 40
-                #y coor: 22-23 to 31-33
-
-                #create ogres
-                #Easy: 1 ogre, 3 young ogres
-                #Medium: 2 ogres, 2 young ogres
-                #Hard: 3 ogres, 1 young ogre
-
-                #in all 3 difficulties, there are at least 1 ogre and 1 
young ogre
 
                 {RANDOM_PLACEMENT 34 27 3 ({CREATE_UNIT 3 "Ogre" 1 1 "Ogre 
Nomad" (user_description=_"Ogre Nomad"
                   random_traits="no")})}
@@ -1556,17 +1450,11 @@
         {CLEAR_VARIABLE turn_temp}
     [/event]
 
-    #!***Incorporated -> Set when needed only***
-
-    # Encounter #5 Wraith appears
-
-    #!***Incorporated, Altered -> made to exclude with second ogre ambush***
 
     #Encounter #6 Outlaw Sign
     #y coor: 1 to (20-21)
     #Sign appears as soon as player moves to the location
     #Outlaw leader is given money and units
-
     [event]
         name=moveto
 
@@ -1688,9 +1576,9 @@
         [/capture_village]
     [/event]
 
-    #Encounter #7 Mirage
+
+    #Encounter 7 Mirage
     #Oasis disappears as soon as player moves to the location
-
     [event]
         name=moveto
 
@@ -1715,10 +1603,9 @@
         [/message]
     [/event]
 
+
     # Encounter 7.5 Pinnacle Rock
     # first unit to see the rock comments on the outlaws there
-    # this event can be undone
-
     [event]
         name=moveto
 
@@ -1737,12 +1624,12 @@
         [/message]
     [/event]
 
+
     #Encounter 8: Death of outlaw leader
 
     # Holy Water item event
     # If unit moves to hex after outlaw leader it dead, it gets the holy 
water
 
-    #!***Macroised -> Allows setting up directly without need of extra 
variables
 #define HOLY_WATER X Y
     [event]
         name=moveto
@@ -1774,8 +1661,6 @@
 
 #enddef
 
-    #changed so player gets holy water in easy and medium difficulty
-
     [event]
         name=die
 
@@ -1840,6 +1725,7 @@
 
         #undef HOLY_WATER
     [/event]
+
 
     #if Kaleh moves to north edge of map but outlaw leader isn't defeated
     #then this warns the player that he must go back and kill outlaw leader
@@ -1883,7 +1769,6 @@
         [/if]
     [/event]
 
-    #victory if Kaleh moves to north of map and outlaw is defeated
 
 # macro for all hydration effects to all units stored in
 # a variable called "affected_unit"




Related Messages


Powered by MHonArc, Updated Mon Sep 17 19:20:37 2007