UtBS: Increase difficulty of scenarios 1 and 3

Slightly fewer units in scenario 1 on hard Deep One has more hp/attacks depending on difficulty Less income available to player on hard in scenarios 1 and 2 to decrease gold available in scenario 3 Added a define to make it easier to make Garak killable in scenario 3
wesnoth · Jun 2, 2014 · 44c993e · 44c993e
1 parent a5974b3
commit 44c993e
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 15 deletions.
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
@@ -5,7 +5,7 @@
     name= _ "The Morning After"
     {UTBS_MAP 01_The_Morning_After.map}
     next_scenario=02_Across_the_Harsh_Sands
-    {TURNS 34 32 30}
+    {TURNS 34 32 29}
 
     # Since the scenario can't end until all the elves are rescued we
     # can't allow it to end with the death of the necromancer
@@ -110,6 +110,14 @@
     # set starting variables
     [event]
         name=prestart
+#ifdef HARD
+        # Remove one village on HARD
+        [terrain]
+            x,y=53,3
+            terrain=Dd
+        [/terrain]
+#endif
+
         # set starting scenario objectives
         [objectives]
             summary= _ "Starting Objectives:"
@@ -129,10 +137,9 @@
                 description= _ "Death of Garak"
                 condition=lose
                 [show_if]
-                    # Yes, we realize we could just use [have_unit] for this and Zhul's, but if Garak
-                    # or Zhul dies and if the player checks the objectives, the respective objective
-                    # won't be displayed, and disappearing objectives for no good reason would look
-                    # buggy.
+                    # We could just use [have_unit], but if Garak or Zhul dies and the player
+                    # checks the objectives, the respective objective won't be displayed,
+                    # and disappearing objectives for no good reason would look buggy.
                     [variable]
                         name=found_garak
                         boolean_equals=yes
@@ -170,7 +177,7 @@
         # Can't end scenario until all elves have been rescued (5 events)
 
         # setting up the village occupants
-        # 2 fighters, 2 archers, 2 hunters, 2 scouts
+        # 2 fighters, 2 archers, 2 hunters (if not HARD), 2 scouts
         [set_variables]
             name=elf_pool
             [value]
@@ -193,6 +200,7 @@
                 name=_"Danu"
                 gender=male
             [/value]
+#ifndef HARD
             [value]
                 type="Desert Hunter"
                 name=_"Hamuil"
@@ -203,6 +211,7 @@
                 name=_"Anioh"
                 gender=male
             [/value]
+#endif
             [value]
                 type="Desert Scout"
                 name=_"Vemuil"
@@ -420,7 +429,11 @@
         [+unit]
             gender=female
         [/unit]
+#ifdef HARD
+        {NAMED_GENERIC_UNIT 1 "Desert Fighter" 21 35 "Raynor" ( _ "Raynor")}
+#else
         {NAMED_GENERIC_UNIT 1 "Desert Hunter" 21 35 "Raynor" ( _ "Raynor")}
+#endif
 
         {NOTRAIT_UNIT 2 "Giant Mudcrawler" 25 34}
         {NOTRAIT_UNIT 2 "Small Mudcrawler" 21 36}
@@ -657,7 +670,9 @@
                 x=31
                 y=27
             [/unit]
+#ifndef HARD
             {NAMED_GENERIC_UNIT 1 "Desert Shaman" 30 27 "Ryoko" ( _ "Ryoko")}
+#endif
             {NAMED_GENERIC_UNIT 1 "Desert Shaman" 32 27 "Yuni" ( _ "Yuni")}
             [message]
                 speaker=Zhul
@@ -685,7 +700,7 @@
             [show_objectives]
             [/show_objectives]
 
-            #Lake monster event
+            # Lake monster event
 
             [event]
                 name=moveto
@@ -700,19 +715,18 @@
                     name=_"Deep One"
                     description= _ "The Deep Ones are gigantic aquatic monsters that lurk in the dark places of the world. Rarely do they come to the surface, and when they do the best way to survive an encounter with these monsters is to remain ashore. They can grab their opponents with strong tentacles, or spit a poisonous black ink from a distance."
                     # Deep one is basicaly a weakened Cuttlefish, it
