slashem/doc/fr/slashem.6 @@ -1,5 +1,5 @@ # SCCS Id: @(#)data.base 3.4 2003/07/23 -# $Id: data.base,v 1.14 2003/12/11 09:49:05 j_ali Exp $ +# $Id: data.base,v 1.14.2.2 2006/04/17 11:14:04 prousu Exp $ # Copyright (c) 1994, 1995, 1996 by the NetHack Development Team # Copyright (c) 1994 by Boudewijn Wayers # Copyright (c) 2002 by the Slash'EM Development Team @@ -455,8 +455,9 @@ barbarian barbed devil Barbed devils lack any real special abilities, though they are quite difficult to kill. -+~mongbat -+~vampire bat +~mongbat +~vampire bat +~wombat *bat A bat, flitting in the darkness outside, took the wrong turn as it made its nightly rounds and came in through the window @@ -2851,7 +2852,8 @@ lord surt* and harry, and overcome all the gods, and burn all the world with fire. [ The Prose Edda, by Snorri Sturluson ] -lug* +lug +lugh Lugh, or Lug, was the sun god of the Irish Celts. One of his weapons was a rod-sling which worshippers sometimes saw in the sky as a rainbow. As a tribal god, he was particularly slashem/dat/data.base @@ -29,6 +29,32 @@ | Section 1: Yesterday's News | +-----------------------------+ +ver 0.0.7E7F2 [December 4/2005] [Released by Ali] +-fixed bug 1232707: engraving with lightsabers +-fixed bug 1237780: gtk window port fails to build with gcc-4.0 +-fixed bug 1239041: engrave dialog doesn't show lightsabers +-fixed bug 1231766: Food shown in Medical Kits +-fixed bug 1238060: grammatical error when burning through a door + (Benjamin Schieder) +-fixed bug 1104713: Pet and Frozen food stores can charge +-fixed bug 988827: Monster wearing CoI left invisible corpse +-fixed bug 934078: Mold "wiggle" out of bag +-fixed bug 933587: One-Eyed Sam referred to as "it" +-fixed bug 1240794: Pets don't grow up properly +-fixed bug 1240799: Steed ridden onto poly trap polymorphs permanently +-fixed bug 1243904: chameleon as statue trap +-fixed bug 1223226: Some creatures are missing horns +-fixed bug 1223222: Female Bulls?? +-fixed bug 1244470: shopkeeper don't have shotgun +-fixed bug 215062: no black color + Extends videocolors option, see Guidebook for details. +-fixed bug 1244468: different spitting venom when polymorph +-fixed bug 1179557: Found egg marked (laid by you) +-fixed bug 1206099: Torches are not extinguished with rust traps +-fixed bug 1294907: 'Raise Zombies' technique cannot raise dwarf zombies! (Xeno) +-fixed bug 1355972: Monsters Don't gain Drain resistance due to worn items! + (Xeno) + ver 0.0.7E7F1 [July 2/2005] [Released by Ali] -fixed bug 1155634: charm spell or command undead spell invoke genocide -fixed incorrect #ifdef resulting in compilation failure on ANSI only DOS builds slashem/history.txt @@ -153,7 +153,7 @@ A("Luckblade", SHORT_SWORD, PHYS(5,5), NO_DFNS, NO_CARY, 0, A_NEUTRAL, NON_PM, PM_GNOME, 1000L ), A("Sword of Balance", SILVER_SHORT_SWORD, - SPFX_DALIGN, 0, 0, + (SPFX_RESTR|SPFX_DALIGN), 0, 0, PHYS(2,5), NO_DFNS, NO_CARY, 0, A_NEUTRAL, NON_PM, NON_PM, 5000L ), A("Frost Brand", LONG_SWORD, slashem/include/artilist.h @@ -5,12 +5,6 @@ #ifndef COLOR_H #define COLOR_H -#ifdef MENU_COLOR -# ifdef USE_REGEX_MATCH -# include <regex.h> -# endif -#endif - /* * The color scheme used is tailored for an IBM PC. It consists of the * standard 8 colors, folowed by their bright counterparts. There are slashem/include/color.h @@ -177,10 +177,6 @@ # define POSITIONBAR #endif -#ifndef DEFAULT_WINDOW_SYS -# define DEFAULT_WINDOW_SYS "tty" -#endif - #ifdef X11_GRAPHICS /* * There are two ways that X11 tiles may be defined. (1) using a custom @@ -195,6 +191,13 @@ # ifdef USE_XPM # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */ # endif +# ifndef DEFAULT_WINDOW_SYS +# define DEFAULT_WINDOW_SYS "X11" +# endif +#endif + +#ifndef DEFAULT_WINDOW_SYS +# define DEFAULT_WINDOW_SYS "tty" #endif /* slashem/include/config.h @@ -2125,6 +2125,7 @@ E void NDECL(run_timers); E void FDECL(obj_move_timers, (struct obj *, struct obj *)); E void FDECL(obj_split_timers, (struct obj *, struct obj *)); E void FDECL(obj_stop_timers, (struct obj *)); +E void FDECL(mon_stop_timers, (struct monst *)); E boolean FDECL(obj_is_local, (struct obj *)); E void FDECL(save_timers, (int,int,int)); E void FDECL(restore_timers, (int,int,BOOLEAN_P,long)); slashem/include/extern.h @@ -176,7 +176,8 @@ ((ptr) == &mons[PM_FIRE_ELEMENTAL]) ? 2 : \ ((ptr) == &mons[PM_FIRE_VAMPIRE])? 2 : \ ((ptr) == &mons[PM_FLAMING_SPHERE]) ? 1 : \ - ((ptr) == &mons[PM_SHOCKING_SPHERE]) ? 1 : 0) + ((ptr) == &mons[PM_SHOCKING_SPHERE]) ? 1 : \ + ((ptr) == &mons[PM_WAX_GOLEM]) ? 1 : 0) /* [note: the light ranges above were reduced to 1 for performance...] */ /* WAC increased to 3 and 2?*/ #define likes_lava(ptr) (ptr == &mons[PM_FIRE_ELEMENTAL] || \ slashem/include/mondata.h @@ -16,10 +16,10 @@ */ #define PATCHLEVEL 7 #define EDITLEVEL 7 -#define FIXLEVEL 2 +#define FIXLEVEL 3 #define COPYRIGHT_BANNER_A \ -"This is SuperLotsoAddedStuffHack-Extended Magic 1997-2005" +"This is SuperLotsoAddedStuffHack-Extended Magic 1997-2006" #define COPYRIGHT_BANNER_B \ "NetHack, Copyright 1985-2003 Stichting Mathematisch Centrum, M. Stephenson." slashem/include/patchlevel.h @@ -423,8 +423,9 @@ #endif /* LINUX */ #endif /* GNOME_GRAPHICS */ -#if defined(USE_REGEX_MATCH) -# if defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(MENU_COLOR) && defined(USE_REGEX_MATCH) +# include <regex.h> +# ifndef RE_NO_GNU_OPS # define POSIX_REGEX # else # define GNU_REGEX slashem/include/unixconf.h @@ -67,31 +67,46 @@ http://www.slashem.org/ 1.2 Changes ----------- -ver 0.0.7E7F2 [December 4/2005] [Released by Ali] --fixed bug 1232707: engraving with lightsabers --fixed bug 1237780: gtk window port fails to build with gcc-4.0 --fixed bug 1239041: engrave dialog doesn't show lightsabers --fixed bug 1231766: Food shown in Medical Kits --fixed bug 1238060: grammatical error when burning through a door - (Benjamin Schieder) --fixed bug 1104713: Pet and Frozen food stores can charge --fixed bug 988827: Monster wearing CoI left invisible corpse --fixed bug 934078: Mold "wiggle" out of bag --fixed bug 933587: One-Eyed Sam referred to as "it" --fixed bug 1240794: Pets don't grow up properly --fixed bug 1240799: Steed ridden onto poly trap polymorphs permanently --fixed bug 1243904: chameleon as statue trap --fixed bug 1223226: Some creatures are missing horns --fixed bug 1223222: Female Bulls?? --fixed bug 1244470: shopkeeper don't have shotgun --fixed bug 215062: no black color - Extends videocolors option, see Guidebook for details. --fixed bug 1244468: different spitting venom when polymorph --fixed bug 1179557: Found egg marked (laid by you) --fixed bug 1206099: Torches are not extinguished with rust traps --fixed bug 1294907: 'Raise Zombies' technique cannot raise dwarf zombies! (Xeno) --fixed bug 1355972: Monsters Don't gain Drain resistance due to worn items! - (Xeno) +ver 0.0.7E7F3 [December 30/2006] [Released by Ali] +-inserted missing #ifdef resulting in compilation of pure ansi tty version for DOS failure. +-fixed bug 1461660: Misaligned door +-fixed bug 1449238: #youpoly takes a turn when denied +-fixed bug 1432473: help for Luggage shows help for Lug/Lugh +-fixed bug 1428520: Poisoned ID'd weapon gives description as well as ID +-fixed bug 1375292: help for wombat shows text for bat +-fixed bug 1375286: pummel strikes nothing, inside ochre jelly +-fixed bug 1355891: Cannot wish for multiple potions of vampire blood +-fixed bug 1314114: Shopkeepers cant see Shirts through invisible armour +-fixed bug 1304954: You can Name the Sword of Balance +-fixed bug 1223533: Typo error in the Install.X11 file +-fixed bug 1407275: Wrong weight of medical kits +-fixed bug 1213658: Death message missing with gas spore explosion when blind +-fixed bug 1291161: #force command doesn't work on locked box +-fixed bug 1223632: #force on shop doors +-fixed bug 879247: gender & alignment select dont focus on "random" button +-fixed bug 943553: Eating off floor while levitating +-fixed bug 1432411: Knew the colour of a potion thrown on me, when blind +-fixed bug 1449159: DEFAULT_WINDOW_SYS wrong if only X11 enabled +-fixed bug 1400802: wax golems don't emit light +-fixed bug 1586216: USE_REGEX_MATCH fails on Solaris 10 +-fixed bug 1583978: Grammer error in broken celibacy message +-fixed bug 1549137: Technique cutthroat is effective to no-head monster + (Michael DiPietro) +-fixed bug 1288590: Potion of hallucination cannot be identified by drinking +-fixed bug 1482524: alchemy with gain level asymmetric (Michael DiPietro) +-fixed bug 1546379: Fedora & charisma (Michael DiPietro) +-Actioned feature request 1504905: Add french translation of manual page + (Rémi Delrue) +-fixed bug 1624174: koala bugs steed +-fixed bug 1539448: rotten wraith corpses GPF +-fixed bug 1521400: Dungeon collapsed returning to full level +-fixed bug 1211513: Upgraded objects retain names, even artifact names +-fixed bug 1554633: lichen, grown on a dead pet corpse, inherits pet's name +-fixed bug 1521471: Medical kit contents can leak +-fixed bug 1609542: Reaper + eyes of overworld +-fixed bug 1503394: Conduct= is not always written to logfile +-fixed bug 1558274: Light source weapons not working properly +-fixed bug 1602002: dmonsfree when using travel command & burdened See history.txt for changes made in previous versions. @@ -228,7 +243,7 @@ Thanks to Kevin Hugo (hugo@cae.wisc.edu), the previous Macintosh maintainer and the author of many changes, who has had to move on to other projects. -Thanks to Dirk Schönberger (shoenberger@signsoft.com), who worked on +Thanks to Dirk Schönberger (shoenberger@signsoft.com), who worked on the Qt and Linux ports. Thanks to Ben Olmstead for mirroring the homepage. slashem/readme.txt @@ -2747,177 +2747,23 @@ struct obj *obj; } -/* KMH, balance patch -- Distance attacks by pole-weapons */ -/* WAC -- Range limited by skill */ -static int -use_pole(obj) - struct obj *obj; -{ - int res = 0, max_range = 8, min_range; - coord cc; - struct monst *mtmp; - struct obj *otmp; - boolean fishing; - - - /* Are you allowed to use the pole? */ - if (u.uswallow) { - pline("There's not enough room here to use that."); - return (0); - } - if (obj != uwep) { - if (!wield_tool(obj, "swing")) return(0); - else res = 1; - } - - /* Prompt for a location */ - pline("Where do you want to hit?"); - cc.x = u.ux; - cc.y = u.uy; - getpos(&cc, TRUE, "the spot to hit"); - if (cc.x == -10) return (0); /* user pressed esc */ - -#ifdef WEAPON_SKILLS - /* WAC -- range depends on skill. Default is 8 */ - if (weapon_type(obj) == P_NONE) max_range = 4; - else if (P_SKILL(weapon_type(obj)) <= P_BASIC) max_range = 4; - else if (P_SKILL(weapon_type(obj)) <= P_SKILLED) max_range = 5; -#endif - - min_range = ((obj->otyp == FISHING_POLE) ? 1 : 4); - - if (distu(cc.x, cc.y) > max_range) { - pline("Too far!"); - return (res); - } else if (distu(cc.x, cc.y) < min_range) { - pline("Too close!"); - return (res); - } else if (!cansee(cc.x, cc.y)) { - You("won't hit anything if you can't see that spot."); - return (res); - } - - /* What is there? */ - mtmp = m_at(cc.x, cc.y); - fishing = (obj->otyp == FISHING_POLE) && is_pool(cc.x, cc.y); - - /* Try a random effect */ - switch (rnd(6)) - { - case 1: - /* Snag yourself */ - if (obj->otyp == FISHING_POLE) { - You("hook yourself!"); - losehp(rn1(10,10), "a fishing hook", KILLED_BY); - return (1); - } - break; - case 2: - /* Reel in a fish */ - if (fishing && mtmp) { - if ((bigmonst(mtmp->data) || strongmonst(mtmp->data)) - && !rn2(2)) { - You("are yanked toward the %s", - surface(cc.x, cc.y)); - hurtle(sgn(cc.x-u.ux), sgn(cc.y-u.uy), 1, TRUE); - return (1); - } else if (enexto(&cc, u.ux, u.uy, 0)) { - You("reel in %s!", mon_nam(mtmp)); - mtmp->mundetected = 0; - rloc_to(mtmp, cc.x, cc.y); - return (1); - } - } - break; - case 3: - /* Snag an existing object */ - if (obj->otyp == FISHING_POLE && - (otmp = level.objects[cc.x][cc.y]) != - (struct obj *)0) { - You("snag an object from the %s!", surface(cc.x, cc.y)); - pickup_object(otmp, 1, FALSE); - /* If pickup fails, leave it alone */ - newsym(cc.x, cc.y); - return (1); - } - break; - case 4: - /* Snag some garbage */ - if (fishing && flags.boot_count < 1 && - (otmp = mksobj(LOW_BOOTS, TRUE, FALSE)) != - (struct obj *)0) { - flags.boot_count++; - You("snag some garbage from the %s!", - surface(cc.x, cc.y)); - if (pickup_object(otmp, 1, FALSE) <= 0) { - obj_extract_self(otmp); - place_object(otmp, u.ux, u.uy); - newsym(u.ux, u.uy); - } - return (1); - } -#ifdef SINKS - /* Or a rat in the sink/toilet */ - if (obj->otyp == FISHING_POLE && - !(mvitals[PM_SEWER_RAT].mvflags & G_GONE) && - (IS_SINK(levl[cc.x][cc.y].typ) || - IS_TOILET(levl[cc.x][cc.y].typ))) { - mtmp = makemon(&mons[PM_SEWER_RAT], - cc.x, cc.y, NO_MM_FLAGS); - pline("Eek! There's %s there!", - Blind ? "something squirmy" : - a_monnam(mtmp)); - return (1); - } -#endif - break; - case 5: - /* Catch your dinner */ - if (fishing && - (otmp = mksobj(CRAM_RATION, TRUE, FALSE)) != - (struct obj *)0) { - You("catch tonight's dinner!"); - if (pickup_object(otmp, 1, FALSE) <= 0) { - obj_extract_self(otmp); - place_object(otmp, u.ux, u.uy); - newsym(u.ux, u.uy); - } - return (1); - } - break; - default: - case 6: - /* Untrap */ - /* FIXME -- needs to deal with non-adjacent traps */ - break; - } - - /* The effect didn't apply. Attack whatever is there. */ - if (mtmp) { - (void) thitmonst(mtmp, uwep, 1); - return (1); - } - - pline(nothing_happens); - return (1); -} - - static const char not_enough_room[] = "There's not enough room here to use that.", where_to_hit[] = "Where do you want to hit?", cant_see_spot[] = "won't hit anything if you can't see that spot.", cant_reach[] = "can't reach that spot from here."; -#if 0 /* Distance attacks by pole-weapons */ STATIC_OVL int use_pole (obj) struct obj *obj; { - int res = 0, typ, max_range = 4, min_range = 4; + int res = 0, typ, max_range; + int min_range = obj->otyp == FISHING_POLE ? 1 : 4; coord cc; struct monst *mtmp; + struct obj *otmp; + boolean fishing; /* Are you allowed to use the pole? */ @@ -2929,7 +2775,6 @@ use_pole (obj) if (!wield_tool(obj, "swing")) return(0); else res = 1; } - /* assert(obj == uwep); */ /* Prompt for a location */ pline(where_to_hit); @@ -2938,11 +2783,16 @@ use_pole (obj) if (getpos(&cc, TRUE, "the spot to hit") < 0) return 0; /* user pressed ESC */ +#ifdef WEAPON_SKILLS /* Calculate range */ - typ = uwep_skill_type(); + typ = weapon_type(obj); if (typ == P_NONE || P_SKILL(typ) <= P_BASIC) max_range = 4; - else if (P_SKILL(typ) == P_SKILLED) max_range = 5; + else if (P_SKILL(typ) <= P_SKILLED) max_range = 5; else max_range = 8; +#else + max_range = 8; +#endif + if (distu(cc.x, cc.y) > max_range) { pline("Too far!"); return (res); @@ -2957,13 +2807,98 @@ use_pole (obj) } else if (!couldsee(cc.x, cc.y)) { /* Eyes of the Overworld */ You(cant_reach); return res; - } else if (!couldsee(cc.x, cc.y)) { /* Eyes of the Overworld */ - You(cant_reach); - return res; } - /* Attack the monster there */ - if ((mtmp = m_at(cc.x, cc.y)) != (struct monst *)0) { + /* What is there? */ + mtmp = m_at(cc.x, cc.y); + + if (obj->otyp == FISHING_POLE) { + fishing = is_pool(cc.x, cc.y); + /* Try a random effect */ + switch (rnd(6)) + { + case 1: + /* Snag yourself */ + You("hook yourself!"); + losehp(rn1(10,10), "a fishing hook", KILLED_BY); + return 1; + case 2: + /* Reel in a fish */ + if (mtmp) { + if ((bigmonst(mtmp->data) || strongmonst(mtmp->data)) + && !rn2(2)) { + You("are yanked toward the %s", surface(cc.x,cc.y)); + hurtle(sgn(cc.x-u.ux), sgn(cc.y-u.uy), 1, TRUE); + return 1; + } else if (enexto(&cc, u.ux, u.uy, 0)) { + You("reel in %s!", mon_nam(mtmp)); + mtmp->mundetected = 0; + rloc_to(mtmp, cc.x, cc.y); + return 1; + } + } + break; + case 3: + /* Snag an existing object */ + if ((otmp = level.objects[cc.x][cc.y]) != (struct obj *)0) { + You("snag an object from the %s!", surface(cc.x, cc.y)); + pickup_object(otmp, 1, FALSE); + /* If pickup fails, leave it alone */ + newsym(cc.x, cc.y); + return 1; + } + break; + case 4: + /* Snag some garbage */ + if (fishing && flags.boot_count < 1 && + (otmp = mksobj(LOW_BOOTS, TRUE, FALSE)) != + (struct obj *)0) { + flags.boot_count++; + You("snag some garbage from the %s!", + surface(cc.x, cc.y)); + if (pickup_object(otmp, 1, FALSE) <= 0) { + obj_extract_self(otmp); + place_object(otmp, u.ux, u.uy); + newsym(u.ux, u.uy); + } + return 1; + } +#ifdef SINKS + /* Or a rat in the sink/toilet */ + if (!(mvitals[PM_SEWER_RAT].mvflags & G_GONE) && + (IS_SINK(levl[cc.x][cc.y].typ) || + IS_TOILET(levl[cc.x][cc.y].typ))) { + mtmp = makemon(&mons[PM_SEWER_RAT], cc.x, cc.y, + NO_MM_FLAGS); + pline("Eek! There's %s there!", + Blind ? "something squirmy" : a_monnam(mtmp)); + return 1; + } +#endif + break; + case 5: + /* Catch your dinner */ + if (fishing && (otmp = mksobj(CRAM_RATION, TRUE, FALSE)) != + (struct obj *)0) { + You("catch tonight's dinner!"); + if (pickup_object(otmp, 1, FALSE) <= 0) { + obj_extract_self(otmp); + place_object(otmp, u.ux, u.uy); + newsym(u.ux, u.uy); + } + return 1; + } + break; + default: + case 6: + /* Untrap */ + /* FIXME -- needs to deal with non-adjacent traps */ + break; + } + } + + /* The effect didn't apply. Attack the monster there. */ + if (mtmp) { int oldhp = mtmp->mhp; bhitpos = cc; @@ -2980,7 +2915,6 @@ use_pole (obj) pline(nothing_happens); return (1); } -#endif STATIC_OVL int use_cream_pie(obj) @@ -3679,9 +3613,10 @@ doapply() yname(obj)); else { check_unpaid(obj); - if (otmp->quan > 1L) + if (otmp->quan > 1L) { otmp->quan--; - else { + obj->owt = weight(obj); + } else { obj_extract_self(otmp); obfree(otmp, (struct obj *)0); } slashem/src/apply.c @@ -322,17 +322,14 @@ register boolean mod; for (a = artilist+1; a->otyp; a++) if (a->otyp == otmp->otyp && !strcmp(a->name, name)) { register int m = a - artilist; -/*WAC add code to automatically light up Sunsword/holy spear of light on - creation*/ - /* For the check so artifact_light recognizes it */ - otmp->oartifact = m; - if (!artiexist[m] && mod && (artifact_light(otmp) || - otmp->otyp == MAGIC_CANDLE)) { - begin_burn(otmp, FALSE); - /* WAC light source deletion handled in obfree */ - } otmp->oartifact = (char)(mod ? m : 0); if (mod) { + /* Light up Candle of Eternal Flame and + * Holy Spear of Light on creation. + */ + if (!artiexist[m] && artifact_light(otmp) && + otmp->oartifact != ART_SUNSWORD) + begin_burn(otmp, FALSE); otmp->quan = 1; /* guarantee only one of this artifact */ #ifdef UNPOLYPILE /* Artifacts are immune to unpolypile --ALI */ if (is_hazy(otmp)) { @@ -1561,107 +1558,102 @@ arti_invoke(obj) case LEV_TELE: level_tele(); break; - /* STEPHEN WHITE'S NEW CODE */ case LIGHT_AREA: if (!Blind) - pline("%s shines brightly for an instant!", The(xname(obj))); + pline("%s shines brightly for an instant!", The(xname(obj))); else - pline("%s grows warm for a second!", The(xname(obj))); - - litroom(TRUE, obj); /* Light up the room */ - - vision_recalc(0); /*clean up vision*/ - - /* WAC - added effect to self, damage is now range dependant */ - if(is_undead(youmonst.data)) { - You("burn in the radiance!"); - - /* This is ground zero. Not good news ... */ - u.uhp /= 100; - - if (u.uhp < 1) { - u.uhp = 0; - killer_format = KILLED_BY; - killer = "the Holy Spear of Light"; - done(DIED); - } + pline("%s grows warm for a second!", The(xname(obj))); + litroom(TRUE, obj); + vision_recalc(0); + if (is_undead(youmonst.data)) { + You("burn in the radiance!"); + /* This is ground zero. Not good news ... */ + u.uhp /= 100; + if (u.uhp < 1) { + u.uhp = 0; + killer_format = KILLED_BY; + killer = "the Holy Spear of Light"; + done(DIED); } - + } /* Undead and Demonics can't stand the light */ unseen = 0; for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) { - if (DEADMONSTER(mtmp)) continue; - - /* Range is 9 paces */ - if (distu(mtmp->mx,mtmp->my) > 81) continue; - - if (couldsee(mtmp->mx, mtmp->my) && - (is_undead(mtmp->data) || is_demon(mtmp->data)) && - !resist(mtmp, '\0', 0, TELL)) { - if (canseemon(mtmp)) - pline("%s burns in the radiance!", Monnam(mtmp)); - else - unseen++; - /* damage now depends on distance, divisor ranges from 10 to 2 */ - mtmp->mhp /= (10 - (distu(mtmp->mx,mtmp->my)/10)); - if (mtmp->mhp < 1) mtmp->mhp = 1; - } + if (DEADMONSTER(mtmp)) continue; + if (distu(mtmp->mx, mtmp->my) > 9*9) continue; + if (couldsee(mtmp->mx, mtmp->my) && + (is_undead(mtmp->data) || is_demon(mtmp->data)) && + !resist(mtmp, '\0', 0, TELL)) { + if (canseemon(mtmp)) + pline("%s burns in the radiance!", Monnam(mtmp)); + else + unseen++; + /* damage depends on distance, divisor ranges from 10 to 2 */ + mtmp->mhp /= (10 - (distu(mtmp->mx, mtmp->my) / 10)); + if (mtmp->mhp < 1) mtmp->mhp = 1; + } } if (unseen) - You("hear %s of intense pain!", unseen > 1 ? "cries" : "a cry"); + You_hear("%s of intense pain!", unseen > 1 ? "cries" : "a cry"); break; case DEATH_GAZE: - if (u.uluck < -9) { /* uh oh... */ - pline("The Eye turns on you!"); - u.uhp = 0; - killer_format = KILLED_BY; - killer = "the Eye of the Beholder"; - done(DIED); + if (u.uluck < -9) { + pline_The("Eye turns on you!"); + u.uhp = 0; + killer_format = KILLED_BY; + killer = "the Eye of the Beholder"; + done(DIED); } - pline("The Eye looks around with its icy gaze!"); - for (mtmp = fmon; mtmp; mtmp = mtmp2) { - mtmp2 = mtmp->nmon; - /* The eye is never blind ... */ - if (couldsee(mtmp->mx, mtmp->my) && !is_undead(mtmp->data)) { - pline("%s screams in agony!",Monnam(mtmp)); - mtmp->mhp /= 3; - if (mtmp->mhp < 1) mtmp->mhp = 1; - } + pline_The("Eye looks around with its icy gaze!"); + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) { + if (DEADMONSTER(mtmp)) continue; + /* The eye is never blind ... */ + if (couldsee(mtmp->mx, mtmp->my) && !is_undead(mtmp->data)) { + pline("%s screams in agony!", Monnam(mtmp)); + mtmp->mhp /= 3; + if (mtmp->mhp < 1) mtmp->mhp = 1; } + } /* Tsk,tsk.. */ adjalign(-3); u.uluck -= 3; break; case SUMMON_UNDEAD: - if (u.uluck < -9) { /* uh oh... */ - u.uhp -= (rn2(20)+5); - pline("The Hand claws you with its icy nails!"); + if (u.uluck < -9) { + u.uhp -= rn2(20) + 5; + pline_The("Hand claws you with its icy nails!"); if (u.uhp <= 0) { - killer_format = KILLED_BY; - killer="the Hand of Vecna"; - done(DIED); + killer_format = KILLED_BY; + killer="the Hand of Vecna"; + done(DIED); } } summon_loop = rn2(4) + 4; pline("Creatures from the grave surround you!"); do { - switch (rn2(6)+1) { - case 1: mtmp = makemon(mkclass(S_VAMPIRE,0), u.ux, u.uy, NO_MM_FLAGS); - break; - case 2: - case 3: mtmp = makemon(mkclass(S_ZOMBIE,0), u.ux, u.uy, NO_MM_FLAGS); - break; - case 4: mtmp = makemon(mkclass(S_MUMMY,0), u.ux, u.uy, NO_MM_FLAGS); - break; - case 5: mtmp = makemon(mkclass(S_GHOST,0), u.ux, u.uy, NO_MM_FLAGS); - break; - default: mtmp = makemon(mkclass(S_WRAITH,0), u.ux, u.uy, NO_MM_FLAGS); - break; - } - if ((mtmp2 = tamedog(mtmp, (struct obj *)0)) != 0) - mtmp = mtmp2; - mtmp->mtame = 30; - summon_loop--; + switch (rn2(6) + 1) { + case 1: + pm = mkclass(S_VAMPIRE, 0); + break; + case 2: + case 3: + pm = mkclass(S_ZOMBIE, 0); + break; + case 4: + pm = mkclass(S_MUMMY, 0); + break; + case 5: + pm = mkclass(S_GHOST, 0); + break; + default: + pm = mkclass(S_WRAITH, 0); + break; + } + mtmp = makemon(pm, u.ux, u.uy, NO_MM_FLAGS); + if ((mtmp2 = tamedog(mtmp, (struct obj *)0)) != 0) + mtmp = mtmp2; + mtmp->mtame = 30; + summon_loop--; } while (summon_loop); /* Tsk,tsk.. */ adjalign(-3); @@ -1882,8 +1874,9 @@ boolean artifact_light(obj) struct obj *obj; { - return get_artifact(obj) && (get_artifact(obj)->inv_prop == LIGHT_AREA - || obj->oartifact == ART_CANDLE_OF_ETERNAL_FLAME); + return get_artifact(obj) && (obj->oartifact == ART_SUNSWORD || + obj->oartifact == ART_HOLY_SPEAR_OF_LIGHT || + obj->oartifact == ART_CANDLE_OF_ETERNAL_FLAME); } /* KMH -- Talking artifacts are finally implemented */ slashem/src/artifact.c @@ -2044,12 +2044,12 @@ int final; if (!u.uconduct.celibacy) - you_have_X("remained celibate"); + you_have_X("remained celibate"); #ifdef WIZARD else if (wizard) { - Sprintf(buf, "broken your vow of celibacy %ld time%s.", - u.uconduct.celibacy, u.uconduct.celibacy > 1 ? "s" : ""); - you_have_X(buf); + Sprintf(buf, "your vow of celibacy %ld time%s", + u.uconduct.celibacy, plur(u.uconduct.celibacy)); + enl_msg(You_, "have broken ", "broke ", buf); } #endif slashem/src/cmd.c @@ -1670,11 +1670,12 @@ moldy_corpse(arg, timeout) genericptr_t arg; long timeout; { - int pmtype, oldtyp, oldquan; + int pmtype, oldtyp, oldquan, oldnamelth; struct obj *body = (struct obj *) arg; /* Turn the corpse into a mold corpse if molds are available */ oldtyp = body->corpsenm; + oldnamelth = body->onamelth; /* Weight towards non-motile fungi. */ @@ -1697,6 +1698,7 @@ long timeout; pmtype = -1; /* cantcreate might have changed it so change it back */ else { body->corpsenm = pmtype; + body->onamelth = 0; /* Molds shouldn't be named */ /* oeaten isn't used for hp calc here, and zeroing it * prevents eaten_stat() from worrying when you've eaten more @@ -1733,6 +1735,7 @@ long timeout; */ if (body) { body->corpsenm = oldtyp; /* Fixup corpse after (attempted) revival */ + body->onamelth = oldnamelth; body->owt = weight(body); (void) start_timer(250L - (monstermoves-peek_at_iced_corpse_age(body)), TIMER_OBJECT, ROT_CORPSE, arg); slashem/src/do.c @@ -308,6 +308,7 @@ Helmet_on() switch(uarmh->otyp) { case FEDORA: set_moreluck(); + flags.botl = 1; break; case HELMET: case DENTED_POT: @@ -372,6 +373,7 @@ Helmet_off() case FEDORA: setworn((struct obj *)0, W_ARMH); set_moreluck(); + flags.botl = 1; return 0; case HELMET: case DENTED_POT: slashem/src/do_wear.c @@ -1612,7 +1612,7 @@ eatcorpse(otmp) /* called when a corpse is selected as food */ } if (!retcode) consume_oeaten(otmp, 2); /* oeaten >>= 2 */ - if (otmp->odrained && otmp->oeaten < drainlevel(otmp)) + if (retcode<2 && otmp->odrained && otmp->oeaten < drainlevel(otmp)) otmp->oeaten = drainlevel(otmp); } else if (!is_vampire(youmonst.data)) { pline("%s%s %s!", slashem/src/eat.c @@ -1203,7 +1203,10 @@ register const char *let,*word; pline(silly_thing_to, word); return(struct obj *)0; } else if (!allowfloor) { - pline("There's nothing here to %s.", word); + if ((Levitation || Flying)) + You("cannot reach the floor to %s while %sing.", word, Levitation ? "float" : "fly"); + else + pline("There's nothing here to %s.", word); return(struct obj *)0; } Sprintf(qbuf, "%s what?", word); slashem/src/invent.c @@ -514,9 +514,7 @@ obj_sheds_light(obj) struct obj *obj; { /* so far, only burning objects shed light */ - /* WAC - Some artifacts now shed light */ - - return (obj_is_burning(obj) || obj_permanent_light(obj)); + return obj_is_burning(obj); } /* Return TRUE if sheds light AND will be snuffed by end_burn(). */ @@ -534,17 +532,6 @@ obj_is_burning(obj) || artifact_light(obj))); } -/* WAC Return TRUE if object always lights up - * Currently only artifacts have this property - */ -boolean -obj_permanent_light(obj) - struct obj *obj; -{ - return ((obj->lamplit) && - (artifact_light(obj))); -} - /* copy the light source(s) attachted to src, and attach it/them to dest */ void obj_split_light_source(src, dest) slashem/src/light.c @@ -27,7 +27,7 @@ boolean picking_lock(x, y) int *x, *y; { - if (occupation == picklock) { + if (occupation == picklock || occupation == forcedoor) { *x = u.ux + u.dx; *y = u.uy + u.dy; return TRUE; @@ -259,9 +259,33 @@ forcedoor() /* try to break/pry open a door */ xlock.door->doormask = D_BROKEN; else xlock.door->doormask = D_NODOOR; unblock_point(u.ux+u.dx, u.uy+u.dy); - if (*in_rooms(u.ux+u.dx, u.uy+u.dy, SHOPBASE)) - add_damage(u.ux+u.dx, u.uy+u.dy, 0L); - newsym(u.ux+u.dx, u.uy+u.dy); + if (*in_rooms(u.ux+u.dx, u.uy+u.dy, SHOPBASE)) { + add_damage(u.ux+u.dx, u.uy+u.dy, 400L); + pay_for_damage("break", FALSE); + + if (in_town(u.ux+u.dx, u.uy+u.dy)) { + struct monst *mtmp; + for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) { + if (DEADMONSTER(mtmp)) continue; + if((mtmp->data == &mons[PM_WATCHMAN] || + mtmp->data == &mons[PM_WATCH_CAPTAIN]) && + couldsee(mtmp->mx, mtmp->my) && + mtmp->mpeaceful) { + if (canspotmon(mtmp)) + pline("%s yells:", Amonnam(mtmp)); + else + You_hear("someone yell:"); + verbalize("Halt, thief! You're under arrest!"); + (void) angry_guards(FALSE); + break; + } + } + } + } + if (Blind) + feel_location(u.ux+u.dx, u.uy+u.dy); /* we know we broke it */ + else + newsym(u.ux+u.dx, u.uy+u.dy); exercise(A_STR, TRUE); return((xlock.usedtime = 0)); @@ -598,9 +622,13 @@ doforce() /* try to force a chest with your weapon */ picktyp = is_blade(uwep) ? 1 : 0; if(xlock.usedtime && picktyp == xlock.picktyp) { if (xlock.box) { - You("resume your attempt to force the lock."); - set_occupation(forcelock, "forcing the lock", 0); - return(1); + if (!can_reach_floor()) { + pline("Unfortunately, you can no longer reach the lock."); + return 0; + } + You("resume your attempt to force the lock."); + set_occupation(forcelock, "forcing the lock", 0); + return(1); } else if (xlock.door) { You("resume your attempt to force the door."); set_occupation(forcedoor, "forcing the door", 0); @@ -615,9 +643,27 @@ doforce() /* try to force a chest with your weapon */ x = u.ux + u.dx; y = u.uy + u.dy; - if (x == u.ux && y == u.uy && !u.dz) { - for(otmp = level.objects[u.ux][u.uy]; otmp; otmp = otmp->nexthere) - if(Is_box(otmp)) { + if (x == u.ux && y == u.uy) { + if (u.dz < 0) { + There("isn't any sort of lock up %s.", + Levitation ? "here" : "there"); + return 0; + } else if (is_lava(u.ux, u.uy)) { + pline("Doing that would probably melt your %s.", + xname(uwep)); + return 0; + } else if (is_pool(u.ux, u.uy) && !Underwater) { + pline_The("water has no lock."); + return 0; + } + + for(otmp = level.objects[u.ux][u.uy]; otmp; otmp = otmp->nexthere) + if(Is_box(otmp)) { + if (!can_reach_floor()) { + You_cant("reach %s from up here.", the(xname(otmp))); + return 0; + } + if (otmp->obroken || !otmp->olocked) { There("is %s here, but its lock is already %s.", doname(otmp), otmp->obroken ? "broken" : "unlocked"); slashem/src/lock.c @@ -1772,6 +1772,8 @@ physical: !(mdef->data->geno & G_UNIQ) && (magr->mtame || mdef->mtame)) { if (vis) pline("%s looks calmer.", Monnam(mdef)); + if (mdef == u.usteed) + dismount_steed(DISMOUNT_THROWN); mdef->mpeaceful = 1; mdef->mtame = 0; tmp = 0; slashem/src/mhitm.c @@ -1168,7 +1168,7 @@ hitmu(mtmp, mattk) } if (otmp->opoisoned) { - poisoned(obj_typename(otmp->otyp), A_STR, + poisoned(simple_typename(otmp->otyp), A_STR, killer_xname(otmp), 10); if (nopoison < 2) nopoison = 2; if (!rn2(nopoison)) { slashem/src/mhitu.c @@ -913,6 +913,8 @@ meatobj(mtmp) /* for gelatinous cubes */ mtmp->mhp += objects[otmp->otyp].oc_weight; if (mtmp->mhp > mtmp->mhpmax) mtmp->mhp = mtmp->mhpmax; } + if (otmp->otyp == MEDICAL_KIT) + delete_contents(otmp); if (Has_contents(otmp)) { register struct obj *otmp3; /* contents of eaten containers become engulfed; this @@ -1504,6 +1506,7 @@ m_detach(mtmp, mptr) struct monst *mtmp; struct permonst *mptr; /* reflects mtmp->data _prior_ to mtmp's death */ { + mon_stop_timers(mtmp); if (mtmp->mleashed) m_unleash(mtmp, FALSE); /* to prevent an infinite relobj-flooreffects-hmon-killed loop */ mtmp->mtrapped = 0; @@ -1728,8 +1731,6 @@ boolean was_swallowed; /* digestion */ /* Gas spores always explode upon death */ for(i = 0; i < NATTK; i++) { if (mdat->mattk[i].aatyp == AT_BOOM) { - char buf[BUFSZ]; - if (mdat->mattk[i].damn) tmp = d((int)mdat->mattk[i].damn, (int)mdat->mattk[i].damd); @@ -1759,8 +1760,8 @@ boolean was_swallowed; /* digestion */ return FALSE; } - Sprintf(buf, "%s explosion", s_suffix(mdat->mname)); - killer = buf; + Sprintf(killer_buf, "%s explosion", s_suffix(mdat->mname)); + killer = killer_buf; killer_format = KILLED_BY_AN; explode(mon->mx, mon->my, -1, tmp, MON_EXPLODE, EXPL_NOXIOUS); return (FALSE); slashem/src/mon.c @@ -100,7 +100,7 @@ struct monst *mon; return FALSE; } -/* TRUE iff monster is resistant to light-induced blindness */ +/* TRUE if monster is resistant to light-induced blindness */ boolean resists_blnd(mon) struct monst *mon; slashem/src/mondata.c @@ -3492,7 +3492,7 @@ struct permonst _mons2[] = { NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK), SIZ(400, 0, 0, MS_SILENT, MZ_LARGE), MR_SLEEP|MR_POISON, 0, M1_BREATHLESS|M1_MINDLESS|M1_HUMANOID, - M2_HOSTILE|M2_NEUTER, 0, CLR_GRAY), + M2_HOSTILE|M2_NEUTER, M3_INFRAVISIBLE, CLR_GRAY), MON("plastic golem", S_GOLEM, LVL(4, 12, 9, 0, 0), (G_NOCORPSE|1), A(ATTK(AT_CLAW, AD_PHYS, 1, 3), ATTK(AT_CLAW, AD_PHYS, 1, 3), slashem/src/monst.c @@ -2259,6 +2259,7 @@ boolean from_user; && !strstri(bp, "medallion ") && !strstri(bp, "stake ") && !strstri(bp, "potion ") + && !strstri(bp, "potions ") && !strstri(bp, "finger ")) { if ((p = strstri(bp, " of ")) != 0 && (mntmp = name_to_mon(p+4)) >= LOW_PM) @@ -2997,7 +2998,9 @@ typfnd: nname[n] = (nname[n] == c1) ? c2 : highc(c2); /* keep same case */ } # endif + place_object(otmp, u.ux, u.uy);/* make it viable light source */ otmp = oname(otmp, nname); + obj_extract_self(otmp); /* now release it for caller's use */ if (otmp->oartifact) { otmp->quan = 1L; u.uconduct.wisharti++; /* KMH, conduct */ @@ -3054,7 +3057,7 @@ typfnd: /* (do this adjustment before setting up object's weight) */ consume_oeaten(otmp, 1); } - if (isdrained && otmp->otyp == CORPSE) { + if (isdrained && otmp->otyp == CORPSE && mons[otmp->corpsenm].cnutrit) { int amt; otmp->odrained = 1; amt = mons[otmp->corpsenm].cnutrit - drainlevel(otmp); slashem/src/objnam.c @@ -1647,9 +1647,6 @@ polyatwill() /* Polymorph under conscious control (#youpoly) */ (uarm && uarm->otyp == WHITE_DRAGON_SCALE_MAIL && Role_if(PM_ICE_MAGE))); - /* Set to TRUE when you can polyatwill but choose not to */ - boolean can_polyatwill = FALSE; - /* KMH, balance patch -- new intrinsic */ if (Unchanging) { pline("You cannot change your form."); @@ -1705,7 +1702,7 @@ polyatwill() /* Polymorph under conscious control (#youpoly) */ * is unaffected by blindness, confusion, stun etc. */ if (yn("Transform into your draconic form?") == 'n') - can_polyatwill = TRUE; + return 0; else if (!scales && !scale_mail && u.uen <= EN_BABY_DRAGON) { You("don't have the energy to polymorph."); return 0; @@ -1742,7 +1739,7 @@ polyatwill() /* Polymorph under conscious control (#youpoly) */ } if (Race_if(PM_DOPPELGANGER)) { if (yn("Polymorph at will?") == 'n') - can_polyatwill = TRUE; + return 0; else if (u.uen < EN_DOPP) { You("don't have the energy to polymorph!"); return 0; @@ -1765,7 +1762,7 @@ polyatwill() /* Polymorph under conscious control (#youpoly) */ } else if (Race_if(PM_HUMAN_WEREWOLF) && (!Upolyd || u.umonnum == u.ulycn)) { if (yn("Change form?") == 'n') - can_polyatwill = TRUE; + return 0; else if (u.ulycn == NON_PM) { /* Very serious */ You("are no longer a lycanthrope!"); @@ -1784,13 +1781,12 @@ polyatwill() /* Polymorph under conscious control (#youpoly) */ else nomul(0); } you_were(); - return 1; } else { rehumanize(); - return 1; } + return 1; } - } else if (!can_polyatwill) { + } else { pline("You can't polymorph at will%s.", ((Role_if(PM_FLAME_MAGE) || Role_if(PM_ICE_MAGE) || Race_if(PM_HUMAN_WEREWOLF) || Race_if(PM_DOPPELGANGER)) ? slashem/src/polyself.c @@ -479,6 +479,7 @@ peffects(otmp) break; case POT_HALLUCINATION: if (Hallucination || Halluc_resistance) nothing++; + else makeknown(otmp->otyp); (void) make_hallucinated(itimeout_incr(HHallucination, rn1(200, 600 - 300 * bcsign(otmp))), TRUE, 0L); @@ -1663,7 +1664,7 @@ register struct obj *obj; if (kn) makeknown(obj->otyp); else if (!objects[obj->otyp].oc_name_known && - !objects[obj->otyp].oc_uname) + !objects[obj->otyp].oc_uname && !Blind) docall(obj); } } @@ -2181,6 +2182,7 @@ register struct obj *obj; long owornmask; struct obj *otmp; boolean explodes; + char buf[BUFSZ]; /* Check to see if object is valid */ if (!obj) @@ -2512,6 +2514,19 @@ register struct obj *obj; return 0; } + if (artifact_name(ONAME(obj), &otyp2) && otyp2 == obj->otyp) { + int n; + char c1, c2; + + Strcpy(buf, ONAME(obj)); + n = rn2((int)strlen(buf)); + c1 = lowc(buf[n]); + do c2 = 'a' + rn2('z'-'a'); while (c1 == c2); + buf[n] = (buf[n] == c1) ? c2 : highc(c2); /* keep same case */ + if (oname(obj, buf) != obj) + panic("upgrade_obj: unhandled realloc"); + } + if ((!carried(obj) || obj->unpaid) && #ifdef UNPOLYPILE !is_hazy(obj) && @@ -2750,27 +2765,7 @@ dodip() /* WAC - Finn Theoderson - make polymorph and gain level msgs similar * Give out name of new object and allow user to name the potion */ - /* KMH, balance patch -- idea by Dylan O'Donnell <dylanw@demon.net> */ - else if (potion->otyp == POT_GAIN_LEVEL) { - res = upgrade_obj(obj); - - if (res != 0) { - - if (res == 1) { - /* The object was upgraded */ - pline("Hmm! You don't recall dipping that into the potion."); - prinv((char *)0, obj, 0L); - } /* else potion exploded */ - if (!objects[potion->otyp].oc_name_known && - !objects[potion->otyp].oc_uname) - docall(potion); - useup(potion); - update_inventory(); - exercise(A_WIS, TRUE); - return(1); - } - /* no return here, go for Interesting... message */ - } else if (obj->otyp == POT_POLYMORPH || + else if (obj->otyp == POT_POLYMORPH || potion->otyp == POT_POLYMORPH) { /* some objects can't be polymorphed */ if (obj->otyp == potion->otyp || /* both POT_POLY */ @@ -2985,6 +2980,23 @@ dodip() makeknown(potion->otyp); useup(potion); return 1; + } else if (potion->otyp == POT_GAIN_LEVEL) { + res = upgrade_obj(obj); + if (res != 0) { + if (res == 1) { + /* The object was upgraded */ + pline("Hmm! You don't recall dipping that into the potion."); + prinv((char *)0, obj, 0L); + } /* else potion exploded */ + if (!objects[potion->otyp].oc_name_known && + !objects[potion->otyp].oc_uname) + docall(potion); + useup(potion); + update_inventory(); + exercise(A_WIS, TRUE); + return 1; + } + /* no return here, go for Interesting... message */ } /* KMH, balance patch -- acid affects damage(proofing) */ slashem/src/potion.c @@ -2328,11 +2328,12 @@ register struct monst *shkp; /* if angry, impose a surcharge */ } #ifdef TOURIST if ((Role_if(PM_TOURIST) && u.ulevel < (MAXULEV/2)) - || (uarmu && !uarm && !uarmc)) /* touristy shirt visible */ + || ((uarmu && !uarmu->oinvis) && (!uarm || uarm->oinvis) + && (!uarmc || uarmc->oinvis))) /* touristy shirt visible */ tmp += tmp / 3L; else #endif - if (uarmh && uarmh->otyp == DUNCE_CAP) + if (uarmh && !uarmh->oinvis && uarmh->otyp == DUNCE_CAP) tmp += tmp / 3L; if (ACURR(A_CHA) > 18) tmp /= 2L; @@ -2482,11 +2483,12 @@ register struct monst *shkp; #ifdef TOURIST if ((Role_if(PM_TOURIST) && u.ulevel < (MAXULEV/2)) - || (uarmu && !uarm && !uarmc)) /* touristy shirt visible */ + || ((uarmu && !uarmu->oinvis) && (!uarm || uarm->oinvis) + && (!uarmc || uarmc->oinvis))) /* touristy shirt visible */ tmp /= 3L; else #endif - if (uarmh && uarmh->otyp == DUNCE_CAP) + if (uarmh && !uarmh->oinvis && uarmh->otyp == DUNCE_CAP) tmp /= 3L; else tmp /= 2L; slashem/src/shk.c @@ -2508,13 +2508,19 @@ dlb *fd; typ = tmpdoor.mask == -1 ? rnddoor() : tmpdoor.mask; if (get_location(&x, &y, DRY)) { - if(levl[x][y].typ != SDOOR) + if(levl[x][y].typ != SDOOR) levl[x][y].typ = DOOR; - else { + else { if(typ < D_CLOSED) typ = D_CLOSED; /* force it to be closed */ - } - levl[x][y].doormask = typ; + } + levl[x][y].doormask = typ; + + /* Fix random door alignment */ + + if (y > 0 && (IS_WALL(levl[x][y-1].typ) || + levl[x][y-1].horizontal)) + levl[x][y].horizontal = 0; } /* Now the complicated part, list it with each subroom */ slashem/src/sp_lev.c @@ -703,9 +703,10 @@ int tech_no; "dress your wounds with"); if (otmp) { check_unpaid(otmp); - if (otmp->quan > 1L) + if (otmp->quan > 1L) { otmp->quan--; - else { + otmp->ocontainer->owt = weight(otmp->ocontainer); + } else { obj_extract_self(otmp); obfree(otmp, (struct obj *)0); } @@ -804,39 +805,41 @@ int tech_no; break; case T_CUTTHROAT: if (!is_blade(uwep)) { - You("need a blade to perform cutthroat!"); - return (0); + You("need a blade to perform cutthroat!"); + return 0; } - if (!getdir((char *)0)) return(0); + if (!getdir((char *)0)) return 0; if (!u.dx && !u.dy) { - /* Hopefully a mistake ;B */ - pline("Things may be going badly, but that's extreme."); - return(0); + /* Hopefully a mistake ;B */ + pline("Things may be going badly, but that's extreme."); + return 0; } mtmp = m_at(u.ux + u.dx, u.uy + u.dy); if (!mtmp) { - You("attack...nothing!"); - return (0); + You("attack...nothing!"); + return 0; } else { - int oldhp = mtmp->mhp; - - if (!attack(mtmp)) return(0); - if (!DEADMONSTER(mtmp) && mtmp->mhp < oldhp) { - int tmp = 0; - if (!has_head(mtmp->data) || u.uswallow) { - You("can't perform cutthroat on %s!",mon_nam(mtmp)); - } - if (rn2(5) < (techlev(tech_no)/10 + 1)) { - You("sever %s head!", s_suffix(mon_nam(mtmp))); - tmp = mtmp->mhp; - } else { - You("hurt %s badly!", s_suffix(mon_nam(mtmp))); - tmp = mtmp->mhp / 2; - } - tmp += techlev(tech_no); - t_timeout = rn1(1000,500); - hurtmon(mtmp, tmp); + int oldhp = mtmp->mhp; + + if (!attack(mtmp)) return 0; + if (!DEADMONSTER(mtmp) && mtmp->mhp < oldhp) { + if (!has_head(mtmp->data) || u.uswallow) + You_cant("perform cutthroat on %s!", mon_nam(mtmp)); + else { + int tmp = 0; + + if (rn2(5) < (techlev(tech_no)/10 + 1)) { + You("sever %s head!", s_suffix(mon_nam(mtmp))); + tmp = mtmp->mhp; + } else { + You("hurt %s badly!", s_suffix(mon_nam(mtmp))); + tmp = mtmp->mhp / 2; + } + tmp += techlev(tech_no); + t_timeout = rn1(1000,500); + hurtmon(mtmp, tmp); } + } } break; case T_BLESSING: @@ -2064,7 +2067,11 @@ blitz_pummel() You("let loose a barrage of blows!"); - mtmp = m_at(u.ux + u.dx, u.uy + u.dy); + if (u.uswallow) + mtmp = u.ustuck; + else + mtmp = m_at(u.ux + u.dx, u.uy + u.dy); + if (!mtmp) { You("strike nothing."); return (0); @@ -2075,7 +2082,12 @@ blitz_pummel() */ for (i = 0; (i < 4); i++) { if (rn2(70) > (techlev(tech_no) + 30)) break; - mtmp = m_at(u.ux + u.dx, u.uy + u.dy); + + if (u.uswallow) + mtmp = u.ustuck; + else + mtmp = m_at(u.ux + u.dx, u.uy + u.dy); + if (!mtmp) return (1); if (!attack(mtmp)) return (1); } slashem/src/tech.c @@ -1648,10 +1648,10 @@ begin_burn(obj, already_lit) if (obj->lamplit && !already_lit) { xchar x, y; - /* [ALI] Support floating light sources (eg., wished for artifacts) - */ - (void)get_obj_location(obj, &x, &y, CONTAINED_TOO|BURIED_TOO); + if (get_obj_location(obj, &x, &y, CONTAINED_TOO|BURIED_TOO)) new_light_source(x, y, radius, LS_OBJECT, (genericptr_t) obj); + else + impossible("begin_burn: can't get obj position"); } } @@ -1828,6 +1828,10 @@ do_storms() * * void obj_stop_timers(struct obj *obj) * Stop all timers attached to obj. + * + * Monster Specific: + * void mon_stop_timers(struct monst *mon) + * Stop all timers attached to mon. */ #ifdef WIZARD @@ -2121,6 +2125,34 @@ obj_stop_timers(obj) } +/* + * Stop all timers attached to this monster. We can get away with this because + * all monster pointers are unique. + */ +void +mon_stop_timers(mon) + struct monst *mon; +{ + timer_element *curr, *prev, *next_timer=0; + + for (prev = 0, curr = timer_base; curr; curr = next_timer) { + next_timer = curr->next; + if (curr->kind == TIMER_MONSTER && curr->arg == (genericptr_t)mon) { + if (prev) + prev->next = curr->next; + else + timer_base = curr->next; + if (timeout_funcs[curr->func_index].cleanup) + (*timeout_funcs[curr->func_index].cleanup)(curr->arg, + curr->timeout); + free((genericptr_t) curr); + } else { + prev = curr; + } + } +} + + /* Insert timer into the global queue */ STATIC_OVL void insert_timer(gnu) slashem/src/timeout.c @@ -256,14 +256,11 @@ writeentry(rfile,tt) FILE *rfile; struct toptenentry *tt; { - char *cp = NULL; - #ifdef RECORD_CONDUCT + char *cp = eos(tt->death); + /* Add a trailing " Conduct=%d" to tt->death */ - if(tt->conduct != 4095) { - cp = tt->death + strlen(tt->death); - Sprintf(cp, " Conduct=%d", tt->conduct); - } + Sprintf(cp, " Conduct=%d", tt->conduct); #endif #ifdef NO_SCAN_BRACK @@ -302,8 +299,7 @@ struct toptenentry *tt; #ifdef RECORD_CONDUCT /* Return the tt->death line to the original form */ - if(cp) - *cp = '\0'; + *cp = '\0'; #endif } slashem/src/topten.c @@ -95,7 +95,8 @@ boolean put_away; * *whenever* Sunsword is unwielded, from whatever cause. */ setworn(obj, W_WEP); - if (uwep == obj && artifact_light(olduwep) && olduwep->lamplit) { + if (uwep == obj && olduwep && olduwep->oartifact == ART_SUNSWORD && + olduwep->lamplit) { end_burn(olduwep, FALSE); if (!Blind) pline("%s glowing.", Tobjnam(olduwep, "stop")); } @@ -189,7 +190,7 @@ boolean put_away; /* KMH -- Talking artifacts are finally implemented */ arti_speak(wep); - if (artifact_light(wep) && !wep->lamplit) { + if (wep->oartifact == ART_SUNSWORD && !wep->lamplit) { begin_burn(wep, FALSE); if (!Blind) pline("%s to glow brilliantly!", Tobjnam(wep, "begin")); slashem/src/wield.c @@ -53,9 +53,9 @@ Guidebook.dvi: Guidebook.tex # tbl tmac.n Guidebook.mn | groff -Wall -Tdvi > Guidebook.dvi GAME = slashem-noegnud -#GAME = nethack -MANDIR = /games/slash/doc -MANEXT = 1n +MANDIR = /usr/man/man6 +MANEXT = 6 +FRMANDIR= $(MANDIR:man6=fr/man6) # manual installation for most BSD-style systems GAMEMANCREATE = cp $(GAME).6 @@ -63,6 +63,7 @@ LEVMANCREATE = cp lev_comp.6 DGNMANCREATE = cp dgn_comp.6 RCVRMANCREATE = cp recover.6 DLBMANCREATE = cp dlb.6 +FRGAMEMANCREATE = cp fr/$(GAME).6 # manual installation for most SYSV-style systems # and for man files readable in less (eg dos DJGPP+GNU) # GAMEMANCREATE = groff -Wall -mtty-char -Tascii -man $(GAME).6 > @@ -70,6 +71,7 @@ DLBMANCREATE = cp dlb.6 # DGNMANCREATE = groff -Wall -mtty-char -Tascii -man dgn_comp.6 > # RCVRMANCREATE = groff -Wall -mtty-char -Tascii -man recover.6 > # DLBMANCREATE = groff -Wall -mtty-char -Tascii -man dlb.6 > +# FRGAMEMANCREATE = groff -Wall -mtty-char -Tutf8 -man fr/$(GAME).6 > manpages: -$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT) @@ -77,6 +79,7 @@ manpages: -$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT) -$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT) -$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT) + -$(FRGAMEMANCREATE) $(FRMANDIR)/$(GAME).$(MANEXT) # manual creation for distribution DISTRIB = Guidebook.txt $(GAME).txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt slashem/sys/unix/Makefile.doc @@ -37,7 +37,7 @@ an executable supporting both X11 and tty windowing. If you want to use the optional tiles (multicolored pictures instead of a replacement font), you will need to have the win/share files and change -the CF_SHARE_DATND setting in the top Makefile to contain the tile files before +the CNF_SHARE_DATND setting in the top Makefile to contain the tile files before you do your 'make all'. Include x11tiles for the 16x16 tile set and x11bigtiles for the 32x32 set. The available tile sets should be defined in the configuration file. The tiles option can then be used to select the initial @@ -65,7 +65,7 @@ in src/Makefile. If you define USE_XPM in config.h, you may also define GRAPHIC_TOMBSTONE which causes the closing tombstone to be displayed from the image file specified by the "tombstone" X resource (rip.xpm by default). In this -case, make sure the top Makefile CF_SHARE_X11ND also contains rip.xpm. +case, make sure the top Makefile CNF_SHARE_X11ND also contains rip.xpm. Whether or not you install tile support, you can provide support for slashem/win/X11/Install.X11 @@ -132,6 +132,30 @@ SlashEM*race_selection*Command.foreground: red SlashEM*race_selection*quit.accelerators: #override\n\ <Key>Escape: set() notify() unset() +SlashEM*gender_selection*random.borderColor: blue +SlashEM*gender_selection*random.borderWidth: 2 +SlashEM*gender_selection*random.foreground: blue +SlashEM*gender_selection*random.accelerators: #override\n\ + <Key>Return: set() notify() unset() +SlashEM*gender_selection*quit.borderColor: blue +SlashEM*gender_selection*quit.foreground: blue +SlashEM*gender_selection*Command.borderColor: red +SlashEM*gender_selection*Command.foreground: red +SlashEM*gender_selection*quit.accelerators: #override\n\ + <Key>Return: set() notify() unset() + +SlashEM*alignment_selection*random.borderColor: blue +SlashEM*alignment_selection*random.borderWidth: 2 +SlashEM*alignment_selection*random.foreground: blue +SlashEM*alignment_selection*random.accelerators: #override\n\ + <Key>Return: set() notify() unset() +SlashEM*alignment_selection*quit.borderColor: blue +SlashEM*alignment_selection*quit.foreground: blue +SlashEM*alignment_selection*Command.borderColor: red +SlashEM*alignment_selection*Command.foreground: red +SlashEM*alignment_selection*quit.accelerators: #override\n\ + <Key>Return: set() notify() unset() + SlashEM*extended_commands*dismiss.borderColor: blue SlashEM*extended_commands*dismiss.foreground: blue SlashEM*extended_commands*help.borderColor: blue slashem/win/X11/SlashEM.ad @@ -211,7 +211,9 @@ int *wid, *hgt; #endif #ifdef TEXTCOLOR +# ifndef MSDOS init_ttycolor(); +# endif #endif #ifdef TERMLIB slashem/win/tty/termcap.c 16d16dbac9c49cc472fec4402691462f38c38fef Clive Crous clive@crous.co.za http://github.com/clivecrous/noegnud/commit/4456dfb2758734e65bb686c1dc21b238d96644c5 4456dfb2758734e65bb686c1dc21b238d96644c5 2007-01-25T23:29:35-08:00 2007-01-25T23:29:35-08:00 Update to SlashEM-0.0.7E7F3 54c47eb517d72b5b279fd2374d46191739d4f01a Clive Crous clive@crous.co.za