summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/describe.cc7
-rw-r--r--crawl-ref/source/fight.cc8
2 files changed, 14 insertions, 1 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 9b43b76a8c..c57a3beb73 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -3644,7 +3644,12 @@ std::string get_skill_description(int skill, bool need_title)
|| you.species == SP_MERFOLK && player_is_swimming()
|| player_mutation_level( MUT_STINGER ))
{
- unarmed_attacks.push_back("slap with your tail");
+ // TSO worshippers will not use their venomous tails.
+ if (!(you.religion == GOD_SHINING_ONE
+ && player_mutation_level(MUT_STINGER)))
+ {
+ unarmed_attacks.push_back("slap with your tail");
+ }
}
if (player_mutation_level(MUT_FANGS)
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 1ba39f706e..26c4ce3644 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -1097,6 +1097,14 @@ bool melee_attack::player_aux_unarmed()
continue;
}
+ // TSO worshippers don't use their stinger in order to
+ // avoid poisoning.
+ if (you.religion == GOD_SHINING_ONE
+ && player_mutation_level(MUT_STINGER) > 0)
+ {
+ continue;
+ }
+
unarmed_attack = "tail-slap";
aux_damage = 6;