try wiggling in the remaining rejects files

see cooljeanius/wesnoth_mods#9 see https://github.com/cooljeanius/wesnoth_mods/tree/master/campaigns/Under_the_Burning_Suns/diffs
cooljeanius · Feb 17, 2024 · 5b759c2 · 5b759c2
1 parent 0b0f4d9
commit 5b759c2
Show file tree

Hide file tree

Showing 17 changed files with 60 additions and 2,295 deletions.
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 58 54}
+    {TURNS 66 60 54}
     victory_when_enemies_defeated=no
 
     {TWO_SUNS_DEFAULT_SCHEDULE}
@@ -1432,17 +1432,42 @@
             y=13-19
         [/filter]
 
+#ifdef EASY
+        [scroll_to]
+            x,y=10,14
+        [/scroll_to]
+#else
         [terrain]
             terrain=Dd
             x=10,10,11,11,11,12,12
             y=14,15,15,16,17,15,16
         [/terrain]
-
+#endif
         {CHECK_EXPLORER}
+#ifdef EASY
+        [message]
+            speaker=$explorer.id
+            message= _ "Phew, thank goodness that this oasis is here! After hearing about the bandits in this area, I was beginning to worry that they had created a mirage to trick thirsty travelers such as ourselves!"
+        [/message]
+        [message]
+            speaker=Nym
+            message= _ "I know these bandits are evil, but do you really think they'd stoop so low as to get their victims' hopes up before crushing them?"
+            image=portraits/nym_moody.png
+        [/message]
+        [message]
+            speaker=Zhul
+            message= _ "It has been known to happen before."
+        [/message]
+        [message]
+            speaker=Kaleh
+            message= _ "Truly, there are some depraved and cruel individuals in this world."
+        [/message]
+#else
         [message]
             speaker=$explorer.id
             message= _ "Dang. I was sure I saw an oasis here. Must have been a mirage. I’ve been out in the sand for too long."
         [/message]
+#endif
         {CLEAR_VARIABLE explorer}
     [/event]
 

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg.rej b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg.rej
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg
@@ -21,8 +21,8 @@
         id=Kaleh
         type=Quenoth Youth
         canrecruit=yes
-        {GOLD 250 215 180}
-        {INCOME 5 4 3}
+        {GOLD 280 230 180}
+        {INCOME 9 6 3}
         controller=human
         shroud=yes
         fog=no

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg.rej b/data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg.rej
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
@@ -15,7 +15,7 @@
     {SCENARIO_MUSIC "the_deep_path.ogg"}
 
     next_scenario=07a_Dealing_with_Dwarves
-    {TURNS 60 58 56}
+    {TURNS 68 62 56}
     victory_when_enemies_defeated=no
 
     {UNDERGROUND}
@@ -30,7 +30,7 @@
         type=Quenoth Youth
         canrecruit=yes
         {GOLD 235 190 135}
-        {INCOME 6 3 0}
+        {INCOME 8 4 0}
         controller=human
         shroud=yes
         fog=no
@@ -255,6 +255,11 @@
             value={ON_DIFFICULTY 2 4 6}
         [/set_variable]
 
+        [set_variable]
+            name=lava_damage
+            value={ON_DIFFICULTY 15 20 25}
+        [/set_variable]
+
         # create AI=guardian units. They can't move unless an enemy
         # moves nearby. I create them at the beginning because when the
         # player sees them, events will fire.
@@ -691,14 +696,18 @@
         name=rogrimir
 
         [unit]
+#ifdef EASY
+            type=Dwarvish Sentinel
+#else
             type=Dwarvish Stalwart
+#endif
             id=Rogrimir
             name= _ "Rogrimir"
             profile=portraits/dwarves/fighter-2.webp
             x=41
             y=4
             side=2
-            hitpoints=20
+            hitpoints={ON_DIFFICULTY 40 30 20}
             unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
@@ -1760,6 +1769,7 @@
         name=victory
 
         {CLEAR_VARIABLE heat_damage}
+        {CLEAR_VARIABLE lava_damage}
         {CLEAR_VARIABLE summon_flame_guardian}
         {CLEAR_VARIABLE flame_guardian_turn_counter}
     [/event]