diff options
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 45 | ||||
| -rw-r--r-- | crawl-ref/source/newgame.cc | 14 |
2 files changed, 30 insertions, 29 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 42c67aa419..e9397e4982 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1201,27 +1201,7 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) break; } - if (monster->type == MONS_MUMMY) - { - if (YOU_KILL(killer) && killer != KILL_YOU_CONF) - curse_an_item(true); - } - else if (monster->type == MONS_GUARDIAN_MUMMY - || monster->type == MONS_GREATER_MUMMY - || monster->type == MONS_MUMMY_PRIEST) - { - if (YOU_KILL(killer) && killer != KILL_YOU_CONF) - { - mpr("You feel extremely nervous for a moment...", - MSGCH_MONSTER_SPELL); - - miscast_effect( SPTYP_NECROMANCY, - 3 + (monster->type == MONS_GREATER_MUMMY) * 8 - + (monster->type == MONS_MUMMY_PRIEST) * 5, - random2avg(88, 3), 100, "a mummy death curse" ); - } - } - else if (monster->type == MONS_BORIS && !in_transit) + if (monster->type == MONS_BORIS && !in_transit) { // XXX: Actual blood curse effect for Boris? -- bwr @@ -1237,6 +1217,29 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) // creation again. -- bwr you.unique_creatures[ monster->type ] = false; } + else if (!mons_is_summoned(monster)) + { + if (monster->type == MONS_MUMMY) + { + if (YOU_KILL(killer) && killer != KILL_YOU_CONF) + curse_an_item(true); + } + else if (monster->type == MONS_GUARDIAN_MUMMY + || monster->type == MONS_GREATER_MUMMY + || monster->type == MONS_MUMMY_PRIEST) + { + if (YOU_KILL(killer) && killer != KILL_YOU_CONF) + { + mpr("You feel extremely nervous for a moment...", + MSGCH_MONSTER_SPELL); + + miscast_effect( SPTYP_NECROMANCY, + 3 + (monster->type == MONS_GREATER_MUMMY) * 8 + + (monster->type == MONS_MUMMY_PRIEST) * 5, + random2avg(88, 3), 100, "a mummy death curse" ); + } + } + } if (killer != KILL_RESET && killer != KILL_DISMISSED) { diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 06e30a2c70..b7483afdcc 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -3411,18 +3411,16 @@ spec_query: cprintf(EOL); textcolor( BROWN ); - + cprintf(EOL EOL); if (you.char_class == JOB_UNKNOWN) { - cprintf(EOL - "SPACE - Choose class first; * - Random species" EOL + cprintf("Space - Choose class first; * - Random species" EOL "! - Random character; # - Good random character; X - Quit" EOL); } else { - cprintf(EOL - "* - Random; + - Good random; " + cprintf("* - Random; + - Good random; " "Bksp - Back to class selection; X - Quit" EOL); } @@ -3436,7 +3434,7 @@ spec_query: } if (_prev_startup_options_set()) { - cprintf("%sTAB - %s", + cprintf("%sTab - %s", prevraceok? "; " : "", _prev_startup_description().c_str()); } @@ -3661,7 +3659,7 @@ job_query: if (you.species == SP_UNKNOWN) { cprintf(EOL - "SPACE - Choose species first; * - Random class; " + "Space - Choose species first; * - Random class; " "+ - Good random" EOL "! - Random character; # - Good random character; X - Quit" EOL); @@ -3683,7 +3681,7 @@ job_query: } if (_prev_startup_options_set()) { - cprintf("%sTAB - %s", + cprintf("%sTab - %s", prevclassok? "; " : "", _prev_startup_description().c_str()); } |