From 76d8576482fc19f6baea315397ff4422eda3cb59 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sun, 23 Jan 2011 13:14:56 +0000 Subject: * Updated Aegis NPC ID constants from current npcidentity.lub (bugreport:4706). - Fixes some incorrect NPC ID constants (since r12780). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14679 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/Changelog.txt | 3 ++ db/const.txt | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 148 insertions(+), 7 deletions(-) diff --git a/db/Changelog.txt b/db/Changelog.txt index 0161f1977..b1fe0a256 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -9,6 +9,9 @@ 13005 Angelic Wing Dagger: NEED INFO. ======================= +2011/01/23 + * Rev. 14679 Updated Aegis NPC ID constants from current npcidentity.lub (bugreport:4706). [Ai4rei] + - Fixes some incorrect NPC ID constants (since r12780). 2011/01/06 * Rev. 14653 Updated mapcache once more, because the one from r14643 contained official xmas versions of the town maps, now causing glitches after the xmas event on kRO ended. [Ai4rei] 2011/01/04 diff --git a/db/const.txt b/db/const.txt index d5e222239..b159a80f7 100644 --- a/db/const.txt +++ b/db/const.txt @@ -1466,7 +1466,7 @@ WARPNPC 45 4W_F_01 101 8_F 102 8_F_GRANDMOTHER 103 -//104 is shadow sprite +EFFECTLAUNCHER 104 8W_SOLDIER 105 1_M_MOC_LORD 106 1_M_PAY_ELDER 107 @@ -1488,9 +1488,6 @@ HIDDEN_NPC 111 2_F_MAGICMASTER 123 4_F_TELEPORTER 124 4_M_TELEPORTER 125 -//Free Ids -HIDDEN_WARP_NPC 139 -//Free Ids 4_M_MUT2 401 4_M_SCIENCE 402 4_F_VALKYRIE2 403 @@ -1518,7 +1515,147 @@ HIDDEN_WARP_NPC 139 4_M_BONGUN 425 4_BEAR 426 4_BLUEWOLF 427 -4_PECO-PECO 428 +4_PECOPECO 428 +4_M_JP_MID 429 +4_M_JP_RUN 430 +4_ORCLADY 431 +4_ORCLADY2 432 +4_ORCWARRIOR 433 +4_ORCWARRIOR2 434 +4_F_FAIRY 435 +4_F_FAIRYKID 436 +4_F_FAIRYKID2 437 +4_F_FAIRYKID3 438 +4_F_FAIRYKID4 439 +4_F_FAIRYKID5 440 +4_F_FAIRYKID6 441 +4_M_FAIRYKID 442 +4_M_FAIRYKID2 443 +4_M_FAIRYKID3 444 +4_M_FAIRYKID4 445 +4_M_FAIRYKID5 446 +4_M_FAIRYSOLDIER 447 +4_M_TUFFOLD 448 +4_MAN_BENKUNI 449 +4_MAN_GALTUN 450 +4_MAN_JERUTOO 451 +4_MAN_LAVAIL 452 +4_MAN_NITT 453 +4_MAN_PIOM 454 +4_MAN_PIOM2 455 +4_M_DSTMAN 456 +4_M_DSTMANDEAD 457 +4_BABYLEOPARD 458 +4_M_REDSWORD 459 +4_MAN_PIOM3 460 +4_M_FAIRYSOLDIER2 461 +4_F_FAIRYSOLDIER 462 +4_DRAGON_EGG 463 +4_MIMIC 464 +4_F_FAIRY1 465 +4_F_GUILLOTINE 466 +4_M_GUILLOTINE 467 +4_M_KNIGHT_BLACK 468 +4_M_KNIGHT_GOLD 469 +4_M_KNIGHT_SILVER 470 +4_SKULL_MUD 471 +4_M_BRZ_INDIAN 472 +4_F_BRZ_INDIAN 473 +4_F_BRZ_INDOLD 474 +4_M_BRZ_JACI 475 +4_M_BRZ_MAN1 476 +4_M_BRZ_MAN2 477 +4_F_BRZ_WOMAN 478 +4_M_MINSTREL 479 +4_M_MINSTREL1 480 +4_M_SHADOWCHASER 481 +4_F_SHADOWCHASER 482 +4_M_SURA 483 +4_F_SURA 484 +4_F_WANDERER 485 +4_M_BARD 486 +1_FLAG_NOFEAR 487 +4_M_NOFEARGUY 488 +4_MAN_PIOM6 489 +4_MAN_PIOM4 490 +4_MAN_PIOM5 491 +4_MAN_GALTUN1 492 +4_HUMAN_GERUTOO 493 +4_M_ROKI 494 +4_M_MERCAT1 495 +4_M_MERCAT2 496 +4_M_CATMAN1 497 +4_M_CATMAN2 498 +4_F_BRZ_WOMAN2 499 +4_M_JP_DISH 500 +4_F_JP_NOAH 501 +4_F_JP_OZ 502 +4_F_JP_CHROME 503 +4_F_JP_RINNE 504 +4_WHITETIGER 505 +4_VENDING_MACHINE 506 +4_MISTY 507 +4_NECORING 508 +4_ELEPHANT 509 +4_F_NYDHOG 510 +4_F_NYDHOG2 511 +4_M_ROKI2 512 +4_M_DOGTRAVELER 513 +4_M_DOGTRAVELER2 514 +4_F_DOGTRAVELER 515 +4_M_RAFLE_GR 516 +4_M_RAFLE_OLD 517 +4_F_RAFLE_PK 518 +4_M_LYINGDOG 519 +4_F_MORAFINE1 520 +4_F_MORAFINE2 521 +4_M_RAFLE_OR 522 +4_F_RAFLE_YE 523 +4_M_RAFLE_VI 524 +4_F_RAFLE_VI 525 +4_M_ARDHA 526 +4_CREEPER 527 +JP_RUFAKU 528 +JP_SUPIKA 529 +JP_SABIKU 530 +JP_ARUGORU 531 +JP_ARUNA 532 +JP_AIRI 533 +4_M_DEWOLDMAN 534 +4_M_DEWOLDWOMAN 535 +4_M_DEWMAN 536 +4_M_DEWWOMAN 537 +4_M_DEWBOY 538 +4_M_DEWGIRL 539 +4_M_DEWZATICHIEF 540 +4_M_DEWZATIMAN 541 +4_M_ALCHE_E 542 +4_MASK_SMOKEY 543 +4_CAT_SAILOR1 544 +4_CAT_SAILOR2 545 +4_CAT_SAILOR3 546 +4_CAT_SAILOR4 547 +4_CAT_CHEF 548 +4_CAT_MERMASTER 549 +4_CRACK 550 +4_ASTER 551 +4_F_STARFISHGIRL 552 +4_CAT_DOWN 553 +4_CAT_REST 554 +4_CAT_3COLOR 555 +4_CAT_ADMIRAL 556 +4_SOIL 557 +4_F_ALCHE_A 558 +4_CAT_ADV1 559 +4_CAT_ADV2 560 +4_CAT_SAILOR5 561 +2_DROP_MACHINE 562 +2_SLOT_MACHINE 563 +2_VENDING_MACHINE1 564 +MOB_TOMB 565 +4_MYSTCASE 566 +4_M_SIT_NOVICE 567 +4_OCTOPUS_LEG 568 //Free Ids 8_F_GIRL 700 4_F_GODEMOM 701 @@ -1542,7 +1679,7 @@ HIDDEN_WARP_NPC 139 4_F_NACORURI 719 4_F_SHAMAN 720 4_F_KAFRA7 721 -GUILDFLAG90_1 722 +GUILD_FLAG 722 1_SHADOW_NPC 723 4_F_07 724 4_F_JOB_ASSASSIN 725 @@ -1664,6 +1801,7 @@ TW_TOWER 812 4_M_THAIAYO 841 4_M_THAIOLD 842 4_M_THAIONGBAK 843 +CLEAR_NPC 844 4_F_RACING 845 4_F_EINOLD 846 4_M_EINOLD 847 @@ -1730,8 +1868,8 @@ TW_TOWER 812 4_M_PHILMAN 908 4_PORING 909 2_COLAVEND 910 -4_M_SOCCER7 912 4_F_SOCCER 911 +4_M_SOCCER7 912 4_M_SOCCER9 913 4_F_CHILD 914 4_F_MADAME 915 -- cgit v1.2.3-60-g2f50