diff options
-rw-r--r-- | conf/messages.conf | 10 | ||||
-rw-r--r-- | db/constants.conf | 7 | ||||
-rw-r--r-- | db/re/item_db.conf | 195 |
3 files changed, 108 insertions, 104 deletions
diff --git a/conf/messages.conf b/conf/messages.conf index f47c2c7d..90bc5af2 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -17,7 +17,7 @@ // 550-699: reserved for job names (also loaded by char server) // 900-1500: @atcommand -// To disable a string (%s) field, make it's max length 0: +// To disable a string (%s) field, make its max length 0: // eg: // 270: *%s %s* (@me format) // 270: *%.0s%s* (remove the character's name from it) @@ -177,8 +177,8 @@ 166: No item has been refined. 167: 1 item has been refined. 168: %d items have been refined. -169: The item (%d: '%s') is not equipable. -170: The item is not equipable. +169: The item (%d: '%s') is not equippable. +170: The item is not equippable. 171: %d - void 172: Speed returned to normal. //173 FREE @@ -732,7 +732,7 @@ //995 FREE // @refine -996: Please enter a position and an amount (usage: @refine <equip position> <+/- amount>). +996: Please enter a position bitmask and an amount (usage: @refine <equip position> <+/- amount>). 997: %d: Lower Headgear 998: %d: Right Hand 999: %d: Garment @@ -1447,7 +1447,7 @@ 1427: -- %s bindto <channel name> 1428: - binds your global chat to <channel name>, making anything you type in global be sent to the channel 1429: -- %s unbind -1430: - unbinds your global chat from its attached channel (if binded) +1430: - unbinds your global chat from its attached channel (if bound) 1431: Your global chat is now bound to the '%s' channel 1432: Your global chat is not bound to any channel 1433: Your global chat is no longer bound to the '#%s' channel diff --git a/db/constants.conf b/db/constants.conf index 97cc5e7e..f22f4ec3 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -1397,6 +1397,8 @@ constants_db: { SC_DAILYSENDMAILCNT: 653 + SC_DAILYSENDMAILCNT: 653 + comment__: "petstat" PET_CLASS: 1 PET_NAME: 2 @@ -3673,8 +3675,9 @@ constants_db: { C_VIOLET: 0xEE82EE comment__: "Genders" - SEX_FEMALE: 0 - SEX_MALE: 1 + SEX_FEMALE: 0 + SEX_MALE: 1 + SEX_ANY: 2 comment__: "Script Unit Data Types" UDT_TYPE: 0 diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 3263c84d..dc956f5b 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -39,7 +39,7 @@ item_db: ( AegisName: "Aegis_Name" (string) Name: "Item Name" (string) // =================== Optional fields ================================ - Type: Item Type (int, defaults to 3 = etc item) + Type: Item Type (string, defaults to "IT_ETC") Buy: Buy Price (int, defaults to Sell * 2) Sell: Sell Price (int, defaults to Buy / 2) Weight: Item Weight (int, defaults to 0) @@ -50,15 +50,16 @@ item_db: ( MinRange: Minimal Attack Range (int, defaults to 0) Slots: Slots (int, defaults to 0) Job: Job mask (int, defaults to all jobs = 0xFFFFFFFF) - Upper: Upper mask (int, defaults to any = 0x3f) - Gender: Gender (int, defaults to both = 2) - Loc: Equip location (int, required value for equipment) + Upper: Upper mask (bitmask array, string or int, defaults to "ITEMUPPER_ALL") + Gender: Gender (string, defaults to "SEX_ANY") + Loc: Equip location (bitmask array, string or int, required value for equipment) WeaponLv: Weapon Level (int, defaults to 0) EquipLv: Equip required level (int, defaults to 0) EquipLv: [min, max] (alternative syntax with min / max level) Refine: Refineable (boolean, defaults to true) DisableOptions: true/false (boolean, defaults to false !!for equipments only!!) [Smokexyz] - View: View ID (int, defaults to 0) + Subtype: Item Subtype (int, defaults to 0) + ViewSprite: Sprite view ID (int, defaults to 0) BindOnEquip: true/false (boolean, defaults to false) ForceSerial: true/false (boolean, defaults to false) BuyingStore: true/false (boolean, defaults to false) @@ -144,7 +145,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 501 + ViewSprite: 501 BindOnEquip: false BuyingStore: true Delay: 500 @@ -188,7 +189,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 502 + ViewSprite: 502 BindOnEquip: false BuyingStore: true Delay: 500 @@ -222,7 +223,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 503 + ViewSprite: 503 BindOnEquip: false BuyingStore: true Delay: 1000 @@ -257,7 +258,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 504 + ViewSprite: 504 BindOnEquip: false BuyingStore: true Delay: 500 @@ -291,7 +292,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 505 + ViewSprite: 505 BindOnEquip: false BuyingStore: true Delay: 500 @@ -325,7 +326,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 506 + ViewSprite: 506 BindOnEquip: false BuyingStore: true Delay: 500 @@ -359,7 +360,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 507 + ViewSprite: 507 BindOnEquip: false BuyingStore: true Delay: 500 @@ -393,7 +394,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 508 + ViewSprite: 508 BindOnEquip: false BuyingStore: true Sprite: 0 @@ -427,7 +428,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 509 + ViewSprite: 509 BindOnEquip: false BuyingStore: true Delay: 500 @@ -461,7 +462,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 510 + ViewSprite: 510 BindOnEquip: false BuyingStore: true Sprite: 0 @@ -495,7 +496,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 511 + ViewSprite: 511 BindOnEquip: false BuyingStore: true Sprite: 0 @@ -529,7 +530,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 512 + ViewSprite: 512 BindOnEquip: false BuyingStore: true Delay: 500 @@ -563,7 +564,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 513 + ViewSprite: 513 BindOnEquip: false BuyingStore: true Delay: 0 @@ -592,7 +593,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 514 + ViewSprite: 514 BindOnEquip: false BuyingStore: true KeepAfterUse: true @@ -621,7 +622,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 515 + ViewSprite: 515 BindOnEquip: false BuyingStore: true Delay: 1000 @@ -656,7 +657,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 516 + ViewSprite: 516 BindOnEquip: false BuyingStore: true Sprite: 0 @@ -686,7 +687,7 @@ item_db: ( WeaponLv: 0 EquipLv: 1 Refine: false - View: 517 + ViewSprite: 517 BindOnEquip: false BuyingStore: false Trade: { @@ -715,7 +716,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 518 + ViewSprite: 518 BindOnEquip: false BuyingStore: true Delay: 500 @@ -749,7 +750,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 519 + ViewSprite: 519 BindOnEquip: false BuyingStore: true Delay: 500 @@ -783,7 +784,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 520 + ViewSprite: 520 BindOnEquip: false BuyingStore: true Delay: 500 @@ -817,7 +818,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 521 + ViewSprite: 521 BindOnEquip: false BuyingStore: true Delay: 500 @@ -851,7 +852,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 522 + ViewSprite: 522 BindOnEquip: false BuyingStore: true Delay: 500 @@ -885,7 +886,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 523 + ViewSprite: 523 BindOnEquip: false BuyingStore: true Delay: 500 @@ -919,7 +920,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 524 + ViewSprite: 524 BindOnEquip: false BuyingStore: true Delay: 500 @@ -953,7 +954,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 525 + ViewSprite: 525 BindOnEquip: false BuyingStore: true Delay: 1000 @@ -983,7 +984,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 526 + ViewSprite: 526 BindOnEquip: false BuyingStore: true KeepAfterUse: true @@ -1012,7 +1013,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 527 + ViewSprite: 527 BindOnEquip: false BuyingStore: true Delay: 500 @@ -1038,7 +1039,7 @@ item_db: ( Upper: 0x3F Gender: 2 Refine: false - View: 528 + ViewSprite: 528 BindOnEquip: false BuyingStore: true Delay: 500 @@ -1067,7 +1068,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 529 + ViewSprite: 529 BindOnEquip: false BuyingStore: true Delay: 1000 @@ -1096,7 +1097,7 @@ item_db: ( Gender: 2 Loc: 0 Refine: false - View: 530 + ViewSprite: 530 BindOnEquip: false BuyingStore: true Delay: 500 @@ -1123,7 +1124,7 @@ item_db: ( Gender: 2 Loc: 0 Refine: false - View: 531 + ViewSprite: 531 BindOnEquip: false BuyingStore: true Delay: 500 @@ -1157,7 +1158,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 532 + ViewSprite: 532 BindOnEquip: false BuyingStore: true KeepAfterUse: true @@ -1186,7 +1187,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 533 + ViewSprite: 533 BindOnEquip: false BuyingStore: true KeepAfterUse: true @@ -1215,7 +1216,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 534 + ViewSprite: 534 BindOnEquip: false BuyingStore: true KeepAfterUse: true @@ -1285,7 +1286,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 700 + ViewSprite: 700 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1311,7 +1312,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 701 + ViewSprite: 701 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1337,7 +1338,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 702 + ViewSprite: 702 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1363,7 +1364,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 703 + ViewSprite: 703 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1389,7 +1390,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 704 + ViewSprite: 704 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1415,7 +1416,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 705 + ViewSprite: 705 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1441,7 +1442,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 706 + ViewSprite: 706 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1467,7 +1468,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 707 + ViewSprite: 707 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1493,7 +1494,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 708 + ViewSprite: 708 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1519,7 +1520,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 709 + ViewSprite: 709 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1545,7 +1546,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 710 + ViewSprite: 710 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1571,7 +1572,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 711 + ViewSprite: 711 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1597,7 +1598,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 712 + ViewSprite: 712 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1623,7 +1624,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 713 + ViewSprite: 713 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1653,7 +1654,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 714 + ViewSprite: 714 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1683,7 +1684,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 715 + ViewSprite: 715 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1713,7 +1714,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 716 + ViewSprite: 716 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1743,7 +1744,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 717 + ViewSprite: 717 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1773,7 +1774,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 718 + ViewSprite: 718 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1803,7 +1804,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 719 + ViewSprite: 719 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1829,7 +1830,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 720 + ViewSprite: 720 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1855,7 +1856,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 721 + ViewSprite: 721 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1881,7 +1882,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 722 + ViewSprite: 722 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1907,7 +1908,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 723 + ViewSprite: 723 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1933,7 +1934,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 724 + ViewSprite: 724 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1959,7 +1960,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 725 + ViewSprite: 725 BindOnEquip: false BuyingStore: true Delay: 0 @@ -1985,7 +1986,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 726 + ViewSprite: 726 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2011,7 +2012,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 727 + ViewSprite: 727 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2037,7 +2038,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 728 + ViewSprite: 728 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2063,7 +2064,7 @@ item_db: ( WeaponLv: 0 EquipLv: 0 Refine: false - View: 729 + ViewSprite: 729 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2097,7 +2098,7 @@ item_db: ( WeaponLv: 0 EquipLv: 1 Refine: false - View: 1300 + ViewSprite: 1300 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2123,7 +2124,7 @@ item_db: ( WeaponLv: 0 EquipLv: 10 Refine: false - View: 1301 + ViewSprite: 1301 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2154,7 +2155,7 @@ item_db: ( WeaponLv: 0 EquipLv: 5 Refine: false - View: 1302 + ViewSprite: 1302 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2201,7 +2202,7 @@ item_db: ( WeaponLv: 0 EquipLv: 10 Refine: false - View: 1303 + ViewSprite: 1303 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2227,7 +2228,7 @@ item_db: ( WeaponLv: 0 EquipLv: 10 Refine: false - View: 1304 + ViewSprite: 1304 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2253,7 +2254,7 @@ item_db: ( WeaponLv: 0 EquipLv: 15 Refine: false - View: 1305 + ViewSprite: 1305 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2279,7 +2280,7 @@ item_db: ( WeaponLv: 0 EquipLv: 4 Refine: false - View: 1800 + ViewSprite: 1800 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2305,7 +2306,7 @@ item_db: ( WeaponLv: 0 EquipLv: 3 Refine: false - View: 2000 + ViewSprite: 2000 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2331,7 +2332,7 @@ item_db: ( WeaponLv: 0 EquipLv: 7 Refine: false - View: 2001 + ViewSprite: 2001 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2357,7 +2358,7 @@ item_db: ( WeaponLv: 0 EquipLv: 11 Refine: false - View: 2002 + ViewSprite: 2002 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2383,7 +2384,7 @@ item_db: ( WeaponLv: 0 EquipLv: 1 Refine: false - View: 2200 + ViewSprite: 2200 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2409,7 +2410,7 @@ item_db: ( WeaponLv: 0 EquipLv: 5 Refine: false - View: 2201 + ViewSprite: 2201 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2435,7 +2436,7 @@ item_db: ( WeaponLv: 0 EquipLv: 5 Refine: false - View: 2700 + ViewSprite: 2700 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2461,7 +2462,7 @@ item_db: ( Loc: 32 EquipLv: 5 Refine: false - View: 2701 + ViewSprite: 2701 BindOnEquip: false BuyingStore: true OnEquipScript: <" @@ -2488,7 +2489,7 @@ item_db: ( WeaponLv: 0 EquipLv: 5 Refine: false - View: 2900 + ViewSprite: 2900 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2514,7 +2515,7 @@ item_db: ( WeaponLv: 0 EquipLv: 4 Refine: false - View: 2901 + ViewSprite: 2901 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2540,7 +2541,7 @@ item_db: ( WeaponLv: 0 EquipLv: 4 Refine: false - View: 2902 + ViewSprite: 2902 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2566,7 +2567,7 @@ item_db: ( WeaponLv: 0 EquipLv: 8 Refine: false - View: 2903 + ViewSprite: 2903 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2592,7 +2593,7 @@ item_db: ( WeaponLv: 0 EquipLv: 8 Refine: false - View: 2904 + ViewSprite: 2904 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2618,7 +2619,7 @@ item_db: ( WeaponLv: 0 EquipLv: 8 Refine: false - View: 2905 + ViewSprite: 2905 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2639,7 +2640,7 @@ item_db: ( Loc: 128 EquipLv: 3 Refine: false - View: 3200 + ViewSprite: 3200 BindOnEquip: false BuyingStore: true }, @@ -2663,7 +2664,7 @@ item_db: ( WeaponLv: 1 EquipLv: 1 Refine: false - View: 1 + ViewSprite: 1 BindOnEquip: false BuyingStore: true Delay: 0 @@ -2689,7 +2690,7 @@ item_db: ( WeaponLv: 1 EquipLv: 3 Refine: false - View: 1 + Subtype: "W_DAGGER" BindOnEquip: false BuyingStore: true Delay: 0 @@ -2715,7 +2716,7 @@ item_db: ( WeaponLv: 1 EquipLv: 5 Refine: false - View: 1 + Subtype: "W_DAGGER" BindOnEquip: false BuyingStore: true Delay: 0 @@ -2741,7 +2742,7 @@ item_db: ( WeaponLv: 1 EquipLv: 5 Refine: false - View: 1 + Subtype: "W_DAGGER" BindOnEquip: false BuyingStore: true Delay: 0 @@ -2767,7 +2768,7 @@ item_db: ( WeaponLv: 1 EquipLv: 15 Refine: false - View: 1 + Subtype: "W_DAGGER" BindOnEquip: false BuyingStore: true Delay: 0 @@ -2997,7 +2998,7 @@ item_db: ( Loc: 34 WeaponLv: 1 EquipLv: 5 - View: 11 + Subtype: "W_BOW" AllowAmmo: { Id6500: 1 } @@ -3012,6 +3013,6 @@ item_db: ( Weight: 1 Atk: 100 Loc: 32768 - View: 1 + Subtype: "W_DAGGER" }, ) |