diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-17 01:42:23 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-17 01:42:23 +0000 |
| commit | 1eff96d6a545f553cb96cc6347f712c5262a1852 (patch) | |
| tree | fa7553aaef6aef77e4be943dfdb92ed746e81c50 /crawl-ref | |
| parent | ded3b65a0dfd01a304e0b1c9f41c5d9fafc1d3f8 (diff) | |
| download | crawl-ref-1eff96d6a545f553cb96cc6347f712c5262a1852.tar.gz crawl-ref-1eff96d6a545f553cb96cc6347f712c5262a1852.zip | |
Put stabbing back in as a separate conduct, in case it can be used for
e.g. a future god of assassins.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5094 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/enum.h | 1 | ||||
| -rw-r--r-- | crawl-ref/source/fight.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 12 |
3 files changed, 10 insertions, 5 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 48b990a984..2209fa92f5 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -637,6 +637,7 @@ enum conduct_type DID_ATTACK_NEUTRAL, DID_ATTACK_FRIEND, DID_FRIEND_DIES, + DID_STABBING, DID_UNCHIVALRIC_ATTACK, DID_POISON, DID_DEDICATED_BUTCHERY, diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index ae8885f921..5699bacf0e 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -1424,6 +1424,8 @@ int melee_attack::player_stab(int damage) stab_message( def, stab_bonus ); exercise(SK_STABBING, 1 + random2avg(5, 4)); + + did_god_conduct(DID_STABBING, 4); } else { diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index ff5e28e4b6..ba2193d0cb 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2353,6 +2353,7 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known, } break; + case DID_STABBING: // unused case DID_STIMULANTS: // unused case DID_EAT_MEAT: // unused case DID_CREATED_LIFE: // unused @@ -2373,11 +2374,12 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known, { "", "Necromancy", "Unholy", "Attack Holy", "Attack Neutral", - "Attack Friend", "Friend Died", "Unchivalric Attack", "Poison", - "Field Sacrifice", "Kill Living", "Kill Undead", "Kill Demon", - "Kill Natural Evil", "Kill Mutator Or Rotter", "Kill Wizard", - "Kill Priest", "Kill Holy", "Undead Slave Kill Living", - "Servant Kill Living", "Servant Kill Undead", "Servant Kill Demon", + "Attack Friend", "Friend Died", "Stab", "Unchivalric Attack", + "Poison", "Field Sacrifice", "Kill Living", "Kill Undead", + "Kill Demon", "Kill Natural Evil", "Kill Mutator Or Rotter", + "Kill Wizard", "Kill Priest", "Kill Holy", + "Undead Slave Kill Living", "Servant Kill Living", + "Servant Kill Undead", "Servant Kill Demon", "Servant Kill Natural Evil", "Servant Kill Holy", "Spell Memorise", "Spell Cast", "Spell Practise", "Spell Nonutility", "Cards", "Stimulants", "Drink Blood", "Cannibalism", "Eat Meat", |