From bf8f76369f3779b4bd48ab9a1f09bc06a6f0ea7a Mon Sep 17 00:00:00 2001 From: dshaligram Date: Mon, 18 Sep 2006 14:49:26 +0000 Subject: r115@xenon: dshaligram | 2006-09-18 20:20:13 +051800 * Fixed egregiously high damage output from monster poison arrow. * Fixed Sif Muna piety decay rate - it was still too fast for sustainable piety gains. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@47 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/mstuff2.cc | 2 +- crawl-ref/source/religion.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 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(); -- cgit v1.2.3-54-g00ecf From e5860798ba239a9f474ad97263094c6d50967137 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Mon, 18 Sep 2006 14:53:38 +0000 Subject: r117@xenon: dshaligram | 2006-09-18 20:25:11 +051800 Fixed evocations giving increased max MP. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@48 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/skills.cc | 3 +-- crawl-ref/source/skills2.cc | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) 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 ); -- cgit v1.2.3-54-g00ecf