diff options
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 10 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/spells2.cc | 8 |
3 files changed, 13 insertions, 11 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index f29527ad53..63211593b6 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -644,13 +644,13 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) if (!silent && _monster_avoided_death(monster, killer, i)) return; - + if (mons_is_caught(monster)) mons_clear_trapping_net(monster); // update list of monsters beholding player update_beholders(monster, true); - + const int monster_killed = monster_index(monster); bool death_message = !silent && mons_near(monster) && player_monster_visible(monster); @@ -685,7 +685,7 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) monster->name(DESC_NOCAP_A, true).c_str())); } } - + // From time to time Trog gives you a little bonus if (killer == KILL_YOU && you.duration[DUR_BERSERKER]) { @@ -1069,7 +1069,7 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) case KILL_DISMISSED: break; - + default: monster->destroy_inventory(); break; @@ -1108,7 +1108,7 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) { // Provide the player with an ingame clue to Boris' return. -- bwr const int tmp = random2(6); - simple_monster_message( monster, + simple_monster_message( monster, (tmp == 0) ? " says, \"You haven't seen the last of me!\"" : (tmp == 1) ? " says, \"I'll get you next time!\"" : (tmp == 2) ? " says, \"This isn't over yet!\"" : diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 8f2beba492..bc4558ecc7 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -770,7 +770,7 @@ static bool blessing_reinforcements(void) followers[random2(ARRAYSIZE(followers))]; return (create_monster(follower_type, 0, BEH_GOD_GIFT, you.x_pos, - you.y_pos, MHITYOU, MONS_PROGRAM_BUG, true) != -1); + you.y_pos, you.pet_target, MONS_PROGRAM_BUG, true) != -1); } static bool blessing_priesthood(monsters* mon) @@ -1051,7 +1051,7 @@ static void do_god_gift(bool prayed_for) && !grid_destroys_items(grd[you.x_pos][you.y_pos]) && one_chance_in(4)) { - if (you.religion == GOD_TROG + if (you.religion == GOD_TROG || (you.religion == GOD_OKAWARU && coinflip())) { success = acquirement(OBJ_WEAPONS, you.religion); @@ -1349,7 +1349,7 @@ void pray() if (you.religion == GOD_NEMELEX_XOBEH) you.duration[DUR_PRAYER] = 1; - + if (!was_praying) do_god_gift(true); diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index ae4aaee5ed..7f32ea6eb9 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1577,7 +1577,8 @@ bool summon_berserker(int pow, bool god_gift) } int mons = create_monster( mon, numsc, beha, you.x_pos, you.y_pos, - MHITYOU, MONS_PROGRAM_BUG ); + god_gift ? you.pet_target : MHITYOU, + MONS_PROGRAM_BUG ); if (mons != -1) { @@ -1668,8 +1669,9 @@ bool summon_swarm( int pow, bool unfriendly, bool god_gift ) behaviour = BEH_FRIENDLY; if (create_monster( thing_called, 3, behaviour, - you.x_pos, you.y_pos, MHITYOU, - MONS_PROGRAM_BUG, false, false, false, true)) + you.x_pos, you.y_pos, + !unfriendly ? you.pet_target : MHITYOU, + MONS_PROGRAM_BUG, false, false, false, true) != -1) { summoned = true; } |