Skip to content

Commit

Permalink
Simplify partially-resistable attacks (hellmonk)
Browse files Browse the repository at this point in the history
Instead of ice, lava, and water being 40/55/40% resistable by their
applicable resistance (respectively), make them all 50% resistable.
This is a small nerf to hailstorm/glaciate/polar vortex/iceblast/flash
freeze/etc, and a small buff to fire storm/bolt of magma/lava spit.
(Except against vulnerable creatures.) We can add a little compensation
damage later if it's really needed - this is just intended to simplify.
  • Loading branch information
PleasingFungus committed Dec 7, 2022
1 parent eff3892 commit 2638490
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 29 deletions.
4 changes: 2 additions & 2 deletions crawl-ref/source/dat/descript/items.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1317,8 +1317,8 @@ A magical device which throws little puffs of flame.
%%%%
wand of iceblast

A magical device which creates a loud explosion of ice shards, partially
harming even creatures resistant to cold.
A magical device which creates a loud explosion of ice shards, bypassing half
of victims' resistance to cold.
%%%%
wand of light

Expand Down
26 changes: 13 additions & 13 deletions crawl-ref/source/dat/descript/spells.txt
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ Fires a penetrating bolt of flames.
%%%%
Bolt of Magma spell

Fires a penetrating bolt of molten rock. A portion of its damage bypasses
fire resistance.
Fires a penetrating bolt of molten rock. Half of its damage bypasses fire
resistance.
%%%%
Borgnjor's Revivification spell

Expand Down Expand Up @@ -600,8 +600,8 @@ Breathes a blast of fire at a targeted creature.
Fire Storm spell

Calls forth a mighty storm of roaring flame directly onto the target, dealing
damage in a large area and leaving behind short-lived fire vortices. A portion
of its damage bypasses fire resistance.
damage in a large area and leaving behind short-lived fire vortices. Half of
its damage bypasses fire resistance.
%%%%
Fire Summon spell

Expand All @@ -628,7 +628,7 @@ Conjures up a large cloud of roaring flames.
Flash Freeze spell

Freezes the air around a target, causing significant harm and slowing the
target's movement. A portion of its damage bypasses cold resistance. It has no
target's movement. Half of its damage bypasses cold resistance. It has no
effect on targets that are already frozen.
%%%%
Force Lance spell
Expand Down Expand Up @@ -698,8 +698,8 @@ Glaciate spell
Conjures forth a mighty blast of ice. Creatures within its cone-shaped area of
effect take damage, with higher damage being dealt to those close to the
caster. Those hit by the blast are encased in ice, slowing their movement, and
those killed by the blast may be frozen into solid blocks of ice. A significant
portion of its damage bypasses cold resistance.
those killed by the blast may be frozen into solid blocks of ice. Half of its
damage bypasses cold resistance.
%%%%
Grasping Roots spell

Expand All @@ -715,8 +715,8 @@ Hailstorm spell

Conjures a cannonade of hail, battering nearby creatures that fail to dodge.
The eye of the storm is wide enough that monsters adjacent to the caster are
unaffected. Due to the strong impact and cutting edges, a significant portion
of its damage bypasses cold resistance.
unaffected. Due to the strong impact and cutting edges, half of its damage
bypasses cold resistance.
%%%%
Haste Other spell

Expand Down Expand Up @@ -1135,7 +1135,7 @@ the target before dispersing.
Polar Vortex spell

Turns the air around the caster into a freezing vortex, doing tremendous damage
to everyone caught in it that can only partially be mitigated by resistance to
to everyone caught in it that can only be half-mitigated by resistance to
cold. Those affected will also be swept up into the air and tossed around.
Only the eye of the storm is a safe place, and it follows the caster. The
vortex is unable to follow the caster through long-distance translocations.
Expand Down Expand Up @@ -1346,7 +1346,7 @@ Spits acid at a targeted creature.
%%%%
Spit Lava spell

Spits lava at a targeted creature.
Spits lava at a targeted creature. Half of its damage bypasses fire resistance.
%%%%
Spit Poison spell

Expand Down Expand Up @@ -1647,8 +1647,8 @@ Throws a small puff of frost.
%%%%
Throw Icicle spell

Fires a shard of ice. Due to its strong impact and cutting edges, a
significant portion of its damage bypasses cold resistance.
Fires a shard of ice. Due to its strong impact and cutting edges, half of its
damage bypasses cold resistance.
%%%%
Throw Klown Pie spell

Expand Down
14 changes: 1 addition & 13 deletions crawl-ref/source/fight.cc
Original file line number Diff line number Diff line change
Expand Up @@ -553,25 +553,13 @@ static inline int get_resistible_fraction(beam_type flavour)
{
switch (flavour)
{
// Drowning damage from water is resistible by being a water thing, or
// otherwise asphyx resistant.
case BEAM_WATER:
return 40;

// Assume ice storm and throw icicle are mostly solid.
case BEAM_ICE:
return 40;

// 50/50 split of elec and sonic damage.
case BEAM_THUNDER:
return 50;

case BEAM_LAVA:
return 55;

return 50;
case BEAM_POISON_ARROW:
return 70;

default:
return 100;
}
Expand Down
2 changes: 1 addition & 1 deletion crawl-ref/source/zap-data.h
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ static const zap_info zap_data[] =
new tohit_calculator<5, 1, 3>,
WHITE,
false,
BEAM_ICE, // rC capped at 40%, use ZAP_FLASH_FREEZE if you don't want this
BEAM_ICE, // rC capped at 50%, use ZAP_FLASH_FREEZE if you don't want this
DCHAR_FIRED_ZAP,
false,
false,
Expand Down

0 comments on commit 2638490

Please sign in to comment.