Tweaks to the wishing spawn effects and effect on difficulty. Both in…

…crease more gradually now.
elunna · Oct 12, 2023 · 633630f · 633630f
1 parent e013f7c
commit 633630f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/allmain.c b/src/allmain.c
@@ -301,19 +301,22 @@ boolean resuming;
                      * of a harder game later.
                      */
                     monclock = MIN_MONGEN_RATE;
-
+                    /* Don't let wishes influence the fuzzer */
                     if (!iflags.debug_fuzzer) {
-                        /* Don't let wishes influence the fuzzer */
                         past_clock = moves - timeout_start;
                         if (past_clock > 0)
                             monclock = MIN_MONGEN_RATE * TURN_THRESHOLD / (past_clock + TURN_THRESHOLD);
-                        if (monclock > MIN_MONGEN_RATE / 4 && (u.uconduct.wishes >= 2L))
+                        if (monclock > MIN_MONGEN_RATE / 2 && (u.uconduct.wishes >= 2L))
+                            monclock = MIN_MONGEN_RATE / 2;
+                        if (monclock > MIN_MONGEN_RATE / 3 && (u.uconduct.wishes >= 3L))
+                            monclock = MIN_MONGEN_RATE / 3;
+                        if (monclock > MIN_MONGEN_RATE / 4 && (u.uconduct.wishes >= 4L))
                             monclock = MIN_MONGEN_RATE / 4;
-                        if (monclock > MIN_MONGEN_RATE / 6 && (u.uconduct.wishes >= 3L))
+                        if (monclock > MIN_MONGEN_RATE / 5 && (u.uconduct.wishes >= 5L))
+                            monclock = MIN_MONGEN_RATE / 5;
+                        if (monclock > MIN_MONGEN_RATE / 6 && (u.uconduct.wishes >= 6L))
                             monclock = MIN_MONGEN_RATE / 6;
-                        if (monclock > MIN_MONGEN_RATE / 8 && (u.uconduct.wishes >= 4L))
-                            monclock = MIN_MONGEN_RATE / 8;
-                        if (monclock > MIN_MONGEN_RATE / 8 && (u.uconduct.wishes >= 5L))
+                        if (u.uconduct.wishes >= 7L)
                             monclock = MAX_MONGEN_RATE;
                     }
 		            /* make sure we don't fall off the bottom */

diff --git a/src/dungeon.c b/src/dungeon.c
@@ -1683,7 +1683,7 @@ level_difficulty()
     }
     /* Wishes increase difficulty (unless fuzzing) */
     else if (u.uconduct.wishes > 1 && !iflags.debug_fuzzer) {
-        int bump = (u.uconduct.wishes - 1) * 4;
+        int bump = (u.uconduct.wishes - 1) * 2;
         res += (bump > 15) ? 15 : bump;
     }
     return (xchar) res;