diff --git a/src/mon.c b/src/mon.c index 49f6282dc..2831e4305 100644 --- a/src/mon.c +++ b/src/mon.c @@ -1,4 +1,4 @@ -/* NetHack 3.5 mon.c $NHDT-Date: 1425319883 2015/03/02 18:11:23 $ $NHDT-Branch: master $:$NHDT-Revision: 1.137 $ */ +/* NetHack 3.5 mon.c $NHDT-Date: 1426458561 2015/03/15 22:29:21 $ $NHDT-Branch: derek-farming $:$NHDT-Revision: 1.139 $ */ /* NetHack 3.5 mon.c $Date: 2012/05/16 02:15:10 $ $Revision: 1.126 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -268,6 +268,14 @@ unsigned corpseflags; obj = mksobj_at(SCR_BLANK_PAPER, x, y, TRUE, FALSE); free_mname(mtmp); break; + case PM_BLACK_PUDDING: + case PM_GREEN_SLIME: + case PM_BROWN_PUDDING: + case PM_GRAY_OOZE: + /* expired puddings will congeal into a large blob */ + obj = mksobj_at(BLOB_OF_PUDDING, x, y, TRUE, FALSE); + free_mname(mtmp); + break; default_1: default: if (mvitals[mndx].mvflags & G_NOCORPSE) @@ -1673,7 +1681,6 @@ boolean was_swallowed; /* digestion */ is_golem(mdat) || is_mplayer(mdat) || is_rider(mdat)) return TRUE; tmp = 2 + ((mdat->geno & G_FREQ) < 2) + verysmall(mdat); - if (mon->mcloned) tmp += mvitals[monsndx(mdat)].died / 25; return (boolean) !rn2(tmp); } @@ -1937,13 +1944,13 @@ int dest; int otyp; /* illogical but traditional "treasure drop" */ - if (!rn2(6) && !(mvitals[mndx].mvflags & G_NOCORPSE) && + if (!rn2(6) && !(mvitals[mndx].mvflags & G_NOCORPSE) /* no extra item from swallower or steed */ - (x != u.ux || y != u.uy) && + && (x != u.ux || y != u.uy) /* no extra item from kops--too easy to abuse */ - mdat->mlet != S_KOP && - /* reduced chance of item from cloned monster */ - (!mtmp->mcloned || !rn2(mvitals[mndx].died / 5 + 1))) { + && mdat->mlet != S_KOP + /* no items from cloned monsters */ + && !mtmp->mcloned) { otmp = mkobj(RANDOM_CLASS, TRUE); /* don't create large objects from small monsters */ otyp = otmp->otyp; diff --git a/src/objects.c b/src/objects.c index 4c015595d..91cc1e318 100644 --- a/src/objects.c +++ b/src/objects.c @@ -1,4 +1,4 @@ -/* NetHack 3.5 objects.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */ +/* NetHack 3.5 objects.c $NHDT-Date: 1426458573 2015/03/15 22:29:33 $ $NHDT-Branch: derek-farming $:$NHDT-Revision: 1.26 $ */ /* NetHack 3.5 objects.c $Date: 2011/07/28 04:00:20 $ $Revision: 1.23 $ */ /* Copyright (c) Mike Threepoint, 1989. */ /* NetHack may be freely redistributed. See license for details. */ @@ -670,6 +670,10 @@ FOOD("egg", 85, 1, 1, 1, FLESH, 80, CLR_WHITE), FOOD("meatball", 0, 1, 1, 0, FLESH, 5, CLR_BROWN), FOOD("meat stick", 0, 1, 1, 0, FLESH, 5, CLR_BROWN), FOOD("huge chunk of meat", 0,20,400, 0, FLESH,2000, CLR_BROWN), + +/* pudding 'corpses' will turn into this */ +FOOD("blob of pudding", 0, 1, 1, 0, FLESH, 0, CLR_BROWN), + /* special case because it's not mergable */ OBJECT(OBJ("meat ring", (char *)0), BITS(1,0,0,0,0,0,0,0,0,0,0,0,FLESH), diff --git a/win/share/objects.txt b/win/share/objects.txt index 0322de15f..37229118f 100644 --- a/win/share/objects.txt +++ b/win/share/objects.txt @@ -4707,7 +4707,26 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 247 (meat ring) +# tile 247 (blob of pudding) +{ + MMMMMMMMMMMMMMMM + MMMMMMMMMMMMMMMM + MMMMMKDKKMMMMMMM + MMMKKJJJJKDMMMMM + MMKCCKKCJJJKMMMM + MMKCKKCJJJJKAMMM + MKKKKJJJDDJJKAAM + MKKKJJJJJJJJKAAA + MKCKDJJJDJJJJAAA + MKKJDJJDJJAJAAAA + MKKKKJJDKKDJJAAA + MDKDJJJKKKKAJAAM + DKKKKAJJAJDAJJAM + KKKKKKKKKJJJAJAM + MMMMMMMMMMMMMMMM + MMMMMMMMMMMMMMMM +} +# tile 248 (meat ring) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -4726,7 +4745,7 @@ P = (108, 145, 182) MMMMMMAAAAAMMMMM MMMMMMMMMMMMMMMM } -# tile 248 (kelp frond) +# tile 249 (kelp frond) { MMMMFAMMMMMMMMMM MMMMFFAMMMMMMMMM @@ -4745,7 +4764,7 @@ P = (108, 145, 182) MMMMMFFFFAMMMMMM MMMMMMFFFFAMMMMM } -# tile 249 (eucalyptus leaf) +# tile 250 (eucalyptus leaf) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -4764,7 +4783,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 250 (apple) +# tile 251 (apple) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -4783,7 +4802,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 251 (orange) +# tile 252 (orange) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -4802,7 +4821,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 252 (pear) +# tile 253 (pear) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -4821,7 +4840,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 253 (melon) +# tile 254 (melon) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -4840,7 +4859,7 @@ P = (108, 145, 182) MMMMMMAAAMMMMMMM MMMMMMMMMMMMMMMM } -# tile 254 (banana) +# tile 255 (banana) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -4859,7 +4878,7 @@ P = (108, 145, 182) MMMMMAAAAAMMMMMM MMMMMMMMMMMMMMMM } -# tile 255 (carrot) +# tile 256 (carrot) { MMMMMMMMMMMMMMMM MMMMMMMMMMFMMFMM @@ -4878,7 +4897,7 @@ P = (108, 145, 182) MMMAMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 256 (sprig of wolfsbane) +# tile 257 (sprig of wolfsbane) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -4897,7 +4916,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 257 (clove of garlic) +# tile 258 (clove of garlic) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -4916,7 +4935,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 258 (slime mold) +# tile 259 (slime mold) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -4935,7 +4954,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 259 (lump of royal jelly) +# tile 260 (lump of royal jelly) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -4954,7 +4973,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 260 (cream pie) +# tile 261 (cream pie) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -4973,7 +4992,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 261 (candy bar) +# tile 262 (candy bar) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -4992,7 +5011,7 @@ P = (108, 145, 182) MMMMAMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 262 (fortune cookie) +# tile 263 (fortune cookie) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5011,7 +5030,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 263 (pancake) +# tile 264 (pancake) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5030,7 +5049,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 264 (lembas wafer) +# tile 265 (lembas wafer) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5049,7 +5068,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 265 (cram ration) +# tile 266 (cram ration) { MMMMMMMMMMMMMMMM MMMJKAMMMMMMMMMM @@ -5068,7 +5087,7 @@ P = (108, 145, 182) MMMMMAAAAAAMMMMM MMMMMMMMMMMMMMMM } -# tile 266 (food ration) +# tile 267 (food ration) { MMMJJAMMMMMMMMMM MMMBPAMMMMMMMMMM @@ -5087,7 +5106,7 @@ P = (108, 145, 182) MMMMKKKKKKKKKAMM MMMMMAAAAAAAAMMM } -# tile 267 (K-ration) +# tile 268 (K-ration) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5106,7 +5125,7 @@ P = (108, 145, 182) MMMMKKKKKKKKKAMM MMMMMAAAAAAAAMMM } -# tile 268 (C-ration) +# tile 269 (C-ration) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5125,7 +5144,7 @@ P = (108, 145, 182) MMMMKKKKKKKKKAMM MMMMMAAAAAAAAMMM } -# tile 269 (tin) +# tile 270 (tin) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5144,7 +5163,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 270 (ruby / gain ability) +# tile 271 (ruby / gain ability) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5163,7 +5182,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 271 (pink / restore ability) +# tile 272 (pink / restore ability) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5182,7 +5201,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 272 (orange / confusion) +# tile 273 (orange / confusion) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5201,7 +5220,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 273 (yellow / blindness) +# tile 274 (yellow / blindness) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5220,7 +5239,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 274 (emerald / paralysis) +# tile 275 (emerald / paralysis) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5239,7 +5258,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 275 (dark green / speed) +# tile 276 (dark green / speed) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5258,7 +5277,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 276 (cyan / levitation) +# tile 277 (cyan / levitation) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5277,7 +5296,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 277 (sky blue / hallucination) +# tile 278 (sky blue / hallucination) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5296,7 +5315,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 278 (brilliant blue / invisibility) +# tile 279 (brilliant blue / invisibility) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5315,7 +5334,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 279 (magenta / see invisible) +# tile 280 (magenta / see invisible) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5334,7 +5353,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 280 (purple-red / healing) +# tile 281 (purple-red / healing) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5353,7 +5372,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 281 (puce / extra healing) +# tile 282 (puce / extra healing) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5372,7 +5391,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 282 (milky / gain level) +# tile 283 (milky / gain level) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5391,7 +5410,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 283 (swirly / enlightenment) +# tile 284 (swirly / enlightenment) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5410,7 +5429,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 284 (bubbly / monster detection) +# tile 285 (bubbly / monster detection) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5429,7 +5448,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 285 (smoky / object detection) +# tile 286 (smoky / object detection) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5448,7 +5467,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 286 (cloudy / gain energy) +# tile 287 (cloudy / gain energy) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5467,7 +5486,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 287 (effervescent / sleeping) +# tile 288 (effervescent / sleeping) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5486,7 +5505,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 288 (black / full healing) +# tile 289 (black / full healing) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5505,7 +5524,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 289 (golden / polymorph) +# tile 290 (golden / polymorph) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5524,7 +5543,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 290 (brown / booze) +# tile 291 (brown / booze) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5543,7 +5562,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 291 (fizzy / sickness) +# tile 292 (fizzy / sickness) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5562,7 +5581,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 292 (dark / fruit juice) +# tile 293 (dark / fruit juice) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5581,7 +5600,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 293 (white / acid) +# tile 294 (white / acid) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5600,7 +5619,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 294 (murky / oil) +# tile 295 (murky / oil) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5619,7 +5638,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 295 (clear / water) +# tile 296 (clear / water) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5638,7 +5657,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 296 (ZELGO MER / enchant armor) +# tile 297 (ZELGO MER / enchant armor) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5657,7 +5676,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 297 (JUYED AWK YACC / destroy armor) +# tile 298 (JUYED AWK YACC / destroy armor) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5676,7 +5695,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 298 (NR 9 / confuse monster) +# tile 299 (NR 9 / confuse monster) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5695,7 +5714,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 299 (XIXAXA XOXAXA XUXAXA / scare monster) +# tile 300 (XIXAXA XOXAXA XUXAXA / scare monster) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5714,7 +5733,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 300 (PRATYAVAYAH / remove curse) +# tile 301 (PRATYAVAYAH / remove curse) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5733,7 +5752,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 301 (DAIYEN FOOELS / enchant weapon) +# tile 302 (DAIYEN FOOELS / enchant weapon) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5752,7 +5771,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 302 (LEP GEX VEN ZEA / create monster) +# tile 303 (LEP GEX VEN ZEA / create monster) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5771,7 +5790,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 303 (PRIRUTSENIE / taming) +# tile 304 (PRIRUTSENIE / taming) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5790,7 +5809,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 304 (ELBIB YLOH / genocide) +# tile 305 (ELBIB YLOH / genocide) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5809,7 +5828,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 305 (VERR YED HORRE / light) +# tile 306 (VERR YED HORRE / light) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5828,7 +5847,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 306 (VENZAR BORGAVVE / teleportation) +# tile 307 (VENZAR BORGAVVE / teleportation) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5847,7 +5866,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 307 (THARR / gold detection) +# tile 308 (THARR / gold detection) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5866,7 +5885,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 308 (YUM YUM / food detection) +# tile 309 (YUM YUM / food detection) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5885,7 +5904,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 309 (KERNOD WEL / identify) +# tile 310 (KERNOD WEL / identify) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5904,7 +5923,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 310 (ELAM EBOW / magic mapping) +# tile 311 (ELAM EBOW / magic mapping) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5923,7 +5942,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 311 (DUAM XNAHT / amnesia) +# tile 312 (DUAM XNAHT / amnesia) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5942,7 +5961,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 312 (ANDOVA BEGARIN / fire) +# tile 313 (ANDOVA BEGARIN / fire) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5961,7 +5980,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 313 (KIRJE / earth) +# tile 314 (KIRJE / earth) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5980,7 +5999,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 314 (VE FORBRYDERNE / punishment) +# tile 315 (VE FORBRYDERNE / punishment) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -5999,7 +6018,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 315 (HACKEM MUCHE / charging) +# tile 316 (HACKEM MUCHE / charging) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6018,7 +6037,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 316 (VELOX NEB / stinking cloud) +# tile 317 (VELOX NEB / stinking cloud) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6037,7 +6056,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 317 (FOOBIE BLETCH) +# tile 318 (FOOBIE BLETCH) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6056,7 +6075,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 318 (TEMOV) +# tile 319 (TEMOV) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6075,7 +6094,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 319 (GARVEN DEH) +# tile 320 (GARVEN DEH) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6094,7 +6113,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 320 (READ ME) +# tile 321 (READ ME) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6113,7 +6132,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 321 (stamped / mail) +# tile 322 (stamped / mail) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6132,7 +6151,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 322 (unlabeled / blank paper) +# tile 323 (unlabeled / blank paper) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6151,7 +6170,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 323 (parchment / dig) +# tile 324 (parchment / dig) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6170,7 +6189,7 @@ P = (108, 145, 182) MMMMMMMJJJAAMMMM MMMMMMMMMMMMMMMM } -# tile 324 (vellum / magic missile) +# tile 325 (vellum / magic missile) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6189,7 +6208,7 @@ P = (108, 145, 182) MMMMMMMJJJAAMMMM MMMMMMMMMMMMMMMM } -# tile 325 (ragged / fireball) +# tile 326 (ragged / fireball) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6208,7 +6227,7 @@ P = (108, 145, 182) MMMMMMOOJJAAMMMM MMMMMMMMMMMMMMMM } -# tile 326 (dog eared / cone of cold) +# tile 327 (dog eared / cone of cold) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6227,7 +6246,7 @@ P = (108, 145, 182) MMMMMMMJJJAAMMMM MMMMMMMMMMMMMMMM } -# tile 327 (mottled / sleep) +# tile 328 (mottled / sleep) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6246,7 +6265,7 @@ P = (108, 145, 182) MMMMMMMJJJAAMMMM MMMMMMMMMMMMMMMM } -# tile 328 (stained / finger of death) +# tile 329 (stained / finger of death) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6265,7 +6284,7 @@ P = (108, 145, 182) MMMMMMMJJJAAMMMM MMMMMMMMMMMMMMMM } -# tile 329 (cloth / light) +# tile 330 (cloth / light) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6284,7 +6303,7 @@ P = (108, 145, 182) MMMMMMMPPPAAMMMM MMMMMMMMMMMMMMMM } -# tile 330 (leathery / detect monsters) +# tile 331 (leathery / detect monsters) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6303,7 +6322,7 @@ P = (108, 145, 182) MMMMMMMJJJAAMMMM MMMMMMMMMMMMMMMM } -# tile 331 (white / healing) +# tile 332 (white / healing) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6322,7 +6341,7 @@ P = (108, 145, 182) MMMMMMMPNNAAMMMM MMMMMMMMMMMMMMMM } -# tile 332 (pink / knock) +# tile 333 (pink / knock) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6341,7 +6360,7 @@ P = (108, 145, 182) MMMMMMMIIIAAMMMM MMMMMMMMMMMMMMMM } -# tile 333 (red / force bolt) +# tile 334 (red / force bolt) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6360,7 +6379,7 @@ P = (108, 145, 182) MMMMMMMDDDAAMMMM MMMMMMMMMMMMMMMM } -# tile 334 (orange / confuse monster) +# tile 335 (orange / confuse monster) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6379,7 +6398,7 @@ P = (108, 145, 182) MMMMMMMCCCAAMMMM MMMMMMMMMMMMMMMM } -# tile 335 (yellow / cure blindness) +# tile 336 (yellow / cure blindness) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6398,7 +6417,7 @@ P = (108, 145, 182) MMMMMMMHHHAAMMMM MMMMMMMMMMMMMMMM } -# tile 336 (velvet / drain life) +# tile 337 (velvet / drain life) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6417,7 +6436,7 @@ P = (108, 145, 182) MMMMMMMEEEAAMMMM MMMMMMMMMMMMMMMM } -# tile 337 (light green / slow monster) +# tile 338 (light green / slow monster) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6436,7 +6455,7 @@ P = (108, 145, 182) MMMMMMMGGGAAMMMM MMMMMMMMMMMMMMMM } -# tile 338 (dark green / wizard lock) +# tile 339 (dark green / wizard lock) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6455,7 +6474,7 @@ P = (108, 145, 182) MMMMMMMFFFAAMMMM MMMMMMMMMMMMMMMM } -# tile 339 (turquoise / create monster) +# tile 340 (turquoise / create monster) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6474,7 +6493,7 @@ P = (108, 145, 182) MMMMMMMFBBAAMMMM MMMMMMMMMMMMMMMM } -# tile 340 (cyan / detect food) +# tile 341 (cyan / detect food) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6493,7 +6512,7 @@ P = (108, 145, 182) MMMMMMMBBBAAMMMM MMMMMMMMMMMMMMMM } -# tile 341 (light blue / cause fear) +# tile 342 (light blue / cause fear) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6512,7 +6531,7 @@ P = (108, 145, 182) MMMMMMMBBBAAMMMM MMMMMMMMMMMMMMMM } -# tile 342 (dark blue / clairvoyance) +# tile 343 (dark blue / clairvoyance) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6531,7 +6550,7 @@ P = (108, 145, 182) MMMMMMMEEEAAMMMM MMMMMMMMMMMMMMMM } -# tile 343 (indigo / cure sickness) +# tile 344 (indigo / cure sickness) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6550,7 +6569,7 @@ P = (108, 145, 182) MMMMMMMEEEAAMMMM MMMMMMMMMMMMMMMM } -# tile 344 (magenta / charm monster) +# tile 345 (magenta / charm monster) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6569,7 +6588,7 @@ P = (108, 145, 182) MMMMMMMIIIAAMMMM MMMMMMMMMMMMMMMM } -# tile 345 (purple / haste self) +# tile 346 (purple / haste self) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6588,7 +6607,7 @@ P = (108, 145, 182) MMMMMMMIIIAAMMMM MMMMMMMMMMMMMMMM } -# tile 346 (violet / detect unseen) +# tile 347 (violet / detect unseen) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6607,7 +6626,7 @@ P = (108, 145, 182) MMMMMMMIIIAAMMMM MMMMMMMMMMMMMMMM } -# tile 347 (tan / levitation) +# tile 348 (tan / levitation) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6626,7 +6645,7 @@ P = (108, 145, 182) MMMMMMMKKKAAMMMM MMMMMMMMMMMMMMMM } -# tile 348 (plaid / extra healing) +# tile 349 (plaid / extra healing) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6645,7 +6664,7 @@ P = (108, 145, 182) MMMMMMMEFDAAMMMM MMMMMMMMMMMMMMMM } -# tile 349 (light brown / restore ability) +# tile 350 (light brown / restore ability) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6664,7 +6683,7 @@ P = (108, 145, 182) MMMMMMMJJJAAMMMM MMMMMMMMMMMMMMMM } -# tile 350 (dark brown / invisibility) +# tile 351 (dark brown / invisibility) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6683,7 +6702,7 @@ P = (108, 145, 182) MMMMMMMJJJAAMMMM MMMMMMMMMMMMMMMM } -# tile 351 (gray / detect treasure) +# tile 352 (gray / detect treasure) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6702,7 +6721,7 @@ P = (108, 145, 182) MMMMMMMPPPAAMMMM MMMMMMMMMMMMMMMM } -# tile 352 (wrinkled / remove curse) +# tile 353 (wrinkled / remove curse) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6721,7 +6740,7 @@ P = (108, 145, 182) MMMMMMJJKKAAMMMM MMMMMMMMMMMMMMMM } -# tile 353 (dusty / magic mapping) +# tile 354 (dusty / magic mapping) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6740,7 +6759,7 @@ P = (108, 145, 182) MKAKAMMJJJAAMMMM MMMMMMMMMMMMMMMM } -# tile 354 (bronze / identify) +# tile 355 (bronze / identify) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6759,7 +6778,7 @@ P = (108, 145, 182) MMMMMMMCCCAAMMMM MMMMMMMMMMMMMMMM } -# tile 355 (copper / turn undead) +# tile 356 (copper / turn undead) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6778,7 +6797,7 @@ P = (108, 145, 182) MMMMMMMJCJAAMMMM MMMMMMMMMMMMMMMM } -# tile 356 (silver / polymorph) +# tile 357 (silver / polymorph) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6797,7 +6816,7 @@ P = (108, 145, 182) MMMMMMMPPPAAMMMM MMMMMMMMMMMMMMMM } -# tile 357 (gold / teleport away) +# tile 358 (gold / teleport away) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6816,7 +6835,7 @@ P = (108, 145, 182) MMMMMMMHHHAAMMMM MMMMMMMMMMMMMMMM } -# tile 358 (glittering / create familiar) +# tile 359 (glittering / create familiar) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6835,7 +6854,7 @@ P = (108, 145, 182) MMMMMMMPPPANMMMM MMMMMMMNMMMMMMMM } -# tile 359 (shining / cancellation) +# tile 360 (shining / cancellation) { MMMMNMMMMMMMMMMM MMMMMMMNMMMMMMMM @@ -6854,7 +6873,7 @@ P = (108, 145, 182) MMMMMMMPPPAAMMMM MMMMMMMMMMMMMMMM } -# tile 360 (dull / protection) +# tile 361 (dull / protection) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6873,7 +6892,7 @@ P = (108, 145, 182) MMMMMMMJJJAAMMMM MMMMMMMMMMMMMMMM } -# tile 361 (thin / jumping) +# tile 362 (thin / jumping) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6892,7 +6911,7 @@ P = (108, 145, 182) MMMMMMMJJJAAMMMM MMMMMMMMMMMMMMMM } -# tile 362 (thick / stone to flesh) +# tile 363 (thick / stone to flesh) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6911,7 +6930,7 @@ P = (108, 145, 182) MMMMMMMJJJAAMMMM MMMMMMMMMMMMMMMM } -# tile 363 (plain / blank paper) +# tile 364 (plain / blank paper) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6930,7 +6949,7 @@ P = (108, 145, 182) MMMMMMMJJJAAMMMM MMMMMMMMMMMMMMMM } -# tile 364 (papyrus / Book of the Dead) +# tile 365 (papyrus / Book of the Dead) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6949,7 +6968,7 @@ P = (108, 145, 182) MMMMMMMAAAMMMMMM MMMMMMMMMMMMMMMM } -# tile 365 (glass / light) +# tile 366 (glass / light) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6968,7 +6987,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 366 (balsa / secret door detection) +# tile 367 (balsa / secret door detection) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -6987,7 +7006,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 367 (crystal / enlightenment) +# tile 368 (crystal / enlightenment) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7006,7 +7025,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 368 (maple / create monster) +# tile 369 (maple / create monster) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7025,7 +7044,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 369 (pine / wishing) +# tile 370 (pine / wishing) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7044,7 +7063,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 370 (oak / nothing) +# tile 371 (oak / nothing) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7063,7 +7082,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 371 (ebony / striking) +# tile 372 (ebony / striking) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7082,7 +7101,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 372 (marble / make invisible) +# tile 373 (marble / make invisible) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7101,7 +7120,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 373 (tin / slow monster) +# tile 374 (tin / slow monster) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7120,7 +7139,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 374 (brass / speed monster) +# tile 375 (brass / speed monster) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7139,7 +7158,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 375 (copper / undead turning) +# tile 376 (copper / undead turning) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7158,7 +7177,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 376 (silver / polymorph) +# tile 377 (silver / polymorph) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7177,7 +7196,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 377 (platinum / cancellation) +# tile 378 (platinum / cancellation) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7196,7 +7215,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 378 (iridium / teleportation) +# tile 379 (iridium / teleportation) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7215,7 +7234,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 379 (zinc / opening) +# tile 380 (zinc / opening) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7234,7 +7253,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 380 (aluminum / locking) +# tile 381 (aluminum / locking) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7253,7 +7272,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 381 (uranium / probing) +# tile 382 (uranium / probing) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7272,7 +7291,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 382 (iron / digging) +# tile 383 (iron / digging) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7291,7 +7310,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 383 (steel / magic missile) +# tile 384 (steel / magic missile) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7310,7 +7329,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 384 (hexagonal / fire) +# tile 385 (hexagonal / fire) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7329,7 +7348,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 385 (short / cold) +# tile 386 (short / cold) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7348,7 +7367,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 386 (runed / sleep) +# tile 387 (runed / sleep) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7367,7 +7386,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 387 (long / death) +# tile 388 (long / death) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMNOM @@ -7386,7 +7405,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 388 (curved / lightning) +# tile 389 (curved / lightning) { MMMMMMMMMMMMMMMM MMMMMMMNOMMMMMMM @@ -7405,7 +7424,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 389 (forked) +# tile 390 (forked) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7424,7 +7443,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 390 (spiked) +# tile 391 (spiked) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7443,7 +7462,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 391 (jeweled) +# tile 392 (jeweled) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7462,7 +7481,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 392 (gold piece) +# tile 393 (gold piece) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7481,7 +7500,7 @@ P = (108, 145, 182) MMMMMMMMMHAMMMMM MMMMMMMMMMMHAMMM } -# tile 393 (white / dilithium crystal) +# tile 394 (white / dilithium crystal) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7500,7 +7519,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 394 (white / diamond) +# tile 395 (white / diamond) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7519,7 +7538,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 395 (red / ruby) +# tile 396 (red / ruby) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7538,7 +7557,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 396 (orange / jacinth) +# tile 397 (orange / jacinth) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7557,7 +7576,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 397 (blue / sapphire) +# tile 398 (blue / sapphire) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7576,7 +7595,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 398 (black / black opal) +# tile 399 (black / black opal) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7595,7 +7614,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 399 (green / emerald) +# tile 400 (green / emerald) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7614,7 +7633,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 400 (green / turquoise) +# tile 401 (green / turquoise) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7633,7 +7652,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 401 (yellow / citrine) +# tile 402 (yellow / citrine) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7652,7 +7671,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 402 (green / aquamarine) +# tile 403 (green / aquamarine) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7671,7 +7690,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 403 (yellowish brown / amber) +# tile 404 (yellowish brown / amber) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7690,7 +7709,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 404 (yellowish brown / topaz) +# tile 405 (yellowish brown / topaz) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7709,7 +7728,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 405 (black / jet) +# tile 406 (black / jet) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7728,7 +7747,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 406 (white / opal) +# tile 407 (white / opal) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7747,7 +7766,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 407 (yellow / chrysoberyl) +# tile 408 (yellow / chrysoberyl) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7766,7 +7785,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 408 (red / garnet) +# tile 409 (red / garnet) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7785,7 +7804,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 409 (violet / amethyst) +# tile 410 (violet / amethyst) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7804,7 +7823,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 410 (red / jasper) +# tile 411 (red / jasper) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7823,7 +7842,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 411 (violet / fluorite) +# tile 412 (violet / fluorite) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7842,7 +7861,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 412 (black / obsidian) +# tile 413 (black / obsidian) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7861,7 +7880,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 413 (orange / agate) +# tile 414 (orange / agate) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7880,7 +7899,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 414 (green / jade) +# tile 415 (green / jade) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7899,7 +7918,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 415 (white / worthless piece of white glass) +# tile 416 (white / worthless piece of white glass) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7918,7 +7937,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 416 (blue / worthless piece of blue glass) +# tile 417 (blue / worthless piece of blue glass) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7937,7 +7956,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 417 (red / worthless piece of red glass) +# tile 418 (red / worthless piece of red glass) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7956,7 +7975,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 418 (yellowish brown / worthless piece of yellowish brown glass) +# tile 419 (yellowish brown / worthless piece of yellowish brown glass) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7975,7 +7994,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 419 (orange / worthless piece of orange glass) +# tile 420 (orange / worthless piece of orange glass) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -7994,7 +8013,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 420 (yellow / worthless piece of yellow glass) +# tile 421 (yellow / worthless piece of yellow glass) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -8013,7 +8032,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 421 (black / worthless piece of black glass) +# tile 422 (black / worthless piece of black glass) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -8032,7 +8051,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 422 (green / worthless piece of green glass) +# tile 423 (green / worthless piece of green glass) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -8051,7 +8070,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 423 (violet / worthless piece of violet glass) +# tile 424 (violet / worthless piece of violet glass) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -8070,7 +8089,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 424 (gray / luckstone) +# tile 425 (gray / luckstone) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -8089,7 +8108,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 425 (gray / loadstone) +# tile 426 (gray / loadstone) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -8108,7 +8127,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 426 (gray / touchstone) +# tile 427 (gray / touchstone) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -8127,7 +8146,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 427 (gray / flint) +# tile 428 (gray / flint) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -8146,7 +8165,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 428 (rock) +# tile 429 (rock) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -8165,7 +8184,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 429 (boulder) +# tile 430 (boulder) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -8184,7 +8203,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 430 (statue) +# tile 431 (statue) { MMMMMMMMMMMMMMMM MMMMMMMMJJMMMMMM @@ -8203,7 +8222,7 @@ P = (108, 145, 182) MMMMMJJJJJJAAMMM MMMMMMMMMMMMMMMM } -# tile 431 (heavy iron ball) +# tile 432 (heavy iron ball) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -8222,7 +8241,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 432 (iron chain) +# tile 433 (iron chain) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -8241,7 +8260,7 @@ P = (108, 145, 182) MMMMMMMMMMMPPMPA MMMMMMMMMMMMAAMM } -# tile 433 (splash of venom / blinding venom) +# tile 434 (splash of venom / blinding venom) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM @@ -8260,7 +8279,7 @@ P = (108, 145, 182) MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } -# tile 434 (splash of venom / acid venom) +# tile 435 (splash of venom / acid venom) { MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM diff --git a/win/share/renumtiles.pl b/win/share/renumtiles.pl new file mode 100644 index 000000000..e7a02e6c8 --- /dev/null +++ b/win/share/renumtiles.pl @@ -0,0 +1,84 @@ +#!/bin/perl +# +# $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ +# $Date: 2002/01/05 21:06:02 $ $Revision: 1.1 $ +# + +sub bail($); + +use Getopt::Std; + +$Getopt::Std::STANDARD_HELP_VERSION = TRUE; +$main::VERSION = 1.0; + +my %commands = ( + 'd' => 'debug mode; parse objects.txt to stdout instead of updating', +); + +getopts(join('', keys(%commands))); + +my $debug = (defined($opt_d) && $opt_d == 1); +my $tilecount = 0; +my $outfile = $debug ? "-" : "objects.txt"; +my $infile = $debug ? "objects.txt" : "objects.bak"; + + +unless ($debug) { + if (-e "$infile") { die "something didn't clean up objects.bak from last time; stopping\n"; } + rename($outfile,$infile) or die "couldn't move objects.txt to objects.bak; stopping\n"; +} + +open(INFILE, "<$infile") or bail("couldn't open $infile; bailing"); +open(OUTFILE, ">$outfile") or bail("couldn't open $outfile; bailing"); + +while (my $line = ) +{ + if (my ($tiletext) = $line =~ /^# tile \d+ (.*)/) + { + $line = "# tile $tilecount $tiletext\n"; + $tilecount++; + } + + print OUTFILE $line; +} + +close(INFILE); +close(OUTFILE); + +exit; + +sub main::HELP_MESSAGE() +{ + print <<"STARTHELP"; +Usage: renumtiles.pl [OPTIONS] + +STARTHELP + foreach $cmd (keys(%commands)) { + printf("%10s %s\n", '-'.$cmd, $commands{$cmd}); + } + print <<"ENDHELP"; + +\t--help display this help message and exit +\t--version display version and exit +ENDHELP + exit; +} + +sub main::VERSION_MESSAGE() +{ + my ($objglob, $optpackage, $ver, $switches) = @_; + print <<"STARTHELP"; +renumtiles $ver -- tile-renumbering utility for NetHack +STARTHELP +} + +sub bail($) +{ + unless ($debug) { + unlink $outfile; + rename ($infile,$outfile); + } + shift; + die "$_\n"; +} +