diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-03 23:02:32 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-03 23:02:32 +0000 |
commit | 49815faa5cfe1cce614f4d2bbab9341613a662c5 (patch) | |
tree | 9bf29a86509e1cbbf39674875d832d080fb0bdda /crawl-ref/source/it_use3.cc | |
parent | 72aae92fdbbe1afa692ebe0bf9dc32e59ae9e368 (diff) | |
download | crawl-ref-49815faa5cfe1cce614f4d2bbab9341613a662c5.tar.gz crawl-ref-49815faa5cfe1cce614f4d2bbab9341613a662c5.zip |
[2070013]: newly created, animated, etc. friendly monsters now default to
'follow me' behaviour, rather than following your last command (even if
was before they were summoned.) Their behaviour can still be changed by
giving them commands, of course.
The previous behaviour was clearly intentional so I'm not too sure about
this change; feel free to revert if I'm missing something.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8886 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/it_use3.cc')
-rw-r--r-- | crawl-ref/source/it_use3.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc index e4dadc298b..460059ad27 100644 --- a/crawl-ref/source/it_use3.cc +++ b/crawl-ref/source/it_use3.cc @@ -227,8 +227,7 @@ void special_wielded() if (x_chance_in_y(player_spec_death() + 1, 8)) { create_monster( - mgen_data(MONS_SHADOW, BEH_FRIENDLY, - 2, 0, you.pos(), you.pet_target)); + mgen_data(MONS_SHADOW, BEH_FRIENDLY, 2, 0, you.pos(), MHITYOU)); did_god_conduct(DID_NECROMANCY, 1); } break; @@ -718,8 +717,7 @@ static bool efreet_flask(void) mgen_data(MONS_EFREET, friendly ? BEH_FRIENDLY : BEH_HOSTILE, 0, 0, you.pos(), - friendly ? you.pet_target : MHITYOU, - MG_FORCE_BEH)); + MHITYOU, MG_FORCE_BEH)); if (monster != -1) { @@ -986,17 +984,13 @@ static bool box_of_beasts() while (player_will_anger_monster(beasty)); beh_type beha = BEH_FRIENDLY; - unsigned short hitting = you.pet_target; if (one_chance_in(you.skills[SK_EVOCATIONS] + 5)) - { beha = BEH_HOSTILE; - hitting = MHITYOU; - } if (create_monster( mgen_data(beasty, beha, 2 + random2(4), 0, - you.pos(), hitting)) != -1) + you.pos(), MHITYOU)) != -1) { success = true; |