From b0eb19b7a0750759d429c78845888e88de517352 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 23 Feb 2015 09:12:00 +0100 Subject: Remove smart_cheat option Behave as if always FALSE. --- lib/help/option.txt | 5 ----- lib/mods/theme/help/option.txt | 5 ----- lib/mods/theme/user/all.prf | 3 --- src/externs.h | 1 - src/files.cc | 1 - src/melee2.cc | 48 ++---------------------------------------- src/tables.cc | 3 --- src/variable.cc | 1 - 8 files changed, 2 insertions(+), 65 deletions(-) diff --git a/lib/help/option.txt b/lib/help/option.txt index b96e6dc3..c34f7c22 100644 --- a/lib/help/option.txt +++ b/lib/help/option.txt @@ -289,11 +289,6 @@ off at will during the course of the game. Allow monsters to learn what spell attacks you are resistant to, and to use this information to choose the best attacks. -#####GMonsters exploit players weaknesses [smart_cheat] - Allow monsters to know what spell attacks you are resistant to, without - first having to observe such an attack upon you, and to use this - information to choose the best attacks. - #####GAllow unusually small dungeon levels [small_levels] This option enables the creation of levels of varying sizes. Levels that are as small as one "screen" (80x24) are possible, and they can be diff --git a/lib/mods/theme/help/option.txt b/lib/mods/theme/help/option.txt index eebc8c9f..e046aded 100644 --- a/lib/mods/theme/help/option.txt +++ b/lib/mods/theme/help/option.txt @@ -289,11 +289,6 @@ off at will during the course of the game. Allow monsters to learn what spell attacks you are resistant to, and to use this information to choose the best attacks. -#####GMonsters exploit players weaknesses [smart_cheat] - Allow monsters to know what spell attacks you are resistant to, without - first having to observe such an attack upon you, and to use this - information to choose the best attacks. - #####GAllow unusually small dungeon levels [small_levels] This option enables the creation of levels of varying sizes. Levels that are as small as one "screen" (80x24) are possible, and they can be diff --git a/lib/mods/theme/user/all.prf b/lib/mods/theme/user/all.prf index 778c4ce4..67671aa4 100644 --- a/lib/mods/theme/user/all.prf +++ b/lib/mods/theme/user/all.prf @@ -122,9 +122,6 @@ X:flow_by_sound # Option 'Monsters learn from their mistakes' X:smart_learn -# Option 'Monsters exploit players weaknesses' -X:smart_cheat - # Option 'Allow unusually small dungeon levels' Y:small_levels diff --git a/src/externs.h b/src/externs.h index 10cadf91..3a44201f 100644 --- a/src/externs.h +++ b/src/externs.h @@ -216,7 +216,6 @@ extern bool_ expand_list; extern bool_ dungeon_align; extern bool_ dungeon_stair; extern bool_ smart_learn; -extern bool_ smart_cheat; extern bool_ testing_stack; extern bool_ testing_carry; extern bool_ cheat_peek; diff --git a/src/files.cc b/src/files.cc index a805cea6..d89e9e18 100644 --- a/src/files.cc +++ b/src/files.cc @@ -4314,7 +4314,6 @@ long total_points(void) if (small_levels) mult += ((always_small_level) ? 4 : 10); if (empty_levels) mult += 2; if (smart_learn) mult += 4; - if (smart_cheat) mult += 4; if (mult < 2) mult = 2; /* At least 10% of the original score */ /* mult is now between 2 and 40, i.e. 10% and 200% */ diff --git a/src/melee2.cc b/src/melee2.cc index 7032e511..6832eb39 100644 --- a/src/melee2.cc +++ b/src/melee2.cc @@ -261,10 +261,7 @@ void mon_handle_fear(monster_type *m_ptr, int dam, bool_ *fear) * * This has the added advantage that attacks and spells are related. * The "smart_learn" option means that the monster "learns" the flags -* that should be set, and "smart_cheat" means that he "knows" them. -* So "smart_cheat" means that the "smart" field is always up to date, -* while "smart_learn" means that the "smart" field is slowly learned. -* Both of them have the same effect on the "choose spell" routine. +* that should be set. */ @@ -303,7 +300,7 @@ static void remove_bad_spells(int m_idx, u32b *f4p, u32b *f5p, u32b *f6p) /* Must be cheating or learning */ - if (!smart_cheat && !smart_learn) return; + if (!smart_learn) return; /* Update acquired knowledge */ @@ -317,47 +314,6 @@ static void remove_bad_spells(int m_idx, u32b *f4p, u32b *f5p, u32b *f6p) } - /* Cheat if requested */ - if (smart_cheat) - { - /* Know basic info */ - if (p_ptr->resist_acid) smart |= (SM_RES_ACID); - if (p_ptr->oppose_acid) smart |= (SM_OPP_ACID); - if (p_ptr->immune_acid) smart |= (SM_IMM_ACID); - if (p_ptr->resist_elec) smart |= (SM_RES_ELEC); - if (p_ptr->oppose_elec) smart |= (SM_OPP_ELEC); - if (p_ptr->immune_elec) smart |= (SM_IMM_ELEC); - if (p_ptr->resist_fire) smart |= (SM_RES_FIRE); - if (p_ptr->oppose_fire) smart |= (SM_OPP_FIRE); - if (p_ptr->immune_fire) smart |= (SM_IMM_FIRE); - if (p_ptr->resist_cold) smart |= (SM_RES_COLD); - if (p_ptr->oppose_cold) smart |= (SM_OPP_COLD); - if (p_ptr->immune_cold) smart |= (SM_IMM_COLD); - - /* Know poison info */ - if (p_ptr->resist_pois) smart |= (SM_RES_POIS); - if (p_ptr->oppose_pois) smart |= (SM_OPP_POIS); - - /* Know special resistances */ - if (p_ptr->resist_neth) smart |= (SM_RES_NETH); - if (p_ptr->resist_lite) smart |= (SM_RES_LITE); - if (p_ptr->resist_dark) smart |= (SM_RES_DARK); - if (p_ptr->resist_fear) smart |= (SM_RES_FEAR); - if (p_ptr->resist_conf) smart |= (SM_RES_CONF); - if (p_ptr->resist_chaos) smart |= (SM_RES_CHAOS); - if (p_ptr->resist_disen) smart |= (SM_RES_DISEN); - if (p_ptr->resist_blind) smart |= (SM_RES_BLIND); - if (p_ptr->resist_nexus) smart |= (SM_RES_NEXUS); - if (p_ptr->resist_sound) smart |= (SM_RES_SOUND); - if (p_ptr->resist_shard) smart |= (SM_RES_SHARD); - if (p_ptr->reflect) smart |= (SM_IMM_REFLECT); - - /* Know bizarre "resistances" */ - if (p_ptr->free_act) smart |= (SM_IMM_FREE); - if (!p_ptr->msp) smart |= (SM_IMM_MANA); - } - - /* Nothing known */ if (!smart) return; diff --git a/src/tables.cc b/src/tables.cc index 2228f813..16abe9b1 100644 --- a/src/tables.cc +++ b/src/tables.cc @@ -1475,9 +1475,6 @@ option_type option_info[] = { &smart_learn, FALSE, 3, 14, "smart_learn", "Monsters learn from their mistakes" }, - { &smart_cheat, FALSE, 3, 15, - "smart_cheat", "Monsters exploit players weaknesses" }, - { &small_levels, TRUE, 3, 17, "small_levels", "Allow unusually small dungeon levels" }, diff --git a/src/variable.cc b/src/variable.cc index ab941525..f5fdefe0 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -221,7 +221,6 @@ bool_ dungeon_stair; /* Generate dungeons with connected stairs */ bool_ flow_by_sound; /* Monsters track new player location */ bool_ smart_learn; /* Monsters learn from their mistakes */ -bool_ smart_cheat; /* Monsters exploit player weaknesses */ /* Option Set 4 -- Efficiency */ -- cgit v1.2.3