From: Pasi Kallinen Date: Thu, 17 Sep 2015 16:32:28 +0000 (+0300) Subject: One more scroll name, a tongue twister X-Git-Tag: NetHack-3.6.0_RC01~193 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=798b2e76f97e919558ef35adeaabd374031837fe;p=nethack One more scroll name, a tongue twister --- diff --git a/src/objects.c b/src/objects.c index 993081cda..11f1978bd 100644 --- a/src/objects.c +++ b/src/objects.c @@ -866,6 +866,7 @@ SCROLL(None, "GHOTI", 1, 0, 100), /* pronounced a SCROLL(None, "MAPIRO MAHAMA DIROMAT", 1, 0, 100), /* Wizardry */ SCROLL(None, "VAS CORP BET MANI", 1, 0, 100), /* Ultima */ SCROLL(None, "XOR OTA", 1, 0, 100), /* Aarne Haapakoski */ +SCROLL(None, "STRC PRST SKRZ KRK", 1, 0, 100), /* Czech and Slovak tongue-twister */ /* these must come last because they have special descriptions */ #ifdef MAIL diff --git a/win/share/objects.txt b/win/share/objects.txt index 5208f4e3e..996c59198 100644 --- a/win/share/objects.txt +++ b/win/share/objects.txt @@ -6487,7 +6487,26 @@ Z = (195, 195, 195) ................ ................ } -# tile 340 (stamped / mail) +# tile 340 (STRC PRST SKRZ KRK) +{ + ................ + ................ + ....POOOOOPKA... + ...DOOOOOOKDJ... + ....POOOOOPJAA.. + .....AAAAAAPA... + .....LLLLLLPA... + .....NJNJAO.A... + .....LLLLLLPA... + .....LLJLJLPA... + ....POOOOOPKA... + ...DOOOOOOKDJ... + ....POOOOOPJAA.. + .....AAAAAAAA... + ................ + ................ +} +# tile 341 (stamped / mail) { ................ ................ @@ -6506,7 +6525,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 341 (unlabeled / blank paper) +# tile 342 (unlabeled / blank paper) { ................ ................ @@ -6525,7 +6544,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 342 (parchment / dig) +# tile 343 (parchment / dig) { ................ ................ @@ -6544,7 +6563,7 @@ Z = (195, 195, 195) .......JJJAA.... ................ } -# tile 343 (vellum / magic missile) +# tile 344 (vellum / magic missile) { ................ ................ @@ -6563,7 +6582,7 @@ Z = (195, 195, 195) .......JJJAA.... ................ } -# tile 344 (ragged / fireball) +# tile 345 (ragged / fireball) { ................ ................ @@ -6582,7 +6601,7 @@ Z = (195, 195, 195) ......OOJJAA.... ................ } -# tile 345 (dog eared / cone of cold) +# tile 346 (dog eared / cone of cold) { ................ ................ @@ -6601,7 +6620,7 @@ Z = (195, 195, 195) .......JJJAA.... ................ } -# tile 346 (mottled / sleep) +# tile 347 (mottled / sleep) { ................ ................ @@ -6620,7 +6639,7 @@ Z = (195, 195, 195) .......JJJAA.... ................ } -# tile 347 (stained / finger of death) +# tile 348 (stained / finger of death) { ................ ................ @@ -6639,7 +6658,7 @@ Z = (195, 195, 195) .......JJJAA.... ................ } -# tile 348 (cloth / light) +# tile 349 (cloth / light) { ................ ................ @@ -6658,7 +6677,7 @@ Z = (195, 195, 195) .......PPPAA.... ................ } -# tile 349 (leathery / detect monsters) +# tile 350 (leathery / detect monsters) { ................ ................ @@ -6677,7 +6696,7 @@ Z = (195, 195, 195) .......JJJAA.... ................ } -# tile 350 (white / healing) +# tile 351 (white / healing) { ................ ................ @@ -6696,7 +6715,7 @@ Z = (195, 195, 195) .......PNNAA.... ................ } -# tile 351 (pink / knock) +# tile 352 (pink / knock) { ................ ................ @@ -6715,7 +6734,7 @@ Z = (195, 195, 195) .......IIIAA.... ................ } -# tile 352 (red / force bolt) +# tile 353 (red / force bolt) { ................ ................ @@ -6734,7 +6753,7 @@ Z = (195, 195, 195) .......DDDAA.... ................ } -# tile 353 (orange / confuse monster) +# tile 354 (orange / confuse monster) { ................ ................ @@ -6753,7 +6772,7 @@ Z = (195, 195, 195) .......CCCAA.... ................ } -# tile 354 (yellow / cure blindness) +# tile 355 (yellow / cure blindness) { ................ ................ @@ -6772,7 +6791,7 @@ Z = (195, 195, 195) .......HHHAA.... ................ } -# tile 355 (velvet / drain life) +# tile 356 (velvet / drain life) { ................ ................ @@ -6791,7 +6810,7 @@ Z = (195, 195, 195) .......EEEAA.... ................ } -# tile 356 (light green / slow monster) +# tile 357 (light green / slow monster) { ................ ................ @@ -6810,7 +6829,7 @@ Z = (195, 195, 195) .......GGGAA.... ................ } -# tile 357 (dark green / wizard lock) +# tile 358 (dark green / wizard lock) { ................ ................ @@ -6829,7 +6848,7 @@ Z = (195, 195, 195) .......FFFAA.... ................ } -# tile 358 (turquoise / create monster) +# tile 359 (turquoise / create monster) { ................ ................ @@ -6848,7 +6867,7 @@ Z = (195, 195, 195) .......FBBAA.... ................ } -# tile 359 (cyan / detect food) +# tile 360 (cyan / detect food) { ................ ................ @@ -6867,7 +6886,7 @@ Z = (195, 195, 195) .......BBBAA.... ................ } -# tile 360 (light blue / cause fear) +# tile 361 (light blue / cause fear) { ................ ................ @@ -6886,7 +6905,7 @@ Z = (195, 195, 195) .......BBBAA.... ................ } -# tile 361 (dark blue / clairvoyance) +# tile 362 (dark blue / clairvoyance) { ................ ................ @@ -6905,7 +6924,7 @@ Z = (195, 195, 195) .......EEEAA.... ................ } -# tile 362 (indigo / cure sickness) +# tile 363 (indigo / cure sickness) { ................ ................ @@ -6924,7 +6943,7 @@ Z = (195, 195, 195) .......EEEAA.... ................ } -# tile 363 (magenta / charm monster) +# tile 364 (magenta / charm monster) { ................ ................ @@ -6943,7 +6962,7 @@ Z = (195, 195, 195) .......IIIAA.... ................ } -# tile 364 (purple / haste self) +# tile 365 (purple / haste self) { ................ ................ @@ -6962,7 +6981,7 @@ Z = (195, 195, 195) .......IIIAA.... ................ } -# tile 365 (violet / detect unseen) +# tile 366 (violet / detect unseen) { ................ ................ @@ -6981,7 +7000,7 @@ Z = (195, 195, 195) .......IIIAA.... ................ } -# tile 366 (tan / levitation) +# tile 367 (tan / levitation) { ................ ................ @@ -7000,7 +7019,7 @@ Z = (195, 195, 195) .......KKKAA.... ................ } -# tile 367 (plaid / extra healing) +# tile 368 (plaid / extra healing) { ................ ................ @@ -7019,7 +7038,7 @@ Z = (195, 195, 195) .......EFDAA.... ................ } -# tile 368 (light brown / restore ability) +# tile 369 (light brown / restore ability) { ................ ................ @@ -7038,7 +7057,7 @@ Z = (195, 195, 195) .......JJJAA.... ................ } -# tile 369 (dark brown / invisibility) +# tile 370 (dark brown / invisibility) { ................ ................ @@ -7057,7 +7076,7 @@ Z = (195, 195, 195) .......JJJAA.... ................ } -# tile 370 (gray / detect treasure) +# tile 371 (gray / detect treasure) { ................ ................ @@ -7076,7 +7095,7 @@ Z = (195, 195, 195) .......PPPAA.... ................ } -# tile 371 (wrinkled / remove curse) +# tile 372 (wrinkled / remove curse) { ................ ................ @@ -7095,7 +7114,7 @@ Z = (195, 195, 195) ......JJKKAA.... ................ } -# tile 372 (dusty / magic mapping) +# tile 373 (dusty / magic mapping) { ................ ................ @@ -7114,7 +7133,7 @@ Z = (195, 195, 195) .KAKA..JJJAA.... ................ } -# tile 373 (bronze / identify) +# tile 374 (bronze / identify) { ................ ................ @@ -7133,7 +7152,7 @@ Z = (195, 195, 195) .......CCCAA.... ................ } -# tile 374 (copper / turn undead) +# tile 375 (copper / turn undead) { ................ ................ @@ -7152,7 +7171,7 @@ Z = (195, 195, 195) .......JCJAA.... ................ } -# tile 375 (silver / polymorph) +# tile 376 (silver / polymorph) { ................ ................ @@ -7171,7 +7190,7 @@ Z = (195, 195, 195) .......PPPAA.... ................ } -# tile 376 (gold / teleport away) +# tile 377 (gold / teleport away) { ................ ................ @@ -7190,7 +7209,7 @@ Z = (195, 195, 195) .......HHHAA.... ................ } -# tile 377 (glittering / create familiar) +# tile 378 (glittering / create familiar) { ................ ................ @@ -7209,7 +7228,7 @@ Z = (195, 195, 195) .......PPPAN.... .......N........ } -# tile 378 (shining / cancellation) +# tile 379 (shining / cancellation) { ....N........... .......N........ @@ -7228,7 +7247,7 @@ Z = (195, 195, 195) .......PPPAA.... ................ } -# tile 379 (dull / protection) +# tile 380 (dull / protection) { ................ ................ @@ -7247,7 +7266,7 @@ Z = (195, 195, 195) .......JJJAA.... ................ } -# tile 380 (thin / jumping) +# tile 381 (thin / jumping) { ................ ................ @@ -7266,7 +7285,7 @@ Z = (195, 195, 195) .......JJJAA.... ................ } -# tile 381 (thick / stone to flesh) +# tile 382 (thick / stone to flesh) { ................ ................ @@ -7285,7 +7304,7 @@ Z = (195, 195, 195) .......JJJAA.... ................ } -# tile 382 (plain / blank paper) +# tile 383 (plain / blank paper) { ................ ................ @@ -7304,7 +7323,7 @@ Z = (195, 195, 195) .......JJJAA.... ................ } -# tile 383 (paperback / novel) +# tile 384 (paperback / novel) { ................ ................ @@ -7323,7 +7342,7 @@ Z = (195, 195, 195) .......EEEAA.... ................ } -# tile 384 (papyrus / Book of the Dead) +# tile 385 (papyrus / Book of the Dead) { ................ ................ @@ -7342,7 +7361,7 @@ Z = (195, 195, 195) .......AAA...... ................ } -# tile 385 (glass / light) +# tile 386 (glass / light) { ................ ................ @@ -7361,7 +7380,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 386 (balsa / secret door detection) +# tile 387 (balsa / secret door detection) { ................ ................ @@ -7380,7 +7399,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 387 (crystal / enlightenment) +# tile 388 (crystal / enlightenment) { ................ ................ @@ -7399,7 +7418,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 388 (maple / create monster) +# tile 389 (maple / create monster) { ................ ................ @@ -7418,7 +7437,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 389 (pine / wishing) +# tile 390 (pine / wishing) { ................ ................ @@ -7437,7 +7456,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 390 (oak / nothing) +# tile 391 (oak / nothing) { ................ ................ @@ -7456,7 +7475,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 391 (ebony / striking) +# tile 392 (ebony / striking) { ................ ................ @@ -7475,7 +7494,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 392 (marble / make invisible) +# tile 393 (marble / make invisible) { ................ ................ @@ -7494,7 +7513,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 393 (tin / slow monster) +# tile 394 (tin / slow monster) { ................ ................ @@ -7513,7 +7532,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 394 (brass / speed monster) +# tile 395 (brass / speed monster) { ................ ................ @@ -7532,7 +7551,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 395 (copper / undead turning) +# tile 396 (copper / undead turning) { ................ ................ @@ -7551,7 +7570,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 396 (silver / polymorph) +# tile 397 (silver / polymorph) { ................ ................ @@ -7570,7 +7589,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 397 (platinum / cancellation) +# tile 398 (platinum / cancellation) { ................ ................ @@ -7589,7 +7608,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 398 (iridium / teleportation) +# tile 399 (iridium / teleportation) { ................ ................ @@ -7608,7 +7627,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 399 (zinc / opening) +# tile 400 (zinc / opening) { ................ ................ @@ -7627,7 +7646,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 400 (aluminum / locking) +# tile 401 (aluminum / locking) { ................ ................ @@ -7646,7 +7665,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 401 (uranium / probing) +# tile 402 (uranium / probing) { ................ ................ @@ -7665,7 +7684,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 402 (iron / digging) +# tile 403 (iron / digging) { ................ ................ @@ -7684,7 +7703,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 403 (steel / magic missile) +# tile 404 (steel / magic missile) { ................ ................ @@ -7703,7 +7722,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 404 (hexagonal / fire) +# tile 405 (hexagonal / fire) { ................ ................ @@ -7722,7 +7741,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 405 (short / cold) +# tile 406 (short / cold) { ................ ................ @@ -7741,7 +7760,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 406 (runed / sleep) +# tile 407 (runed / sleep) { ................ ................ @@ -7760,7 +7779,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 407 (long / death) +# tile 408 (long / death) { ................ .............NO. @@ -7779,7 +7798,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 408 (curved / lightning) +# tile 409 (curved / lightning) { ................ .......NO....... @@ -7798,7 +7817,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 409 (forked) +# tile 410 (forked) { ................ ................ @@ -7817,7 +7836,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 410 (spiked) +# tile 411 (spiked) { ................ ................ @@ -7836,7 +7855,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 411 (jeweled) +# tile 412 (jeweled) { ................ ................ @@ -7855,7 +7874,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 412 (gold piece) +# tile 413 (gold piece) { ................ ................ @@ -7874,7 +7893,7 @@ Z = (195, 195, 195) .........HA..... ...........HA... } -# tile 413 (white / dilithium crystal) +# tile 414 (white / dilithium crystal) { ................ ................ @@ -7893,7 +7912,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 414 (white / diamond) +# tile 415 (white / diamond) { ................ ................ @@ -7912,7 +7931,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 415 (red / ruby) +# tile 416 (red / ruby) { ................ ................ @@ -7931,7 +7950,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 416 (orange / jacinth) +# tile 417 (orange / jacinth) { ................ ................ @@ -7950,7 +7969,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 417 (blue / sapphire) +# tile 418 (blue / sapphire) { ................ ................ @@ -7969,7 +7988,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 418 (black / black opal) +# tile 419 (black / black opal) { ................ ................ @@ -7988,7 +8007,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 419 (green / emerald) +# tile 420 (green / emerald) { ................ ................ @@ -8007,7 +8026,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 420 (green / turquoise) +# tile 421 (green / turquoise) { ................ ................ @@ -8026,7 +8045,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 421 (yellow / citrine) +# tile 422 (yellow / citrine) { ................ ................ @@ -8045,7 +8064,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 422 (green / aquamarine) +# tile 423 (green / aquamarine) { ................ ................ @@ -8064,7 +8083,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 423 (yellowish brown / amber) +# tile 424 (yellowish brown / amber) { ................ ................ @@ -8083,7 +8102,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 424 (yellowish brown / topaz) +# tile 425 (yellowish brown / topaz) { ................ ................ @@ -8102,7 +8121,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 425 (black / jet) +# tile 426 (black / jet) { ................ ................ @@ -8121,7 +8140,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 426 (white / opal) +# tile 427 (white / opal) { ................ ................ @@ -8140,7 +8159,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 427 (yellow / chrysoberyl) +# tile 428 (yellow / chrysoberyl) { ................ ................ @@ -8159,7 +8178,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 428 (red / garnet) +# tile 429 (red / garnet) { ................ ................ @@ -8178,7 +8197,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 429 (violet / amethyst) +# tile 430 (violet / amethyst) { ................ ................ @@ -8197,7 +8216,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 430 (red / jasper) +# tile 431 (red / jasper) { ................ ................ @@ -8216,7 +8235,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 431 (violet / fluorite) +# tile 432 (violet / fluorite) { ................ ................ @@ -8235,7 +8254,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 432 (black / obsidian) +# tile 433 (black / obsidian) { ................ ................ @@ -8254,7 +8273,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 433 (orange / agate) +# tile 434 (orange / agate) { ................ ................ @@ -8273,7 +8292,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 434 (green / jade) +# tile 435 (green / jade) { ................ ................ @@ -8292,7 +8311,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 435 (white / worthless piece of white glass) +# tile 436 (white / worthless piece of white glass) { ................ ................ @@ -8311,7 +8330,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 436 (blue / worthless piece of blue glass) +# tile 437 (blue / worthless piece of blue glass) { ................ ................ @@ -8330,7 +8349,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 437 (red / worthless piece of red glass) +# tile 438 (red / worthless piece of red glass) { ................ ................ @@ -8349,7 +8368,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 438 (yellowish brown / worthless piece of yellowish brown glass) +# tile 439 (yellowish brown / worthless piece of yellowish brown glass) { ................ ................ @@ -8368,7 +8387,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 439 (orange / worthless piece of orange glass) +# tile 440 (orange / worthless piece of orange glass) { ................ ................ @@ -8387,7 +8406,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 440 (yellow / worthless piece of yellow glass) +# tile 441 (yellow / worthless piece of yellow glass) { ................ ................ @@ -8406,7 +8425,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 441 (black / worthless piece of black glass) +# tile 442 (black / worthless piece of black glass) { ................ ................ @@ -8425,7 +8444,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 442 (green / worthless piece of green glass) +# tile 443 (green / worthless piece of green glass) { ................ ................ @@ -8444,7 +8463,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 443 (violet / worthless piece of violet glass) +# tile 444 (violet / worthless piece of violet glass) { ................ ................ @@ -8463,7 +8482,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 444 (gray / luckstone) +# tile 445 (gray / luckstone) { ................ ................ @@ -8482,7 +8501,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 445 (gray / loadstone) +# tile 446 (gray / loadstone) { ................ ................ @@ -8501,7 +8520,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 446 (gray / touchstone) +# tile 447 (gray / touchstone) { ................ ................ @@ -8520,7 +8539,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 447 (gray / flint) +# tile 448 (gray / flint) { ................ ................ @@ -8539,7 +8558,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 448 (rock) +# tile 449 (rock) { ................ ................ @@ -8558,7 +8577,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 449 (boulder) +# tile 450 (boulder) { ................ ................ @@ -8577,7 +8596,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 450 (statue) +# tile 451 (statue) { ................ ........JJ...... @@ -8596,7 +8615,7 @@ Z = (195, 195, 195) .....JJJJJJAA... ................ } -# tile 451 (heavy iron ball) +# tile 452 (heavy iron ball) { ................ ................ @@ -8615,7 +8634,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 452 (iron chain) +# tile 453 (iron chain) { ................ ................ @@ -8634,7 +8653,7 @@ Z = (195, 195, 195) ...........PP.PA ............AA.. } -# tile 453 (splash of venom / blinding venom) +# tile 454 (splash of venom / blinding venom) { ................ ................ @@ -8653,7 +8672,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 454 (splash of venom / acid venom) +# tile 455 (splash of venom / acid venom) { ................ ................