-                    # would be pretty much unbeatable if left without
-                    # change
+                    # would be pretty much unbeatable if left without change
                     [modifications]
                         [trait]
                             id=Deep_one
                             [effect]
                                 apply_to=attack
                                 range=melee
-                                increase_attacks=-4
+                                increase_attacks={ON_DIFFICULTY -4 -3 -2}
                             [/effect]
                             [effect]
                                 apply_to=hitpoints
-                                increase_total=-27
+                                increase_total={ON_DIFFICULTY -30 -27 -20}
                             [/effect]
 #ifndef HARD
                             [effect]
@@ -1210,9 +1224,13 @@
             y=1-6
         [/remove_shroud]
         {NAMED_GENERIC_UNIT 1 "Desert Hunter" 29 2 "Pythos" ( _ "Pythos")}
+#ifndef HARD
         {NAMED_GENERIC_UNIT 1 "Desert Fighter" 28 2 "Shea" ( _ "Shea")}
+#endif
         {NAMED_GENERIC_UNIT 1 "Desert Fighter" 29 1 "Narn" ( _ "Narn")}
+#ifndef HARD
         {NAMED_GENERIC_UNIT 1 "Desert Scout" 27 2 "Jokli" ( _ "Jokli")}
+#endif
         {NAMED_GENERIC_UNIT 1 "Desert Archer" 28 1 "Lyia" ( _ "Lyia")}
         [+unit]
             gender=female
@@ -1361,5 +1379,8 @@
     {UTBS_INCLUDE utils/kaleh-abilities.cfg}
 
     # Common death events for heroes
+#define UTBS_GARAK_MUST_LIVE
+#enddef
     {UTBS_INCLUDE utils/deaths.cfg}
+#undef UTBS_GARAK_MUST_LIVE
 [/scenario]
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
@@ -5,7 +5,7 @@
     name= _ "Across the Harsh Sands"
     {UTBS_MAP 02_Across_the_Harsh_Sands.map}
     next_scenario=03_Stirring_in_the_Night
-    {TURNS 62 60 59}
+    {TURNS 62 60 58}
     victory_when_enemies_defeated=no
 
     {TWO_SUNS_DEFAULT_SCHEDULE}
@@ -25,7 +25,7 @@
         type=Desert Fighter
         canrecruit=yes
         gold=200
-        {INCOME 17 14 12}
+        {INCOME 17 14 11}
         controller=human
         recruit=Desert Fighter, Desert Archer, Desert Hunter, Desert Shaman, Desert Scout
         shroud=yes
@@ -2077,5 +2077,8 @@
     [/event]
 
     {UTBS_INCLUDE utils/kaleh-abilities.cfg}
+#define UTBS_GARAK_MUST_LIVE
+#enddef
     {UTBS_INCLUDE utils/deaths.cfg}
+#undef UTBS_GARAK_MUST_LIVE
 [/scenario]
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
@@ -52,7 +52,7 @@
         {GOLD 125 150 175}
         {INCOME 15 18 21}
 #ifdef HARD
-        recruit=Deathblade,Revenant,Bone Shooter,Chocobone,Skeleton Rider
+        recruit=Deathblade,Revenant,Bone Shooter,Skeleton Rider
 #else
         recruit=Skeleton,Skeleton Archer,Skeleton Rider
 #endif
@@ -2157,5 +2157,8 @@
     [/event]
 
     {UTBS_INCLUDE utils/kaleh-abilities.cfg}
+#define UTBS_GARAK_MUST_LIVE
+#enddef
     {UTBS_INCLUDE utils/deaths.cfg}
+#undef UTBS_GARAK_MUST_LIVE
 [/scenario]
diff --git a/data/campaigns/Under_the_Burning_Suns/utils/deaths.cfg b/data/campaigns/Under_the_Burning_Suns/utils/deaths.cfg
@@ -66,7 +66,7 @@
 #endif
 [/event]
 
-#ifndef UTBS_IN_FINAL_FIGHT
+#ifdef UTBS_GARAK_MUST_LIVE
 [event]
     name=last breath