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

tribute post-merge smoothing

Browse Source 
Changes to be committed:
	modified:   src/mon.c
	modified:   win/share/objects.txt
This commit is contained in:
nhmall
2015-04-12 10:31:26 -04:00
parent 11560933cc
commit 7da3ed32e1
2 changed files with 74 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mon.c
View File

@@ -1627,6 +1627,8 @@ register struct monst *mtmp;
}
if(mtmp->iswiz) wizdead();
if(mtmp->data->msound == MS_NEMESIS) nemdead();
if(mtmp->data == &mons[PM_MEDUSA])
u.uachieve.killed_medusa = 1;
if(glyph_is_invisible(levl[mtmp->mx][mtmp->my].glyph))
unmap_object(mtmp->mx, mtmp->my);
m_detach(mtmp, mptr);

143
win/share/objects.txt
View File

@@ -7006,7 +7006,7 @@ P = (108, 145, 182)
MMMMMMMJJJAAMMMM
MMMMMMMMMMMMMMMM
}
# tile 363 (paperback / novel)
# tile 368 (paperback / novel)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7025,6 +7025,7 @@ P = (108, 145, 182)
MMMMMMMEEEAAMMMM
MMMMMMMMMMMMMMMM
}
# tile 369 (papyrus / Book of the Dead)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7043,7 +7044,7 @@ P = (108, 145, 182)
MMMMMMMAAAMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 369 (glass / light)
# tile 370 (glass / light)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7062,7 +7063,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 370 (balsa / secret door detection)
# tile 371 (balsa / secret door detection)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7081,7 +7082,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 371 (crystal / enlightenment)
# tile 372 (crystal / enlightenment)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7100,7 +7101,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 372 (maple / create monster)
# tile 373 (maple / create monster)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7119,7 +7120,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 373 (pine / wishing)
# tile 374 (pine / wishing)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7138,7 +7139,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 374 (oak / nothing)
# tile 375 (oak / nothing)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7157,7 +7158,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 375 (ebony / striking)
# tile 376 (ebony / striking)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7176,7 +7177,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 376 (marble / make invisible)
# tile 377 (marble / make invisible)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7195,7 +7196,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 377 (tin / slow monster)
# tile 378 (tin / slow monster)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7214,7 +7215,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 378 (brass / speed monster)
# tile 379 (brass / speed monster)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7233,7 +7234,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 379 (copper / undead turning)
# tile 380 (copper / undead turning)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7252,7 +7253,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 380 (silver / polymorph)
# tile 381 (silver / polymorph)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7271,7 +7272,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 381 (platinum / cancellation)
# tile 382 (platinum / cancellation)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7290,7 +7291,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 382 (iridium / teleportation)
# tile 383 (iridium / teleportation)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7309,7 +7310,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 383 (zinc / opening)
# tile 384 (zinc / opening)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7328,7 +7329,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 384 (aluminum / locking)
# tile 385 (aluminum / locking)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7347,7 +7348,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 385 (uranium / probing)
# tile 386 (uranium / probing)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7366,7 +7367,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 386 (iron / digging)
# tile 387 (iron / digging)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7385,7 +7386,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 387 (steel / magic missile)
# tile 388 (steel / magic missile)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7404,7 +7405,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 388 (hexagonal / fire)
# tile 389 (hexagonal / fire)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7423,7 +7424,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 389 (short / cold)
# tile 390 (short / cold)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7442,7 +7443,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 390 (runed / sleep)
# tile 391 (runed / sleep)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7461,7 +7462,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 391 (long / death)
# tile 392 (long / death)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMNOM
@@ -7480,7 +7481,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 392 (curved / lightning)
# tile 393 (curved / lightning)
{
MMMMMMMMMMMMMMMM
MMMMMMMNOMMMMMMM
@@ -7499,7 +7500,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 393 (forked)
# tile 394 (forked)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7518,7 +7519,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 394 (spiked)
# tile 395 (spiked)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7537,7 +7538,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 395 (jeweled)
# tile 396 (jeweled)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7556,7 +7557,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 396 (gold piece)
# tile 397 (gold piece)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7575,7 +7576,7 @@ P = (108, 145, 182)
MMMMMMMMMHAMMMMM
MMMMMMMMMMMHAMMM
}
# tile 397 (white / dilithium crystal)
# tile 398 (white / dilithium crystal)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7594,7 +7595,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 398 (white / diamond)
# tile 399 (white / diamond)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7613,7 +7614,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 399 (red / ruby)
# tile 400 (red / ruby)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7632,7 +7633,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 400 (orange / jacinth)
# tile 401 (orange / jacinth)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7651,7 +7652,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 401 (blue / sapphire)
# tile 402 (blue / sapphire)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7670,7 +7671,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 402 (black / black opal)
# tile 403 (black / black opal)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7689,7 +7690,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 403 (green / emerald)
# tile 404 (green / emerald)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7708,7 +7709,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 404 (green / turquoise)
# tile 405 (green / turquoise)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7727,7 +7728,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 405 (yellow / citrine)
# tile 406 (yellow / citrine)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7746,7 +7747,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 406 (green / aquamarine)
# tile 407 (green / aquamarine)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7765,7 +7766,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 407 (yellowish brown / amber)
# tile 408 (yellowish brown / amber)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7784,7 +7785,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 408 (yellowish brown / topaz)
# tile 409 (yellowish brown / topaz)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7803,7 +7804,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 409 (black / jet)
# tile 410 (black / jet)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7822,7 +7823,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 410 (white / opal)
# tile 411 (white / opal)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7841,7 +7842,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 411 (yellow / chrysoberyl)
# tile 412 (yellow / chrysoberyl)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7860,7 +7861,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 412 (red / garnet)
# tile 413 (red / garnet)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7879,7 +7880,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 413 (violet / amethyst)
# tile 414 (violet / amethyst)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7898,7 +7899,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 414 (red / jasper)
# tile 415 (red / jasper)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7917,7 +7918,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 415 (violet / fluorite)
# tile 416 (violet / fluorite)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7936,7 +7937,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 416 (black / obsidian)
# tile 417 (black / obsidian)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7955,7 +7956,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 417 (orange / agate)
# tile 418 (orange / agate)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7974,7 +7975,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 418 (green / jade)
# tile 419 (green / jade)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -7993,7 +7994,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 419 (white / worthless piece of white glass)
# tile 420 (white / worthless piece of white glass)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8012,7 +8013,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 420 (blue / worthless piece of blue glass)
# tile 421 (blue / worthless piece of blue glass)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8031,7 +8032,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 421 (red / worthless piece of red glass)
# tile 422 (red / worthless piece of red glass)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8050,7 +8051,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 422 (yellowish brown / worthless piece of yellowish brown glass)
# tile 423 (yellowish brown / worthless piece of yellowish brown glass)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8069,7 +8070,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 423 (orange / worthless piece of orange glass)
# tile 424 (orange / worthless piece of orange glass)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8088,7 +8089,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 424 (yellow / worthless piece of yellow glass)
# tile 425 (yellow / worthless piece of yellow glass)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8107,7 +8108,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 425 (black / worthless piece of black glass)
# tile 426 (black / worthless piece of black glass)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8126,7 +8127,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 426 (green / worthless piece of green glass)
# tile 427 (green / worthless piece of green glass)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8145,7 +8146,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 427 (violet / worthless piece of violet glass)
# tile 428 (violet / worthless piece of violet glass)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8164,7 +8165,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 428 (gray / luckstone)
# tile 429 (gray / luckstone)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8183,7 +8184,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 429 (gray / loadstone)
# tile 430 (gray / loadstone)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8202,7 +8203,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 430 (gray / touchstone)
# tile 431 (gray / touchstone)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8221,7 +8222,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 431 (gray / flint)
# tile 432 (gray / flint)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8240,7 +8241,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 432 (rock)
# tile 433 (rock)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8259,7 +8260,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 433 (boulder)
# tile 434 (boulder)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8278,7 +8279,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 434 (statue)
# tile 435 (statue)
{
MMMMMMMMMMMMMMMM
MMMMMMMMJJMMMMMM
@@ -8297,7 +8298,7 @@ P = (108, 145, 182)
MMMMMJJJJJJAAMMM
MMMMMMMMMMMMMMMM
}
# tile 435 (heavy iron ball)
# tile 436 (heavy iron ball)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8316,7 +8317,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 436 (iron chain)
# tile 437 (iron chain)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8335,7 +8336,7 @@ P = (108, 145, 182)
MMMMMMMMMMMPPMPA
MMMMMMMMMMMMAAMM
}
# tile 437 (splash of venom / blinding venom)
# tile 438 (splash of venom / blinding venom)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
@@ -8354,7 +8355,7 @@ P = (108, 145, 182)
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM
}
# tile 438 (splash of venom / acid venom)
# tile 439 (splash of venom / acid venom)
{
MMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMM