diff options
| -rw-r--r-- | crawl-ref/docs/changes.stone_soup | 2 | ||||
| -rw-r--r-- | crawl-ref/source/dat/descript/ability.txt | 28 | ||||
| -rw-r--r-- | crawl-ref/source/dat/descript/branches.txt | 51 | ||||
| -rw-r--r-- | crawl-ref/source/dat/descript/cards.txt | 32 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/transfor.cc | 14 | ||||
| -rw-r--r-- | crawl-ref/source/xom.cc | 1 |
7 files changed, 66 insertions, 65 deletions
diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup index 095444523e..5f04161fff 100644 --- a/crawl-ref/docs/changes.stone_soup +++ b/crawl-ref/docs/changes.stone_soup @@ -132,7 +132,7 @@ Gods ---- * Greatly improved Yredelemnul. * Nerfed TSO/Beogh's blessings of followers. -* Xom is more interesting and more useful in combat. +* Xom is more active and more useful in combat. * Cleansing Flame centers on the player and deals less damage. * Killing a holy being is now sometimes avenged by TSO. * Split Elyvilon's healing powers in "heal self" and "heal other" versions. diff --git a/crawl-ref/source/dat/descript/ability.txt b/crawl-ref/source/dat/descript/ability.txt index 927369c694..a99b33910e 100644 --- a/crawl-ref/source/dat/descript/ability.txt +++ b/crawl-ref/source/dat/descript/ability.txt @@ -49,7 +49,7 @@ Breathe a jet of steam at a targeted monster. %%%% Bat Form -Turn into a speedy vampire bat. In bat form, you can neither interact with items in any form (except picking them up or dropping them), nor cast spells. Note that Bat Form will decrease your current strength while increasing your dexterity. Thus, you won't be able to change form if your strength is too low. +Turn into a speedy vampire bat. In bat form, you can neither interact with items in any form (except picking them up or dropping them), nor cast spells. Note that Bat Form will decrease your current Strength while increasing your Dexterity. Thus, you won't be able to change form if your Strength is too low. Vampires below experience level 10 will be unable to transform if wearing cursed equipment. %%%% @@ -80,7 +80,7 @@ Torment yourself and the monsters around you. %%%% Raise Dead -Reanimate all corpses and skeletons in your vicinity as followers. Note that zombies and skeletons cannot leave the level they were created on via stairs. +Reanimate all corpses and skeletons in your vicinity as followers. Note that zombies and skeletons cannot leave the level they were created on. %%%% Control Demon @@ -112,7 +112,7 @@ Instantly release a previously memorised (delayed) fireball without additional c %%%% Self-Restoration -At the permanent loss of one magic point restore your Strength, Dexterity and Intelligence, and heal a large amount of rotted hitpoints. +At the permanent loss of one magic point restore your Strength, Dexterity and Intelligence, and heal a large amount of rotted hit points. %%%% Device Recharging @@ -192,16 +192,16 @@ Permanently enslave undead monsters. %%%% Invoke Death -Summon the personification of Death, which, depending on your Invocations skill, may be hostile. +Summon a personification of Death, which, depending on your Invocations skill, may be hostile. %%%% # Yredelemnul Animate Remains -Reanimate a single corpse or skeleton as a follower. Note that zombies and skeletons cannot leave the level they were created on via stairs. +Reanimate a single corpse or skeleton as a follower. Note that zombies and skeletons cannot leave the level they were created on. %%%% Animate Dead ability -Reanimate all corpses and skeletons in your vicinity as followers. Note that zombies and skeletons cannot leave the level they were created on via stairs. +Reanimate all corpses and skeletons in your vicinity as followers. Note that zombies and skeletons cannot leave the level they were created on. %%%% Drain Life @@ -270,7 +270,7 @@ Destroy all weapons on the ground. In order to prevent a weapon from being accid %%%% Lesser Healing -Using this ability on hostile monsters will try to make them neutral. This works best on animals, worse on humanoids of your species, still worse on other humanoids, and worst of all on demons and undead. The chance for successful pacification depends on the healing power. +Depending on your Invocations skill, heal a creature other than you by a small amount. Using this ability on hostile monsters will try to make them neutral. This works best on animals, worse on humanoids of your species, still worse on other humanoids, and worst of all on demons and undead. The chance for successful pacification depends on the healing power. Whether the pacification succeeds or not, the invested food, piety and magic points are lost. If it does succeed, the monster is healed and you gain some piety and half the monster's experience value. Otherwise, the monster is unaffected and you gain nothing. In total, this is a net piety gain if you need just one try. Whether the pacification succeeds or not, the invested food, piety and magic point are lost. If it does succeed, the monster is healed and you gain some piety and half the monster's experience value. Otherwise, the monster is unaffected and you gain nothing. In total, this is a net piety gain if you need just one try. @@ -278,7 +278,7 @@ You can also heal allies and neutral monsters. %%%% Lesser Self-Healing -Depending on your Invocations skill, heal a small amount of your health. +Depending on your Invocations skill, heal a small amount of hit points. %%%% Purification @@ -286,7 +286,7 @@ Purge your body of bad effects such as sickness, poisoning, slowness, confusion %%%% Greater Healing -Using this ability on hostile monsters will try to make them neutral. This works best on animals, worse on humanoids of your species, still worse on other humanoids, and worst of all on demons and undead. The chance for successful pacification depends on the healing power, so is significantly better than using Lesser Healing. +Depending on your Invocations skill, heal a creature other than you by a moderate amount. Using this ability on hostile monsters will try to make them neutral. This works best on animals, worse on humanoids of your species, still worse on other humanoids, and worst of all on demons and undead. The chance for successful pacification depends on the healing power, so it is significantly better than using Lesser Healing. Whether the pacification succeeds or not, the invested food, piety and magic points are lost. If it does succeed, the monster is healed and you gain some piety and half the monster's experience value. Otherwise, the monster is unaffected and you gain nothing. In total, this is a net piety loss even if you need just one try. Whether the pacification succeeds or not, the invested food, piety and magic points are lost. If it does succeed, the monster is healed and you gain some piety and half the monster's experience value. Otherwise, the monster is unaffected and you gain nothing. In total, this is a net piety loss even if you need just one try. @@ -294,15 +294,15 @@ You can also heal allies and neutral monsters. %%%% Greater Self-Healing -Depending on your Invocations skill, heal a moderate amount of your health. Roughly, Greater Healing will allow you to heal three times the amount of Lesser Healing at a slightly higher total piety cost. +Depending on your Invocations skill, heal a moderate amount of hit points. Roughly, Greater Healing will allow you to heal three times the amount of Lesser Healing at a slightly higher total piety cost. %%%% Restoration -Fully restore your Strength, Dexterity and Intelligence, and heal a large amount of rotted hitpoints. +Fully restore your Strength, Dexterity and Intelligence, and heal a large amount of rotted hit points. %%%% Divine Vigour -Depending on your Invocations skill, heal a large amount of, and temporarily increase, your hitpoints. +Depending on your Invocations skill, heal a large amount of, and temporarily increase, your hit points. %%%% # Lugonu Depart the Abyss @@ -323,7 +323,7 @@ Corrupt the current level by unleashing Abyssal energies on it. This will cause %%%% Enter the Abyss -You can transfer yourself to Lugonu's realm instantly... at a cost. +Transfer yourself to Lugonu's realm instantly... at a cost. %%%% # Nemelex Xobeh Draw One @@ -344,7 +344,7 @@ Draw four cards from any deck in your inventory, mark and remember them, so that %%%% Stack Five -Draw five cards from your wielded deck, losing the rest of the deck. Look at the cards and sort them into any order you'd like. Subsequently, you'll draw these cards in the order you chose. +Draw five cards from any deck in your inventory, losing the rest of the deck. Look at the cards and sort them into any order you'd like. Subsequently, you can draw these cards in the order you chose. %%%% # Beogh Smiting diff --git a/crawl-ref/source/dat/descript/branches.txt b/crawl-ref/source/dat/descript/branches.txt index a6cf442273..d51bbfc38f 100644 --- a/crawl-ref/source/dat/descript/branches.txt +++ b/crawl-ref/source/dat/descript/branches.txt @@ -8,13 +8,12 @@ matter what the origin of this cave is, it is filled with riches unheard of as well as with ample dangers to any intruder. Few have escaped alive, and even fewer have kept some rest of sanity to tell the tale. -The dungeon is 27 levels deep but honestly, this is only the beginning. +The dungeon is 27 levels deep, but honestly, this is only the beginning. %%%% Temple -The Temple of some of the Gods, a place of peace and refuge from the -insanity of the dungeon. It is located between the levels 4 and 7 of -the main dungeon. +A Temple of Gods, a place of peace and refuge from the insanity of the +dungeon. It is located between the levels 4 and 7 of the main dungeon. %%%% Orcish Mines @@ -34,15 +33,15 @@ The Elven Halls are seven levels deep. %%%% Lair -Most adventurers find the lair to be an exciting change of climate. And -indeed, there is something to be said about getting gored, mauled and -eaten rather than sliced, burnt or stabbed. +Most adventurers find the Lair of Beasts to be an exciting change of +climate. And indeed, there is something to be said about getting gored, +mauled and eaten rather than sliced, burnt or stabbed. The Lair is ten levels deep and contains the stairs to three more branches. %%%% Swamp -A swampy waste land, complete with ooze, muck, flies and large slavering +A swampy wasteland, complete with ooze, muck, flies and large slavering carnivorous monsters. The Swamp is five levels deep and contains the decaying rune. A dungeon @@ -55,7 +54,7 @@ From afar you hear the steady sounds of waves and smell the salty spray. Upon reaching the Shoals, you are impressed by exotic underground beaches, making up a few islands in a vast sea. Out of a sudden, a bloodcurdling scream fills the air, followed by a gurgle. Anxiously, you look around and -wonder: who is the predator? And who is the prey? +wonder: Who is the predator? And who is the prey? The Shoals are five levels deep and contain the barnacled rune. A dungeon features only one of the Swamp or Shoals branches. If the Shoals are @@ -87,7 +86,7 @@ The Hive is two levels deep. The entry is located between dungeon levels %%%% Vaults -Possibly constructed by some powerful madman, the vaults are said to be home +Possibly constructed by some powerful madman, the Vaults are said to be home to great treasures. The blood spots all around the entrance indicate that there is a certain amount of violence, too. @@ -100,15 +99,15 @@ Once upon a time, all the daggers and axes and polearms would gather at the time of night and dance the waltz, dreaming of battlefields void of man and beast. That time is no more, yet the weapons are still there. -The Hall of Blades is a single level and can be found between Vaults:4 and -Vaults:6. +The Hall of Blades is a single level and can be found between Vault:4 and +Vault:6. %%%% Crypt You hear moans and shrieks of tortured souls, suffering in acts of the unspeakable. -The Crypt is five levels deep and can be found between Vaults:2 and Vaults:4. +The Crypt is five levels deep and can be found between Vault:2 and Vault:4. %%%% Tomb @@ -129,7 +128,7 @@ of the main dungeon. %%%% Dis -Who will stand the test of iron? +The Iron City of Dis. Who will stand the test of iron? Dis is seven levels deep and contains the iron rune. It can be accessed via the Vestibule of Hell. @@ -144,28 +143,29 @@ accessed via the Vestibule of Hell. %%%% Cocytus -A grim and frost-bitten hell. +A grim and frost-bitten wasteland. Cocytus is seven levels deep and contains the icy rune. It can be accessed via the Vestibule of Hell. %%%% Tartarus -Over time, the undead, demons and devils of this place drain all life out of -treasure-craving visitors. +A decaying netherworld. Over time, the undead, demons and devils of this +place drain all life out of treasure-craving visitors. Tartarus is seven levels deep and contains the bone rune. It can be accessed via the Vestibule of Hell. %%%% Pan -Pandemonium, colloquially known as Pan, is an infinite realm of pain and -suffering. Pan contains four special runes, as well as generic ones, in -addition to lots of loot. All these treasures are guarded by demons and -cruel Pan lords. Many a hero, confusing confidence with megalomania, has -died unsuspectingly in the barrage of torment and hellfire. +Pandemonium, is an infinite realm of pain and suffering. It contains four +special runes, as well as generic ones, in addition to lots of loot. All +these treasures are guarded by demons and even crueler demon lords. Many a +hero, confusing confidence with megalomania, has died unsuspectingly in the +barrage of torment and hellfire. -Pan is endless. +Pandemonium is endless. Portals there are found abundantly in the deeper +parts of the main dungeon. Note that getting back might be more difficult. %%%% Abyss @@ -184,7 +184,8 @@ Zot A region of the dungeon complex, safely locked away and referred to usually by madness, frenzy, lunacy. Only the most demented adventurers would dare to break the seal and press deeper - in the vain hope for a fabled artefact no -man has ever laid eyes on before. +one has ever laid eyes on before. -Zot is five levels deep and can only be entered when carrying three runes. +The Realm of Zot is five levels deep and can only be entered when carrying +at least three runes. %%%% diff --git a/crawl-ref/source/dat/descript/cards.txt b/crawl-ref/source/dat/descript/cards.txt index fb23071241..f945df51d4 100644 --- a/crawl-ref/source/dat/descript/cards.txt +++ b/crawl-ref/source/dat/descript/cards.txt @@ -3,7 +3,7 @@ the Portal card This card teleports you to a random location. At higher power levels this may be instantaneous, controlled or both. -It is usually found in decks of escape and war, or in Nemelex's deck of punishment. +It is usually found in decks of escape and war, or in Nemelex Xobeh's deck of punishment. %%%% the Warp card @@ -12,7 +12,7 @@ It is usually found in decks of escape and war. %%%% Swap card -This card swaps your position with that of a nearby monster. +This card swaps your position with that of a nearby creature. It is usually found in decks of escape and war. %%%% Velocity card @@ -24,7 +24,7 @@ It is usually found in decks of escape and war. the Tomb card This card entombs the player in protective walls of solid rock. At lower power levels, the tomb may be imperfect. Use with caution! -It is usually found in decks of defence, escape and war, or in Nemelex's deck of punishment. +It is usually found in decks of defence, escape and war, or in Nemelex Xobeh's deck of punishment. %%%% the Banshee card @@ -34,11 +34,11 @@ It is usually found in decks of defence, escape and war. Damnation card This card banishes one or more nearby creatures to the Abyss, possibly including you. -It is usually found in decks of defence, escape and war, or in Nemelex's deck of punishment. +It is usually found in decks of defence, escape and war, or in Nemelex Xobeh's deck of punishment. %%%% Solitude card -This card randomly teleports creatures adjacent to you. +This card randomly teleports creatures that are adjacent to you. It is usually found in decks of defence, escape and war. %%%% Warpwright card @@ -141,13 +141,13 @@ It is usually found in decks of changes and dungeons. %%%% the Trowel card -This card may create an altar, a statue, a golem or a portal. +This card may create an altar, a statue, a golem or even a portal. It is usually found in decks of changes and dungeons. %%%% the Minefield card This card makes your immediate surroundings more dangerous. -It is usually found in decks of changes and dungeons, or in Nemelex's deck of punishment. +It is usually found in decks of changes and dungeons, or in Nemelex Xobeh's deck of punishment. %%%% # deck of summonings the Crusade card @@ -177,7 +177,7 @@ It is usually found in decks of summonings and war. %%%% the Bones card -This card summons a skeletal monster. +This card summons a skeletal creature. It is usually found in decks of summonings and war. %%%% Repulsiveness card @@ -217,44 +217,44 @@ It is usually found in decks of destruction and war. %%%% Pain card -The Pain card unleashes a necromantic attack spell, which may affect you as well. +This card unleashes a necromantic attack spell, which may affect you as well. It is usually found in decks of destruction and war. %%%% Torment card -This card calls on the powers of Hell to agonising injury to any nearby living creature. +This card calls on the powers of Hell to cause agonising injury to any nearby living creature. It is usually found in decks of destruction and war. %%%% # deck of punishment (along with a few others) Wrath card This card draws a god's wrath against you. -It is usually only found in Nemelex's deck of punishment. +It is usually only found in Nemelex Xobeh's deck of punishment. %%%% the Wraith card This card will drain you. -It is usually only found in Nemelex's deck of punishment. +It is usually only found in Nemelex Xobeh's deck of punishment. %%%% the Curse card This card places curses on your possessions and may even spoil your potions. -It is usually only found in Nemelex's deck of punishment. +It is usually only found in Nemelex Xobeh's deck of punishment. %%%% Xom card This card draws the attention of Xom on yourself. -It is usually only found in Nemelex's deck of punishment. +It is usually only found in Nemelex Xobeh's deck of punishment. %%%% Famine card This card starves you. -It is usually only found in Nemelex's deck of punishment. +It is usually only found in Nemelex Xobeh's deck of punishment. %%%% Wild Magic card This card causes wild magic, as if from miscasting a spell, to act upon you. -It is usually only found in Nemelex's deck of punishment. +It is usually only found in Nemelex Xobeh's deck of punishment. %%%% # deck of oddities (random card, along with a few others) the Bargain card diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index d055dde4cf..3dc98e8679 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2185,10 +2185,11 @@ void pray() else if (!_god_accepts_prayer(you.religion)) { simple_god_message(" ignores your prayer."); + you.turn_is_over = false; return; } - // Beoghites and Nemelexites can abort out now instead of offering + // Beoghites and Nemelexites can abort now instead of offering // something they don't want to lose. if (altar_god == GOD_NO_GOD && (you.religion == GOD_BEOGH || you.religion == GOD_NEMELEX_XOBEH) diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc index 4724ef63f1..35aa8c5f1d 100644 --- a/crawl-ref/source/transfor.cc +++ b/crawl-ref/source/transfor.cc @@ -476,9 +476,9 @@ static void _transformation_expiration_warning() } } -static bool _abort_or_fizzle() +static bool _abort_or_fizzle(bool just_check) { - if (you.turn_is_over) + if (!just_check && you.turn_is_over) { canned_msg(MSG_SPELL_FIZZLES); return (true); // pay the necessary costs @@ -562,7 +562,7 @@ bool transform(int pow, transformation_type which_trans, bool force, { if (!force) mpr("Your unliving flesh cannot be transformed in this way."); - return (_abort_or_fizzle()); + return (_abort_or_fizzle(just_check)); } if (which_trans == TRAN_LICH && you.duration[DUR_DEATHS_DOOR]) @@ -572,13 +572,13 @@ bool transform(int pow, transformation_type which_trans, bool force, mpr("The transformation conflicts with an enchantment " "already in effect."); } - return (_abort_or_fizzle()); + return (_abort_or_fizzle(just_check)); } std::set<equipment_type> rem_stuff = _init_equipment_removal(which_trans); if (_check_for_cursed_equipment(rem_stuff, which_trans, force)) - return (_abort_or_fizzle()); + return (_abort_or_fizzle(just_check)); int str = 0, dex = 0, symbol = '@', colour = LIGHTGREY, xhp = 0, dur = 0; const char* tran_name = "buggy"; @@ -669,7 +669,7 @@ bool transform(int pow, transformation_type which_trans, bool force, if (check_transformation_stat_loss(rem_stuff, force, std::max(-str, 0), std::max(-dex, 0))) { - return (_abort_or_fizzle()); + return (_abort_or_fizzle(just_check)); } // If we're just pretending return now. @@ -677,7 +677,7 @@ bool transform(int pow, transformation_type which_trans, bool force, return (true); if (!force && _check_transformation_inscription_warning(rem_stuff)) - return (_abort_or_fizzle()); + return (_abort_or_fizzle(just_check)); // All checks done, transformation will take place now. you.redraw_evasion = true; diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 56c89f4bf2..9516a68c85 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -188,7 +188,6 @@ static void _xom_is_stimulated(int maxinterestingness, interestingness = std::min(255, interestingness); -#define DEBUG_XOM #if defined(DEBUG_RELIGION) || defined(DEBUG_GIFTS) || defined(DEBUG_XOM) mprf(MSGCH_DIAGNOSTICS, "Xom: gift_timeout: %d, maxinterestingness = %d, interestingness = %d", |