diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-09-18 15:13:34 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-09-18 15:13:34 +0000 |
commit | 2f75c92ad79443e954d0167055c08decff3e41b2 (patch) | |
tree | 20bf394b6ae9e60e6f687ad881a2ef4e89d8e8d2 /crawl-ref | |
parent | a4d4f3ecccb29c3f5fc1ce55579119106c399911 (diff) | |
parent | e5860798ba239a9f474ad97263094c6d50967137 (diff) | |
download | crawl-ref-0.1b1.tar.gz crawl-ref-0.1b1.zip |
Updated stone_soup-0.1b1 tag to include fix for Poison Arrow of Doom.0.1b1
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/tags/stone_soup-0.1b1@51 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/mstuff2.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/religion.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/skills.cc | 3 | ||||
-rw-r--r-- | crawl-ref/source/skills2.cc | 7 |
4 files changed, 6 insertions, 10 deletions
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index f514ab8ddd..d4460a0697 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -1314,7 +1314,7 @@ bolt mons_spells( int spell_cast, int power ) case MS_POISON_ARROW: strcpy( beam.beam_name, "poison arrow" ); - beam.damage = dice_def( 4, 5 + power / 4 ); + beam.damage = dice_def( 4, 5 + power / 12 ); beam.colour = LIGHTGREEN; beam.type = SYM_MISSILE; beam.thrower = KILL_MON; diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 94cef35207..964840f972 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2691,9 +2691,9 @@ void handle_god_time(void) case GOD_SIF_MUNA: // [dshaligram] Sif Muna is now very patient - has to be - // to make up with the new spell training requirements, else + // to make up for the new spell training requirements, else // it's practically impossible to get Master of Arcane status. - if (one_chance_in(45)) + if (one_chance_in(60)) lose_piety(1); if (you.piety < 1) excommunication(); diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc index 2c96373bf3..db7fe62372 100644 --- a/crawl-ref/source/skills.cc +++ b/crawl-ref/source/skills.cc @@ -418,8 +418,7 @@ static int exercise2( int exsk ) if (exsk == SK_FIGHTING) calc_hp(); - if (exsk == SK_INVOCATIONS || exsk == SK_EVOCATIONS - || exsk == SK_SPELLCASTING) + if (exsk == SK_INVOCATIONS || exsk == SK_SPELLCASTING) { calc_mp(); } diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 6a6f468125..b4a0cbca9f 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -2178,14 +2178,11 @@ int calc_mp(void) int spell_extra = (you.experience_level * you.skills[SK_SPELLCASTING]) / 4; int invoc_extra = (you.experience_level * you.skills[SK_INVOCATIONS]) / 6; - int evoc_extra = (you.experience_level * you.skills[SK_EVOCATIONS]) / 6; - if (spell_extra > invoc_extra && spell_extra > evoc_extra) + if (spell_extra > invoc_extra) enp += spell_extra; - else if (invoc_extra > evoc_extra) - enp += invoc_extra; else - enp += evoc_extra; + enp += invoc_extra; you.max_magic_points = stepdown_value( enp, 9, 18, 45, 100 ); |