diff options
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/acr.cc | 19 | ||||
| -rw-r--r-- | crawl-ref/source/describe.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/enum.h | 9 | ||||
| -rw-r--r-- | crawl-ref/source/godabil.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 7 |
6 files changed, 25 insertions, 24 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index ca692e1202..d7704a6aaa 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -327,7 +327,6 @@ static const ability_def Ability_List[] = 8, 0, 200, 15, ABFLAG_NONE }, // Feawn - { ABIL_FEAWN_PLANTWALK, "Plant Walking", 0, 0, 0, 0, ABFLAG_NONE }, { ABIL_FEAWN_FUNGAL_BLOOM, "Decomposition", 0, 0, 0, 0, ABFLAG_NONE }, { ABIL_FEAWN_SUNLIGHT, "Sunlight", 2, 0, 0, 0, ABFLAG_NONE}, { ABIL_FEAWN_PLANT_RING, "Growth", 2, 0, 0, 1, ABFLAG_FRUIT}, @@ -1927,10 +1926,6 @@ static bool _do_ability(const ability_def& abil) exercise(SK_INVOCATIONS, 1); break; - case ABIL_FEAWN_PLANTWALK: - // Activated via prayer elsewhere. - break; - case ABIL_FEAWN_FUNGAL_BLOOM: { int count = fungal_bloom(); diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 5565d8e2ec..06383b6d69 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -3868,7 +3868,26 @@ static void _move_player(coord_def move) monsters* targ_monst = monster_at(targ); if (feawn_passthrough(targ_monst)) + { + // Moving on a plant takes 1.5 x normal move delay. We + // will print a message about it but only when moving + // from open space->plant (hopefully this will cut down + // on the message spam). + you.time_taken = div_rand_round(you.time_taken * 3, 2); + + monsters * current = monster_at(you.pos()); + if(!current || !feawn_passthrough(current)) + { + // Probably need a better messages. -cao + if(mons_genus(targ_monst->type == MONS_FUNGUS)) + { + mprf("You walk carefully through the fungus."); + } + else + mprf("You walk carefully throuh the plants."); + } targ_monst = NULL; + } const bool targ_pass = you.can_pass_through(targ); diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 69cfd1a798..2a06aa347d 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -3656,10 +3656,6 @@ void describe_god( god_type which_god, bool give_title ) std::string buf = "You can speed up decomposition."; _print_final_god_abil_desc(which_god, buf, ABIL_FEAWN_FUNGAL_BLOOM); - - buf = "You can pass through plants during prayer."; - _print_final_god_abil_desc(which_god, buf, - ABIL_FEAWN_PLANTWALK); } // mv: No abilities (except divine protection) under penance diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index ab634b6a2d..069a081841 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -103,15 +103,14 @@ enum ability_type ABIL_JIYVA_JELLY_SHIELD, // 240 ABIL_JIYVA_SLIMIFY, ABIL_JIYVA_CURE_BAD_MUTATION, - ABIL_FEAWN_PLANTWALK, ABIL_FEAWN_FUNGAL_BLOOM, - ABIL_FEAWN_SUNLIGHT, // 245 - ABIL_FEAWN_RAIN, + ABIL_FEAWN_SUNLIGHT, + ABIL_FEAWN_RAIN, // 245 ABIL_FEAWN_PLANT_RING, ABIL_FEAWN_SPAWN_SPORES, ABIL_FEAWN_EVOLUTION, - ABIL_CHEIBRIADOS_PONDEROUSIFY, // 250 - ABIL_CHEIBRIADOS_TIME_STEP, + ABIL_CHEIBRIADOS_PONDEROUSIFY, + ABIL_CHEIBRIADOS_TIME_STEP, // 250 ABIL_CHEIBRIADOS_TIME_BEND, ABIL_CHEIBRIADOS_SLOUCH, diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc index 1647678869..7432ec5f72 100644 --- a/crawl-ref/source/godabil.cc +++ b/crawl-ref/source/godabil.cc @@ -396,12 +396,11 @@ void feawn_neutralise_plant(monsters *plant) plant->flags |= MF_WAS_NEUTRAL; } -// During prayer feawn allows worshipers to walk on top of stationary plants -// and fungi. +// Feawn allows worshipers to walk on top of stationary plants and +// fungi. bool feawn_passthrough(const monsters * target) { return (target && you.religion == GOD_FEAWN - && you.duration[DUR_PRAYER] && mons_is_plant(target) && mons_is_stationary(target)); } diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 44ac27d16c..c117a22f26 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2393,7 +2393,6 @@ static bool _god_accepts_prayer(god_type god) case GOD_BEOGH: case GOD_NEMELEX_XOBEH: - case GOD_FEAWN: return (true); default: @@ -2510,12 +2509,6 @@ void pray() { you.duration[DUR_PRAYER] = 20; } - else if (you.religion == GOD_FEAWN) - { - if (you.duration[DUR_SLOW] < you.duration[DUR_PRAYER]) - slow_player(you.duration[DUR_PRAYER]); - mprf(MSGCH_GOD, "You feel in touch with plants."); - } // Gods who like fresh corpses, Beoghites and Nemelexites offer the // items they're standing on. |