From 7f0d7a0a3d6c306777dbbb17a25b348bb2ff2884 Mon Sep 17 00:00:00 2001 From: euphyy Date: Thu, 20 Jun 2013 02:35:13 +0000 Subject: [PATCH] * Updated Eden Quests 86-90 and 91-99 to their latest versions. * Fixed a small mistake in Eden Group enchants. (bugreport:7750) * Minor updates to Pile Bunker script. * Updated a handful of item names. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17377 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/quest_db.txt | 32 ++ db/re/item_db.txt | 20 +- npc/re/merchants/enchan_mora.txt | 1 - npc/re/quests/eden/86-90.txt | 233 +++++++++----- npc/re/quests/eden/91-99.txt | 249 ++++++++++----- npc/re/quests/eden/eden_quests.txt | 471 +++++++++++++++-------------- npc/re/quests/pile_bunker.txt | 29 +- sql-files/item_db_re.sql | 20 +- 8 files changed, 638 insertions(+), 417 deletions(-) diff --git a/db/quest_db.txt b/db/quest_db.txt index 1cac0ca481..9e4b362dd2 100644 --- a/db/quest_db.txt +++ b/db/quest_db.txt @@ -525,6 +525,38 @@ 4197,10800,0,0,0,0,0,0,"Octopus" +// Paradise Cooldowns +4198,10800,,0,0,0,0,0,0,"86-90 Mission Board Timer" +4199,10800,,0,0,0,0,0,0,"86-90 Mission Board Timer" +4200,10800,,0,0,0,0,0,0,"86-90 Mission Board Timer" +4201,10800,,0,0,0,0,0,0,"86-90 Mission Board Timer" +4202,10800,,0,0,0,0,0,0,"86-90 Mission Board Timer" +4203,10800,,0,0,0,0,0,0,"86-90 Mission Board Timer" +4204,10800,,0,0,0,0,0,0,"86-90 Mission Board Timer" +4205,10800,,0,0,0,0,0,0,"86-90 Mission Board Timer" +4206,10800,,0,0,0,0,0,0,"86-90 Mission Board Timer" +4207,10800,,0,0,0,0,0,0,"86-90 Mission Board Timer" +4208,10800,,0,0,0,0,0,0,"86-90 Mission Board Timer" +4209,10800,,0,0,0,0,0,0,"86-90 Mission Board Timer" +4210,10800,,0,0,0,0,0,0,"86-90 Mission Board Timer" +4211,10800,,0,0,0,0,0,0,"86-90 Mission Board Timer" +4212,10800,,0,0,0,0,0,0,"91-99 Mission Board Timer" +4213,10800,,0,0,0,0,0,0,"91-99 Mission Board Timer" +4214,10800,,0,0,0,0,0,0,"91-99 Mission Board Timer" +4215,10800,,0,0,0,0,0,0,"91-99 Mission Board Timer" +4216,10800,,0,0,0,0,0,0,"91-99 Mission Board Timer" +4217,10800,,0,0,0,0,0,0,"91-99 Mission Board Timer" +4218,10800,,0,0,0,0,0,0,"91-99 Mission Board Timer" +4219,10800,,0,0,0,0,0,0,"91-99 Mission Board Timer" +4220,10800,,0,0,0,0,0,0,"91-99 Mission Board Timer" +4221,10800,,0,0,0,0,0,0,"91-99 Mission Board Timer" +4222,10800,,0,0,0,0,0,0,"91-99 Mission Board Timer" +4223,10800,,0,0,0,0,0,0,"91-99 Mission Board Timer" +4224,10800,,0,0,0,0,0,0,"91-99 Mission Board Timer" +4225,10800,,0,0,0,0,0,0,"91-99 Mission Board Timer" +4226,10800,,0,0,0,0,0,0,"91-99 Mission Board Timer" +4227,10800,,0,0,0,0,0,0,"91-99 Mission Board Timer" + 4229,0,0,0,0,0,0,0,"Devil in the Cave" 4254,0,0,0,0,0,0,0,"Fairy with a stomache" diff --git a/db/re/item_db.txt b/db/re/item_db.txt index 584d6a0a3f..f4980069ca 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -1532,8 +1532,8 @@ 2487,Vital_Tree_Shoes_,Vital Tree Shoes,5,20,,500,,16,,1,0xFFFFFFFE,7,2,64,,60,1,0,{ bonus bVit,2; bonus bMdef,3; },{},{} 2488,Fricco_Shoes_,Fricco Shoes,5,30000,,500,,12,,1,0xFFFFFFFE,7,2,64,,65,1,0,{ bonus bAgi,2; },{},{} 2489,Vidar's_Boots_,Vidar's Boots,5,30000,,650,,13,,1,0xFFFFFFFE,7,2,64,,65,1,0,{},{},{} -2491,Bangungot_Boots,Nightmare Bangungot Boots,5,20,,600,,10,,0,0xFFFFFFFF,7,2,64,,1,1,0,{ bonus bMdef,getrefine(); if(getrefine()>=14){ bonus bSpeedRate,25; } },{},{} -2492,Bayani_Bangungot_Boots,Bayani Nightmare Bangungot Boots,5,20,,600,,10,,1,0xFFFFFFFF,7,2,64,,1,1,0,{ bonus bMdef,getrefine(); if(getrefine()>=12){ bonus bSpeedRate,25; } },{},{} +2491,Bangungot_Boots,Bangungot Boots of Nightmare,5,20,,600,,10,,0,0xFFFFFFFF,7,2,64,,1,1,0,{ bonus bMdef,getrefine(); if(getrefine()>=14){ bonus bSpeedRate,25; } },{},{} +2492,Bayani_Bangungot_Boots,Bayani Bangungot Boots of Nightmare,5,20,,600,,10,,1,0xFFFFFFFF,7,2,64,,1,1,0,{ bonus bMdef,getrefine(); if(getrefine()>=12){ bonus bSpeedRate,25; } },{},{} 2495,Egir_Shoes,Egir Shoes,5,200000,,300,,13,,1,0xFFFFFFFF,7,2,64,,110,1,0,{},{},{} // Garments //=================================================================== @@ -1626,8 +1626,8 @@ 2587,Siege_Muffler,Siege Muffler,5,10,,400,,15,,1,0xFFFFFFFF,7,2,4,,95,1,0,{ bonus bMdef,10; bonus2 bSubRace,RC_DemiHuman,2; },{},{} 2588,Ragamuffin_Cape_,Ragamuffin Cape,5,56000,,500,,4,,1,0xFFFFFFFE,7,2,4,,40,1,0,{ bonus bMdef,10; },{},{} 2589,Fallen_Angel_Wing,Fallen Angel Wing,5,0,,200,,18,,0,0xFFFFFFFF,7,2,4,,0,1,3,{ bonus bLuk,2; bonus bMdef,18; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubEle,Ele_Dark,30; bonus2 bSubEle,Ele_Holy,-30; },{},{} -2590,Buwaya_Cloth,Buwaya Skin Clothes,5,20,,200,,8,,0,0xFFFFFFFF,7,2,4,,1,1,0,{ bonus bHealpower2,getrefine()/3; bonus bAddItemHealRate,getrefine()/3; bonus2 bSubEle,Ele_Water,10; bonus2 bSubEle,Ele_Wind,10; bonus2 bSubEle,Ele_Earth,10; bonus2 bSubEle,Ele_Fire,10; },{},{} -2591,Bayani_Buwaya_Cloth,Bayani Buwaya Skin Clothes,5,20,,200,,8,,1,0xFFFFFFFF,7,2,4,,1,1,0,{ bonus bHealpower2,getrefine(); bonus bAddItemHealRate,getrefine(); bonus2 bSubEle,Ele_Water,10; bonus2 bSubEle,Ele_Wind,10; bonus2 bSubEle,Ele_Earth,10; bonus2 bSubEle,Ele_Fire,10; },{},{} +2590,Buwaya_Cloth,Buwaya Sack Cloth,5,20,,200,,8,,0,0xFFFFFFFF,7,2,4,,1,1,0,{ bonus bHealpower2,getrefine()/3; bonus bAddItemHealRate,getrefine()/3; bonus2 bSubEle,Ele_Water,10; bonus2 bSubEle,Ele_Wind,10; bonus2 bSubEle,Ele_Earth,10; bonus2 bSubEle,Ele_Fire,10; },{},{} +2591,Bayani_Buwaya_Cloth,Bayani Buwaya Sack Cloth,5,20,,200,,8,,1,0xFFFFFFFF,7,2,4,,1,1,0,{ bonus bHealpower2,getrefine(); bonus bAddItemHealRate,getrefine(); bonus2 bSubEle,Ele_Water,10; bonus2 bSubEle,Ele_Wind,10; bonus2 bSubEle,Ele_Earth,10; bonus2 bSubEle,Ele_Fire,10; },{},{} 2592,Boss_Brownie_Manteau,Boss Brownie Manteau,5,20,,100,,3,,0,0xFFFFFFFF,7,2,4,,50,1,0,{},{},{} 2593,Flow_Manteau,Flow Manteau,5,20,,700,,20,,1,0xFFFFFFFF,7,2,4,,65,1,0,{},{},{} 2594,Wrapping_Manteau,Wrapping Manteau,5,20,,100,,0,,1,0xFFFFFFFF,7,2,4,,0,1,0,{},{},{} @@ -1938,11 +1938,11 @@ 2904,Naqsh,Naqsi,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ skill "BS_MAXIMIZE",5; skill "BS_WEAPONPERFECT",5; skill "WL_RECOGNIZEDSPELL",5; skill "ECL_SNOWFLIP",1; skill "ECL_PEONYMAMY",1; skill "ECL_SADAGUI",1; skill "ECL_SEQUOIADUST",1; /* bonus2 bSkillDelay,"WL_RECOGNIZEDSPELL",-180000; */ bonus bDelayRate,-100; },{},{} 2905,Super_Ora_Ora,Super Ora Ora,5,0,,1000,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{} 2906,Happy_Gauntlet,Happy Gauntlet,5,20,,1000,,3,,1,0xFFFFFFFF,7,2,136,,70,0,0,{ bonus bMdef,3; },{},{} -2907,Buwaya_Tattoo,Bawaya Symbol Tattoo,5,20,,100,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus bMatkRate,7; bonus bFixedCastrate,-7; },{},{} +2907,Buwaya_Tattoo,Bawaya Agimat Tattoo,5,20,,100,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus bMatkRate,7; bonus bFixedCastrate,-7; },{},{} 2908,Light_Ring,Light Ring,5,20,,100,,0,,1,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{} 2909,Darkness_Ring,Darkness Ring,5,20,,100,,0,,1,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{} -2910,Bakonawa_Tattoo,Bakunawa Symbol Tattoo,5,20,,100,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus2 bAddRace,RC_NonBoss,7; bonus2 bAddRace,RC_Boss,7; bonus bAspdRate,10; },{},{} -2911,Bangungot_Tattoo,Bangungot Symbol Tattoo,5,20,,100,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus bHealPower,4; bonus bHealPower2,7; },{},{} +2910,Bakonawa_Tattoo,Bakunawa Agimat Tattoo,5,20,,100,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus2 bAddRace,RC_NonBoss,7; bonus2 bAddRace,RC_Boss,7; bonus bAspdRate,10; },{},{} +2911,Bangungot_Tattoo,Bangungot Agimat Tattoo,5,20,,100,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus bHealPower,4; bonus bHealPower2,7; },{},{} 2912,Xylitol_2011,Xylitol 2011,5,20,,300,,0,,1,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{} 2913,Thief_Handcuff,Thief Handcuff,5,20,,1400,,0,,1,0xFFFFFFFF,7,2,136,,10,0,0,{},{},{} 2914,Wizard_Left_Eye,Wizard Left Eye,5,20,,100,,1,,1,0x00CFDF80,7,2,136,,0,0,0,{ bonus bInt,4; bonus bMdef,3; },{},{} @@ -5942,8 +5942,8 @@ 12682,Nestea_Blacktea,Nestea Black Tea,2,0,,30,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12683,Sg_Vi_Potion_Box200,Siege Violet Potion Box (200),2,20,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 11547,50; },{},{} // -12699,Tikbalang_Belt,Tikbalang Belt,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 2313; },{},{} -12700,Insideout_Shirt,Upside Down Shirt,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ warp "malaya",242,211; },{},{} +12699,Tikbalang_Belt,Tikbalang Harness,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 2313; },{},{} +12700,Insideout_Shirt,Inside-out Shirt,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ warp "malaya",242,211; },{},{} 12701,Old_Blue_Box_F,Old Blue Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12702,Old_Bleu_Box,Old Navy Box,2,0,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getrandgroupitem(IG_BleuBox),1; getrandgroupitem(IG_BleuBox),1; },{},{} 12703,Holy_Egg_2,Holy Egg,11,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} @@ -6024,7 +6024,7 @@ 12772,Cool_Hat_Box2,Cool Hat Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12773,Victory_Hat_Box2,Victory Hat Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12774,Empty_Potion_Bottle,Empty Potion Bottle,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -12775,Ancient_Spirit_Agimat,Ancient Spirit Amulet,2,20,,600,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +12775,Ancient_Spirit_Agimat,Greater Agimat of Ancient Spirit,2,20,,600,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} // 12778,Bapho_Jr_Scroll,Bapho Jr Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ mercenary_create 2325,1800000; },{},{} 12779,Galapago_Scroll,Galapago Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ mercenary_create 2326,1800000; },{},{} diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt index 55f7cdba44..1df7afdd3f 100644 --- a/npc/re/merchants/enchan_mora.txt +++ b/npc/re/merchants/enchan_mora.txt @@ -655,7 +655,6 @@ mora,148,98,3 script Artifact Researcher#new 521,{ set .@equip_id, getequipid(.@part); set @mora_equip_part, .@part; - // @mora_equip_id = enc_type //callsub L_Socket,,,<4-x enchants possible>; // Enchant types: // [1]ATK [2]CRIT [3]EVA [4]Healer [5]Spell 1 [6]Assist 1 [7]Assist 2 [8]STR [9]Range [10]Physical [11]Spell 2 diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt index eea07144c2..cd39de52e7 100644 --- a/npc/re/quests/eden/86-90.txt +++ b/npc/re/quests/eden/86-90.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Chilly //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -12,102 +12,187 @@ //= 1.0 First Version. [Chilly] //= 1.1 Some little improvements here and there. [Masao] //= 1.2 Optimized. [Euphy] +//= 1.3 Updated to match the official script. [Euphy] //============================================================ -moc_para01,48,175,3 script Mission [86 - 90] 857,{ +moc_para01,48,175,3 script 86-90 Mission Board 857,{ if (countitem(6219) < 1) { - mes "- Only members of the -"; - mes "- Eden Group can read -"; - mes "- this bulletin board. -"; - close; + mes "Wait a minute!"; + mes "-You need to have an-"; + mes "-^4d4dff'Eden Group Mark'^000000-"; + mes "-to receive these missions.-"; + next; + switch(select("Just walk away.:^0000FFEden Group^000000 missions?:How can I be a member of the ^0000FFEden Group^000000?")) { + case 1: + close; + case 2: + mes "::The Eden Group Missions"; + mes "::are basically missions"; + mes "::requested by"; + mes "::people from all around the kingdom."; + mes "::We just categorize them."; + next; + mes "::In the Eden Group,"; + mes "::we sorted out the missions"; + mes "::according to the level of difficulty."; + mes "::According to this level,"; + mes "::you can find"; + mes "::missions that"; + mes "::suit you."; + next; + mes "::When you are done,"; + mes "::you can come back"; + mes "::to the mission board."; + next; + mes "::Then you will be"; + mes "::rewarded!!"; + mes "::Simple, isn't it!!"; + mes "::No commission required!!"; + close; + case 3: + mes "::You can become a member"; + mes "::of the Eden Group"; + mes "::to ^0000FFLaime Evenor^000000,"; + mes "::who is waiting on the 1st floor."; + next; + mes "::If you become a member,"; + mes "::you will get an"; + mes "::\"^006400Eden Group Mark^000000\"."; + mes "::Then you will be able"; + mes "::to see the mission board."; + close; + } } - if (BaseLevel < 86) { - mes "- This missions can only be -"; - mes "- read by those who are -"; - mes "- of the correct level. -"; - mes "- There might be another -"; - mes "- board somewhere for -"; - mes "- my level. -"; - close; - } - if (BaseLevel > 90) { - setarray .@Exp[0],76000,82000,82000,72000,76000,72000,117000,82000,120000,72000,72000,72000,86000,80000; - setarray .@Mob$[0],"Dragon Tail","Spring Rabbit","Pest","Bathory","Alarm","Baba Yaga","Hyegun","Antique Firelock","Zipper Bear","Earth Petite","Rafflesia","Venomous","Pitman","Yellow Novus"; - for(set .@i,0; .@i<14; set .@i,.@i+1) - if (checkquest(4167+.@i,HUNTING) == 2) { - mes "You hunted all 30 "+.@Mob$[.@i]+"."; - mes "Thank you very much."; + if (BaseLevel < 86 || BaseLevel > 90) { + // Quest IDs: 4167-4180 + // Quest cooldown IDs: 4198-4211 + setarray .@names$[0], + "Dragon Tail","Spring Rabbit","Pest", + "Bathory","Alarm", + "Baba Yaga","Yao Jun","Firelock Soldier","Zipper Bear", + "Ground Petite","Rafflesia","Venomous","Pitman","Yellow Novus"; + setarray .@exp[0], + 76000,82000,82000, + 72000,76000, + 72000,78000,82000,80000, + 72000,72000,72000,86000,80000; + mes "You must be within level 86-90 to accept these missions."; + for(set .@quest,4167; .@quest<=4180; set .@quest,.@quest+1) { + set .@hunting, checkquest(.@quest,HUNTING); + if (.@hunting == 0 || .@hunting == 1) { next; - mes "I know it isn't much but here's a small gift."; - mes "I hope that it helps you at least a little bit."; + mes ":: You cannot proceed in"; + mes ":: ^0000FF"+.@names$[.@quest-4167]+" Hunting^000000."; + mes ":: The registration to the mission"; + mes ":: is cancelled."; + erasequest .@quest; + close; + } else if (.@hunting == 2) { next; - erasequest 4167+.@i; - getexp .@Exp[.@i],0; - mes "Wooohoo!"; - mes "Good luck."; + mes ":: You added information"; + mes ":: about the mission"; + mes ":: ^0000FF"+.@names$[.@quest-4167]+" Hunting^000000"; + mes ":: on the mission board."; + mes ":: You've got a"; + mes ":: salutary experience."; + erasequest .@quest; + getexp .@exp[.@quest-4167],0; close; } - mes "- This missions can only be -"; - mes "- read by those who are -"; - mes "- of the correct level. -"; - mes "- There might be another -"; - mes "- board somewhere for -"; - mes "- my level. -"; + } close; } - mes "- Many hunting missions -"; - mes "- are on the bulletin board. -"; + mes "[86-90 Mission Board]"; + mes "There are several requests on this board."; next; - switch(select("Turtle Dungeon Area:Clock Tower Area:Local Area:Other Area")) { + switch(select("^8B4513Turtle Island^000000:^8B4513Clock Tower Dungeon^000000:^8B4513Expansion Towns^000000:^8B4513Other Regions^000000")) { case 1: - switch(select("Dragon Tail:Spring Rabbit:Pest")) { - case 1: callsub L_Quest,4167,"Dragon Tail",76000; - case 2: callsub L_Quest,4168,"Spring Rabbit",82000; - case 3: callsub L_Quest,4169,"Pest",82000; + mes "^8B4513Turtle Island^000000."; + mes "Which monster will you hunt or have you finished hunting?"; + next; + switch(select("^0000FFDragon Tail^000000:^0000FFSpring Rabbit^000000:^0000FFPest^000000")) { + case 1: callsub L_Quest,4167,"Dragon Tail",76000,"µå·¡°ïÅ×ÀÏÄ«µå","There is a monster that only can be found on ^8B4513Turtle Island^000000.","s"; + case 2: callsub L_Quest,4168,"Spring Rabbit",82000,"½ºÇÁ¸µ·¡ºøÄ«µå","There is a monster that only can be found on ^8B4513Turtle Island^000000.","s"; + case 3: callsub L_Quest,4169,"Pest",82000,"Æä½ºÆ®Ä«µå","There is a monster that only can be found on ^8B4513Turtle Island^000000.","s"; } case 2: - switch(select("Bathory:Alarm")) { - case 1: callsub L_Quest,4170,"Bathory",72000; - case 2: callsub L_Quest,4171,"Alarm",76000; + mes "^8B4513Clock Tower Dungeon^000000."; + mes "Which monster will you hunt or have you finished hunting?"; + next; + switch(select("^0000FFBathory^000000:^0000FFAlarm^000000")) { + case 1: callsub L_Quest,4170,"Bathory",72000,"¹Ù¼Ò¸®Ä«µå","The Clock Tower Dungeon is full of dangerous monsters."; + case 2: callsub L_Quest,4171,"Alarm",76000,"¾Ë¶÷Ä«µå","The Clock Tower Dungeon is full of dangerous monsters."; } case 3: - switch(select("Baba Yaga:Hyegun:Antique Firelock:Zipper Bear")) { - case 1: callsub L_Quest,4172,"Baba Yaga",72000; - case 2: callsub L_Quest,4173,"Hyegun",117000; - case 3: callsub L_Quest,4174,"Antique Firelock",82000; - case 4: callsub L_Quest,4175,"Zipper Bear",120000; + mes "^8B4513Expansion Cities^000000"; + mes "Which monster will you hunt or have you finished hunting?"; + next; + switch(select("^0000FFBaba Yaga^000000:^0000FFYao Jun^000000:^0000FFFirelock Soldier^000000:^0000FFZipper Bear^000000")) { + case 1: callsub L_Quest,4172,"Baba Yaga",72000,"","The witch Baba Yaga can be found in the outskirts of Moscovia."; + case 2: callsub L_Quest,4173,"Yao Jun",117000,"Çý±ºÄ«µå","There are human-like monsters that roam around the dungeon in Louyang."; + case 3: callsub L_Quest,4174,"Firelock Soldier",82000,"±¸½ÄÁ¶ÃѺ´Ä«µå","There are human-like monsters that roam around the dungeon in Amatsu.","s"; + case 4: callsub L_Quest,4175,"Zipper Bear",120000,"ÁöÆÛº£¾îÄ«µå","There are bear monsters swarming in the Kunlun dungeon."; } case 4: - switch(select("Earth Petite:Rafflesia:Venomous:Pitman:Yellow Novus")) { - case 1: callsub L_Quest,4176,"Earth Petite",72000; - case 2: callsub L_Quest,4177,"Rafflesia",72000; - case 3: callsub L_Quest,4178,"Venomous",72000; - case 4: callsub L_Quest,4179,"Pitman",86000; - case 5: callsub L_Quest,4180,"Yellow Novus",80000; + mes "[86-90 Mission Board]"; + mes "Here is a list of random requests to hunt monsters in other regions of Rune Midgard."; + mes "Which monster will you hunt or have you finished hunting?"; + next; + switch(select("^0000FFGround Petite^000000:^0000FFRafflesia^000000:^0000FFVenomous^000000:^0000FFPitman^000000:^0000FFYellow Novus^000000")) { + case 1: callsub L_Quest,4176,"Ground Petite",72000,"Áö»ó»Ú¶ìÄ«µå","There are dragon type monsters swarming the western region of Geffen."; + case 2: callsub L_Quest,4177,"Rafflesia",72000,"¶óÇ÷¹½Ã¾ÆÄ«µå","There are plant type monsters infesting the fields of Lighthalzen."; + case 3: callsub L_Quest,4178,"Venomous",72000,"º£³ë¸Ó½º","There are formless monsters floating around the fields of Einbroch."; + case 4: callsub L_Quest,4179,"Pitman",86000,"Ç͸Ç","There are undead monsters pushing a cart around the fields and dungeons of Einbroch."; + case 5: callsub L_Quest,4180,"Yellow Novus",80000,"¿»·Î¿ì³ë¹ö½º","There are yellow dragon type monsters terrorizing the fields of Hugel."; } } end; + +//callsub L_Quest,,"",,"",""{,"s"}; L_Quest: - if (checkquest(getarg(0),HUNTING) == 2) { - mes "You hunted all 30 "+getarg(1)+"."; - mes "Thank you very much."; - next; - mes "I know it isn't much but here's a small gift."; - mes "I hope that it helps you at least a little bit."; - next; - erasequest getarg(0); + set .@quest1, getarg(0); + set .@quest2, .@quest1+31; + set .@playtime, checkquest(.@quest2,PLAYTIME); + if (.@playtime == 0 || .@playtime == 1) { + mes "[86-90 Mission Board]"; + mes "You need to wait 3 hours before you can take this mission again."; + close; + } + set .@hunting, checkquest(.@quest1,HUNTING); + if (.@hunting == 0 || .@hunting == 1) { + mes "[86-90 Mission Board]"; + mes "Have you finished hunting all 30 "+getarg(1)+getarg(5,"")+" yet?"; + close; + } else if (.@hunting == 2) { + mes "[86-90 Mission Board]"; + mes "You have completed the hunting."; + mes "Please accept this reward as a compensation."; + erasequest .@quest1; + if (.@playtime > -1) erasequest .@quest2; + setquest .@quest2; getexp getarg(2),0; - mes "Wooohoo!"; - mes "Good luck."; + close; + }/* else if (.@hunting == 3) { +// recall_completequest .@quest1 + erasequest .@quest1; + mes "[86-90 Mission Board]"; + mes "You have re-accepted the "+getarg(1)+" Hunting mission."; + close; + }*/ else { + mes "[86-90 Mission Board]"; + mes getarg(4); + next; + if (getarg(3) != "") cutin getarg(3),3; + mes "[86-90 Mission Board]"; + mes "Hunt 30 "+getarg(1)+" monsters there and post your success on this board."; + next; + if (getarg(3) != "") cutin getarg(3),255; + if(select("I'll hunt them.:No thanks.") == 1) { + mes "[86-90 Mission Board]"; + mes "When you have completed the mission, post it on this board and collect your reward."; + if (.@playtime > -1) erasequest .@quest2; + setquest .@quest1; + } close; } - if (checkquest(getarg(0)) == -1) { - setquest getarg(0); - mes "Please hunt 30 "+getarg(1)+" and return here."; - close; - } - mes "Umm? You didn't hunt"; - mes "all 30 "+getarg(1)+" yet..."; - mes "Will you check again?"; - close; } diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt index 2e7e7dd28f..ddfc657275 100644 --- a/npc/re/quests/eden/91-99.txt +++ b/npc/re/quests/eden/91-99.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Chilly //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -12,107 +12,204 @@ //= 1.0 First Version. [Chilly] //= 1.1 Some little improvements here and there. [Masao] //= 1.2 Optimized. [Euphy] +//= 1.3 Updated to match the official script. [Euphy] //============================================================ -moc_para01,48,177,3 script Mission [91 - 99] 857,{ +moc_para01,48,177,3 script 91-99 Mission Board 857,{ if (countitem(6219) < 1) { - mes "- Only members of the -"; - mes "- Eden Group can read -"; - mes "- this bulletin board. -"; - close; + mes "Wait a minute!"; + mes "-You need to have an-"; + mes "-^4d4dff'Eden Group Mark'^000000-"; + mes "-to receive these missions.-"; + next; + switch(select("Just walk away.:^0000FFEden Group^000000 missions?:How can I be a member of the ^0000FFEden Group^000000?")) { + case 1: + close; + case 2: + mes "::The Eden Group Missions"; + mes "::are basically missions"; + mes "::requested by"; + mes "::people from all around the kingdom."; + mes "::We just categorize them."; + next; + mes "::In the Eden Group,"; + mes "::we sorted out the missions"; + mes "::according to the level of difficulty."; + mes "::According to this level,"; + mes "::you can find"; + mes "::missions that"; + mes "::suit you."; + next; + mes "::When you are done,"; + mes "::you can come back"; + mes "::to the mission board."; + next; + mes "::Then you will be"; + mes "::rewarded!!"; + mes "::Simple, isn't it!!"; + mes "::No commission required!!"; + close; + case 3: + mes "::You can become a member"; + mes "::of the Eden Group"; + mes "::to ^0000FFLaime Evenor^000000,"; + mes "::who is waiting on the 1st floor."; + next; + mes "::If you become a member,"; + mes "::you will get an"; + mes "::\"^006400Eden Group Mark^000000\"."; + mes "::Then you will be able"; + mes "::to see the mission board."; + close; + } } - if (BaseLevel < 91) { - mes "- This missions can only be -"; - mes "- read by those who are -"; - mes "- of the correct level. -"; - mes "- There might be another -"; - mes "- board somewhere for -"; - mes "- my level. -"; - close; - } - if (BaseLevel > 99) { - setarray .@Exp[0],90000,94000,114000,96000,96000,146000,96000,102000,110000,102000,108000,110000,138000,118000,96000,134000; - setarray .@Mob$[0],"Solider","Freezer","Heater","Injustice","Rybio","Dark Priest","Stapo","Roween","Siroma","Shinobi","Evil Nymph","Deviruchi","Mineral","Kaho","Neraid","Disguise"; - for(set .@i,0; .@i<16; set .@i,.@i+1) - if (checkquest(4181+.@i,HUNTING) == 2) { - mes "You hunted all 30 "+.@Mob$[.@i]+"."; - mes "Thank you very much."; + if (BaseLevel < 91 || BaseLevel > 99) { + // Quest IDs: 4181-4196 + // Quest cooldown IDs: 4212-4227 + setarray .@names$[0], + "Solider","Freezer","Heater", + "Injustice","Rybio","Dark Priest", + "Stapo","Roween","Siroma", + "Shinobi","Evil Nymph", + "Deviruchi","Mineral","Kaho","Neraid","Disguise"; + setarray .@exp[0], + 90000,94000,114000, + 96000,96000,146000, + 96000,102000,110000, + 102000,108000, + 110000,138000,118000,96000,134000; + mes "You must be within level 91-99 to accept these missions."; + for(set .@quest,4181; .@quest<=4196; set .@quest,.@quest+1) { + set .@hunting, checkquest(.@quest,HUNTING); + if (.@hunting == 0 || .@hunting == 1) { next; - mes "I know it isn't much but here's a small gift."; - mes "I hope that it helps you at least a little bit."; + mes ":: You cannot proceed in"; + mes ":: ^0000FF"+.@names$[.@quest-4181]+" Hunting^000000."; + mes ":: The registration to the mission"; + mes ":: is cancelled."; + erasequest .@quest; + close; + } else if (.@hunting == 2) { next; - erasequest 4181+.@i; - getexp .@Exp[.@i],311000; - mes "Wooohoo!"; - mes "Good luck."; + mes ":: You added information"; + mes ":: about the mission"; + mes ":: ^0000FF"+.@names$[.@quest-4181]+" Hunting^000000"; + mes ":: on the mission board."; + mes ":: You've got a"; + mes ":: salutary experience."; + erasequest .@quest; + getexp .@exp[.@quest-4181],0; close; } - mes "- This missions can only be -"; - mes "- read by those who are -"; - mes "- of the correct level. -"; - mes "- There might be another -"; - mes "- board somewhere for -"; - mes "- my level. -"; + } close; } - mes "- Many hunting missions -"; - mes "- are on the bulletin board. -"; + mes "[91-99 Mission Board]"; + mes "There are several requests on this board."; next; - switch(select("Turtle Dungeon Area:Glast Heim Area:Rachel Area:Local Area:Other Area")) { + switch(select("^8B4513Turtle Island^000000:^8B4513Glast Heim^000000:^8B4513Rachel / Veins^000000:^8B4513Expansion Cities^000000:^8B4513Other regions^000000")) { case 1: - switch(select("Solider:Freezer:Heater")) { - case 1: callsub L_Quest,4181,"Solider",90000; - case 2: callsub L_Quest,4182,"Freezer",94000; - case 3: callsub L_Quest,4183,"Heater",114000; + mes "^8B4513Turtle Island^000000."; + mes "Which monster will you hunt or have you finished hunting?"; + next; + switch(select("^0000FFSolider^000000:^0000FFFreezer^000000:^0000FFHeater^000000")) { + case 1: callsub L_Quest,4181,"Solider",90000,"¼Ö¸®´õÄ«µå","There is a monster that only can be found on ^8B4513Turtle Island^000000."; + case 2: callsub L_Quest,4182,"Freezer",94000,"ÇÁ¸®ÀúÄ«µå","There is a monster that only can be found on ^8B4513Turtle Island^000000."; + case 3: callsub L_Quest,4183,"Heater",114000,"È÷ÅÍÄ«µå","There is a monster that only can be found on ^8B4513Turtle Island^000000."; } case 2: - switch(select("Injustice:Rybio:Dark Priest")) { - case 1: callsub L_Quest,4184,"Injustice",96000; - case 2: callsub L_Quest,4185,"Rybio",96000; - case 3: callsub L_Quest,4186,"Dark Priest",146000; + mes "^8B4513Glast Heim^000000."; + mes "Which monster will you hunt or have you finished hunting?"; + next; + switch(select("^0000FFInjustice^000000:^0000FFRybio^000000:^0000FFDark Priest^000000")) { + case 1: callsub L_Quest,4184,"Injustice",96000,"ÀÎÀú½ºÆ¼½ºÄ«µå","There is a monster only found in ^8B4513Glast Heim prison^000000."; + case 2: callsub L_Quest,4185,"Rybio",96000,"¸®ºñ¿ÀÄ«µå","There is a monster only found in ^8B4513Glast Heim prison^000000."; + case 3: callsub L_Quest,4186,"Dark Priest",146000,"´ÙÅ©ÇÁ¸®½ºÆ®Ä«µå","There is a monster only found in ^8B4513Glast Heim prison^000000."; } case 3: - switch(select("Stapo:Roween:Siroma")) { - case 1: callsub L_Quest,4187,"Stapo",96000; - case 2: callsub L_Quest,4188,"Roween",102000; - case 3: callsub L_Quest,4189,"Siroma",110000; + mes "^8B4513Rachel / Veins^000000."; + mes "Which monster will you hunt or have you finished hunting?"; + next; + switch(select("^0000FFStapo^000000:^0000FFRoween^000000:^0000FFSiroma^000000")) { + case 1: callsub L_Quest,4187,"Stapo",96000,"½ºÅÂÆ÷Ä«µå","There is a monster only found in ^8B4513Veins^000000."; + case 2: callsub L_Quest,4188,"Roween",102000,"·Î¿ìÀ©Ä«µå","There is a monster only found in ^8B4513Rachel^000000."; + case 3: callsub L_Quest,4189,"Siroma",110000,"½Ã·Î¸¶Ä«µå","There is a monster only found in ^8B4513Ice Dungeon^000000."; } case 4: - switch(select("Shinobi:Evil Nymph")) { - case 1: callsub L_Quest,4190,"Shinobi",102000; - case 2: callsub L_Quest,4191,"Evil Nymph",108000; + mes "^8B4513Expansion Cities^000000."; + mes "Which monster will you hunt or have you finished hunting?"; + next; + switch(select("^0000FFShinobi^000000:^0000FFEvil Nymph^000000")) { + case 1: callsub L_Quest,4190,"Shinobi",102000,"½Ã³ëºñÄ«µå","There is a monster only found in ^8B4513Amatsu Dungeon^000000."; + case 2: callsub L_Quest,4191,"Evil Nymph",108000,"¿ä¼±³àÄ«µå","There is a monster only found in ^8B4513Kunlun Dungeon^000000."; } case 5: - switch(select("Deviruchi:Mineral:Kaho:Neraid:Disguise")) { - case 1: callsub L_Quest,4192,"Deviruchi",110000; - case 2: callsub L_Quest,4193,"Mineral",138000; - case 3: callsub L_Quest,4194,"Kaho",118000; - case 4: callsub L_Quest,4195,"Neraid",96000; - case 5: callsub L_Quest,4196,"Disguise",134000; + mes "Other Regions."; + mes "Which monster will you hunt or have you finished hunting?"; + next; + switch(select("^0000FFDeviruchi^000000:^0000FFMineral^000000:^0000FFKaho^000000:^0000FFNeraid^000000:^0000FFDisguise^000000")) { + case 1: callsub L_Quest,4192,"Deviruchi",110000,"µ¥ºñ·çġīµå","There is a monster only found in ^8B4513Geffen Dungeon^000000."; + case 2: callsub L_Quest,4193,"Mineral",138000,"¹Ì³×¶ö","There is a monster only found in ^8B4513Einbech Dungeon^000000."; + case 3: callsub L_Quest,4194,"Kaho",118000,"īȣīµå","There is a monster found in ^8B4513Nogg Road Magma 1^000000."; + case 4: callsub L_Quest,4195,"Neraid",96000,"³×·¹À̵åÄ«µå","There is a monster only found in ^8B4513Comodo Dungeon^000000."; + case 5: callsub L_Quest,4196,"Disguise",134000,"µð½º°¡ÀÌÁîÄ«µå","There is a monster only found in ^8B4513Nifflheim^000000."; } } end; + +//callsub L_Quest,,"",,"",""{,"s"}; L_Quest: - if (checkquest(getarg(0),HUNTING) == 2) { - mes "You hunted all 30 "+getarg(1)+"."; - mes "Thank you very much."; - next; - mes "I know it isn't much but here's a small gift."; - mes "I hope that it helps you at least a little bit."; - next; - erasequest getarg(0); - getexp getarg(2),311000; - mes "Wooohoo!"; - mes "Good luck."; + set .@quest1, getarg(0); + set .@quest2, .@quest1+31; + set .@playtime, checkquest(.@quest2,PLAYTIME); + if (.@playtime == 0 || .@playtime == 1) { + mes "[91-99 Mission Board]"; + mes "You need to wait 3 hours before you can take this mission again."; close; } - if (checkquest(getarg(0)) == -1) { - setquest getarg(0); - mes "Please hunt 30 "+getarg(1)+" and return here."; + set .@hunting, checkquest(.@quest1,HUNTING); + if (.@hunting == 0 || .@hunting == 1) { + mes "[91-99 Mission Board]"; + mes "Have you finished hunting all 30 "+getarg(1)+getarg(5,"")+" yet?"; + close; + } else if (.@hunting == 2) { + mes "[91-99 Mission Board]"; + mes "You have completed the hunting."; + mes "Please accept this reward as a compensation."; + erasequest .@quest1; + if (.@playtime > -1) erasequest .@quest2; + setquest .@quest2; + + // Job Experience calculation. + if (JobLevel > 50 && JobLevel < 56) set .@jexp,67000; + else if (JobLevel > 55 && JobLevel < 61) set .@jexp,94000; + else if (JobLevel > 60 && JobLevel < 66) set .@jexp,141000; + else if (JobLevel > 65 && JobLevel < 69) set .@jexp,212000; + else if (JobLevel == 69) set .@jexp,311000; + + getexp getarg(2),.@jexp; + close; + }/* else if (.@hunting == 3) { +// recall_completequest .@quest1 + erasequest .@quest1; + mes "[91-99 Mission Board]"; + mes "You have re-accepted the "+getarg(1)+" Hunting mission."; + close; + }*/ else { + mes "[91-99 Mission Board]"; + mes getarg(4); + next; + if (getarg(3) != "") cutin getarg(3),3; + mes "[91-99 Mission Board]"; + mes "Hunt 30 "+getarg(1)+" monsters there and post your success on this board."; + next; + if (getarg(3) != "") cutin getarg(3),255; + if(select("I'll hunt them.:No thanks.") == 1) { + mes "[91-99 Mission Board]"; + mes "When you have completed the mission, post it on this board and collect your reward."; + if (.@playtime > -1) erasequest .@quest2; + setquest .@quest1; + } close; } - mes "Umm? You didn't hunt"; - mes "all 30 "+getarg(1)+" yet..."; - mes "Will you check again?"; - close; } diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index 65c49309a0..21a4b55fb7 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -2330,7 +2330,7 @@ moc_para01,112,96,5 script Administrator Michael 967,{ mes "Make enough space."; close; case 2: - if (Class == Job_Swordman || Class == Job_Swordman_High || Class == Job_Knight || Class == Job_Crusader){ + if (Class == Job_Swordman || Class == Job_Swordman_High || Class == Job_Knight || Class == Job_Crusader) { mes "[Michael]"; mes "What kind of weapon do you want?"; mes "We have one and Two-handed swords."; @@ -2413,21 +2413,72 @@ moc_para01,112,96,5 script Administrator Michael 967,{ mes "This is what we strive for."; close; } - } if (Class == Job_Thief || Class == Job_Thief_High || Class == Job_Assassin || Class == Job_Rogue || Class == Job_Ninja || Class == Job_Novice || Class == Job_Novice_High) { + } + if (Class == Job_Thief || Class == Job_Thief_High || Class == Job_Assassin || Class == Job_Rogue || Class == Job_Ninja || Class == Job_Novice || Class == Job_Novice_High) { + mes "[Michael]"; + mes "We only have 1 weapon for you."; + next; + mes "[Michael]"; + mes "Eden Dagger I: Dagger. MATK+60, attack 124."; + mes "It is Lv. 2 and the required level is 26."; + next; + mes "[Michael]"; + mes "It also can't be traded with other players or be refined."; + next; + mes "[Michael]"; + mes "You'll receive the Eden Dagger I."; + next; + mes "[Michael]"; + mes "Additionally you'll receive the Eden Group Boots II and Uniform II."; + next; + if (para_suv02 == 0) { mes "[Michael]"; - mes "We only have 1 weapon for you."; + mes "You don't have a record of receiving any supplies"; + mes "so, you'll receive the Eden Group Hat and Manteau aswell."; + set para_suv01,23; + set para_suv02,2; + getitem 13050,1; //P_Dagger1 + getitem 2457,1; //Para_Team_Boots2 + getitem 15010,1; //Para_Team_Uniform2 + getitem 5583,1; //Para_Team_Hat + getitem 2560,1; //Para_Team_Manteau next; mes "[Michael]"; - mes "Eden Dagger I: Dagger. MATK+60, attack 124."; - mes "It is Lv. 2 and the required level is 26."; - next; - mes "[Michael]"; - mes "It also can't be traded with other players or be refined."; - next; - mes "[Michael]"; - mes "You'll receive the Eden Dagger I."; - next; + mes "Check your supplies again and look after it."; + close; + } + mes "[Michael]"; + mes "A Dagger, Uniform and Boots all 3 supplies."; + mes "Please check it again."; + set para_suv01,23; + set para_suv02,2; + getitem 13050,1; //P_Dagger1 + getitem 2457,1; //Para_Team_Boots2 + getitem 15010,1; //Para_Team_Uniform2 + next; + mes "[Michael]"; + mes "I hope they're useful to you."; + mes "This is what we strive for."; + close; + } + if (Class == Job_Merchant || Class == Job_Merchant_High || Class == Job_Blacksmith || Class == Job_Alchemist) { + mes "[Michael]"; + mes "What kind of weapon do you want?"; + mes "We have a mace and a One-handed sword."; + mes "Here are the options."; + next; + mes "[Michael]"; + mes "Eden Saber I: One-handed sword. attack 147."; + mes "Eden Mace I: Mace. attack 142."; + mes "Both are level 2 and the required level is 26."; + next; + mes "[Michael]"; + mes "They also can't be traded with other players or be refined."; + next; + switch (select("Eden Sabre I:Eden Mace I")) { + case 1: mes "[Michael]"; + mes "You've chosen the Eden Sabre I."; mes "Additionally you'll receive the Eden Group Boots II and Uniform II."; next; if (para_suv02 == 0) { @@ -2436,7 +2487,7 @@ moc_para01,112,96,5 script Administrator Michael 967,{ mes "so, you'll receive the Eden Group Hat and Manteau aswell."; set para_suv01,23; set para_suv02,2; - getitem 13050,1; //P_Dagger1 + getitem 13423,1; //P_Sabre1 getitem 2457,1; //Para_Team_Boots2 getitem 15010,1; //Para_Team_Uniform2 getitem 5583,1; //Para_Team_Hat @@ -2447,11 +2498,11 @@ moc_para01,112,96,5 script Administrator Michael 967,{ close; } mes "[Michael]"; - mes "A Dagger, Uniform and Boots all 3 supplies."; + mes "A One-handed Sword, Uniform and Boots all 3 supplies."; mes "Please check it again."; set para_suv01,23; set para_suv02,2; - getitem 13050,1; //P_Dagger1 + getitem 13423,1; //P_Sabre1 getitem 2457,1; //Para_Team_Boots2 getitem 15010,1; //Para_Team_Uniform2 next; @@ -2459,115 +2510,18 @@ moc_para01,112,96,5 script Administrator Michael 967,{ mes "I hope they're useful to you."; mes "This is what we strive for."; close; - } - if (Class == Job_Merchant || Class == Job_Merchant_High || Class == Job_Blacksmith || Class == Job_Alchemist) { - mes "[Michael]"; - mes "What kind of weapon do you want?"; - mes "We have a mace and a One-handed sword."; - mes "Here are the options."; - next; - mes "[Michael]"; - mes "Eden Saber I: One-handed sword. attack 147."; - mes "Eden Mace I: Mace. attack 142."; - mes "Both are level 2 and the required level is 26."; - next; - mes "[Michael]"; - mes "They also can't be traded with other players or be refined."; - next; - switch (select("Eden Sabre I:Eden Mace I")) { - case 1: - mes "[Michael]"; - mes "You've chosen the Eden Sabre I."; - mes "Additionally you'll receive the Eden Group Boots II and Uniform II."; - next; - if (para_suv02 == 0) { - mes "[Michael]"; - mes "You don't have a record of receiving any supplies"; - mes "so, you'll receive the Eden Group Hat and Manteau aswell."; - set para_suv01,23; - set para_suv02,2; - getitem 13423,1; //P_Sabre1 - getitem 2457,1; //Para_Team_Boots2 - getitem 15010,1; //Para_Team_Uniform2 - getitem 5583,1; //Para_Team_Hat - getitem 2560,1; //Para_Team_Manteau - next; - mes "[Michael]"; - mes "Check your supplies again and look after it."; - close; - } - mes "[Michael]"; - mes "A One-handed Sword, Uniform and Boots all 3 supplies."; - mes "Please check it again."; - set para_suv01,23; - set para_suv02,2; - getitem 13423,1; //P_Sabre1 - getitem 2457,1; //Para_Team_Boots2 - getitem 15010,1; //Para_Team_Uniform2 - next; - mes "[Michael]"; - mes "I hope they're useful to you."; - mes "This is what we strive for."; - close; - case 2: - mes "[Michael]"; - mes "You've chosen the Eden Mace I."; - mes "Additionally you'll receive the Eden Group Boots II and Uniform II."; - next; - if (para_suv02 == 0) { - mes "[Michael]"; - mes "You don't have a record of receiving any supplies"; - mes "so, you'll receive the Eden Group Hat and Manteau aswell."; - set para_suv01,23; - set para_suv02,2; - getitem 16004,1; //P_Mace1 - getitem 2457,1; //Para_Team_Boots2 - getitem 15010,1; //Para_Team_Uniform2 - getitem 5583,1; //Para_Team_Hat - getitem 2560,1; //Para_Team_Manteau - next; - mes "[Michael]"; - mes "Check your supplies again and look after it."; - close; - } - mes "[Michael]"; - mes "A Mace, Uniform and Boots all 3 supplies."; - mes "Please check it again."; - set para_suv01,23; - set para_suv02,2; - getitem 16004,1; //P_Mace1 - getitem 2457,1; //Para_Team_Boots2 - getitem 15010,1; //Para_Team_Uniform2 - next; - mes "[Michael]"; - mes "I hope they're useful to you."; - close; - } - } - if (Class == Job_Archer || Class == Job_Archer_High || Class == Job_Hunter || Class == Job_Dancer || Class == Job_Bard) { - mes "[Michael]"; - mes "We only have 1 weapon for you."; - next; - mes "[Michael]"; - mes "Eden Bow I: Bow. attack 82."; - mes "It is Lv. 2 and the required level is 26."; - next; - mes "[Michael]"; - mes "It also can't be traded with other players or be refined."; - next; - mes "[Michael]"; - mes "You'll receive the Eden Bow I."; - next; + case 2: mes "[Michael]"; + mes "You've chosen the Eden Mace I."; mes "Additionally you'll receive the Eden Group Boots II and Uniform II."; next; if (para_suv02 == 0) { mes "[Michael]"; mes "You don't have a record of receiving any supplies"; mes "so, you'll receive the Eden Group Hat and Manteau aswell."; - set para_suv01, 23; - set para_suv02, 2; - getitem 1747,1; //P_Bow1 + set para_suv01,23; + set para_suv02,2; + getitem 16004,1; //P_Mace1 getitem 2457,1; //Para_Team_Boots2 getitem 15010,1; //Para_Team_Uniform2 getitem 5583,1; //Para_Team_Hat @@ -2578,11 +2532,11 @@ moc_para01,112,96,5 script Administrator Michael 967,{ close; } mes "[Michael]"; - mes "A Bow, Uniform and Boots all 3 supplies."; + mes "A Mace, Uniform and Boots all 3 supplies."; mes "Please check it again."; set para_suv01,23; set para_suv02,2; - getitem 1747,1; //P_Bow1 + getitem 16004,1; //P_Mace1 getitem 2457,1; //Para_Team_Boots2 getitem 15010,1; //Para_Team_Uniform2 next; @@ -2590,112 +2544,79 @@ moc_para01,112,96,5 script Administrator Michael 967,{ mes "I hope they're useful to you."; close; } - if (Class == Job_Acolyte || Class == Job_Acolyte_High || Class == Job_Priest || Class == Job_Monk) { + } + if (Class == Job_Archer || Class == Job_Archer_High || Class == Job_Hunter || Class == Job_Dancer || Class == Job_Bard) { + mes "[Michael]"; + mes "We only have 1 weapon for you."; + next; + mes "[Michael]"; + mes "Eden Bow I: Bow. attack 82."; + mes "It is Lv. 2 and the required level is 26."; + next; + mes "[Michael]"; + mes "It also can't be traded with other players or be refined."; + next; + mes "[Michael]"; + mes "You'll receive the Eden Bow I."; + next; + mes "[Michael]"; + mes "Additionally you'll receive the Eden Group Boots II and Uniform II."; + next; + if (para_suv02 == 0) { mes "[Michael]"; - mes "What kind of weapon do you want?"; - mes "We have a mace and a staff."; - mes "Here are the options."; + mes "You don't have a record of receiving any supplies"; + mes "so, you'll receive the Eden Group Hat and Manteau aswell."; + set para_suv01, 23; + set para_suv02, 2; + getitem 1747,1; //P_Bow1 + getitem 2457,1; //Para_Team_Boots2 + getitem 15010,1; //Para_Team_Uniform2 + getitem 5583,1; //Para_Team_Hat + getitem 2560,1; //Para_Team_Manteau next; mes "[Michael]"; - mes "Eden Mace I: Mace. attack 142."; - mes "Eden Staff I: Staff. INT+2, MATK+125, attack 60."; - mes "Both are Lv. 2 and the required level is 26."; - next; - mes "[Michael]"; - mes "They also can't be traded with other players or be refined."; - next; - switch (select("Eden Staff I:Eden Mace I")) { - case 1: - mes "[Michael]"; - mes "You've chosen the Eden Staff I."; - mes "Additionally you'll receive the Eden Group Boots II and Uniform II."; - next; - if (para_suv02 == 0) { - mes "[Michael]"; - mes "You don't have a record of receiving any supplies"; - mes "so, you'll receive the Eden Group Hat and Manteau aswell."; - set para_suv01,23; - set para_suv02,2; - getitem 1650,1; //P_Staff1 - getitem 2457,1; //Para_Team_Boots2 - getitem 15010,1; //Para_Team_Uniform2 - getitem 5583,1; //Para_Team_Hat - getitem 2560,1; //Para_Team_Manteau - next; - mes "[Michael]"; - mes "Check your supplies again and look after it."; - close; - } - mes "[Michael]"; - mes "A Staff, Uniform and Boots all 3 supplies."; - mes "Please check it again."; - set para_suv01,23; - set para_suv02,2; - getitem 1650,1; //P_Staff1 - getitem 2457,1; //Para_Team_Boots2 - getitem 15010,1; //Para_Team_Uniform2 - next; - mes "[Michael]"; - mes "I hope they're useful to you."; - close; - case 2: - mes "[Michael]"; - mes "You've chosen the Eden Mace I."; - mes "Additionally you'll receive the Eden Group Boots II and Uniform II."; - next; - if (para_suv02 == 0) { - mes "[Michael]"; - mes "You don't have a record of receiving any supplies"; - mes "so, you'll receive the Eden Group Hat and Manteau aswell."; - set para_suv01,23; - set para_suv02,2; - getitem 16004,1; //P_Mace1 - getitem 2457,1; //Para_Team_Boots2 - getitem 15010,1; //Para_Team_Uniform2 - getitem 5583,1; //Para_Team_Hat - getitem 2560,1; //Para_Team_Manteau - next; - mes "[Michael]"; - mes "Check your supplies again and look after it."; - close; - } - mes "[Michael]"; - mes "A Mace, Uniform and Boots all 3 supplies."; - mes "Please check it again."; - set para_suv01,23; - set para_suv02,2; - getitem 16004,1; //P_Mace1 - getitem 2457,1; //Para_Team_Boots2 - getitem 15010,1; //Para_Team_Uniform2 - next; - mes "[Michael]"; - mes "I hope they're useful to you."; - close; - } + mes "Check your supplies again and look after it."; + close; } - if (Class == Job_Mage || Class == Job_Mage_High || Class == Job_Wizard || Class == Job_Sage) { - mes "[Michael]"; - mes "We only have 1 weapon for you."; - next; - mes "[Michael]"; - mes "Eden Staff I: Staff. INT+2, MATK+125, attack 60."; - mes "It is Lv. 2 and the required level is 26."; - next; - mes "[Michael]"; - mes "It also can't be traded with other players or be refined."; - next; - mes "[Michael]"; - mes "You'll receive the Eden Staff I."; - next; + mes "[Michael]"; + mes "A Bow, Uniform and Boots all 3 supplies."; + mes "Please check it again."; + set para_suv01,23; + set para_suv02,2; + getitem 1747,1; //P_Bow1 + getitem 2457,1; //Para_Team_Boots2 + getitem 15010,1; //Para_Team_Uniform2 + next; + mes "[Michael]"; + mes "I hope they're useful to you."; + close; + } + if (Class == Job_Acolyte || Class == Job_Acolyte_High || Class == Job_Priest || Class == Job_Monk) { + mes "[Michael]"; + mes "What kind of weapon do you want?"; + mes "We have a mace and a staff."; + mes "Here are the options."; + next; + mes "[Michael]"; + mes "Eden Mace I: Mace. attack 142."; + mes "Eden Staff I: Staff. INT+2, MATK+125, attack 60."; + mes "Both are Lv. 2 and the required level is 26."; + next; + mes "[Michael]"; + mes "They also can't be traded with other players or be refined."; + next; + switch (select("Eden Staff I:Eden Mace I")) { + case 1: mes "[Michael]"; + mes "You've chosen the Eden Staff I."; mes "Additionally you'll receive the Eden Group Boots II and Uniform II."; next; if (para_suv02 == 0) { mes "[Michael]"; mes "You don't have a record of receiving any supplies"; mes "so, you'll receive the Eden Group Hat and Manteau aswell."; - set para_suv01, 23; - set para_suv02, 2; + set para_suv01,23; + set para_suv02,2; getitem 1650,1; //P_Staff1 getitem 2457,1; //Para_Team_Boots2 getitem 15010,1; //Para_Team_Uniform2 @@ -2718,31 +2639,18 @@ moc_para01,112,96,5 script Administrator Michael 967,{ mes "[Michael]"; mes "I hope they're useful to you."; close; - } - if (Class == Job_Gunslinger) { - mes "[Michael]"; - mes "We only have 1 weapon for you."; - next; - mes "[Michael]"; - mes "Eden Revolver I: Revolver. HIT-5, attack 44."; - mes "It is Lv. 2 and the required level is 26."; - next; - mes "[Michael]"; - mes "It also can't be traded with other players or be refined."; - next; - mes "[Michael]"; - mes "You'll receive the Eden Revolver I."; - next; + case 2: mes "[Michael]"; + mes "You've chosen the Eden Mace I."; mes "Additionally you'll receive the Eden Group Boots II and Uniform II."; next; if (para_suv02 == 0) { mes "[Michael]"; mes "You don't have a record of receiving any supplies"; mes "so, you'll receive the Eden Group Hat and Manteau aswell."; - set para_suv01, 23; - set para_suv02, 2; - getitem 13112,1; //P_Revolver1 + set para_suv01,23; + set para_suv02,2; + getitem 16004,1; //P_Mace1 getitem 2457,1; //Para_Team_Boots2 getitem 15010,1; //Para_Team_Uniform2 getitem 5583,1; //Para_Team_Hat @@ -2753,11 +2661,11 @@ moc_para01,112,96,5 script Administrator Michael 967,{ close; } mes "[Michael]"; - mes "A Revolver, Uniform and Boots all 3 supplies."; + mes "A Mace, Uniform and Boots all 3 supplies."; mes "Please check it again."; set para_suv01,23; set para_suv02,2; - getitem 13112,1; //P_Revolver1 + getitem 16004,1; //P_Mace1 getitem 2457,1; //Para_Team_Boots2 getitem 15010,1; //Para_Team_Uniform2 next; @@ -2765,6 +2673,99 @@ moc_para01,112,96,5 script Administrator Michael 967,{ mes "I hope they're useful to you."; close; } + } + if (Class == Job_Mage || Class == Job_Mage_High || Class == Job_Wizard || Class == Job_Sage) { + mes "[Michael]"; + mes "We only have 1 weapon for you."; + next; + mes "[Michael]"; + mes "Eden Staff I: Staff. INT+2, MATK+125, attack 60."; + mes "It is Lv. 2 and the required level is 26."; + next; + mes "[Michael]"; + mes "It also can't be traded with other players or be refined."; + next; + mes "[Michael]"; + mes "You'll receive the Eden Staff I."; + next; + mes "[Michael]"; + mes "Additionally you'll receive the Eden Group Boots II and Uniform II."; + next; + if (para_suv02 == 0) { + mes "[Michael]"; + mes "You don't have a record of receiving any supplies"; + mes "so, you'll receive the Eden Group Hat and Manteau aswell."; + set para_suv01, 23; + set para_suv02, 2; + getitem 1650,1; //P_Staff1 + getitem 2457,1; //Para_Team_Boots2 + getitem 15010,1; //Para_Team_Uniform2 + getitem 5583,1; //Para_Team_Hat + getitem 2560,1; //Para_Team_Manteau + next; + mes "[Michael]"; + mes "Check your supplies again and look after it."; + close; + } + mes "[Michael]"; + mes "A Staff, Uniform and Boots all 3 supplies."; + mes "Please check it again."; + set para_suv01,23; + set para_suv02,2; + getitem 1650,1; //P_Staff1 + getitem 2457,1; //Para_Team_Boots2 + getitem 15010,1; //Para_Team_Uniform2 + next; + mes "[Michael]"; + mes "I hope they're useful to you."; + close; + } + if (Class == Job_Gunslinger) { + mes "[Michael]"; + mes "We only have 1 weapon for you."; + next; + mes "[Michael]"; + mes "Eden Revolver I: Revolver. HIT-5, attack 44."; + mes "It is Lv. 2 and the required level is 26."; + next; + mes "[Michael]"; + mes "It also can't be traded with other players or be refined."; + next; + mes "[Michael]"; + mes "You'll receive the Eden Revolver I."; + next; + mes "[Michael]"; + mes "Additionally you'll receive the Eden Group Boots II and Uniform II."; + next; + if (para_suv02 == 0) { + mes "[Michael]"; + mes "You don't have a record of receiving any supplies"; + mes "so, you'll receive the Eden Group Hat and Manteau aswell."; + set para_suv01, 23; + set para_suv02, 2; + getitem 13112,1; //P_Revolver1 + getitem 2457,1; //Para_Team_Boots2 + getitem 15010,1; //Para_Team_Uniform2 + getitem 5583,1; //Para_Team_Hat + getitem 2560,1; //Para_Team_Manteau + next; + mes "[Michael]"; + mes "Check your supplies again and look after it."; + close; + } + mes "[Michael]"; + mes "A Revolver, Uniform and Boots all 3 supplies."; + mes "Please check it again."; + set para_suv01,23; + set para_suv02,2; + getitem 13112,1; //P_Revolver1 + getitem 2457,1; //Para_Team_Boots2 + getitem 15010,1; //Para_Team_Uniform2 + next; + mes "[Michael]"; + mes "I hope they're useful to you."; + close; + } mes "[Michael]"; mes "Let me see... you will receive.."; mes "the Eden Group Boots II and Uniform II."; @@ -4691,7 +4692,7 @@ moc_para01,111,83,3 script Toren 813,{ else if (.@enc_paragear < 35) set .@addpart,4787; else if (.@enc_paragear < 39) set .@addpart,4791; else if (.@enc_paragear < 43) set .@addpart,4786; - set .@enc_paragear2,4701+(10*rand(6)); + set .@addpart2,4701+(10*rand(6)); delitem .@paragearcount,1; getitem2 .@paragearcount, 1, 1, 0, 0, 0, 0, .@addpart2, .@addpart; set paragearenchant,4; diff --git a/npc/re/quests/pile_bunker.txt b/npc/re/quests/pile_bunker.txt index 31b36c82bf..ecd1c4c784 100644 --- a/npc/re/quests/pile_bunker.txt +++ b/npc/re/quests/pile_bunker.txt @@ -3,16 +3,27 @@ //===== By: ================================================== //= JayPee Mateo //===== Current Version: ===================================== -//= 2.1 +//= 2.2 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= 1.0 A Pile Bunker quest based on iRO WiKi. [JayPee Mateo] //= 2.0 Rewrited the Script a little so it looks a bit better. [Masao] //= 2.1 Switched to official script, coded by Gennosuke Kouga. [Euphy] +//= 2.2 Updated to match the official script. [Euphy] //============================================================ yuno,179,174,4 script Gomer 851,{ + if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) { + mes "[Gomer]"; + mes "You are carrying so much. Drop off some of your luggage and come back to me."; + close; + } + if (countitem(1549)) { + mes "[Gomer]"; + mes "So how's that Pilebuncker working out for you?"; + close; + } if (Class != Job_Mechanic && Class != Job_Mechanic_T && Class != Job_Baby_Mechanic) { mes "[Gomer]"; mes "I'm a retired Mechanic and I don't think I have any business with you."; @@ -73,11 +84,7 @@ yuno,179,174,4 script Gomer 851,{ mes "Lastly, finding a Brocca is very hard, but you should be able to do something about it. Haha, go get it!"; close; case 4: - if (countitem(1549)) { - mes "[Gomer]"; - mes "So how's that Pile Bunker working out for you?"; - close; - } else if (countitem(1415) < 1 || countitem(999) < 200 || countitem(7325) < 30) { + if (countitem(999) < 200 || countitem(7325) < 30 || countitem(1415) < 1) { mes "[Gomer]"; mes "You haven't brought all of the materials that I asked for."; next; @@ -104,11 +111,11 @@ yuno,179,174,4 script Gomer 851,{ next; mes "[Gomer]"; mes "Oh, and it turns out that I didn't need all that Steel after all. So here, take most of it back."; - delitem 999,50; // Steel - delitem 7325,30; // Flexible Tube - delitem 1415,1; // Brocca - getitem 1549,1; // Pile Bunker - getitem 1360,1; // Two-handed Axe [1] + delitem 999,50; //Steel + delitem 7325,30; //Tube + delitem 1415,1; //Skewer + getitem 1549,1; //Pilebuncker + getitem 1360,1; //Two_Handed_Axe close; } } diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index 183be87b2e..2688b28869 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -1563,8 +1563,8 @@ REPLACE INTO `item_db_re` VALUES (2486,'Shadow_Walk_','Shadow Walk',5,20,NULL,20 REPLACE INTO `item_db_re` VALUES (2487,'Vital_Tree_Shoes_','Vital Tree Shoes',5,20,NULL,500,NULL,16,NULL,1,0xFFFFFFFE,7,2,64,NULL,'60',1,0,'bonus bVit,2; bonus bMdef,3;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2488,'Fricco_Shoes_','Fricco Shoes',5,30000,NULL,500,NULL,12,NULL,1,0xFFFFFFFE,7,2,64,NULL,'65',1,0,'bonus bAgi,2;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2489,'Vidar\'s_Boots_','Vidar\'s Boots',5,30000,NULL,650,NULL,13,NULL,1,0xFFFFFFFE,7,2,64,NULL,'65',1,0,NULL,NULL,NULL); -REPLACE INTO `item_db_re` VALUES (2491,'Bangungot_Boots','Nightmare Bangungot Boots',5,20,NULL,600,NULL,10,NULL,0,0xFFFFFFFF,7,2,64,NULL,'1',1,0,'bonus bMdef,getrefine(); if(getrefine()>=14){ bonus bSpeedRate,25; }',NULL,NULL); -REPLACE INTO `item_db_re` VALUES (2492,'Bayani_Bangungot_Boots','Bayani Nightmare Bangungot Boots',5,20,NULL,600,NULL,10,NULL,1,0xFFFFFFFF,7,2,64,NULL,'1',1,0,'bonus bMdef,getrefine(); if(getrefine()>=12){ bonus bSpeedRate,25; }',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (2491,'Bangungot_Boots','Bangungot Boots of Nightmare',5,20,NULL,600,NULL,10,NULL,0,0xFFFFFFFF,7,2,64,NULL,'1',1,0,'bonus bMdef,getrefine(); if(getrefine()>=14){ bonus bSpeedRate,25; }',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (2492,'Bayani_Bangungot_Boots','Bayani Bangungot Boots of Nightmare',5,20,NULL,600,NULL,10,NULL,1,0xFFFFFFFF,7,2,64,NULL,'1',1,0,'bonus bMdef,getrefine(); if(getrefine()>=12){ bonus bSpeedRate,25; }',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2495,'Egir_Shoes','Egir Shoes',5,200000,NULL,300,NULL,13,NULL,1,0xFFFFFFFF,7,2,64,NULL,'110',1,0,NULL,NULL,NULL); # Garments #=================================================================== @@ -1657,8 +1657,8 @@ REPLACE INTO `item_db_re` VALUES (2586,'Siege_Manteau','Siege Manteau',5,10,NULL REPLACE INTO `item_db_re` VALUES (2587,'Siege_Muffler','Siege Muffler',5,10,NULL,400,NULL,15,NULL,1,0xFFFFFFFF,7,2,4,NULL,'95',1,0,'bonus bMdef,10; bonus2 bSubRace,RC_DemiHuman,2;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2588,'Ragamuffin_Cape_','Ragamuffin Cape',5,56000,NULL,500,NULL,4,NULL,1,0xFFFFFFFE,7,2,4,NULL,'40',1,0,'bonus bMdef,10;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2589,'Fallen_Angel_Wing','Fallen Angel Wing',5,0,NULL,200,NULL,18,NULL,0,0xFFFFFFFF,7,2,4,NULL,'0',1,3,'bonus bLuk,2; bonus bMdef,18; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubEle,Ele_Dark,30; bonus2 bSubEle,Ele_Holy,-30;',NULL,NULL); -REPLACE INTO `item_db_re` VALUES (2590,'Buwaya_Cloth','Buwaya Skin Clothes',5,20,NULL,200,NULL,8,NULL,0,0xFFFFFFFF,7,2,4,NULL,'1',1,0,'bonus bHealpower2,getrefine()/3; bonus bAddItemHealRate,getrefine()/3; bonus2 bSubEle,Ele_Water,10; bonus2 bSubEle,Ele_Wind,10; bonus2 bSubEle,Ele_Earth,10; bonus2 bSubEle,Ele_Fire,10;',NULL,NULL); -REPLACE INTO `item_db_re` VALUES (2591,'Bayani_Buwaya_Cloth','Bayani Buwaya Skin Clothes',5,20,NULL,200,NULL,8,NULL,1,0xFFFFFFFF,7,2,4,NULL,'1',1,0,'bonus bHealpower2,getrefine(); bonus bAddItemHealRate,getrefine(); bonus2 bSubEle,Ele_Water,10; bonus2 bSubEle,Ele_Wind,10; bonus2 bSubEle,Ele_Earth,10; bonus2 bSubEle,Ele_Fire,10;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (2590,'Buwaya_Cloth','Buwaya Sack Cloth',5,20,NULL,200,NULL,8,NULL,0,0xFFFFFFFF,7,2,4,NULL,'1',1,0,'bonus bHealpower2,getrefine()/3; bonus bAddItemHealRate,getrefine()/3; bonus2 bSubEle,Ele_Water,10; bonus2 bSubEle,Ele_Wind,10; bonus2 bSubEle,Ele_Earth,10; bonus2 bSubEle,Ele_Fire,10;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (2591,'Bayani_Buwaya_Cloth','Bayani Buwaya Sack Cloth',5,20,NULL,200,NULL,8,NULL,1,0xFFFFFFFF,7,2,4,NULL,'1',1,0,'bonus bHealpower2,getrefine(); bonus bAddItemHealRate,getrefine(); bonus2 bSubEle,Ele_Water,10; bonus2 bSubEle,Ele_Wind,10; bonus2 bSubEle,Ele_Earth,10; bonus2 bSubEle,Ele_Fire,10;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2592,'Boss_Brownie_Manteau','Boss Brownie Manteau',5,20,NULL,100,NULL,3,NULL,0,0xFFFFFFFF,7,2,4,NULL,'50',1,0,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (2593,'Flow_Manteau','Flow Manteau',5,20,NULL,700,NULL,20,NULL,1,0xFFFFFFFF,7,2,4,NULL,'65',1,0,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (2594,'Wrapping_Manteau','Wrapping Manteau',5,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,7,2,4,NULL,'0',1,0,NULL,NULL,NULL); @@ -1969,11 +1969,11 @@ REPLACE INTO `item_db_re` VALUES (2903,'Morpheus\'s_Armlet_','Morpheus\'s Armlet REPLACE INTO `item_db_re` VALUES (2904,'Naqsh','Naqsi',5,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,'0',0,0,'skill "BS_MAXIMIZE",5; skill "BS_WEAPONPERFECT",5; skill "WL_RECOGNIZEDSPELL",5; skill "ECL_SNOWFLIP",1; skill "ECL_PEONYMAMY",1; skill "ECL_SADAGUI",1; skill "ECL_SEQUOIADUST",1; /* bonus2 bSkillDelay,"WL_RECOGNIZEDSPELL",-180000; */ bonus bDelayRate,-100;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2905,'Super_Ora_Ora','Super Ora Ora',5,0,NULL,1000,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,'0',0,0,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (2906,'Happy_Gauntlet','Happy Gauntlet',5,20,NULL,1000,NULL,3,NULL,1,0xFFFFFFFF,7,2,136,NULL,'70',0,0,'bonus bMdef,3;',NULL,NULL); -REPLACE INTO `item_db_re` VALUES (2907,'Buwaya_Tattoo','Bawaya Symbol Tattoo',5,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,'1',0,0,'bonus bMatkRate,7; bonus bFixedCastrate,-7;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (2907,'Buwaya_Tattoo','Bawaya Agimat Tattoo',5,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,'1',0,0,'bonus bMatkRate,7; bonus bFixedCastrate,-7;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2908,'Light_Ring','Light Ring',5,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,7,2,136,NULL,'0',0,0,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (2909,'Darkness_Ring','Darkness Ring',5,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,7,2,136,NULL,'0',0,0,NULL,NULL,NULL); -REPLACE INTO `item_db_re` VALUES (2910,'Bakonawa_Tattoo','Bakunawa Symbol Tattoo',5,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,'1',0,0,'bonus2 bAddRace,RC_NonBoss,7; bonus2 bAddRace,RC_Boss,7; bonus bAspdRate,10;',NULL,NULL); -REPLACE INTO `item_db_re` VALUES (2911,'Bangungot_Tattoo','Bangungot Symbol Tattoo',5,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,'1',0,0,'bonus bHealPower,4; bonus bHealPower2,7;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (2910,'Bakonawa_Tattoo','Bakunawa Agimat Tattoo',5,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,'1',0,0,'bonus2 bAddRace,RC_NonBoss,7; bonus2 bAddRace,RC_Boss,7; bonus bAspdRate,10;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (2911,'Bangungot_Tattoo','Bangungot Agimat Tattoo',5,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,'1',0,0,'bonus bHealPower,4; bonus bHealPower2,7;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2912,'Xylitol_2011','Xylitol 2011',5,20,NULL,300,NULL,0,NULL,1,0xFFFFFFFF,7,2,136,NULL,'0',0,0,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (2913,'Thief_Handcuff','Thief Handcuff',5,20,NULL,1400,NULL,0,NULL,1,0xFFFFFFFF,7,2,136,NULL,'10',0,0,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (2914,'Wizard_Left_Eye','Wizard Left Eye',5,20,NULL,100,NULL,1,NULL,1,0x00CFDF80,7,2,136,NULL,'0',0,0,'bonus bInt,4; bonus bMdef,3;',NULL,NULL); @@ -5973,8 +5973,8 @@ REPLACE INTO `item_db_re` VALUES (12681,'Nestea_Lemon','Nestea Lemon',2,0,NULL,5 REPLACE INTO `item_db_re` VALUES (12682,'Nestea_Blacktea','Nestea Black Tea',2,0,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (12683,'Sg_Vi_Potion_Box200','Siege Violet Potion Box (200)',2,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 11547,50;',NULL,NULL); # -REPLACE INTO `item_db_re` VALUES (12699,'Tikbalang_Belt','Tikbalang Belt',2,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'pet 2313;',NULL,NULL); -REPLACE INTO `item_db_re` VALUES (12700,'Insideout_Shirt','Upside Down Shirt',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'warp "malaya",242,211;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (12699,'Tikbalang_Belt','Tikbalang Harness',2,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'pet 2313;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (12700,'Insideout_Shirt','Inside-out Shirt',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'warp "malaya",242,211;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (12701,'Old_Blue_Box_F','Old Blue Box',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (12702,'Old_Bleu_Box','Old Navy Box',2,0,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getrandgroupitem(IG_BleuBox),1; getrandgroupitem(IG_BleuBox),1;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (12703,'Holy_Egg_2','Holy Egg',11,0,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); @@ -6055,7 +6055,7 @@ REPLACE INTO `item_db_re` VALUES (12771,'Passion_Hat_Box2','Passion Hat Box2',2, REPLACE INTO `item_db_re` VALUES (12772,'Cool_Hat_Box2','Cool Hat Box2',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (12773,'Victory_Hat_Box2','Victory Hat Box2',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (12774,'Empty_Potion_Bottle','Empty Potion Bottle',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db_re` VALUES (12775,'Ancient_Spirit_Agimat','Ancient Spirit Amulet',2,20,NULL,600,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db_re` VALUES (12775,'Ancient_Spirit_Agimat','Greater Agimat of Ancient Spirit',2,20,NULL,600,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); # REPLACE INTO `item_db_re` VALUES (12778,'Bapho_Jr_Scroll','Bapho Jr Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'mercenary_create 2325,1800000;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (12779,'Galapago_Scroll','Galapago Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'mercenary_create 2326,1800000;',NULL,NULL);