nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

pull in the recent unconditionals merge from master

Browse Source
This commit is contained in:
Derek S. Ray
2015-02-27 21:25:00 -05:00
parent 7f0ff8f011
commit b1a7bbbbdb
538 changed files with 1715 additions and 5685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mplayer.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mplayer.c $Date$ $Revision$ */
/* NetHack 3.5 mplayer.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mplayer.c $Date: 2009/05/06 10:47:09 $ $Revision: 1.11 $ */
/* SCCS Id: @(#)mplayer.c 3.5 2006/12/15 */
/* Copyright (c) Izchak Miller, 1992. */
/* NetHack may be freely redistributed. See license for details. */
@@ -202,11 +203,9 @@ register boolean special;
case PM_SAMURAI:
if (rn2(2)) weapon = KATANA;
break;
#ifdef TOURIST
case PM_TOURIST:
/* Defaults are just fine */
break;
#endif
case PM_VALKYRIE:
if (rn2(2)) weapon = WAR_HAMMER;
if (rn2(2)) armor = rnd_class(PLATE_MAIL, CHAIN_MAIL);
@@ -261,11 +260,7 @@ register boolean special;
(void)mongets(mtmp, rnd_class(DILITHIUM_CRYSTAL, JADE));
/* To get the gold "right" would mean a player can double his */
/* gold supply by killing one mplayer. Not good. */
#ifndef GOLDOBJ
mtmp->mgold = rn2(1000);
#else
mkmonmoney(mtmp, rn2(1000));
#endif
quan = rn2(10);
while(quan--)
(void) mpickobj(mtmp, mkobj(RANDOM_CLASS, FALSE));