summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crawl-ref/source/acr.cc6
-rw-r--r--crawl-ref/source/dat/descript/spells.txt8
-rw-r--r--crawl-ref/source/debug.cc2
-rw-r--r--crawl-ref/source/decks.cc26
-rw-r--r--crawl-ref/source/enum.h4
-rw-r--r--crawl-ref/source/output.cc6
-rw-r--r--crawl-ref/source/player.cc9
-rw-r--r--crawl-ref/source/spells1.cc6
-rw-r--r--crawl-ref/source/spells4.cc16
-rw-r--r--crawl-ref/source/spells4.h2
-rw-r--r--crawl-ref/source/spl-book.cc8
-rw-r--r--crawl-ref/source/spl-cast.cc4
-rw-r--r--crawl-ref/source/spl-data.h6
13 files changed, 52 insertions, 51 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 9002173298..fa206cd8b6 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -2204,10 +2204,10 @@ static void _decrement_durations()
burden_change();
}
- if (_decrement_a_duration(DUR_FORESCRY,
- "You feel firmly rooted in the present.",
+ if (_decrement_a_duration(DUR_PHASE_SHIFT,
+ "You feel completely stable again.",
coinflip(),
- "Your vision of the future begins to falter."))
+ "Your phasing is about to run out."))
{
you.redraw_evasion = true;
}
diff --git a/crawl-ref/source/dat/descript/spells.txt b/crawl-ref/source/dat/descript/spells.txt
index 0682ac7ff9..7842839c72 100644
--- a/crawl-ref/source/dat/descript/spells.txt
+++ b/crawl-ref/source/dat/descript/spells.txt
@@ -250,10 +250,6 @@ Flight
This spell grants to the caster the ability to fly through the air.
%%%%
-Forescry
-
-This spell makes the caster aware of the immediate future; while not far enough to predict the result of a fight, it does give the caster ample time to get out of the way of a punch (reflexes allowing).
-%%%%
Fragmentation
This spell creates a concussive explosion within a large body of rock (or other hard material), to the detriment of any who happen to be standing nearby.
@@ -390,6 +386,10 @@ Petrify
This spell attempts to petrify a monster. If successful, the monster is slowed down for a while until it is temporarily turned into stone. In this state, a monster will take less damage upon being hit.
%%%%
+Phase Shift
+
+This spell causes the caster to sporadically phase in and out of the material plane, causing blows to occasionally pass through.
+%%%%
Poison Ammunition
This spell envenoms missile ammunition held by the caster.
diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index 2c2d6488fb..58d4ddc907 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -4778,7 +4778,7 @@ static const char* dur_names[NUM_DURATIONS] =
"transformation",
"death channel",
"deflect missiles",
- "forescry",
+ "phase shift",
"see invisible",
"weapon brand",
"silence",
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 588a5210d6..78d445d64a 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -1882,35 +1882,35 @@ static void _metamorphosis_card(int power, deck_rarity_type rarity)
static void _helm_card(int power, deck_rarity_type rarity)
{
const int power_level = get_power_level(power, rarity);
- bool do_forescry = false;
- bool do_stoneskin = false;
- bool do_shield = false;
+ bool do_phaseshift = false;
+ bool do_stoneskin = false;
+ bool do_shield = false;
int num_resists = 0;
// Chances are cumulative.
if (power_level >= 2)
{
- if (coinflip()) do_forescry = true;
- if (coinflip()) do_stoneskin = true;
- if (coinflip()) do_shield = true;
+ if (coinflip()) do_phaseshift = true;
+ if (coinflip()) do_stoneskin = true;
+ if (coinflip()) do_shield = true;
num_resists = random2(4);
}
if (power_level >= 1)
{
- if (coinflip()) do_forescry = true;
- if (coinflip()) do_stoneskin = true;
- if (coinflip()) do_shield = true;
+ if (coinflip()) do_phaseshift = true;
+ if (coinflip()) do_stoneskin = true;
+ if (coinflip()) do_shield = true;
}
if (power_level >= 0)
{
if (coinflip())
- do_forescry = true;
+ do_phaseshift = true;
else
- do_stoneskin = true;
+ do_stoneskin = true;
}
- if (do_forescry)
- cast_forescry( random2(power/4) );
+ if (do_phaseshift)
+ cast_phase_shift( random2(power/4) );
if (do_stoneskin)
cast_stoneskin( random2(power/4) );
if (num_resists)
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 757217cb10..534d78c36a 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -1199,7 +1199,7 @@ enum duration_type
DUR_TRANSFORMATION,
DUR_DEATH_CHANNEL,
DUR_DEFLECT_MISSILES,
- DUR_FORESCRY,
+ DUR_PHASE_SHIFT,
DUR_SEE_INVISIBLE,
DUR_WEAPON_BRAND, // general "branding" spell counter
DUR_SILENCE,
@@ -2795,7 +2795,7 @@ enum spell_type
SPELL_MASS_SLEEP,
SPELL_DETECT_SECRET_DOORS,
SPELL_SEE_INVISIBLE,
- SPELL_FORESCRY,
+ SPELL_PHASE_SHIFT,
SPELL_SUMMON_BUTTERFLIES, // 140
SPELL_WARP_BRAND,
SPELL_SILENCE,
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index d2d5eb7cd4..7a79bf53d7 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -490,7 +490,7 @@ static void _print_stats_ac(int x, int y)
static void _print_stats_ev(int x, int y)
{
cgotoxy(x+4, y, GOTO_STAT);
- textcolor(you.duration[DUR_FORESCRY] ? LIGHTBLUE : HUD_VALUE_COLOUR);
+ textcolor(you.duration[DUR_PHASE_SHIFT] ? LIGHTBLUE : HUD_VALUE_COLOUR);
cprintf( "%2d ", player_evasion() );
}
@@ -2396,8 +2396,8 @@ std::string _status_mut_abilities()
status.push_back(_get_expiration_string(DUR_DEATH_CHANNEL,
"death channel"));
}
- if (you.duration[DUR_FORESCRY])
- status.push_back(_get_expiration_string(DUR_FORESCRY, "forewarned"));
+ if (you.duration[DUR_PHASE_SHIFT])
+ status.push_back(_get_expiration_string(DUR_PHASE_SHIFT, "phasing"));
if (you.duration[DUR_SILENCE])
status.push_back(_get_expiration_string(DUR_SILENCE, "silence"));
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index b1e768b99c..9a535d5f7d 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -2451,7 +2451,7 @@ int player_evasion()
if (dodge_bonus > 0) // always a bonus
ev += dodge_bonus;
- if (you.duration[DUR_FORESCRY])
+ if (you.duration[DUR_PHASE_SHIFT])
ev += 8;
if (you.duration[DUR_STONEMAIL])
@@ -2558,7 +2558,7 @@ int old_player_evasion(void)
if (you.duration[DUR_STONEMAIL])
ev -= 2;
- if (you.duration[DUR_FORESCRY])
+ if (you.duration[DUR_PHASE_SHIFT])
ev += 8; //jmf: is this a reasonable value?
int emod = 0;
@@ -3889,7 +3889,7 @@ int get_expiration_threshold(duration_type dur)
case DUR_HASTE:
// The following are not shown in the status lines.
case DUR_ICY_ARMOUR:
- case DUR_FORESCRY:
+ case DUR_PHASE_SHIFT:
case DUR_CONTROL_TELEPORT:
case DUR_DEATH_CHANNEL:
return (6);
@@ -4141,7 +4141,8 @@ void display_char_status()
_output_expiring_message(DUR_DEATH_CHANNEL, "You are channeling the dead.");
- _output_expiring_message(DUR_FORESCRY, "You are forewarned.");
+ _output_expiring_message(DUR_PHASE_SHIFT,
+ "You phase in and out of the material plane.");
_output_expiring_message(DUR_SILENCE, "You radiate silence.");
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc
index deb7d06642..f44fedd3b5 100644
--- a/crawl-ref/source/spells1.cc
+++ b/crawl-ref/source/spells1.cc
@@ -1142,7 +1142,7 @@ void antimagic()
DUR_MIGHT, DUR_FIRE_SHIELD, DUR_ICY_ARMOUR, DUR_REPEL_MISSILES,
DUR_REGENERATION, DUR_SWIFTNESS, DUR_STONEMAIL, DUR_CONTROL_TELEPORT,
DUR_TRANSFORMATION, DUR_DEATH_CHANNEL, DUR_DEFLECT_MISSILES,
- DUR_FORESCRY, DUR_SEE_INVISIBLE, DUR_WEAPON_BRAND, DUR_SILENCE,
+ DUR_PHASE_SHIFT, DUR_SEE_INVISIBLE, DUR_WEAPON_BRAND, DUR_SILENCE,
DUR_CONDENSATION_SHIELD, DUR_STONESKIN, DUR_BARGAIN,
DUR_INSULATION, DUR_RESIST_POISON, DUR_RESIST_FIRE, DUR_RESIST_COLD,
DUR_SLAYING, DUR_STEALTH, DUR_MAGIC_SHIELD, DUR_SAGE, DUR_PETRIFIED
@@ -1256,8 +1256,8 @@ void extension(int pow)
if (you.duration[DUR_STONESKIN])
cast_stoneskin(pow);
- if (you.duration[DUR_FORESCRY])
- cast_forescry(pow);
+ if (you.duration[DUR_PHASE_SHIFT])
+ cast_phase_shift(pow);
if (you.duration[DUR_SEE_INVISIBLE])
cast_see_invisible(pow);
diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc
index 50173cae75..9438a89b6e 100644
--- a/crawl-ref/source/spells4.cc
+++ b/crawl-ref/source/spells4.cc
@@ -329,18 +329,18 @@ void cast_shatter(int pow)
mpr("Ka-crash!", MSGCH_SOUND);
}
-// Cast_forescry: raises evasion (by 8 currently) via Divinations.
-void cast_forescry(int pow)
+// Cast_phase_shift: raises evasion (by 8 currently) via Translocations.
+void cast_phase_shift(int pow)
{
- if (!you.duration[DUR_FORESCRY])
- mpr("You begin to receive glimpses of the immediate future...");
+ if (!you.duration[DUR_PHASE_SHIFT])
+ mpr("You begin to phase in and out of the material plane...");
else
- mpr("Your vision of the future intensifies.");
+ mpr("Your phasing becomes more pronounced.");
- you.duration[DUR_FORESCRY] += 5 + random2(pow);
+ you.duration[DUR_PHASE_SHIFT] += 5 + random2(pow);
- if (you.duration[DUR_FORESCRY] > 30)
- you.duration[DUR_FORESCRY] = 30;
+ if (you.duration[DUR_PHASE_SHIFT] > 30)
+ you.duration[DUR_PHASE_SHIFT] = 30;
you.redraw_evasion = true;
}
diff --git a/crawl-ref/source/spells4.h b/crawl-ref/source/spells4.h
index 992bb02a94..1f8b59b2b6 100644
--- a/crawl-ref/source/spells4.h
+++ b/crawl-ref/source/spells4.h
@@ -29,7 +29,7 @@ void cast_detect_secret_doors(int pow);
void cast_discharge(int pow);
bool cast_evaporate(int pow, bolt& beem, int potion);
void cast_fulsome_distillation(int pow);
-void cast_forescry(int pow);
+void cast_phase_shift(int pow);
bool cast_fragmentation(int powc, const dist& spd);
bool cast_apportation(int powc, const coord_def& where);
void cast_ignite_poison(int pow);
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index aabbd55723..d81492307b 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -193,12 +193,12 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
// 12 - Book of Enchantments (fourth one)
{SPELL_LEVITATION,
SPELL_SELECTIVE_AMNESIA,
+ SPELL_SEE_INVISIBLE,
SPELL_CAUSE_FEAR,
SPELL_EXTENSION,
SPELL_DEFLECT_MISSILES,
SPELL_HASTE,
SPELL_NO_SPELL,
- SPELL_NO_SPELL,
},
// 13 - Young Poisoner's Handbook
@@ -359,8 +359,8 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
{SPELL_DETECT_SECRET_DOORS,
SPELL_DETECT_CREATURES,
SPELL_DETECT_ITEMS,
- SPELL_SEE_INVISIBLE,
- SPELL_FORESCRY,
+ SPELL_NO_SPELL,
+ SPELL_NO_SPELL,
SPELL_NO_SPELL,
SPELL_NO_SPELL,
SPELL_NO_SPELL,
@@ -368,13 +368,13 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
// 28 - Book of the Warp
{SPELL_BANISHMENT,
+ SPELL_PHASE_SHIFT,
SPELL_WARP_BRAND,
SPELL_DISPERSAL,
SPELL_PORTAL,
SPELL_CONTROLLED_BLINK,
SPELL_NO_SPELL,
SPELL_NO_SPELL,
- SPELL_NO_SPELL,
},
// 29 - Book of Envenomations
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 61ee304140..381ddf95d8 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -2015,8 +2015,8 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
ice_armour(powc, false);
break;
- case SPELL_FORESCRY:
- cast_forescry(powc);
+ case SPELL_PHASE_SHIFT:
+ cast_phase_shift(powc);
break;
case SPELL_SILENCE:
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index 5dc56a79f0..558e2a52da 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -1876,7 +1876,7 @@
{
SPELL_SEE_INVISIBLE, "See Invisible",
- SPTYP_ENCHANTMENT | SPTYP_DIVINATION,
+ SPTYP_ENCHANTMENT,
SPFLAG_HELPFUL,
4,
200,
@@ -1888,8 +1888,8 @@
},
{
- SPELL_FORESCRY, "Forescry",
- SPTYP_DIVINATION,
+ SPELL_PHASE_SHIFT, "Phase Shift",
+ SPTYP_TRANSLOCATION,
SPFLAG_HELPFUL,
5,
200,
generated by cgit v1.2.3-54-g00ecf (git 2.45.0) at 2024-05-18 09:57:44 +0000