Author: fendrin
Date: Wed Nov 26 23:50:20 2008
New Revision: 31108

URL: http://svn.gna.org/viewcvs/wesnoth?rev=31108&view=rev
Log:
removed a conditional that outcome would require extra speech

Modified:
    trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg

Modified: 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg?rev=31108&r1=31107&r2=31108&view=diff
==============================================================================
--- 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg 
(original)
+++ 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg 
Wed Nov 26 23:50:20 2008
@@ -52,7 +52,6 @@
         type=Orcish Warlord
         id=Urug-Tar
         name=_ "Urug-Tar"
-
         side=3
         canrecruit=yes
         {GOLD 150 230 270}
@@ -61,11 +60,9 @@
 #ifdef EASY
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, 
Orcish Crossbowman, Goblin Pillager, Goblin Knight
 #endif
-
 #ifdef NORMAL
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, 
Orcish Crossbowman, Goblin Knight, Orcish Slayer
 #endif
-
 #ifdef HARD
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, 
Orcish Crossbowman, Orcish Warrior, Goblin Knight, Goblin Pillager, Orcish 
Slayer
 #endif
@@ -93,11 +90,9 @@
 #ifdef EASY
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, 
Orcish Crossbowman, Goblin Pillager, Goblin Knight
 #endif
-
 #ifdef NORMAL
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, 
Orcish Crossbowman, Goblin Knight, Orcish Slayer
 #endif
-
 #ifdef HARD
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, 
Orcish Crossbowman, Orcish Warrior, Goblin Knight, Goblin Pillager, Orcish 
Slayer
 #endif
@@ -112,18 +107,14 @@
         type=Troll Warrior
         id=Traur
         name=_ "Traur"
-
         side=5
         canrecruit=yes
-
 #ifdef EASY
         recruit=Troll Whelp
 #endif
-
 #ifdef NORMAL
         recruit=Troll Whelp, Troll
 #endif
-
 #ifdef HARD
         recruit=Troll Whelp, Troll, Troll Warrior
 #endif
@@ -229,12 +220,10 @@
             id=Kalenz
             message= _ "We must put aside our differences and ally against the 
orcish menace. Olurf, join us!"
         [/message]
-
         [message]
             id=Olurf
             message= _ "Dwarves, ally with elves? I owe ye a debt, but my kin 
willna' be happy at the thought."
         [/message]
-
         [message]
             id=Kalenz
             message= _ "There will be a big fight with the orcs in Wesmere 
very soon. If you can cover our flank to the north, I will pay you 400 gold."
@@ -243,7 +232,6 @@
             id=Olurf
             message= _ "A proper contract for good money? That's a different 
matter; I'm sure I can find some o' my people willing to fight on those terms!"
         [/message]
-
         [message]
             id=Landar
             message= _ "What? Kalenz, are you out of your mind? Surely you 
will not throw away 400 gold on this scheming mercenary! "
@@ -252,31 +240,19 @@
             id=Olurf
             message= _ "Where there's a contract, our honor is involved. We 
will be there to cover your northern flank or else I will return your gold!"
         [/message]
-
         [message]
             id=Kalenz
             message= _ "I believe him. Dwarves are...rough...by our standards, 
but not liars. I think he knows that if he does not honor his contract, next 
time we will not be there to come to his aid."
         [/message]
 
-        # TODO santi -- in 05 kalenz recieves 1800 gold, how can it be
-        # less than 400?  Anyway, if the player hasn't enough gold,
-        # why does Olurf help him beside this? We would at least need
-        # some speech.
-[store_gold]
-        [/store_gold]
-        [if]
-            [variable]
-                name=gold
-                greater_than=400
-            [/variable]
-            [then]
-                [gold]
-                    side=1
-                    amount=-400
-                [/gold]
-            [/then]
-        [/if]
-        {CLEAR_VARIABLE gold}
+        [gold]
+            side=1
+            amount=-400
+        [/gold]
+        
+        [sound]
+            name=gold.ogg
+        [/sound]
 
         [store_unit]
             variable=olurf_store


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to