summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crawl-ref/source/abl-show.cc18
-rw-r--r--crawl-ref/source/dungeon.cc6
-rw-r--r--crawl-ref/source/enum.h16
-rw-r--r--crawl-ref/source/mutation.cc9
-rw-r--r--crawl-ref/source/output.cc3
-rw-r--r--crawl-ref/source/view.cc12
6 files changed, 13 insertions, 51 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 2e5bbab3d5..bee50eafaf 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -180,7 +180,6 @@ static const ability_def Ability_List[] =
{ ABIL_TORMENT, "Torment", 9, 0, 250, 0, ABFLAG_PAIN },
{ ABIL_RAISE_DEAD, "Raise Dead", 5, 5, 150, 0, ABFLAG_NONE },
{ ABIL_CONTROL_DEMON, "Control Demon", 4, 4, 100, 0, ABFLAG_NONE },
- { ABIL_TO_PANDEMONIUM, "Gate Yourself to Pandemonium", 7, 0, 200, 0, ABFLAG_NONE },
{ ABIL_CHANNELING, "Channeling", 1, 0, 30, 0, ABFLAG_NONE },
{ ABIL_THROW_FLAME, "Throw Flame", 1, 1, 50, 0, ABFLAG_NONE },
{ ABIL_THROW_FROST, "Throw Frost", 1, 1, 50, 0, ABFLAG_NONE },
@@ -558,10 +557,6 @@ static talent _get_talent(ability_type ability, bool check_confused)
failure = 40 - you.experience_level;
break;
- case ABIL_TO_PANDEMONIUM:
- failure = 57 - (you.experience_level * 2);
- break;
-
case ABIL_HELLFIRE:
case ABIL_RAISE_DEAD:
failure = 50 - you.experience_level;
@@ -1388,16 +1383,6 @@ static bool _do_ability(const ability_def& abil)
}
break;
- case ABIL_TO_PANDEMONIUM:
- if (you.level_type == LEVEL_PANDEMONIUM)
- {
- mpr("You're already here.");
- return (false);
- }
-
- banished(DNGN_ENTER_PANDEMONIUM, "self");
- break;
-
case ABIL_CHANNELING:
mpr("You channel some magical energy.");
inc_mp(1 + random2(5), false);
@@ -2171,9 +2156,6 @@ std::vector<talent> your_talents( bool check_confused )
if (player_mutation_level(MUT_CONTROL_DEMONS))
_add_talent(talents, ABIL_CONTROL_DEMON, check_confused );
- if (player_mutation_level(MUT_PANDEMONIUM))
- _add_talent(talents, ABIL_TO_PANDEMONIUM, check_confused );
-
if (player_mutation_level(MUT_CHANNEL_HELL))
_add_talent(talents, ABIL_CHANNELING, check_confused );
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index cfba2e8b16..e5b51ee0cf 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -730,7 +730,7 @@ static void _fixup_pandemonium_stairs()
if (grd[i][j] >= DNGN_STONE_STAIRS_UP_I
&& grd[i][j] <= DNGN_ESCAPE_HATCH_UP)
{
- if (one_chance_in( you.mutation[MUT_PANDEMONIUM] ? 5 : 50 ))
+ if (one_chance_in(50))
grd[i][j] = DNGN_EXIT_PANDEMONIUM;
else
grd[i][j] = DNGN_FLOOR;
@@ -6210,13 +6210,13 @@ static char _plan_6(int level_number)
// for demonspawn who gate themselves there. -- bwr
if ((player_in_branch(BRANCH_MAIN_DUNGEON) && level_number > 20
|| you.level_type == LEVEL_PANDEMONIUM)
- && (coinflip() || player_mutation_level(MUT_PANDEMONIUM)))
+ && coinflip())
{
grd[40][36] = DNGN_ENTER_ABYSS;
grd[41][36] = DNGN_ENTER_ABYSS;
}
- return 0;
+ return (0);
}
bool octa_room(spec_room &sr, int oblique_max,
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index c913956c1b..baa78371f7 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -33,20 +33,19 @@ enum ability_type
ABIL_TORMENT,
ABIL_RAISE_DEAD,
ABIL_CONTROL_DEMON, // 20
- ABIL_TO_PANDEMONIUM,
ABIL_CHANNELING,
ABIL_THROW_FLAME,
ABIL_THROW_FROST,
- ABIL_BOLT_OF_DRAINING, // 25
- ABIL_BREATHE_HELLFIRE,
+ ABIL_BOLT_OF_DRAINING,
+ ABIL_BREATHE_HELLFIRE, // 25
ABIL_FLY_II,
ABIL_DELAYED_FIREBALL,
ABIL_MUMMY_RESTORATION,
- ABIL_EVOKE_MAPPING, // 30
- ABIL_EVOKE_TELEPORTATION,
- ABIL_EVOKE_BLINK, // 32
- ABIL_RECHARGING,
- // 34 - 50 unused
+ ABIL_EVOKE_MAPPING,
+ ABIL_EVOKE_TELEPORTATION, // 30
+ ABIL_EVOKE_BLINK,
+ ABIL_RECHARGING, // 32
+ // 33 - 50 unused
ABIL_EVOKE_TURN_INVISIBLE = 51, // 51
ABIL_EVOKE_TURN_VISIBLE,
ABIL_EVOKE_LEVITATE,
@@ -2299,7 +2298,6 @@ enum mutation_type
MUT_CALL_TORMENT,
MUT_RAISE_DEAD,
MUT_CONTROL_DEMONS,
- MUT_PANDEMONIUM,
MUT_DEATH_STRENGTH,
MUT_CHANNEL_HELL,
MUT_DRAIN_LIFE,
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 1748f8f0aa..5a888c37a3 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -758,15 +758,6 @@ mutation_def mutation_defs[] = {
"control demons"
},
- // FIXME: unused!
- { MUT_PANDEMONIUM, 0, 1, false, false,
- {"You can travel to (but not from) Pandemonium at will.", "", ""},
- {"You feel something pulling you to a strange and terrible place.",
- "", ""},
- {"", "", ""},
-
- "pandemonium"
- },
{ MUT_DEATH_STRENGTH, 0, 1, false, false,
{"You can draw strength from death and destruction.", "", ""},
{"You feel hungry for death.", "", ""},
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 04a17159f5..88998c72c8 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -2836,9 +2836,6 @@ std::string _status_mut_abilities()
case MUT_CONTROL_DEMONS:
current = "control demons";
break;
- case MUT_PANDEMONIUM:
- current = "portal to Pandemonium";
- break;
case MUT_DEATH_STRENGTH:
current = "draw strength from death and destruction";
break;
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 0f3b4b72eb..b494f824a6 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -3905,16 +3905,10 @@ bool magic_mapping(int map_radius, int proportion, bool suppress_msg,
if (wizard_map || !get_envmap_obj(*ri))
set_envmap_obj(*ri, grd(*ri));
- // Hack to give demonspawn Pandemonium mutation the ability
- // to detect exits magically.
- if (wizard_map
- || player_mutation_level(MUT_PANDEMONIUM) > 1
- && grd(*ri) == DNGN_EXIT_PANDEMONIUM)
- {
- set_terrain_seen( *ri );
- }
+ if (wizard_map)
+ set_terrain_seen(*ri);
else
- set_terrain_mapped( *ri );
+ set_terrain_mapped(*ri);
}
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.1) at 2024-06-03 22:32:33 +0000