diff options
Diffstat (limited to 'crawl-ref')
37 files changed, 88 insertions, 51 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index a16fdf3ca6..3079b924d0 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -702,8 +702,6 @@ static talent _get_talent(ability_type ability, bool check_confused) case ABIL_TROG_BERSERK: // piety >= 30 invoc = true; failure = 30 - you.piety; // starts at 0% - if (player_mental_clarity(true)) - failure += 80; break; case ABIL_TROG_REGEN_MR: // piety >= 50 @@ -1101,8 +1099,7 @@ static bool _check_ability_possible(const ability_def& abil, mpr("You're too hungry to berserk."); return (false); } - return (you.can_go_berserk(true, abil.ability == ABIL_TROG_BERSERK) - && berserk_check_wielded_weapon()); + return (you.can_go_berserk(true) && berserk_check_wielded_weapon()); case ABIL_FLY_II: if (you.duration[DUR_EXHAUSTED]) @@ -1161,7 +1158,7 @@ static bool _activate_talent(const talent& tal) } if ((tal.which == ABIL_EVOKE_BERSERK || tal.which == ABIL_TROG_BERSERK) - && !you.can_go_berserk(true, tal.which == ABIL_TROG_BERSERK)) + && !you.can_go_berserk(true)) { crawl_state.zero_turns_taken(); return (false); @@ -1745,7 +1742,7 @@ static bool _do_ability(const ability_def& abil) case ABIL_TROG_BERSERK: // Trog abilities don't use or train invocations. - go_berserk(true, true); + go_berserk(true); break; case ABIL_TROG_REGEN_MR: diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt index 25277aff17..2b1dc4c4ea 100644 --- a/crawl-ref/source/dat/descript/items.txt +++ b/crawl-ref/source/dat/descript/items.txt @@ -8,7 +8,8 @@ one is skilled in the appropriate elemental magic. %%%% amulet of clarity -This amulet protects its wearer from some forms of mental confusion. +This amulet protects its wearer from some forms of mental confusion, +including being infuriated against one's will. %%%% amulet of conservation diff --git a/crawl-ref/source/dat/descript/spells.txt b/crawl-ref/source/dat/descript/spells.txt index c79c9e1424..8e58527c87 100644 --- a/crawl-ref/source/dat/descript/spells.txt +++ b/crawl-ref/source/dat/descript/spells.txt @@ -280,7 +280,7 @@ This spell will freeze ammunition held by the caster. Such missiles will shatter %%%% Fulsome Distillation -This spell extracts the vile and poisonous essences from a corpse. A rotten corpse may produce a stronger potion. You probably don't want to drink the results. +This spell extracts the vile and poisonous essences from a corpse. You probably don't want to drink the results. The type of potion produced corresponds roughly to the effects of eating said corpse. %%%% Major Healing diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des index 493d018b9e..a66a5961dc 100644 --- a/crawl-ref/source/dat/float.des +++ b/crawl-ref/source/dat/float.des @@ -709,15 +709,23 @@ NAME: statue_cache ORIENT: north TAGS: no_monster_gen DEPTH: D:12-20, Elf, Vault -MONS: statue name:archer name_adjective ; crossbow ego:flame . bolt q:30 -MONS: statue name:archer name_adjective ; crossbow ego:frost . bolt q:30 -MONS: statue name:warrior name_adjective ; battleaxe ego:flaming good_item -MONS: statue name:warrior name_adjective ; battleaxe ego:freezing good_item -MONS: statue name:warrior name_adjective ; great mace ego:flaming good_item -MONS: statue name:warrior name_adjective ; great mace ego:freezing good_item +MONS: statue name:archer name_adjective tile:mons_statue_crossbow ; crossbow \ + ego:flame . bolt q:30 +MONS: statue name:archer name_adjective tile:mons_statue_crossbow ; crossbow \ + ego:frost . bolt q:30 +MONS: statue name:warrior name_adjective tile:mons_statue_axe ; battleaxe \ + ego:flaming good_item +MONS: statue name:warrior name_adjective tile:mons_statue_axe ; battleaxe \ + ego:freezing good_item +MONS: statue name:warrior name_adjective tile:mons_statue_mace ; great mace \ + ego:flaming good_item +MONS: statue name:warrior name_adjective tile:mons_statue_mace ; great mace \ + ego:freezing good_item MONS: silver statue -KMONS: 8 = statue name:wizard name_adjective spells:lehudib's_crystal_spear;iskenderun's_mystic_blast;slow;stone_arrow -KMONS: 9 = statue name:wizard name_adjective spells:freezing_cloud;mephitic_cloud;throw_icicle;confuse +KMONS: 8 = statue name:wizard name_adjective tile:mons_statue_mage \ + spells:lehudib's_crystal_spear;iskenderun's_mystic_blast;slow;stone_arrow +KMONS: 9 = statue name:wizard name_adjective tile:mons_statue_mage \ + spells:freezing_cloud;mephitic_cloud;throw_icicle;confuse MAP cccccccccccccc cccccccc7ccccc diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des index 2927e8362c..d29eeff639 100644 --- a/crawl-ref/source/dat/mini.des +++ b/crawl-ref/source/dat/mini.des @@ -2667,7 +2667,7 @@ ENDMAP # NAME: archer_statue DEPTH: D:8-, Vault, Elf -MONS: statue tile:mons_archer_statue name:archer name_adjective; longbow . arrow q:30 +MONS: statue tile:mons_statue_archer name:archer name_adjective; longbow . arrow q:30 MAP ccc ccccc1ccccc diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index f770323cfc..27560aa979 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -994,10 +994,10 @@ enum dungeon_feature_type // Highest grid value which can't be reached through. DNGN_MAX_NONREACH = DNGN_CLEAR_PERMAROCK_WALL, - DNGN_TREES, DNGN_OPEN_SEA, // Shoals equivalent for permarock // Can be seen through and reached past. + DNGN_TREES, DNGN_ORCISH_IDOL = 15, DNGN_GRANITE_STATUE = 21, // 21 DNGN_STATUE_RESERVED, diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 57254b012b..0df1de443c 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -1652,7 +1652,10 @@ void melee_attack::player_weapon_auto_id() int melee_attack::player_stab_weapon_bonus(int damage) { if (weapon && weapon->base_type == OBJ_WEAPONS - && (weapon->sub_type == WPN_CLUB || weapon->sub_type == WPN_SPEAR)) + && (weapon->sub_type == WPN_CLUB + || weapon->sub_type == WPN_SPEAR + || weapon->sub_type == WPN_TRIDENT + || weapon->sub_type == WPN_DEMON_TRIDENT)) { goto ok_weaps; } diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 2cc226f127..4bac2e7ff0 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -2696,11 +2696,11 @@ bool scramble(void) return (true); } -bool go_berserk(bool intentional, bool no_clarity) +bool go_berserk(bool intentional) { ASSERT(!crawl_state.arena); - if (!you.can_go_berserk(intentional, no_clarity)) + if (!you.can_go_berserk(intentional)) return (false); if (Tutorial.tutorial_left) diff --git a/crawl-ref/source/misc.h b/crawl-ref/source/misc.h index 3c5cee6cbf..9f75955885 100644 --- a/crawl-ref/source/misc.h +++ b/crawl-ref/source/misc.h @@ -13,7 +13,7 @@ struct bolt; struct dist; struct activity_interrupt_data; -bool go_berserk(bool intentional, bool no_clarity = false); +bool go_berserk(bool intentional); void search_around(bool only_adjacent = false); void down_stairs(int old_level, dungeon_feature_type force_stair = DNGN_UNSEEN, diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc index 781778d6d3..1c98be0c34 100644 --- a/crawl-ref/source/mon-abil.cc +++ b/crawl-ref/source/mon-abil.cc @@ -1489,7 +1489,5 @@ void activate_ballistomycetes( monsters * monster, const coord_def & origin) } if (you.see_cell(origin) && found_others) - { mprf("You feel the ballistomycetes will spawn a replacement spore."); - } } diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 0db6c4e927..9460407bf2 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -4623,7 +4623,7 @@ static monsterentry mondata[] = { { MONS_ILSUIW, 'm', GREEN, "Ilsuiw", M_UNIQUE | M_WARM_BLOOD | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS, - MR_RES_POISON | MR_RES_COLD, + MR_NO_FLAGS, 500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -7, { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 16, 0, 0, 150 }, diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 8ebf0a0655..e490908d1b 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -5980,8 +5980,10 @@ bool player::can_go_berserk() const return (can_go_berserk(false)); } -bool player::can_go_berserk(bool verbose, bool no_clarity) const +bool player::can_go_berserk(bool intentional) const { + const bool verbose = intentional; + if (berserk()) { if (verbose) @@ -6016,7 +6018,7 @@ bool player::can_go_berserk(bool verbose, bool no_clarity) const return (false); } - if (!no_clarity && player_mental_clarity(true)) + if (!intentional && player_mental_clarity(true)) { if (verbose) { diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h index 09b66c2053..1e5c58d47a 100644 --- a/crawl-ref/source/player.h +++ b/crawl-ref/source/player.h @@ -414,7 +414,7 @@ public: void attacking(actor *other); bool can_go_berserk() const; - bool can_go_berserk(bool verbose, bool no_clarity = false) const; + bool can_go_berserk(bool intentional) const; void go_berserk(bool intentional); bool berserk() const; bool can_mutate() const; diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt index 53a5f1270a..6b0ca04184 100644 --- a/crawl-ref/source/rltiles/dc-dngn.txt +++ b/crawl-ref/source/rltiles/dc-dngn.txt @@ -875,6 +875,9 @@ wall/dngn_green_crystal_wall DNGN_GREEN_CRYSTAL_WALL DNGN_CRYSTAL DNGN_CRYSTAL_G %repeat DNGN_CRYSTAL DNGN_CRYSTAL_WHITE %resetcol +wall/tree1 DNGN_TREE +wall/tree2 + ## doors dngn_detected_secret_door DNGN_DETECTED_SECRET_DOOR dngn_closed_door DNGN_CLOSED_DOOR diff --git a/crawl-ref/source/rltiles/dc-dngn/wall/tree1.png b/crawl-ref/source/rltiles/dc-dngn/wall/tree1.png Binary files differnew file mode 100644 index 0000000000..c5c69a2156 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/wall/tree1.png diff --git a/crawl-ref/source/rltiles/dc-dngn/wall/tree2.png b/crawl-ref/source/rltiles/dc-dngn/wall/tree2.png Binary files differnew file mode 100644 index 0000000000..711742ee6b --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/wall/tree2.png diff --git a/crawl-ref/source/rltiles/dc-misc.txt b/crawl-ref/source/rltiles/dc-misc.txt index 653b614435..10bc4fc714 100644 --- a/crawl-ref/source/rltiles/dc-misc.txt +++ b/crawl-ref/source/rltiles/dc-misc.txt @@ -22,6 +22,12 @@ cloud_poison2 CLOUD_POISON_2 cloud_black_smoke CLOUD_BLACK_SMOKE cloud_blue_smoke CLOUD_BLUE_SMOKE cloud_grey_smoke CLOUD_GREY_SMOKE + +%variation CLOUD_GREY_SMOKE white +%lum 0 30 +%repeat CLOUD_GREY_SMOKE CLOUD_WHITE_SMOKE +%resetcol + cloud_miasma CLOUD_MIASMA cloud_tloc_energy CLOUD_TLOC_ENERGY cloud_mutagenic_small1 CLOUD_MUTAGENIC_0 diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index 3a48f1307d..2ecaf85b16 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -287,7 +287,36 @@ roxanne MONS_ROXANNE ice_statue MONS_ICE_STATUE silver_statue MONS_SILVER_STATUE orange_crystal_statue MONS_ORANGE_CRYSTAL_STATUE -statue_archer MONS_ARCHER_STATUE + +%back statue_base +overlay_axe MONS_STATUE_AXE +overlay_bow MONS_STATUE_ARCHER +overlay_crossbow MONS_STATUE_CROSSBOW +overlay_mace MONS_STATUE_MACE +overlay_mage MONS_STATUE_MAGE +overlay_scythe MONS_STATUE_SCYTHE +overlay_sword MONS_STATUE_SWORD +%back none + +%back light_vine_statue_base +overlay_axe MONS_LIGHT_VINE_STATUE_AXE +overlay_bow MONS_LIGHT_VINE_STATUE_ARCHER +overlay_crossbow MONS_LIGHT_VINE_STATUE_CROSSBOW +overlay_mace MONS_LIGHT_VINE_STATUE_MACE +overlay_mage MONS_LIGHT_VINE_STATUE_MAGE +overlay_scythe MONS_LIGHT_VINE_STATUE_SCYTHE +overlay_sword MONS_LIGHT_VINE_STATUE_SWORD +%back none + +%back dark_vine_statue_base +overlay_axe MONS_DARK_VINE_STATUE_AXE +overlay_bow MONS_DARK_VINE_STATUE_ARCHER +overlay_crossbow MONS_DARK_VINE_STATUE_CROSSBOW +overlay_mace MONS_DARK_VINE_STATUE_MACE +overlay_mage MONS_DARK_VINE_STATUE_MAGE +overlay_scythe MONS_DARK_VINE_STATUE_SCYTHE +overlay_sword MONS_DARK_VINE_STATUE_SWORD +%back none ## Gargoyles ('9') %sdir dc-mon @@ -465,6 +494,7 @@ two_headed_ogre MONS_TWO_HEADED_OGRE ogre_mage MONS_OGRE_MAGE ## Plants ('P') +%sdir dc-mon/fungi_plants plant MONS_PLANT plant_crypt MONS_WITHERED_PLANT oklob_plant MONS_OKLOB_PLANT @@ -530,8 +560,11 @@ deep_elf_blademaster MONS_DEEP_ELF_BLADEMASTER deep_elf_master_archer MONS_DEEP_ELF_MASTER_ARCHER ## Fungi ('f') +%sdir dc-mon/fungi_plants fungus MONS_TOADSTOOL fungus MONS_FUNGUS +ballistomycete MONS_BALLISTOMYCETE_INACTIVE +active_ballistomycete MONS_BALLISTOMYCETE_ACTIVE wandering_mushroom MONS_WANDERING_MUSHROOM ## Goblins ('g') diff --git a/crawl-ref/source/rltiles/dc-mon/fungi_plants/active_ballistomycete.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/active_ballistomycete.png Binary files differnew file mode 100644 index 0000000000..bd01f0470c --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/fungi_plants/active_ballistomycete.png diff --git a/crawl-ref/source/rltiles/dc-mon/fungi_plants/ballistomycete.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/ballistomycete.png Binary files differnew file mode 100644 index 0000000000..69bff99afd --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/fungi_plants/ballistomycete.png diff --git a/crawl-ref/source/rltiles/dc-mon/fungus.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/fungus.png Binary files differindex 75d0cd66ed..75d0cd66ed 100644 --- a/crawl-ref/source/rltiles/dc-mon/fungus.png +++ b/crawl-ref/source/rltiles/dc-mon/fungi_plants/fungus.png diff --git a/crawl-ref/source/rltiles/dc-mon/oklob_plant.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/oklob_plant.png Binary files differindex 4f0f0da6b2..4f0f0da6b2 100644 --- a/crawl-ref/source/rltiles/dc-mon/oklob_plant.png +++ b/crawl-ref/source/rltiles/dc-mon/fungi_plants/oklob_plant.png diff --git a/crawl-ref/source/rltiles/dc-mon/plant.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/plant.png Binary files differindex b3124b5cae..b3124b5cae 100644 --- a/crawl-ref/source/rltiles/dc-mon/plant.png +++ b/crawl-ref/source/rltiles/dc-mon/fungi_plants/plant.png diff --git a/crawl-ref/source/rltiles/dc-mon/plant_crypt.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/plant_crypt.png Binary files differindex f17a501d4f..f17a501d4f 100644 --- a/crawl-ref/source/rltiles/dc-mon/plant_crypt.png +++ b/crawl-ref/source/rltiles/dc-mon/fungi_plants/plant_crypt.png diff --git a/crawl-ref/source/rltiles/dc-mon/wandering_mushroom.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/wandering_mushroom.png Binary files differindex e8cff68b06..e8cff68b06 100644 --- a/crawl-ref/source/rltiles/dc-mon/wandering_mushroom.png +++ b/crawl-ref/source/rltiles/dc-mon/fungi_plants/wandering_mushroom.png diff --git a/crawl-ref/source/rltiles/dc-mon/statues/dark_vine_statue_base.png b/crawl-ref/source/rltiles/dc-mon/statues/dark_vine_statue_base.png Binary files differnew file mode 100644 index 0000000000..5d2a5a1283 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/statues/dark_vine_statue_base.png diff --git a/crawl-ref/source/rltiles/dc-mon/statues/light_vine_statue_base.png b/crawl-ref/source/rltiles/dc-mon/statues/light_vine_statue_base.png Binary files differnew file mode 100644 index 0000000000..2d0a4e5ee1 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/statues/light_vine_statue_base.png diff --git a/crawl-ref/source/rltiles/dc-mon/statues/overlay_axe.png b/crawl-ref/source/rltiles/dc-mon/statues/overlay_axe.png Binary files differnew file mode 100644 index 0000000000..1dcb1f1574 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_axe.png diff --git a/crawl-ref/source/rltiles/dc-mon/statues/overlay_bow.png b/crawl-ref/source/rltiles/dc-mon/statues/overlay_bow.png Binary files differnew file mode 100644 index 0000000000..4710c7d683 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_bow.png diff --git a/crawl-ref/source/rltiles/dc-mon/statues/overlay_crossbow.png b/crawl-ref/source/rltiles/dc-mon/statues/overlay_crossbow.png Binary files differnew file mode 100644 index 0000000000..3f78ae7af0 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_crossbow.png diff --git a/crawl-ref/source/rltiles/dc-mon/statues/overlay_mace.png b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mace.png Binary files differnew file mode 100644 index 0000000000..12a2fb2486 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mace.png diff --git a/crawl-ref/source/rltiles/dc-mon/statues/overlay_mage.png b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mage.png Binary files differnew file mode 100644 index 0000000000..ab1533abbb --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mage.png diff --git a/crawl-ref/source/rltiles/dc-mon/statues/overlay_scythe.png b/crawl-ref/source/rltiles/dc-mon/statues/overlay_scythe.png Binary files differnew file mode 100644 index 0000000000..671280385d --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_scythe.png diff --git a/crawl-ref/source/rltiles/dc-mon/statues/overlay_sword.png b/crawl-ref/source/rltiles/dc-mon/statues/overlay_sword.png Binary files differnew file mode 100644 index 0000000000..b0ea9caaae --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_sword.png diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index 9d1c969ea6..7da3ee46af 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -1177,10 +1177,8 @@ bool cast_evaporate(int pow, bolt& beem, int pot_idx) // Producing helpful potions would break game balance here... // and producing more than one potion from a corpse, or not // using up the corpse might also lead to game balance problems. - bwr -void cast_fulsome_distillation(int pow) +void cast_fulsome_distillation(int /*pow*/) { - pow = std::min(100, pow); - int corpse = -1; // Search items at the player's location for corpses. @@ -1206,39 +1204,32 @@ void cast_fulsome_distillation(int pow) } potion_type pot_type = POT_WATER; - int difficulty = 0; switch (mons_corpse_effect(mitm[corpse].plus)) { case CE_CLEAN: pot_type = POT_WATER; - difficulty = 0; break; case CE_CONTAMINATED: pot_type = (mons_weight(mitm[corpse].plus) >= 900) - ? POT_DEGENERATION : POT_POISON; - difficulty = (pot_type == POT_DEGENERATION) ? 100 : 40; + ? POT_DEGENERATION : POT_CONFUSION; break; case CE_POISONOUS: pot_type = POT_POISON; - difficulty = 50; break; case CE_MUTAGEN_RANDOM: case CE_MUTAGEN_GOOD: // unused case CE_RANDOM: // unused pot_type = POT_MUTATION; - // this is a potentially good potion, so it never tries to get into you - difficulty = 0; break; case CE_MUTAGEN_BAD: // unused case CE_ROTTEN: // actually this only occurs via mangling case CE_HCL: // necrophage pot_type = POT_DECAY; - difficulty = 100; break; case CE_NOCORPSE: // shouldn't occur @@ -1250,12 +1241,10 @@ void cast_fulsome_distillation(int pow) { case MONS_RED_WASP: // paralysis attack pot_type = POT_PARALYSIS; - difficulty = 100; break; case MONS_YELLOW_WASP: // slowing attack pot_type = POT_SLOWING; - difficulty = 50; break; default: @@ -1271,7 +1260,6 @@ void cast_fulsome_distillation(int pow) smc->attack[nattk].flavour == AF_POISON_STR) { pot_type = POT_STRONG_POISON; - difficulty = 75; } } @@ -1292,12 +1280,6 @@ void cast_fulsome_distillation(int pow) mprf("You extract %s from the corpse.", mitm[corpse].name(DESC_NOCAP_A).c_str()); - if (random2(difficulty + 1) > pow) - { - mpr("Oops! You accidentally inhaled the fumes!"); - potion_effect(pot_type, 40); - } - // Try to move the potion to the player (for convenience). if (move_item_to_player(corpse, 1) != 1) mpr("Unfortunately, you can't carry it right now!"); diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index db5979a031..75f92737b3 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -927,7 +927,7 @@ SPTYP_TRANSMUTATION | SPTYP_NECROMANCY, SPFLAG_NONE, 1, - 100, + 0, -1, -1, 0, NULL, diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 34cbf7eb7f..723dbc0d00 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -199,7 +199,9 @@ int tileidx_monster_base(const monsters *mon, bool detected) // fungi ('f') case MONS_BALLISTOMYCETE: - return TILEP_MONS_FUNGUS; + if (!detected && mon->has_ench(ENCH_SPORE_PRODUCTION)) + return TILEP_MONS_BALLISTOMYCETE_ACTIVE; + return TILEP_MONS_BALLISTOMYCETE_INACTIVE; case MONS_TOADSTOOL: return TILEP_MONS_TOADSTOOL; case MONS_FUNGUS: @@ -2472,6 +2474,8 @@ int tileidx_feature(dungeon_feature_type feat, int gx, int gy) return TILE_DNGN_ORCISH_IDOL; case DNGN_WAX_WALL: return TILE_DNGN_WAX_WALL; + case DNGN_TREES: + return TILE_DNGN_TREE; case DNGN_GRANITE_STATUE: return TILE_DNGN_GRANITE_STATUE; case DNGN_LAVA: |
