From 58da8501fe630285f3934508e0c9314e99bbb5f8 Mon Sep 17 00:00:00 2001 From: Jedzkie Date: Tue, 15 Dec 2015 09:19:36 +0800 Subject: ItemDB Updates: - Change ID to Constants of some items both pre-re and re. - Corrected some item names and scripts. - Added 'Mysterious_Can2', 'Mysterious_PET_Bottle2', '2009_Rice_Cake_Soup', 'Vulcan Bullet Magazine', 'Unripe_Yggdrasil', 'Iggdrasilberry_Box' effect. Closes #957 as merged Signed-off-by: Haru --- db/pre-re/item_db.conf | 110 +++++++++++++++++++++++++----------------- db/re/item_db.conf | 128 ++++++++++++++++++++++++++++--------------------- 2 files changed, 141 insertions(+), 97 deletions(-) diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index f6b644d3f..a4f3a96da 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-re/item_db.conf @@ -63221,7 +63221,7 @@ item_db: ( Buy: 2 Weight: 350 BuyingStore: true - Script: <" getitem 13204,500; "> + Script: <" getitem Lightning_Sphere, 500; "> }, { Id: 12145 @@ -63231,7 +63231,7 @@ item_db: ( Buy: 2 Weight: 350 BuyingStore: true - Script: <" getitem 13206,500; "> + Script: <" getitem Blind_Sphere, 500; "> }, { Id: 12146 @@ -63241,7 +63241,7 @@ item_db: ( Buy: 2 Weight: 350 BuyingStore: true - Script: <" getitem 13205,500; "> + Script: <" getitem Poison_Sphere, 500; "> }, { Id: 12147 @@ -63251,7 +63251,7 @@ item_db: ( Buy: 2 Weight: 350 BuyingStore: true - Script: <" getitem 13207,500; "> + Script: <" getitem Freezing_Sphere, 500; "> }, { Id: 12148 @@ -63261,7 +63261,7 @@ item_db: ( Buy: 2 Weight: 350 BuyingStore: true - Script: <" getitem 13203,500; "> + Script: <" getitem Flare_Sphere, 500; "> }, { Id: 12149 @@ -63271,7 +63271,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 13200,500; "> + Script: <" getitem Bullet, 500; "> }, { Id: 12150 @@ -63281,7 +63281,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 13202,500; "> + Script: <" getitem Shell_Of_Blood, 500; "> }, { Id: 12151 @@ -63291,7 +63291,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 13201,500; "> + Script: <" getitem Silver_Bullet, 500; "> }, { Id: 12152 @@ -63850,7 +63850,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 1772,500; "> + Script: <" getitem Holy_Arrow, 500; "> }, { Id: 12184 @@ -66157,7 +66157,7 @@ item_db: ( Buy: 30000 Weight: 10 BuyingStore: true - Script: <" getitem 7940,100; "> + Script: <" getitem Special_Alloy_Trap, 100; "> }, { Id: 12342 @@ -66701,6 +66701,10 @@ item_db: ( Nouse: { sitting: true } + Script: <" + percentheal 3, 0; + itemskill PR_GLORIA, 2; + "> }, { Id: 12377 @@ -66713,6 +66717,10 @@ item_db: ( Nouse: { sitting: true } + Script: <" + percentheal 0, 3; + itemskill PR_MAGNIFICAT, 1; + "> }, { Id: 12378 @@ -66721,6 +66729,7 @@ item_db: ( Type: 2 Buy: 10 Weight: 100 + Script: <" percentheal 50, 50; "> }, { Id: 12379 @@ -66776,6 +66785,7 @@ item_db: ( Buy: 11000 Weight: 500 BuyingStore: true + Script: <" getitem Vulcan_Bullet, 1000; "> }, { Id: 12384 @@ -66971,7 +66981,7 @@ item_db: ( Job: 0x00000400 Upper: 8 BuyingStore: true - Script: <" //madoheal rand(200,300),0; "> + Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(200,300), 0; "> }, { Id: 12393 @@ -66983,7 +66993,7 @@ item_db: ( Job: 0x00000400 Upper: 8 BuyingStore: true - Script: <" //madoheal rand(300,400),0; "> + Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(300,400), 0; "> }, { Id: 12394 @@ -66995,7 +67005,7 @@ item_db: ( Job: 0x00000400 Upper: 8 BuyingStore: true - Script: <" //madoheal rand(400,500),0; "> + Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(400,500), 0; "> }, { Id: 12395 @@ -67164,6 +67174,11 @@ item_db: ( nomail: true noauction: true } + Script: <" + percentheal 30,30; + skilleffect AL_BLESSING,0; + sc_start SC_BLESSING,140000,5; + "> }, { Id: 12406 @@ -68373,12 +68388,13 @@ item_db: ( Trade: { nodrop: true notrade: true - noselltonpc: true nocart: true - nogstorage: true + noselltonpc: true nomail: true noauction: true + nogstorage: true } + Script: <" getitem White_Slim_Potion, 200; "> }, { Id: 12530 @@ -68389,12 +68405,13 @@ item_db: ( Trade: { nodrop: true notrade: true - noselltonpc: true nocart: true - nogstorage: true + noselltonpc: true nomail: true noauction: true + nogstorage: true } + Script: <" getitem Fruit_Of_Mastela, 200; "> }, { Id: 12531 @@ -68405,47 +68422,47 @@ item_db: ( Trade: { nodrop: true notrade: true - noselltonpc: true nocart: true - nogstorage: true + noselltonpc: true nomail: true noauction: true + nogstorage: true } - Script: <" getitem White_Potion,100; "> + Script: <" getitem White_Potion, 100; "> }, { Id: 12532 AegisName: "Royal_Jelly_Box2" - Name: "Royal Jelly Box2" + Name: "Royal Jelly Box" Type: 2 Buy: 0 Trade: { nodrop: true notrade: true - noselltonpc: true nocart: true - nogstorage: true + noselltonpc: true nomail: true noauction: true + nogstorage: true } - Script: <" getitem Royal_Jelly,100; "> + Script: <" getitem Royal_Jelly, 100; "> }, { Id: 12533 AegisName: "Blue_Herb_Box2" - Name: "Blue Herb Box2" + Name: "Blue Herb Box" Type: 2 Buy: 0 Trade: { nodrop: true notrade: true - noselltonpc: true nocart: true - nogstorage: true + noselltonpc: true nomail: true noauction: true + nogstorage: true } - Script: <" getitem Blue_Herb,100; "> + Script: <" getitem Blue_Herb, 100; "> }, { Id: 12534 @@ -68456,24 +68473,31 @@ item_db: ( Trade: { nodrop: true notrade: true - noselltonpc: true nocart: true - nogstorage: true + noselltonpc: true nomail: true noauction: true + nogstorage: true } - Script: <" getitem Seed_Of_Yggdrasil,30; "> + Script: <" getitem Seed_Of_Yggdrasil, 30; "> }, -// unknown type, not in database -/* { Id: 12535 - AegisName: "Yggdrasilberry_Box" - Name: "Iggdrasilberry Box" + AegisName: "Iggdrasilberry_Box" + Name: "Yggdrasil Berry Box" Type: 2 Buy: 0 + Trade: { + nodrop: true + notrade: true + nocart: true + noselltonpc: true + nomail: true + noauction: true + nogstorage: true + } + Script: <" getitem Yggdrasilberry, 15; "> }, -*/ { Id: 12536 AegisName: "NY_Rice_Cake_Soup" @@ -68628,7 +68652,7 @@ item_db: ( { Id: 12549 AegisName: "White_Slim_Pot_Box2" - Name: "White Slim Pot Box2" + Name: "White Slim Potion Box" Type: 2 Buy: 0 Trade: { @@ -68640,12 +68664,12 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem White_Slim_Potion,200; "> + Script: <" getitem White_Slim_Potion, 100; "> }, { Id: 12550 AegisName: "Poison_Bottle_Box2" - Name: "Poison Bottle Box2" + Name: "Poison Bottle Box" Type: 2 Buy: 0 Trade: { @@ -68657,7 +68681,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem Poison_Bottle,30; "> + Script: <" getitem Poison_Bottle, 30; "> }, { Id: 12551 @@ -69541,7 +69565,7 @@ item_db: ( Name: "Valentine Gift Box" Type: 2 Buy: 0 - Script: <" getitem Valentine_Gold_Ring,1; "> + Script: <" getitem Valentine_Gold_Ring, 1; "> }, { Id: 12743 @@ -69549,7 +69573,7 @@ item_db: ( Name: "Valentine Gift Box" Type: 2 Buy: 0 - Script: <" getitem Valentine_Silver_Ring,1; "> + Script: <" getitem Valentine_Silver_Ring, 1; "> }, { Id: 12744 @@ -69557,7 +69581,7 @@ item_db: ( Name: "Chocolate Box" Type: 2 Buy: 0 - Script: <" getitem Chocolate,1; "> + Script: <" getitem Chocolate, 1; "> }, { Id: 12745 diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 5c81f7ea0..30f235c90 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -76522,7 +76522,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 1750,500; "> + Script: <" getitem Arrow, 500; "> }, { Id: 12005 @@ -76532,7 +76532,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 1770,500; "> + Script: <" getitem Iron_Arrow, 500; "> }, { Id: 12006 @@ -76542,7 +76542,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 1753,500; "> + Script: <" getitem Steel_Arrow, 500; "> }, { Id: 12007 @@ -76552,7 +76552,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 1765,500; "> + Script: <" getitem Oridecon_Arrow, 500; "> }, { Id: 12008 @@ -76562,7 +76562,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 1752,500; "> + Script: <" getitem Fire_Arrow, 500; "> }, { Id: 12009 @@ -76572,7 +76572,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 1751,500; "> + Script: <" getitem Silver_Arrow, 500; "> }, { Id: 12010 @@ -76582,7 +76582,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 1755,500; "> + Script: <" getitem Arrow_Of_Wind, 500; "> }, { Id: 12011 @@ -76592,7 +76592,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 1756,500; "> + Script: <" getitem Stone_Arrow, 500; "> }, { Id: 12012 @@ -76602,7 +76602,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 1754,500; "> + Script: <" getitem Crystal_Arrow, 500; "> }, { Id: 12013 @@ -76612,7 +76612,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 1767,500; "> + Script: <" getitem Arrow_Of_Shadow, 500; "> }, { Id: 12014 @@ -76622,7 +76622,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 1757,500; "> + Script: <" getitem Immatrial_Arrow, 500; "> }, { Id: 12015 @@ -76632,7 +76632,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 1762,500; "> + Script: <" getitem Rusty_Arrow, 500; "> }, { Id: 12016 @@ -78769,7 +78769,7 @@ item_db: ( Buy: 2 Weight: 250 BuyingStore: true - Script: <" getitem 1772,500; "> + Script: <" getitem Holy_Arrow, 500; "> }, { Id: 12184 @@ -81596,8 +81596,8 @@ item_db: ( sitting: true } Script: <" - percentheal 3,0; - itemskill PR_GLORIA,2; + percentheal 3, 0; + itemskill PR_GLORIA, 2; "> }, { @@ -81612,8 +81612,8 @@ item_db: ( sitting: true } Script: <" - percentheal 0,3; - itemskill PR_MAGNIFICAT,1; + percentheal 0, 3; + itemskill PR_MAGNIFICAT, 1; "> }, { @@ -81623,7 +81623,7 @@ item_db: ( Type: 2 Buy: 10 Weight: 100 - Script: <" percentheal 50,50; "> + Script: <" percentheal 50, 50; "> }, { Id: 12379 @@ -81677,6 +81677,7 @@ item_db: ( Buy: 13750 Weight: 500 BuyingStore: true + Script: <" getitem Vulcan_Bullet, 1000; "> }, { Id: 12384 @@ -81871,7 +81872,7 @@ item_db: ( Weight: 100 Job: 0x00000400 BuyingStore: true - Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(200,300),0; "> + Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(200,300), 0; "> }, { Id: 12393 @@ -81882,7 +81883,7 @@ item_db: ( Weight: 140 Job: 0x00000400 BuyingStore: true - Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(300,400),0; "> + Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(300,400), 0; "> }, { Id: 12394 @@ -81893,7 +81894,7 @@ item_db: ( Weight: 180 Job: 0x00000400 BuyingStore: true - Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(400,500),0; "> + Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(400,500), 0; "> }, { Id: 12395 @@ -83454,18 +83455,19 @@ item_db: ( { Id: 12529 AegisName: "White_Slim_Potion_Box" - Name: "Condensed White Potion Box" + Name: "White Slim Potion Box" Type: 2 Buy: 0 Trade: { nodrop: true notrade: true - noselltonpc: true nocart: true - nogstorage: true + noselltonpc: true nomail: true noauction: true + nogstorage: true } + Script: <" getitem White_Slim_Potion, 200; "> }, { Id: 12530 @@ -83476,29 +83478,30 @@ item_db: ( Trade: { nodrop: true notrade: true - noselltonpc: true nocart: true - nogstorage: true + noselltonpc: true nomail: true noauction: true + nogstorage: true } + Script: <" getitem Fruit_Of_Mastela, 200; "> }, { Id: 12531 AegisName: "White_Potion_Box" - Name: "White Potion 100 Box" + Name: "White Potion Box" Type: 2 Buy: 0 Trade: { nodrop: true notrade: true - noselltonpc: true nocart: true - nogstorage: true + noselltonpc: true nomail: true noauction: true + nogstorage: true } - Script: <" getitem White_Potion,100; "> + Script: <" getitem White_Potion, 100; "> }, { Id: 12532 @@ -83509,13 +83512,13 @@ item_db: ( Trade: { nodrop: true notrade: true - noselltonpc: true nocart: true - nogstorage: true + noselltonpc: true nomail: true noauction: true + nogstorage: true } - Script: <" getitem Royal_Jelly,100; "> + Script: <" getitem Royal_Jelly, 100; "> }, { Id: 12533 @@ -83526,13 +83529,13 @@ item_db: ( Trade: { nodrop: true notrade: true - noselltonpc: true nocart: true - nogstorage: true + noselltonpc: true nomail: true noauction: true + nogstorage: true } - Script: <" getitem Blue_Herb,100; "> + Script: <" getitem Blue_Herb, 100; "> }, { Id: 12534 @@ -83543,13 +83546,30 @@ item_db: ( Trade: { nodrop: true notrade: true - noselltonpc: true nocart: true + noselltonpc: true + nomail: true + noauction: true nogstorage: true + } + Script: <" getitem Seed_Of_Yggdrasil, 30; "> +}, +{ + Id: 12535 + AegisName: "Iggdrasilberry_Box" + Name: "Yggdrasil Berry Box" + Type: 2 + Buy: 0 + Trade: { + nodrop: true + notrade: true + nocart: true + noselltonpc: true nomail: true noauction: true + nogstorage: true } - Script: <" getitem Seed_Of_Yggdrasil,30; "> + Script: <" getitem Yggdrasilberry, 15; "> }, { Id: 12536 @@ -83715,7 +83735,7 @@ item_db: ( { Id: 12549 AegisName: "White_Slim_Pot_Box2" - Name: "Condensed White Potion 200 Box" + Name: "White Slim Potion Box" Type: 2 Buy: 0 Trade: { @@ -83727,7 +83747,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem White_Slim_Potion,200; "> + Script: <" getitem White_Slim_Potion, 100; "> }, { Id: 12550 @@ -83744,7 +83764,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem Poison_Bottle,30; "> + Script: <" getitem Poison_Bottle, 30; "> }, { Id: 12551 @@ -84683,7 +84703,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem Gong_Bung,200; "> + Script: <" getitem Gong_Bung, 200; "> }, { Id: 12638 @@ -84701,7 +84721,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem Dried_Squid,200; "> + Script: <" getitem Dried_Squid, 200; "> }, { Id: 12639 @@ -84719,7 +84739,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem Flying_Fish,200; "> + Script: <" getitem Flying_Fish, 200; "> }, { Id: 12640 @@ -84737,7 +84757,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem Starfish,200; "> + Script: <" getitem Starfish, 200; "> }, { Id: 12641 @@ -84759,7 +84779,7 @@ item_db: ( { Id: 12642 AegisName: "Fruit_Of_Mastela_Box2" - Name: "Fruit Box (100)" + Name: "Mastela Fruit 100 Box" Type: 0 Buy: 0 Trade: { @@ -84771,7 +84791,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem Fruit_Of_Mastela,100; "> + Script: <" getitem Fruit_Of_Mastela, 100; "> }, { Id: 12643 @@ -84779,7 +84799,7 @@ item_db: ( Name: "E Coin Pack50" Type: 2 Buy: 0 - Script: <" getitem Egrade_Coin,50; "> + Script: <" getitem Egrade_Coin, 50; "> }, { Id: 12644 @@ -85248,7 +85268,7 @@ item_db: ( Type: 2 Buy: 20 Weight: 200 - Script: <" getitem Woe_Violet_Potion,50; "> + Script: <" getitem Woe_Violet_Potion, 50; "> }, { Id: 12677 @@ -85258,7 +85278,7 @@ item_db: ( Buy: 2 Weight: 100 EquipLv: 130 - Script: <" getitem Siege_Arrow_S,200; "> + Script: <" getitem Siege_Arrow_S, 200; "> }, { Id: 12678 @@ -85268,7 +85288,7 @@ item_db: ( Buy: 2 Weight: 100 EquipLv: 95 - Script: <" getitem Siege_Arrow_A,200; "> + Script: <" getitem Siege_Arrow_A, 200; "> }, { Id: 12679 @@ -85277,7 +85297,7 @@ item_db: ( Type: 2 Buy: 20 Weight: 200 - Script: <" getitem Woe_White_Potion,30; "> + Script: <" getitem Woe_White_Potion, 30; "> }, { Id: 12680 @@ -85286,7 +85306,7 @@ item_db: ( Type: 2 Buy: 20 Weight: 200 - Script: <" getitem Woe_Blue_Potion,10; "> + Script: <" getitem Woe_Blue_Potion, 10; "> }, { Id: 12681 @@ -85311,7 +85331,7 @@ item_db: ( Type: 2 Buy: 20 Weight: 200 - Script: <" getitem Woe_Violet_Potion,50; "> + Script: <" getitem Woe_Violet_Potion, 200; "> }, { Id: 12684 -- cgit v1.2.3-60-g2f50