Changeset 557

Timestamp:

09/14/07 15:05:42 (1 year ago)

Author:

takkaria

Message:

Remove autoscum. (closes #365)

Files:

• trunk/src/generate.c (modified) (2 diffs)
• trunk/src/load.c (modified) (2 diffs)
• trunk/src/option.c (modified) (3 diffs)
• trunk/src/option.h (modified) (4 diffs)

trunk/src/generate.c

@@ -6 +6 @@
- * Includes rooms of every kind, pits, vaults (inc. interpretation of 
- * vault.txt), streamers, tunnelling, etc.  Level feelings and other 
-, autoscummer behavior
+
- *
- * Copyright (c) 1997-2001 Ben Harrison, James E. Wilson, Robert A. Koeneke
@@ -5165 +5165 @@
-                }
-
-                /* Mega-Hack -- "auto-scum" */
-                if (adult_autoscum && (num < 100))
-                {
-                        /* Require "goodness" */
-                        if ((feeling > 9) ||
-                            ((p_ptr->depth >= 5) && (feeling > 8)) ||
-                            ((p_ptr->depth >= 10) && (feeling > 7)) ||
-                            ((p_ptr->depth >= 20) && (feeling > 6)) ||
-                            ((p_ptr->depth >= 40) && (feeling > 5)))
-                        {
-                                /* Give message to cheaters */
-                                if (cheat_room || cheat_hear ||
-                                    cheat_peek || cheat_xtra)
-                                {
-                                        /* Message */
-                                        why = "boring level";
-                                }
-
-                                /* Try again */
-                                okay = FALSE;
-                        }
-                }
-
-                /* Message */
-                if ((cheat_room) && (why)) 

trunk/src/load.c

@@ -929 +929 @@
-                 * 0    xxx                     maximise
-                 * 1    xxx                     randarts
-autoscum
+xxx
-                 * 3    preserve        ironman
-                 * 4    ironman         no_stores
@@ -956 +956 @@
-
-                birth_no_stairs = adult_no_stairs = !OLD_OPT(41);
-                birth_autoscum = adult_autoscum = OLD_OPT(33);
-                birth_ai_sound = adult_ai_sound = OLD_OPT(42);
-                birth_ai_smell = adult_ai_smell = OLD_OPT(43);

trunk/src/option.c

@@ -85 +85 @@
-                OPT_birth_maximize,
-                OPT_birth_randarts,
-                OPT_birth_autoscum,
-                OPT_birth_ironman,
-                OPT_birth_no_stores,
@@ -260 +259 @@
-{ "birth_maximize",      "Maximize effect of race/class bonuses",       TRUE },  /* 128 */
-{ "birth_randarts",      "Randomize some of the artifacts (alpha)",     FALSE }, /* 129 */
-"birth_autoscum",      "Auto-scum for good levels",
+NULL,                  NULL,                       
-{ "birth_ironman",       "Restrict the use of stairs/recall",           FALSE }, /* 131 */
-{ "birth_no_stores",     "Restrict the use of stores/home",             FALSE }, /* 132 */
@@ -324 +323 @@
-{ "adult_maximize",      "Adult: Maximize effect of race/class bonuses",  TRUE },  /* 192 */
-{ "adult_randarts",      "Adult: Randomize some of the artifacts (beta)", FALSE }, /* 193 */
-"adult_autoscum",      "Adult: Auto-scum for good levels",
+NULL,                  NULL,                              
-{ "adult_ironman",       "Adult: Restrict the use of stairs/recall",    FALSE }, /* 195 */
-{ "adult_no_stores",     "Adult: Restrict the use of stores/home",      FALSE }, /* 196 */

trunk/src/option.h

@@ -86 +86 @@
-#define OPT_birth_maximize          (OPT_BIRTH+0)
-#define OPT_birth_randarts          (OPT_BIRTH+1)
-#define OPT_birth_autoscum          (OPT_BIRTH+2)
-#define OPT_birth_ironman           (OPT_BIRTH+3)
-#define OPT_birth_no_stores         (OPT_BIRTH+4)
@@ -110 +109 @@
-#define OPT_adult_maximize          (OPT_ADULT+0)
-#define OPT_adult_randarts          (OPT_ADULT+1)
-#define OPT_adult_autoscum          (OPT_ADULT+2)
-#define OPT_adult_ironman           (OPT_ADULT+3)
-#define OPT_adult_no_stores         (OPT_ADULT+4)
@@ -177 +175 @@
-#define birth_maximize                  OPT(birth_maximize)
-#define birth_randarts                  OPT(birth_randarts)
-#define birth_autoscum                  OPT(birth_autoscum)
-#define birth_ironman                   OPT(birth_ironman)
-#define birth_no_stores                 OPT(birth_no_stores)
@@ -200 +197 @@
-#define adult_maximize                  OPT(adult_maximize)
-#define adult_randarts                  OPT(adult_randarts)
-#define adult_autoscum                  OPT(adult_autoscum)
-#define adult_ironman                   OPT(adult_ironman)
-#define adult_no_stores                 OPT(adult_no_stores)