From 744fc99610098d9572508383f39a7aa5107f7762 Mon Sep 17 00:00:00 2001 From: haranp Date: Wed, 18 Mar 2009 11:43:07 +0000 Subject: TSO worshippers with the stinger mutation will not use the tailslap unarmed attack. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9514 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/describe.cc | 7 ++++++- crawl-ref/source/fight.cc | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'crawl-ref') 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; -- cgit v1.2.3-54-g00ecf