summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/cloud.cc
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-09-29 22:08:46 -0500
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-09-29 22:08:46 -0500
commit45001d37f21bc2b39c616d313d01b0039a78734e (patch)
treeb936fe4420d217ca7af2d518c1f48fe892da49a5 /crawl-ref/source/cloud.cc
parentf3b1dada2312ceb855cf1eabd5d73325cc9c6ed0 (diff)
downloadcrawl-ref-45001d37f21bc2b39c616d313d01b0039a78734e.tar.gz
crawl-ref-45001d37f21bc2b39c616d313d01b0039a78734e.zip
Make miasma and miasma resistance more consistent. It no longer depends
on negative energy resistance, but on rotting resistance.
Diffstat (limited to 'crawl-ref/source/cloud.cc')
-rw-r--r--crawl-ref/source/cloud.cc16
1 files changed, 6 insertions, 10 deletions
diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc
index 6f045249a2..5d503f70f4 100644
--- a/crawl-ref/source/cloud.cc
+++ b/crawl-ref/source/cloud.cc
@@ -511,12 +511,12 @@ int max_cloud_damage(cloud_type cl_type, int power)
}
case CLOUD_MIASMA:
- if (player_prot_life() >= 3)
+ if (player_res_rotting())
return (0);
dam += 11 * speed / 10;
-
break;
+
default:
break;
}
@@ -666,10 +666,10 @@ void in_a_cloud()
case CLOUD_MIASMA:
mpr("You are engulfed in a dark miasma.");
- if (x_chance_in_y(player_prot_life(), 3))
+ if (player_res_rotting())
return;
- poison_player(1);
+ miasma_player();
hurted += (random2avg(12, 3) * you.time_taken) / 10; // 3
@@ -677,12 +677,8 @@ void in_a_cloud()
hurted = 0;
ouch(hurted, cl, KILLED_BY_CLOUD, "foul pestilence");
- potion_effect(POT_SLOWING, 5);
-
- if (you.hp_max > 4 && coinflip())
- rot_hp(1);
-
break;
+
default:
break;
}
@@ -712,7 +708,7 @@ bool is_damaging_cloud(cloud_type type, bool temp)
case CLOUD_STEAM:
return (player_res_steam(false, temp) <= 0);
case CLOUD_MIASMA:
- return (player_prot_life(false, temp) <= 2);
+ return (player_res_rotting());
default:
// Smoke, never harmful.