Revert "Merge branch 'master' of https://github.com/nemaara/wesnoth"

This reverts commit cb3510f, reversing changes made to a18679e.
wesnoth · Oct 23, 2018 · 0d17569 · 0d17569
1 parent 873d102
commit 0d17569
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 39 deletions.
diff --git a/changelog.md b/changelog.md
@@ -48,9 +48,6 @@
  ### Miscellaneous and bug fixes
 
 ## Version 1.14.5+dev
- ### Campaigns
-   * The Hammer of Thursagan
-     * S12 'The Underlevels': redesigned with completely new map and scenario
  ### Language and i18n
    * Updated translations: Chinese (Traditional), French, Italian, Spanish.
  ### Lua API

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
@@ -51,7 +51,7 @@
     [side]
         side=2
         controller=ai
-        recruit="Necrophage,Draug,Deathblade,Banebow"
+        recruit="Wraith,Shadow,Necrophage,Revenant,Deathblade,Bone Shooter"
         gold=0 # Will change when the side is activated
         income=-2
         team_name=evil
@@ -97,7 +97,7 @@
         {RECRUITS_MASKED_DWARVES}
 
         gold=0 # Will change when the side is activated
-        {INCOME 5 9 13}
+        {INCOME 6 10 14}
         team_name=evil
         user_team_name= _ "Masked Dwarves"
         {FLAG_VARIANT knalgan}
@@ -130,7 +130,7 @@
         {RECRUITS_MASKED_DWARVES}
 
         gold=0 # Will change when the side is activated
-        {INCOME 8 12 16}
+        {INCOME 14 18 22}
         team_name=evil
         user_team_name= _ "Masked Dwarves"
         {FLAG_VARIANT knalgan}
@@ -159,7 +159,7 @@
         {RECRUITS_MASKED_DWARVES}
 
         gold=0 # Will change when the side is activated
-        {INCOME 8 12 16}
+        {INCOME 14 18 22}
         team_name=evil
         user_team_name= _ "Masked Dwarves"
         {FLAG_VARIANT knalgan}
@@ -441,12 +441,6 @@
                 name=unit.id
                 equals=Aiglondur
             [/variable]
-            [or]
-                [variable]
-                    name=unit.id
-                    equals=Angarthing
-                [/variable]            
-            [/or]
             [then]
                 [message]
                     speaker=unit
@@ -498,6 +492,12 @@
             speaker=Angarthing
             message= _ "Let us proceed onward."
         [/message]
+
+        # Activate side 3
+        [gold]
+            side=3
+            amount={ON_DIFFICULTY 100 150 200}
+        [/gold]
     [/event]
 
     [event]
@@ -513,12 +513,6 @@
                 name=unit.id
                 equals=Aiglondur
             [/variable]
-            [or]
-                [variable]
-                    name=unit.id
-                    equals=Angarthing
-                [/variable]            
-            [/or]
             [then]
                 [message]
                     speaker=unit
@@ -609,12 +603,6 @@
             speaker=second_unit
             message= _ "You could not stop us before and you won't be stopping us now!"
         [/message]
-
-        # Activate side 3
-        [gold]
-            side=3
-            amount={ON_DIFFICULTY 30 50 70}
-        [/gold]
     [/event]
 
     [event]
@@ -640,11 +628,6 @@
             speaker=Dufon
             message= _ "Fools! Even should you defeat me, the master's ritual will soon be complete and you shall all become his slaves!"
         [/message]
-
-        [gold]
-            side=3
-            amount={ON_DIFFICULTY 40 60 80}
-        [/gold]
     [/event]
 
     [event]
@@ -664,7 +647,7 @@
         # Give side 4 some gold
         [gold]
             side=4
-            amount={ON_DIFFICULTY 75 100 125}
+            amount={ON_DIFFICULTY 50 75 100}
         [/gold]
     [/event]
 
@@ -685,7 +668,7 @@
         # Give side 5 some gold
         [gold]
             side=5
-            amount={ON_DIFFICULTY 75 100 125}
+            amount={ON_DIFFICULTY 50 75 100}
         [/gold]
     [/event]
     #########################################################################################
@@ -1172,7 +1155,7 @@
         # Karrag's initial wave
         [gold]
             side=2
-            amount={ON_DIFFICULTY 130 150 170}
+            amount={ON_DIFFICULTY 100 125 150}
         [/gold]
     [/event]
 
@@ -1207,7 +1190,7 @@
 
         [message]
             speaker=Karrag
-            message= _ "Any enemy of my rule is no better than the filthiest of dirtgrubbers. You no longer belong to the true people. You will become my slaves!"
+            message= _ "Pah! Any enemy of my rule is no better than the filthiest of dirtgrubbers. You no longer belong to the true people. You will become my slaves!"
         [/message]
 
         [message]
@@ -1218,7 +1201,7 @@
         # Give Karrag more gold
         [gold]
             side=2
-            amount={ON_DIFFICULTY 120 160 200}
+            amount={ON_DIFFICULTY 100 150 200}
         [/gold]
     [/event]
 
@@ -1279,7 +1262,6 @@
 
         [endlevel]
             result=victory
-            carryover_report=no
         [/endlevel]
     [/event]
     #########################################################################################
@@ -1304,7 +1286,7 @@
 
         [message]
             speaker=Dranath
-            message= _ "Imbeciles! Once the master's dark rite is complete, I will return to slay you myself!"
+            message= _ "Argh! Imbeciles! Once the master's dark rite is complete, I will return to slay you myself!"
         [/message]
     [/event]
 
@@ -1351,7 +1333,7 @@
 
         [message]
             speaker=Aiglondur
-            message= _ "I feel as if the life is being sapped out of my body!"
+            message= _ "Argh! I feel as if the life is being sapped out of my body!"
         [/message]
 
         [message]
@@ -1383,4 +1365,4 @@
 [/scenario]
 
 #undef RECRUITS_MASKED_DWARVES
-#undef MASKED_DWARF
+#undef MASKED_DWARF