diff options
author | Frost <Jedzkie@users.noreply.github.com> | 2015-11-19 10:57:07 +0800 |
---|---|---|
committer | Frost <Jedzkie@users.noreply.github.com> | 2015-11-19 10:57:07 +0800 |
commit | 2fde851befe5237d860b1ece86e962287f0fb11f (patch) | |
tree | 82202e2699decbb3ca9c6e063fe25e7bfd3af9b2 | |
parent | dd78e6798f6d472f40dd9f211720b58600e1582c (diff) | |
parent | a14907b77967af2251df796a4f7dd53b3fc9bd62 (diff) | |
download | hercules-2fde851befe5237d860b1ece86e962287f0fb11f.tar.gz hercules-2fde851befe5237d860b1ece86e962287f0fb11f.tar.bz2 hercules-2fde851befe5237d860b1ece86e962287f0fb11f.tar.xz hercules-2fde851befe5237d860b1ece86e962287f0fb11f.zip |
Merge pull request #879 from Jedzkie/request_02
-rw-r--r-- | db/pre-re/item_db.conf | 78 | ||||
-rw-r--r-- | db/re/item_db.conf | 230 |
2 files changed, 224 insertions, 84 deletions
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index c777aa28f..13ba79318 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-re/item_db.conf @@ -67027,16 +67027,16 @@ item_db: ( sitting: true } Script: <" - if(rand(1,10)==1) itemskill AL_TELEPORT,1; - else if(rand(1,10)==2) itemskill AL_TELEPORT,3; - else if(rand(1,10)==3) percentheal 50,0; - else if(rand(1,10)==4) percentheal 0,50; - else if(rand(1,10)==5) end; - else if(rand(1,10)==6) getitem 512,1; - else if(rand(1,10)==7) itemskill ALL_REVERSEORCISH,1; - else if(rand(1,10)==8) specialeffect2 247; - else if(rand(1,10)==9) specialeffect2 338; - else specialeffect2 10; + if (rand(1,10) == 1) itemskill AL_TELEPORT,1; + else if (rand(1,10) == 2) itemskill AL_TELEPORT,3; + else if (rand(1,10) == 3) percentheal 50,0; + else if (rand(1,10) == 4) percentheal 0,50; + else if (rand(1,10) == 5) percentheal 50,50; + else if (rand(1,10) == 6) getitem Apple,1; + else if (rand(1,10) == 7) itemskill ALL_REVERSEORCISH,1; + else if (rand(1,10) == 8) specialeffect2 EF_MAPPILLAR2; + else if (rand(1,10) == 9) specialeffect2 EF_ANGEL2; + else specialeffect2 EF_COIN; "> }, { @@ -67055,16 +67055,16 @@ item_db: ( sitting: true } Script: <" - if(rand(1,10)==1) itemskill TF_DETOXIFY,1; - else if(rand(1,10)==2) itemskill TF_PICKSTONE,1; - else if(rand(1,10)==3) itemskill BA_FROSTJOKER,1; - else if(rand(1,10)==4) itemskill DC_SCREAM,1; - else if(rand(1,10)==5) end; - else if(rand(1,10)==6) getitem 909,1; - else if(rand(1,10)==7) itemskill AL_RUWACH,1; - else if(rand(1,10)==8) specialeffect2 328; - else if(rand(1,10)==9) specialeffect2 68; - else specialeffect2 196; + if (rand(1,10) == 1) itemskill TF_DETOXIFY,1; + else if (rand(1,10) == 2) itemskill TF_PICKSTONE,1; + else if (rand(1,10) == 3) itemskill BA_FROSTJOKER,1; + else if (rand(1,10) == 4) itemskill DC_SCREAM,1; + else if (rand(1,10) == 5) percentheal 50,50; + else if (rand(1,10) == 6) getitem Jellopy,1; + else if (rand(1,10) == 7) itemskill AL_RUWACH,1; + else if (rand(1,10) == 8) specialeffect2 EF_BEGINASURA; + else if (rand(1,10) == 9) specialeffect2 EF_MVP; + else specialeffect2 EF_CURSEATTACK; "> }, { @@ -68413,6 +68413,7 @@ item_db: ( nomail: true noauction: true } + Script: <" getitem White_Potion,100; "> }, { Id: 12532 @@ -68429,6 +68430,7 @@ item_db: ( nomail: true noauction: true } + Script: <" getitem Royal_Jelly,100; "> }, { Id: 12533 @@ -68445,6 +68447,7 @@ item_db: ( nomail: true noauction: true } + Script: <" getitem Blue_Herb,100; "> }, { Id: 12534 @@ -68461,6 +68464,7 @@ item_db: ( nomail: true noauction: true } + Script: <" getitem Seed_Of_Yggdrasil,30; "> }, // unknown type, not in database /* @@ -68480,6 +68484,7 @@ item_db: ( Buy: 20 Weight: 100 BuyingStore: true + Script: <" percentheal 20,20; "> }, { Id: 12537 @@ -68603,6 +68608,7 @@ item_db: ( Type: 2 Buy: 100 Weight: 50 + Script: <" sc_start SC_POISON,12000,0; "> }, { Id: 12547 @@ -68636,6 +68642,7 @@ item_db: ( nomail: true noauction: true } + Script: <" getitem White_Slim_Potion,200; "> }, { Id: 12550 @@ -68652,6 +68659,7 @@ item_db: ( nomail: true noauction: true } + Script: <" getitem Poison_Bottle,30; "> }, { Id: 12551 @@ -68855,6 +68863,7 @@ item_db: ( Buy: 500 Weight: 250 BuyingStore: true + Script: <" getitem Arrow_Of_Elf,500; "> }, { Id: 12576 @@ -68864,6 +68873,7 @@ item_db: ( Buy: 500 Weight: 250 BuyingStore: true + Script: <" getitem Hunting_Arrow,500; "> }, { Id: 12577 @@ -68941,8 +68951,8 @@ item_db: ( Buy: 0 Weight: 200 Script: <" - getrandgroupitem 12702,1; - getrandgroupitem 12702,1; + getrandgroupitem Old_Bleu_Box,1; + getrandgroupitem Old_Bleu_Box,1; "> }, { @@ -69060,6 +69070,7 @@ item_db: ( Type: 2 Buy: 2 Weight: 100 + Script: <" percentheal 0,50; "> }, { Id: 12713 @@ -69472,6 +69483,7 @@ item_db: ( Type: 2 Buy: 0 Weight: 10 + Script: <" percentheal 10,10; "> }, { Id: 12740 @@ -69503,6 +69515,7 @@ item_db: ( Name: "Valentine Gift Box" Type: 2 Buy: 0 + Script: <" getitem Valentine_Gold_Ring,1; "> }, { Id: 12743 @@ -69510,6 +69523,7 @@ item_db: ( Name: "Valentine Gift Box" Type: 2 Buy: 0 + Script: <" getitem Valentine_Silver_Ring,1; "> }, { Id: 12744 @@ -69517,6 +69531,7 @@ item_db: ( Name: "Chocolate Box" Type: 2 Buy: 0 + Script: <" getitem Chocolate,1; "> }, { Id: 12745 @@ -69649,6 +69664,7 @@ item_db: ( nomail: true noauction: true } + Script: <" percentheal 50,50; "> }, { Id: 12755 @@ -69666,6 +69682,11 @@ item_db: ( nomail: true noauction: true } + Script: <" + specialeffect2 EF_POK_JAP; + itemskill MO_CALLSPIRITS,3; + itemskill MO_FINGEROFFENSIVE,5; + "> }, { Id: 12756 @@ -69769,6 +69790,7 @@ item_db: ( nomail: true noauction: true } + Script: <" sc_start SC_CASH_PLUSONLYJOBEXP,1800000,25; "> }, { Id: 12767 @@ -69913,10 +69935,10 @@ item_db: ( noauction: true } Script: <" - getitem 545,100; - getitem 546,100; - getitem 547,100; - getitem 505,100; + getitem Red_Slim_Potion,100; + getitem Yellow_Slim_Potion,100; + getitem White_Slim_Potion,100; + getitem Blue_Potion,100; "> }, { @@ -69928,8 +69950,8 @@ item_db: ( Weight: 10 Script: <" if(getskilllv(HT_FALCON)) { - if(checkoption(Option_Wug)||checkoption(Option_Wugrider)) end; - if(checkfalcon()==1) { + if(checkoption(Option_Wug) || checkoption(Option_Wugrider)) end; + if(checkfalcon() == 1) { setfalcon 0; } else { diff --git a/db/re/item_db.conf b/db/re/item_db.conf index b86305fff..934949782 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -32742,7 +32742,7 @@ item_db: ( Type: 5 Buy: 0 Loc: 136 - EquipLv: [1, 60] + EquipLv: [1, 120] Refine: false Trade: { nodrop: true @@ -32755,10 +32755,12 @@ item_db: ( noauction: true } Script: <" - bonus bBaseAtk,15; - bonus bMatk,15; + bonus bBaseAtk,30; + bonus bMatk,30; bonus2 bExpAddRace,RC_Boss,15; bonus2 bExpAddRace,RC_NonBoss,15; + skill CR_AUTOGUARD,3; + skill AL_CURE,1; "> }, { @@ -69309,7 +69311,7 @@ item_db: ( Id: 7521 AegisName: "Flame_Stone" Name: "Flame Stone" - Buy: 150 + Buy: 112 Weight: 10 BuyingStore: true }, @@ -69317,7 +69319,7 @@ item_db: ( Id: 7522 AegisName: "Ice_Stone" Name: "Ice Stone" - Buy: 150 + Buy: 112 Weight: 10 BuyingStore: true }, @@ -69325,7 +69327,7 @@ item_db: ( Id: 7523 AegisName: "Wind_Stone" Name: "Wind Stone" - Buy: 150 + Buy: 112 Weight: 10 BuyingStore: true }, @@ -69333,7 +69335,7 @@ item_db: ( Id: 7524 AegisName: "Shadow_Orb" Name: "Shadow Orb" - Buy: 300 + Buy: 225 Weight: 20 BuyingStore: true }, @@ -81117,16 +81119,16 @@ item_db: ( sitting: true } Script: <" - if(rand(1,10)==1) itemskill AL_TELEPORT,1; - else if(rand(1,10)==2) itemskill AL_TELEPORT,3; - else if(rand(1,10)==3) percentheal 50,0; - else if(rand(1,10)==4) percentheal 0,50; - else if(rand(1,10)==5) end; - else if(rand(1,10)==6) getitem 512,1; - else if(rand(1,10)==7) itemskill ALL_REVERSEORCISH,1; - else if(rand(1,10)==8) specialeffect2 247; - else if(rand(1,10)==9) specialeffect2 338; - else specialeffect2 10; + if (rand(1,10) == 1) itemskill AL_TELEPORT,1; + else if (rand(1,10) == 2) itemskill AL_TELEPORT,3; + else if (rand(1,10) == 3) percentheal 50,0; + else if (rand(1,10) == 4) percentheal 0,50; + else if (rand(1,10) == 5) percentheal 50,50; + else if (rand(1,10) == 6) getitem Apple,1; + else if (rand(1,10) == 7) itemskill ALL_REVERSEORCISH,1; + else if (rand(1,10) == 8) specialeffect2 EF_MAPPILLAR2; + else if (rand(1,10) == 9) specialeffect2 EF_ANGEL2; + else specialeffect2 EF_COIN; "> }, { @@ -81140,16 +81142,16 @@ item_db: ( sitting: true } Script: <" - if(rand(1,10)==1) itemskill TF_DETOXIFY,1; - else if(rand(1,10)==2) itemskill TF_PICKSTONE,1; - else if(rand(1,10)==3) itemskill BA_FROSTJOKER,1; - else if(rand(1,10)==4) itemskill DC_SCREAM,1; - else if(rand(1,10)==5) end; - else if(rand(1,10)==6) getitem 909,1; - else if(rand(1,10)==7) itemskill AL_RUWACH,1; - else if(rand(1,10)==8) specialeffect2 328; - else if(rand(1,10)==9) specialeffect2 68; - else specialeffect2 196; + if (rand(1,10) == 1) itemskill TF_DETOXIFY,1; + else if (rand(1,10) == 2) itemskill TF_PICKSTONE,1; + else if (rand(1,10) == 3) itemskill BA_FROSTJOKER,1; + else if (rand(1,10) == 4) itemskill DC_SCREAM,1; + else if (rand(1,10) == 5) percentheal 50,50; + else if (rand(1,10) == 6) getitem Jellopy,1; + else if (rand(1,10) == 7) itemskill AL_RUWACH,1; + else if (rand(1,10) == 8) specialeffect2 EF_BEGINASURA; + else if (rand(1,10) == 9) specialeffect2 EF_MVP; + else specialeffect2 EF_CURSEATTACK; "> }, { @@ -82692,7 +82694,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem 504,100; "> + Script: <" getitem White_Potion,100; "> }, { Id: 12532 @@ -82709,7 +82711,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem 526,100; "> + Script: <" getitem Royal_Jelly,100; "> }, { Id: 12533 @@ -82726,7 +82728,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem 510,100; "> + Script: <" getitem Blue_Herb,100; "> }, { Id: 12534 @@ -82743,6 +82745,7 @@ item_db: ( nomail: true noauction: true } + Script: <" getitem Seed_Of_Yggdrasil,30; "> }, { Id: 12536 @@ -82752,6 +82755,7 @@ item_db: ( Buy: 20 Weight: 100 BuyingStore: true + Script: <" percentheal 20,20; "> }, { Id: 12537 @@ -82885,7 +82889,7 @@ item_db: ( Type: 2 Buy: 100 Weight: 50 - Script: <" sc_start SC_POISON,50000,0; "> + Script: <" sc_start SC_POISON,12000,0; "> }, { Id: 12547 @@ -82919,7 +82923,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem 547,200; "> + Script: <" getitem White_Slim_Potion,200; "> }, { Id: 12550 @@ -82936,7 +82940,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem 678,30; "> + Script: <" getitem Poison_Bottle,30; "> }, { Id: 12551 @@ -83225,7 +83229,7 @@ item_db: ( Weight: 250 EquipLv: 100 BuyingStore: true - Script: <" getitem 1773,500; "> + Script: <" getitem Arrow_Of_Elf,500; "> }, { Id: 12576 @@ -83235,7 +83239,7 @@ item_db: ( Buy: 500 Weight: 250 BuyingStore: true - Script: <" getitem 1774,500; "> + Script: <" getitem Hunting_Arrow,500; "> }, { Id: 12577 @@ -83845,7 +83849,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem 13208,200; "> + Script: <" getitem Gong_Bung,200; "> }, { Id: 12638 @@ -83863,6 +83867,7 @@ item_db: ( nomail: true noauction: true } + Script: <" getitem Dried_Squid,200; "> }, { Id: 12639 @@ -83880,6 +83885,7 @@ item_db: ( nomail: true noauction: true } + Script: <" getitem Flying_Fish,200; "> }, { Id: 12640 @@ -83897,6 +83903,7 @@ item_db: ( nomail: true noauction: true } + Script: <" getitem Starfish,200; "> }, { Id: 12641 @@ -83930,7 +83937,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem 504,100; "> + Script: <" getitem Fruit_Of_Mastela,100; "> }, { Id: 12643 @@ -83938,7 +83945,7 @@ item_db: ( Name: "E Coin Pack50" Type: 2 Buy: 0 - Script: <" getitem 6422,50; "> + Script: <" getitem Egrade_Coin,50; "> }, { Id: 12644 @@ -83981,6 +83988,12 @@ item_db: ( Type: 2 Buy: 20 Weight: 30 + Script:<" + percentheal 5,5; + sc_start SC_INCLUK,6000,9; + sc_start SC_PLUSATTACKPOWER,6000,20; + sc_start SC_PLUSMAGICPOWER,6000,20; + "> }, { Id: 12647 @@ -83997,6 +84010,12 @@ item_db: ( Type: 11 Buy: 20 Weight: 100 + Script: <" + getitem Red_Potion,10; + getitem Orange_Potion,10; + getitem Yellow_Potion,10; + getitem Blue_Potion,10; + "> }, { Id: 12649 @@ -84015,6 +84034,14 @@ item_db: ( nomail: true noauction: true } + Script: <" + getitem Str_Dish08,5; + getitem Agi_Dish08,5; + getitem Int_Dish08,5; + getitem Vit_Dish08,5; + getitem Dex_Dish08,5; + getitem Luk_Dish08,5; + "> }, { Id: 12650 @@ -84033,6 +84060,7 @@ item_db: ( nomail: true noauction: true } + Script: <" getitem Comp_Battle_Manual,5; "> }, { Id: 12651 @@ -84051,6 +84079,12 @@ item_db: ( nomail: true noauction: true } + Script: <" + getitem High_Weapon_Box,1; + getitem Octo_Hstick,Box,1; + getitem Octo_Hstick,Box,1; + getitem Octo_Hstick_Box,1; + "> }, { Id: 12652 @@ -84069,6 +84103,7 @@ item_db: ( nomail: true noauction: true } + Script: <" getitem High_Coin_Pocket,10; "> }, { Id: 12653 @@ -84087,6 +84122,12 @@ item_db: ( nomail: true noauction: true } + Script: <" + getitem Protection_Seagod_Box,1; + getitem Protection_Seagod_Box,1; + getitem Protection_Seagod_Box,1; + getitem Dark_Snake_Lord_Hat,1; + "> }, { Id: 12654 @@ -84327,10 +84368,10 @@ item_db: ( noauction: true } Script: <" - getitem 617,2; - getitem 12263,2; - getitem 12329,3; - getitem 12330,2; + getitem Old_Violet_Box,2; + getitem Comp_Battle_Manual,2; + getitem Recall_MaleGM,3; + getitem Recall_FemaleGM,2; "> }, { @@ -84365,7 +84406,7 @@ item_db: ( Type: 2 Buy: 20 Weight: 500 - Script: <" getrandgroupitem 12675,1; "> + Script: <" getrandgroupitem Sg_Weapon_Supply_Box,1; "> }, { Id: 12676 @@ -84374,7 +84415,7 @@ item_db: ( Type: 2 Buy: 20 Weight: 200 - Script: <" getitem 11547,50; "> + Script: <" getitem Woe_Violet_Potion,50; "> }, { Id: 12677 @@ -84403,7 +84444,7 @@ item_db: ( Type: 2 Buy: 20 Weight: 200 - Script: <" getitem 11548,30; "> + Script: <" getitem Woe_White_Potion,30; "> }, { Id: 12680 @@ -84412,7 +84453,7 @@ item_db: ( Type: 2 Buy: 20 Weight: 200 - Script: <" getitem 11549,10; "> + Script: <" getitem Woe_Blue_Potion,10; "> }, { Id: 12681 @@ -84437,7 +84478,7 @@ item_db: ( Type: 2 Buy: 20 Weight: 200 - Script: <" getitem 11547,50; "> + Script: <" getitem Woe_Violet_Potion,50; "> }, { Id: 12684 @@ -84625,8 +84666,8 @@ item_db: ( noauction: true } Script: <" - getrandgroupitem 12702,1; - getrandgroupitem 12702,1; + getrandgroupitem Old_Bleu_Box,1; + getrandgroupitem Old_Bleu_Box,1; "> }, { @@ -84747,6 +84788,7 @@ item_db: ( Buy: 2 Weight: 100 EquipLv: 50 + Script: <" percentheal 0,50; "> }, { Id: 12713 @@ -84771,7 +84813,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getrandgroupitem 12714,1; "> + Script: <" getrandgroupitem Easter_Scroll,1; "> }, { Id: 12715 @@ -85145,6 +85187,7 @@ item_db: ( Type: 2 Buy: 0 Weight: 10 + Script: <" percentheal 10,10; "> }, { Id: 12740 @@ -85186,6 +85229,7 @@ item_db: ( Name: "Valentine Gift Box" Type: 2 Buy: 0 + Script: <" getitem Valentine_Gold_Ring,1; "> }, { Id: 12743 @@ -85193,6 +85237,7 @@ item_db: ( Name: "Valentine Gift Box" Type: 2 Buy: 0 + Script: <" getitem Valentine_Silver_Ring,1; "> }, { Id: 12744 @@ -85200,6 +85245,7 @@ item_db: ( Name: "Chocolate Box" Type: 2 Buy: 0 + Script: <" getitem Chocolate,1; "> }, { Id: 12745 @@ -85314,6 +85360,7 @@ item_db: ( Type: 2 Buy: 0 Weight: 10 + Script: <" percentheal 50,50; "> }, { Id: 12755 @@ -85322,6 +85369,11 @@ item_db: ( Type: 2 Buy: 2 Weight: 10 + Script: <" + specialeffect2 EF_POK_JAP; + itemskill MO_CALLSPIRITS,3; + itemskill MO_FINGEROFFENSIVE,5; + "> }, { Id: 12756 @@ -85417,6 +85469,7 @@ item_db: ( nomail: true noauction: true } + Script: <" sc_start SC_CASH_PLUSONLYJOBEXP,1800000,25; "> }, { Id: 12767 @@ -85716,6 +85769,61 @@ item_db: ( Weight: 10 }, { + Id: 12807 + AegisName: "Mercenary_Casting_" + Name: "Mercenary Casting" + Type: 2 + Buy: 0 + EquipLv: 20 + Trade: { + nodrop: true + notrade: true + noselltonpc: true + nocart: true + nogstorage: true + nomail: true + noauction: true + } + Script: <" + getitem Bow_Mercenary_Scroll8,5; + getitem SwordMercenary_Scroll8,5; + getitem Spear_Mercenary_Scroll8,5; + getitem Mother_Love_Box,1; + "> +}, +{ + Id: 12808 + AegisName: "Mother_Love_Box" + Name: "Mother_Love_Box" + Type: 2 + Buy: 0 + Trade: { + nodrop: true + notrade: true + noselltonpc: true + nocart: true + nogstorage: true + nomail: true + noauction: true + } + Script: <" rentitem Mother_Heart,1209600; "> +}, +{ + Id: 12809 + AegisName: "Level_Up_Box" + Name: "Level Up Box" + Type: 2 + Buy: 0 + EquipLv: 120 + Script: <" + getitem Comp_Battle_Manual,5; + getitem Comp_Bubble_Gum,5; + getitem Comp_Insurance,5; + getitem Reward_Job_BM25,5; + getitem Zherlthsh_Tck_Box_,1; + "> +}, +{ Id: 12812 AegisName: "Snow_Flip" Name: "Snow Flip" @@ -85768,6 +85876,16 @@ item_db: ( nomail: true noauction: true } + Script: <" getitem Level_Up_Box,1; "> +}, +{ + Id: 12819 + AegisName: "Zherlthsh_Tck_Box_" + Name: "Zherlthsh Ticket Box" + Type: 2 + Buy: 0 + EquipLv: 150 + Script: <" getitem Zherlthsh_Ticket,1; "> }, { Id: 12831 @@ -85786,10 +85904,10 @@ item_db: ( noauction: true } Script: <" - getitem 545,100; - getitem 546,100; - getitem 547,100; - getitem 505,100; + getitem Red_Slim_Potion,100; + getitem Yellow_Slim_Potion,100; + getitem White_Slim_Potion,100; + getitem Blue_Potion,100; "> }, { @@ -85843,8 +85961,8 @@ item_db: ( Buy: 0 Script: <" if(getskilllv(HT_FALCON)) { - if(checkoption(Option_Wug)||checkoption(Option_Wugrider)) end; - if(checkfalcon()==1) { + if(checkoption(Option_Wug) || checkoption(Option_Wugrider)) end; + if(checkfalcon() == 1) { setfalcon 0; } else { |