summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--db/re/item_db.txt120
-rw-r--r--db/re/item_trade.txt96
-rw-r--r--db/re/skill_db.txt72
-rw-r--r--npc/custom/quests/hunting_missions.txt10
-rw-r--r--npc/re/merchants/coin_exchange.txt827
-rw-r--r--npc/re/quests/quests_dicastes.txt4
-rw-r--r--npc/re/scripts_athena.conf1
-rw-r--r--sql-files/item_db_re.sql2
8 files changed, 1055 insertions, 77 deletions
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index e18fee53c..05a2d94cc 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -882,7 +882,7 @@
1582,E_Diary_Of_Great_Sage_C,Diary Of Great Sage,4,1,,0,135,,1,2,0x00410100,7,2,2,3,1,0,15,{},{},{}
1583,P_Book1,Eden Book I,4,0,,0,135:110,,1,0,0x00410100,7,2,2,3,60,0,15,{},{},{}
1584,Cold_Magic_Book,Cold Magic Book,4,56000,,1000,100:160,,1,2,0x00010000,7,2,2,4,100,1,15,{ bonus bAtkEle,Ele_Water; bonus bUnbreakableWeapon,0; bonus bDex,1; bonus2 bSkillAtk,"MG_COLDBOLT",(getrefine()/3); bonus2 bSkillAtk,"SO_DIAMONDDUST",(getrefine()/3); bonus bUseSPrate,getrefine(); },{},{}
-1585,Upg_Book,Upg Book,4,20,,600,45:20,,1,1,0x00410100,7,2,2,3,1,1,15,{ bonus bBaseAtk,(getrefine()*10); bonus bMatk,(getrefine()*5); if(BaseLevel>70) bonus bMatk,(((BaseLevel-70)/10)*5); } },{},{}
+1585,Upg_Book,Upg Book,4,20,,600,45:20,,1,1,0x00410100,7,2,2,3,1,1,15,{ bonus bBaseAtk,(getrefine()*10); bonus bMatk,(getrefine()*5); if(BaseLevel>70) bonus bMatk,(((BaseLevel-70)/10)*5); },{},{}
1586,Velum_Bible,Vellum Bible,4,20,,600,110:125,,1,0,0x00410100,7,2,2,4,95,1,15,{ if(BaseLevel>104) { bonus bHealPower,(BaseLevel/5)-20; } },{},{}
1587,Velum_Great_Encyclopedia,Vellum Great Encyclopedia,4,20,,1000,130,,1,0,0x00410100,7,2,2,4,95,1,15,{ bonus2 bAddRace,RC_DemiHuman,80+getrefine(); bonus2 bIgnoreDefRate,RC_DemiHuman,30; autobonus "{ bonus bBaseAtk,200; }",10,3000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; },{},{}
// GM Weapon
@@ -1162,8 +1162,8 @@
2111,Herald_Of_GOD,Sacred Mission,5,128000,,1600,,120,,0,0x00004000,7,2,32,,83,1,4,{ bonus bVit,3; bonus bInt,2; bonus bMdef,3; bonus bUnbreakableShield,0; },{},{}
2112,Novice_Guard,Novice Guard,5,1,,1,,20,,0,0x00000001,7,2,32,,0,0,1,{},{},{}
2113,Novice_Shield,Novice Shield,5,5000,,1000,,20,,1,0x00000001,7,2,32,,40,1,3,{ bonus2 bSubEle,Ele_Water,20; bonus2 bSubEle,Ele_Earth,20; bonus2 bSubEle,Ele_Fire,20; bonus2 bSubEle,Ele_Wind,20; bonus2 bSubEle,Ele_Poison,20; bonus2 bSubEle,Ele_Ghost,20; bonus2 bSubEle,Ele_Undead,20; },{},{}
-2114,Stone_Buckler,Stone Buckler,5,30000,,1500,,45,,1,0xFFFFFFFE,7,2,32,,65,1,2,{ bonus2 bSubSize,Size_Large,5; } },{},{}
-2115,Valkyrja's_Shield,Valkyrja's Shield,5,30000,,500,,80,,1,0xFFFFFFFE,7,2,32,,65,1,4,{ bonus2 bSubEle,Ele_Water,20; bonus2 bSubEle,Ele_Fire,20; bonus2 bSubEle,Ele_Dark,20; bonus2 bSubEle,Ele_Undead,20; bonus bMdef,5; } },{},{}
+2114,Stone_Buckler,Stone Buckler,5,30000,,1500,,45,,1,0xFFFFFFFE,7,2,32,,65,1,2,{ bonus2 bSubSize,Size_Large,5; },{},{}
+2115,Valkyrja's_Shield,Valkyrja's Shield,5,30000,,500,,80,,1,0xFFFFFFFE,7,2,32,,65,1,4,{ bonus2 bSubEle,Ele_Water,20; bonus2 bSubEle,Ele_Fire,20; bonus2 bSubEle,Ele_Dark,20; bonus2 bSubEle,Ele_Undead,20; bonus bMdef,5; },{},{}
2116,Angel's_Safeguard,Angelic Guard,5,10000,,400,,30,,1,0x00000001,7,2,32,,20,1,1,{ bonus2 bSubRace,RC_Demon,5; },{},{}
2117,Arm_Guard,Arm Guard,5,10000,,150,,50,,0,0x02000000,7,2,32,,20,1,1,{},{},{}
2118,Arm_Guard_,Arm Guard,5,10000,,150,,50,,1,0x02000000,7,2,32,,20,1,1,{},{},{}
@@ -1177,11 +1177,11 @@
2126,Guyak_Shield,Guyak Shield,5,20,,700,,3,,0,0xFFFFFFFE,7,2,32,,1,1,2,{ bonus bMdef,2; bonus bMagicDamageReturn,2; autobonus2 "{ bonus bShortWeaponDamageReturn,5; }",20,1000,BF_WEAPON,"{ specialeffect2 EF_REFLECTSHIELD; }"; },{},{}
2127,Secular_Mission,Secular Mission,5,20,,0,,10,,0,0xFFFFFFFF,7,2,32,,0,0,4,{ bonus2 bSubRace,RC_NonBoss,25; bonus2 bSubRace,RC_Boss,25; },{},{}
2128,Herald_Of_GOD_,Sacred Mission,5,128000,,1600,,120,,1,0x00004000,7,2,32,,83,1,4,{ bonus bVit,3; bonus bInt,2; bonus bMdef,3; bonus bUnbreakableShield,0; },{},{}
-2129,Exorcism_Bible,Exorcism Bible,5,20,,600,,80,,0,0x00008100,7,2,32,,50,1,5,{ bonus bHPrecovRate,3; bonus bSPrecovRate,3; bonus bInt,1; } },{},{}
+2129,Exorcism_Bible,Exorcism Bible,5,20,,600,,80,,0,0x00008100,7,2,32,,50,1,5,{ bonus bHPrecovRate,3; bonus bSPrecovRate,3; bonus bInt,1; },{},{}
2130,Cross_Shield,Cross Shield,5,20,,2000,,130,,1,0x00004000,7,2,32,,80,1,4,{ bonus bStr,1; bonus2 bSkillAtk,"PA_SHIELDCHAIN",30; bonus2 bSkillAtk,"CR_SHIELDBOOMERANG",30; bonus bUseSPrate,10; },{},{}
2131,Magic_Study_Vol1,Magic Bible Vol1,5,20,,1000,,18,,1,0x00810204,2,2,32,,70,1,5,{ bonus bMdef,3; bonus bInt,2; bonus2 bAddEffWhenHit,Eff_Stun,1000; },{},{}
2132,Shelter_Resistance,Shell Of Resistance,5,20,,0,,9,,0,0xFFFFFFFF,2,2,32,,0,0,2,{ bonus2 bSubEle,Ele_Neutral,20; bonus2 bSubEle,Ele_Water,20; bonus2 bSubEle,Ele_Earth,20; bonus2 bSubEle,Ele_Fire,20; bonus2 bSubEle,Ele_Wind,20; bonus2 bSubEle,Ele_Poison,20; bonus2 bSubEle,Ele_Holy,20; bonus2 bSubEle,Ele_Dark,20; bonus2 bSubEle,Ele_Ghost,20; bonus2 bSubEle,Ele_Undead,20; bonus bShortWeaponDamageReturn,1; },{},{}
-2133,Tournament_Shield,Tournament Shield,5,20,,1000,,105,,1,0x00004082,2,2,32,,50,1,4,{ bonus2 bAddRace,RC_NonBoss,1; bonus2 bAddRace,RC_Boss,1; if( Class == Job_Lord_Knight ) bonus bAspdRate,-5; } },{},{}
+2133,Tournament_Shield,Tournament Shield,5,20,,1000,,105,,1,0x00004082,2,2,32,,50,1,4,{ bonus2 bAddRace,RC_NonBoss,1; bonus2 bAddRace,RC_Boss,1; if( Class == Job_Lord_Knight ) bonus bAspdRate,-5; },{},{}
2134,Shield_Of_Naga,Shield of Naga,5,20,,500,,35,,1,0x00CFFF80,2,2,32,,70,1,2,{ bonus bMdef,3; autobonus2 "{ bonus bShortWeaponDamageReturn,(getrefine()*3); }",10,5000,BF_WEAPON,"{ specialeffect2 EF_GUARD; }"; },{},{}
2135,Shadow_Guard,Shadow Guard,5,20,,800,,52,,1,0x00020000,2,2,32,,70,1,2,{},{},{}
2136,Cracked_Buckler,Cracked Buckler,5,0,,0,,5,,0,0xFFFFFFFF,7,2,32,,0,0,2,{ bonus bAgi,2; bonus2 bAddEle,Ele_Neutral,-10; bonus3 bAutoSpellWhenHit,"PR_KYRIE",10,10; bonus bMdef,1; },{},{}
@@ -2925,18 +2925,18 @@
5303,Flower_Coronet,Flower Crown,5,20,,300,,1,,0,0xFFFFFFFF,7,2,256,,0,1,325,{ bonus bMdef,3; bonus bMaxHP,50; },{},{}
5304,Cap_Of_Blindness,Cap Of Blindness,5,20,,800,,4,,1,0xFFFFFFFF,7,2,769,,50,1,326,{ bonus2 bResEff,Eff_Curse,700; bonus2 bResEff,Eff_Blind,10000; },{},{}
5305,Pirate_Dagger,Pirate Dagger,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,0,0,327,{ bonus bBaseAtk,5; },{},{}
-5306,Freyja_Crown,Freya\'s Crown,5,0,,500,,12,,0,0xFFFFFFFE,7,2,256,,0,0,328,{ bonus2 bSubRace,RC_DemiHuman,5; },{},{}
-5307,Carmen_Miranda\'s_Hat,Carmen Miranda\'s Hat,5,20,,400,,3,,0,0xFFFFFFFF,7,2,256,,0,1,329,{ bonus bMdef,3; bonus3 bAutoSpellWhenHit,"DC_WINKCHARM",1,50; },{},{}
+5306,Freyja_Crown,Freya's_Crown,5,0,,500,,12,,0,0xFFFFFFFE,7,2,256,,0,0,328,{ bonus2 bSubRace,RC_DemiHuman,5; },{},{}
+5307,Carmen_Miranda's_Hat,Carmen Miranda's Hat,5,20,,400,,3,,0,0xFFFFFFFF,7,2,256,,0,1,329,{ bonus bMdef,3; bonus3 bAutoSpellWhenHit,"DC_WINKCHARM",1,50; },{},{}
5308,Brazilian_Flag_Hat,Brazil National Flag Hat,5,20,,300,,3,,1,0xFFFFFFFF,7,2,256,,0,1,330,{ bonus bSpeedAddRate,25; },{},{}
5309,Mahican,Wool Mask,5,20,,200,,1,,0,0xFFFFFFFF,7,2,769,,0,1,331,{ skill "RG_GRAFFITI",1; },{},{}
5310,Bulb_Hairband,Shining Electric Bulb Hairband,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,0,1,332,{ bonus2 bSubEle,Ele_Dark,10; skill "MG_SIGHT",1; },{},{ sc_end SC_SIGHT; }
5311,Large_Hibiscus,Large Hisbiscus,5,20,,100,,1,,1,0xFFFFFFFF,7,2,256,,0,1,333,{ bonus bMdef,15; },{},{}
-5312,Ayothaya_Hat,Ayothaya King\'s Hat,5,20,,100,,5,,1,0x000654E2,7,2,256,,0,1,334,{ bonus bStr,1; bonus2 bAddRace,RC_DemiHuman,5; },{},{}
+5312,Ayothaya_Hat,Ayothaya King's Hat,5,20,,100,,5,,1,0x000654E2,7,2,256,,0,1,334,{ bonus bStr,1; bonus2 bAddRace,RC_DemiHuman,5; },{},{}
5313,Diadem,Diadem,5,20,,100,,3,,1,0xFFFFFFFF,7,2,768,,0,1,335,{ bonus bInt,1; bonus bMatkRate,3; bonus bVariableCastrate,-3; },{},{}
5314,Hockey_Mask,Hockey Mask,5,20,,100,,1,,0,0xFFFFFFFF,7,2,513,,50,0,336,{ bonus2 bAddRace,RC_DemiHuman,5; },{},{}
5315,Observer,Observer,5,20,,100,,1,,0,0xFFFFFFFF,7,2,512,,35,0,337,{ skill "WZ_ESTIMATION",1; },{},{}
5316,Umbrella_Hat,Umbrella Hat,5,20,,100,,2,,0,0xFFFFFFFF,7,2,256,,50,1,338,{ bonus2 bSubEle,Ele_Water,3; },{},{}
-5317,Fisherman_Hat,Fisherman\'s Hat,5,20,,100,,2,,0,0xFFFFFFFF,7,2,256,,50,1,339,{ bonus3 bAutoSpell,"WZ_WATERBALL",3,50; },{},{}
+5317,Fisherman_Hat,Fisherman's Hat,5,20,,100,,2,,0,0xFFFFFFFF,7,2,256,,50,1,339,{ bonus3 bAutoSpell,"WZ_WATERBALL",3,50; },{},{}
5318,Poring_Party_Hat,Poring Party Hat,5,20,,0,,2,,0,0xFFFFFFFF,7,2,256,,0,1,340,{ bonus bAllStats,3; },{},{}
5319,Hellomother_Hat,Hello Mother Hat,5,20,,200,,2,,0,0xFFFFFFFE,7,2,256,,10,1,341,{ bonus bLuk,3; },{},{}
5320,Champion_Wreath,Champion Wreath,5,20,,500,,4,,0,0xFFFFFFFE,7,2,256,,0,1,261,{ bonus bAllStats,2; bonus4 bAutoSpellWhenHit,"AL_HEAL",1,50,0; },{},{}
@@ -3012,7 +3012,7 @@
5390,Santa_Hat_2,Frozen Twin Pompom,5,20,,100,,2,,0,0xFFFFFFFF,7,2,256,,0,1,395,{ bonus2 bResEff,Eff_Freeze,3000; },{},{}
5391,Toast_C,Toast,5,20,,0,,0,,0,0xFFFFFFFF,7,2,1,,0,0,188,{ bonus bMaxHP,100; bonus2 bAddMonsterDropItem,617,10; },{},{}
5392,Louyang_Cap,Louyang NewYear Hat,5,20,,300,,3,,1,0xFFFFFFFF,7,2,256,,0,1,396,{ bonus bLuk,2; },{},{}
-5393,Valentine_Hat,Love Valentine\'s Hat,5,20,,200,,2,,0,0xFFFFFFFF,7,2,256,,0,0,397,{ bonus bMaxSPrate,7; bonus bMaxHPrate,7; },{},{}
+5393,Valentine_Hat,Love Valentine's Hat,5,20,,200,,2,,0,0xFFFFFFFF,7,2,256,,0,0,397,{ bonus bMaxSPrate,7; bonus bMaxHPrate,7; },{},{}
5394,Bubblegum_Lower,Bubblegum,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1,,0,0,0,{ bonus2 bExpAddRace,RC_Boss,100; bonus2 bExpAddRace,RC_NonBoss,100; },{},{}
5395,Tiraya_Bonnet,Striped Hat,5,20,,500,,2,,1,0xFFFFFFFF,7,2,256,,50,1,398,{ bonus bMaxHP,100+(getrefine()*20); bonus bLuk,3; },{},{}
5396,Jasper_Crest,Jasper Crest,5,20,,700,,2,,1,0xFFFFFFFF,7,2,256,,0,1,399,{ bonus bDex,3; bonus bVit,1; },{},{}
@@ -3868,8 +3868,8 @@
6395,Angel_Magic_Power,Angel Magic Power,3,614,,10,,,,,,,,,,,,,{},{},{}
6396,Auger_Of_Spirit,Auger Of Spirit,3,0,,10,,,,,,,,,,,,,{},{},{}
//
-6401,Palm_Oil,Palm_Oil,3,20,,500,,,,,,,,,,,,,{},{},{}
-6402,Coconut_Oil,Coconut_Oil,3,20,,50,,,,,,,,,,,,,{},{},{}
+6401,Palm_O,Palm Oil,3,0,,500,,,,,,,,,,,,,{},{},{}
+6402,Oil_Palm_F,Palm Oil Fruit,3,0,,50,,,,,,,,,,,,,{},{},{}
6403,Comodo_Leather,Comodo Leather,3,4,,10,,,,,,,,,,,,,{},{},{}
6404,Kris_Hilt,Kris Hilt,3,20,,100,,,,,,,,,,,,,{},{},{}
6405,Cendrawasih_Feather,Cendrawasih Feather,3,2,,10,,,,,,,,,,,,,{},{},{}
@@ -5547,12 +5547,12 @@
12442,F_Kafra_Card,F Kafra Card,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12443,F_Neuralizer,F Neuralizer,2,2,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12444,F_Dun_Tele_Scroll1,F Dun Tele Scroll1,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12445,F_Str_Dish10_,F Str Dish10 ,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12446,F_Agi_Dish10_,F Agi Dish10 ,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12447,F_Int_Dish10_,F Int Dish10 ,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12448,F_Dex_Dish10_,F Dex Dish10 ,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12449,F_Luk_Dish10_,F Luk Dish10 ,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12450,F_Vit_Dish10_,F Vit Dish10 ,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12445,F_Str_Dish10_,F Str Dish10,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12446,F_Agi_Dish10_,F Agi Dish10,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12447,F_Int_Dish10_,F Int Dish10,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12448,F_Dex_Dish10_,F Dex Dish10,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12449,F_Luk_Dish10_,F Luk Dish10,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12450,F_Vit_Dish10_,F Vit Dish10,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12451,F_WOB_Rune,F WOB Rune,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12452,F_WOB_Schwaltz,F WOB Schwaltz,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12453,F_WOB_Rachel,F WOB Rachel,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
@@ -5601,12 +5601,12 @@
12498,E_Kafra_Card,E Kafra Card,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12499,E_Neuralizer,E Neuralizer,2,2,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12500,E_Dun_Tele_Scroll1,E Dun Tele Scroll1,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12501,E_Str_Dish10_,E Str Dish10 ,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12502,E_Agi_Dish10_,E Agi Dish10 ,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12503,E_Int_Dish10_,E Int Dish10 ,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12504,E_Dex_Dish10_,E Dex Dish10 ,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12505,E_Luk_Dish10_,E Luk Dish10 ,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12506,E_Vit_Dish10_,E Vit Dish10 ,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12501,E_Str_Dish10_,E Str Dish10,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12502,E_Agi_Dish10_,E Agi Dish10,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12503,E_Int_Dish10_,E Int Dish10,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12504,E_Dex_Dish10_,E Dex Dish10,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12505,E_Luk_Dish10_,E Luk Dish10,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12506,E_Vit_Dish10_,E Vit Dish10,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12507,E_WOB_Rune,E WOB Rune,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12508,E_WOB_Schwaltz,E WOB Schwaltz,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12509,E_WOB_Rachel,E WOB Rachel,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
@@ -5791,6 +5791,8 @@
//
12775,Ancient_Spirit_Amulet,Ancient Spirit Amulet,2,20,,600,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
//
+12786,Change_Slot_Card,Character Position Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set CharMoves, CharMoves + 1; },{},{}
+//
12848,Falcon_Flute,Falcon Flute,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(getskilllv("HT_FALCON")) { if(checkoption(Option_Wug)||checkoption(Option_Wugrider)) end; if(checkfalcon()==1) { setfalcon 0; } else { setfalcon 1; } } },{},{}
12900,Battle_Manual_Box,Battle Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; },{},{}
12901,Insurance_Package,Insurance Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,10; },{},{}
@@ -6556,13 +6558,13 @@
13915,Love_Angel_Box,Love Angel Magic Powder Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12287,604800; },{},{}
13916,Squirrel_Box,Squirrel Magic Powder Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12288,604800; },{},{}
13917,Gogo_Box,Gogo Magic Powder Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12289,604800; },{},{}
-//13918,?Drooping_W_Kitty_Box?,Koneko Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5372,1; },{},{}
-13919,?L_Magestic_Goat_Box?,Baphomet Horns Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5374,1; },{},{}
-13920,?Satanic_Chain_P_Box?,Flying Evil Wing Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5376,1; },{},{}
-13921,?Antique_Pipe_Box?,Gentleman's Pipe Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5377,1; },{},{}
-13922,?Rabbit_Ear_Hat_Box?,Bunny Top Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5378,1; },{},{}
-13923,?Darkness_Helm_Box?,Dark Randgris Helm Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5373,1; },{},{}
-13924,?L_Orc_Hero_Helm_Box?,Orc Hero Headdress Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5375,1; },{},{}
+//13918,Drooping_W_Kitty_Box,Koneko Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5372,1; },{},{}
+13919,L_Magestic_Goat_Box,Baphomet Horns Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5374,1; },{},{}
+13920,Satanic_Chain_P_Box,Flying Evil Wing Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5376,1; },{},{}
+13921,Antique_Pipe_Box,Gentleman's Pipe Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5377,1; },{},{}
+13922,Rabbit_Ear_Hat_Box,Bunny Top Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5378,1; },{},{}
+13923,Darkness_Helm_Box,Dark Randgris Helm Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5373,1; },{},{}
+13924,L_Orc_Hero_Helm_Box,Orc Hero Headdress Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5375,1; },{},{}
13925,Year_Of_Mouse_Scroll,... GoodLuck Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
13926,Crusader_Card_Box,Crusader Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4371,1; getitem 4311,1; getitem 4319,1; getitem 4331,1; },{},{}
13927,Alchemist_Card_Box,Alchemist Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4281,1; getitem 4233,1; getitem 4343,1; getitem 4186,1; getitem 4036,1; },{},{}
@@ -7233,32 +7235,50 @@
16679,Universal_Catalog_Gold_Box10,Universal Catalog Gold 10 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,10; },{},{}
16680,Universal_Catalog_Gold_Box50,Universal Catalog Gold 50 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,50; },{},{}
//
-16740,The_Sea_God's_Call_23_Hour_Box,The Sea God's Call 23 Hour Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 6436,86400; },{},{}
-16741,Cutlass_1_Day_Box,Cutlass 1 Day Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1198,86400; },{},{}
-16742,Cutlass_7_Day_Box,Cutlass 7 Day Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1198,604800; },{},{}
-16743,Marlin_1_Day_Box,Marlin 1 Day Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1489,86400; },{},{}
-16744,Marlin_7_Day_Box,Marlin 7 Day Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1489,604800; },{},{}
-16745,Pompano_1_Day_Box,Pompano 1 Day Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13068,86400; },{},{}
-16746,Pompano_7_Day_Box,Pompano 7 Day Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13068,604800; },{},{}
-16747,Tuna_1_Day_Box,Tuna 1 Day Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 16016,86400; },{},{}
-16748,Tuna_7_Day_Box,Tuna 7 Day Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 16016,604800; },{},{}
-16749,Malangdo_Crab_1_Day_Box,Malangdo Crab 1 Day Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 18107,86400; },{},{}
-16750,Malangdo_Crab_7_Day_Box,Malangdo Crab 7 Day Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 18107,604800; },{},{}
-16751,Zebra_Eel_1_Day_Box,Zebra Eel 1 Day Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 18108,86400; },{},{}
-16752,Zebra_Eel_7_Day_Box,Zebra Eel 7 Day Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 18108,604800; },{},{}
+16740,The_Sea_God's_Call_23_Hour_Box,The Sea God's Call 23 Hour Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 6436,86400; },{},{}
+16741,Cutlass_1_Day_Box,Cutlass 1 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1198,86400; },{},{}
+16742,Cutlass_7_Day_Box,Cutlass 7 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1198,604800; },{},{}
+16743,Marlin_1_Day_Box,Marlin 1 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1489,86400; },{},{}
+16744,Marlin_7_Day_Box,Marlin 7 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1489,604800; },{},{}
+16745,Pompano_1_Day_Box,Pompano 1 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13068,86400; },{},{}
+16746,Pompano_7_Day_Box,Pompano 7 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13068,604800; },{},{}
+16747,Tuna_1_Day_Box,Tuna 1 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 16016,86400; },{},{}
+16748,Tuna_7_Day_Box,Tuna 7 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 16016,604800; },{},{}
+16749,Malangdo_Crab_1_Day_Box,Malangdo Crab 1 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 18107,86400; },{},{}
+16750,Malangdo_Crab_7_Day_Box,Malangdo Crab 7 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 18107,604800; },{},{}
+16751,Zebra_Eel_1_Day_Box,Zebra Eel 1 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 18108,86400; },{},{}
+16752,Zebra_Eel_7_Day_Box,Zebra Eel 7 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 18108,604800; },{},{}
+//
+16763,The_Sea_God's_Call_7_Day_Box,The Sea God's Call 7 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 6436,604800; },{},{}
+16764,The_Sea_God's_Call_15_Day_Box,The Sea God's Call 15 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 6436,1209600; },{},{}
+16765,Octopus_Hunting_Skewer_23_Hour_Box,Octopus Hunting Skewer 23 Hour Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 6442,86400; },{},{}
+16766,Octopus_Hunting_Skewer_3_Day_Box,Octopus Hunting Skewer 3 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 6442,259200; },{},{}
+16767,Octopus_Hunting_Skewer_7_Day_Box,Octopus Hunting Skewer 7 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 6442,604800; },{},{}
//
-16763,The_Sea_God's_Call_7_Day_Box,The Sea God's Call 7 Day Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 6436,604800; },{},{}
-16764,The_Sea_God's_Call_15_Day_Box,The Sea God's Call 15 Day Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 6436,1209600; },{},{}
-16765,Octopus_Hunting_Skewer_23_Hour_Box,Octopus Hunting Skewer 23 Hour Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 6442,86400; },{},{}
-16766,Octopus_Hunting_Skewer_3_Day_Box,Octopus Hunting Skewer 3 Day Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 6442,259200; },{},{}
-16767,Octopus_Hunting_Skewer_7_Day_Box,Octopus Hunting Skewer 7 Day Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 6442,604800; },{},{}
+16770,Silvervine_Fruit_Box10,Silvervine 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6417,10; getitem 12636,30; },{},{}
+16771,Silvervine_Fruit_Box40,Silvervine 40 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6417,40; getitem 12636,120; },{},{}
//
16776,Universal_Catalog_Gold_Box10,Universal Catalog Gold 10 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,10; },{},{}
16777,Universal_Catalog_Gold_Box50,Universal Catalog Gold 50 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,50; },{},{}
//
+16979,Silvervine_Fruit_Box4,Silvervine 4 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6417,4; getitem 12636,12; },{},{}
+//
16998,Archangel_Wings_Box,Archangel Wings Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2573,1; },{},{}
//
-17155,Enhance_Huuma_Shuriken_Box,Enhance Huuma Shuriken Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13316,86400; },{},{}
+17013,Malang_Woe_Encard_Box,Malang Woe Encard Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 16740,1; getitem 16765,1; },{},{}
+//
+17084,Upg_Katar_Box,Upg Katar Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1292,1; },{},{}
+17085,Upg_Two_Handed_Axe_Box,Upg Two Handed Axe Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1394,1; },{},{}
+17086,Upg_Lance_Box,Upg Lance Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1491,1; },{},{}
+17087,Upg_Book_Box,Upg Book Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1585,1; },{},{}
+17088,Upg_Staff_Box,Upg Staff Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2015,1; },{},{}
+17089,Upg_Dagger_Box,Upg Dagger Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13071,1; },{},{}
+17090,Upg_Revolver_Box,Upg Revolver,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13115,1; },{},{}
+17091,Upg_Mace_Box,Upg Mace Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 16019,1; },{},{}
+17092,Upg_Bow_Box,Upg Bow Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 18112,1; },{},{}
+17093,Upg_Twohand_Sword_Box,Upg Two-Handed Sword Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 21000,1; },{},{}
+//
+17155,Upg_Huuma_Shuriken_Box,Upg Huuma Shuriken Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13316,86400; },{},{}
// Mechanic/Genetic Cannonballs
18000,Cannon_Ball,Cannon Ball,10,100,,10,100,,,,0x00040400,8,2,32768,,99,,8,{},{},{}
18001,Holy_Cannon_Ball,Holy Cannon Ball,10,200,,10,120,,,,0x00040400,8,2,32768,,99,,8,{ bonus bAtkEle,Ele_Holy; },{},{}
diff --git a/db/re/item_trade.txt b/db/re/item_trade.txt
index abc6909c2..9ad2a8c65 100644
--- a/db/re/item_trade.txt
+++ b/db/re/item_trade.txt
@@ -1822,33 +1822,91 @@
6392,475,100 // Bradium_Box
// Dewata
-6404,507,100 // Kris_Hilt
-6406,475,100 // Shining_Cendrawasih_Feather
+6401,507,100 // Palm Oil
+6402,499,100 // Palm Oil Fruit
+6404,507,100 // Kris Hilt
+6406,499,100 // Shining Cendrawasih Feather
+18520,475,100 // Jaty Crown
// Malangdo Island
-6417,475,100 // Garderie_Fruit
-6418,475,100 // A_Grade_Coin
-6419,475,100 // B_Grade_Coin
-6420,475,100 // C_Grade_Coin
-6421,475,100 // D_Grade_Coin
-6422,475,100 // E_Grade_Coin
-6423,475,100 // Sea_God's_Wrath
-6428,507,100 // Adventure_Card_A
-6429,507,100 // Adventure_Card_B
-6430,507,100 // Figure_Sculpture
-6431,507,100 // Pail
-6433,507,100 // Cleaning_Brush
-6436,507,100 // Sea_God's_Call
-6437,475,100 // Lava_Sky_Perfume
-6440,475,100 // General_Lubrication
-6441,475,100 // Advanced_Lubrication
-6442,507,100 // Octopus_Hunting_Skewer
+1198,507,100 // Cutlass
+1489,507,100 // Marlin
+2872,475,100 // G Honor Certificate
+6417,499,100 // Silvervine Fruit
+6418,499,100 // A Grade Coin
+6419,499,100 // B Grade Coin
+6420,499,100 // C Grade Coin
+6421,499,100 // D Grade Coin
+6422,499,100 // E Grade Coin
+6426,499,100 // Bad Canned Food
+6427,507,100 // Bad Canned Food Sack
+6428,507,100 // Adventure Card A
+6429,507,100 // Adventure Card B
+6430,499,100 // Figure Sculpture
+6431,499,100 // Pail
+6432,499,100 // Full Pail
+6433,499,100 // Cleaning Brush
+6434,499,100 // Fix Kit
+6435,499,100 // Fresh Fruit
+6436,507,100 // Sea God's Call
+6440,475,100 // General Lubrication
+6441,475,100 // Advanced Lubrication
+6442,507,100 // Octopus Hunting Skewer
+6443,475,100 // Sillit Pong Bottle
+12624,16,100 // Delicious Jelly
+12633,475,100 // Malangdo Cat Can
+12636,467,100 // Malangdo Canned Specialties
+12637,475,100 // Gong Bug Pocket
+12638,475,100 // Dried Squid Box
+12639,475,100 // Flying Fish Box
+12640,475,100 // Starfish Box
+13068,507,100 // Pompano
+13208,475,100 // Gong Bug
+13291,475,100 // Starfish
+13292,475,100 // Dried Squid
+13293,475,100 // Flying Fish
+16016,507,100 // Tuna
+16740,475,100 // The Sea God's Call 23 Hour Box
+16741,475,100 // Cutlass 1 Day Box
+16742,475,100 // Cutlass 7 Day Box
+16743,475,100 // Marlin 1 Day Box
+16744,475,100 // Marlin 7 Day Box
+16745,475,100 // Pompano 1 Day Box
+16746,475,100 // Pompano 7 Day Box
+16747,475,100 // Tuna 1 Day Box
+16748,475,100 // Tuna 7 Day Box
+16749,475,100 // Malangdo Crab 1 Day Box
+16750,475,100 // Malangdo Crab 7 Day Box
+16751,475,100 // Zebra Eel 1 Day Box
+16752,475,100 // Zebra Eel 7 Day Box
+16763,475,100 // The Sea God's Call 7 Day Box
+16764,475,100 // The Sea God's Call 15 Day Box
+16765,475,100 // Octopus Hunting Skewer 23 Hour Box
+16766,475,100 // Octopus Hunting Skewer 3 Day Box
+16767,475,100 // Octopus Hunting Skewer 7 Day Box
+16770,457,100 // Silvervine 10 Box
+16771,457,100 // Silvervine 40 Box
+16979,457,100 // Silvervine 4 Box
+17013,475,100 // Malang Woe Encard Box
+18107,507,100 // Malangdo Crab
+18108,507,100 // Zebra Eel
// Malaya Port
6519,507,100 // Collected_Samples
// Cash Shop Related Items
2841,507,100 // Caracas Ring
+17084,473,100 // Upg Katar Box
+17085,473,100 // Upg Two Handed Axe Box
+17086,473,100 // Upg Lance Box
+17087,473,100 // Upg Book Box
+17088,473,100 // Upg Staff Box
+17089,473,100 // Upg Dagger Box
+17090,473,100 // Upg Revolver
+17091,473,100 // Upg Mace Box
+17092,473,100 // Upg Bow Box
+17093,473,100 // Upg Two-Handed Sword Box
+
// Misc. Items
1652,499,100 // Tourist Staff
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index 1361f13cf..0bb63d7e9 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -654,6 +654,18 @@
//706,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_VENOMFOG,Venom Fog
//707,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_MILLENNIUMSHIELD,Millenium Shield 2
//708,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_COMET,Comet 2
+//709,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_ICEMINE,Ice Mine
+//710,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_ICEEXPLO,Ice Explosion
+//711,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_FLAMECROSS,Flame Cross
+//712,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_PULSESTRIKE2,Pulse Strike 2
+//713,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_DANCINGBLADE,Dancing Blade
+//714,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_DANCINGBLADE_ATK,Dancing Blade Attack
+//715,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_DARKPIERCING,Dark Piercing
+//716,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_MAXPAIN,Max Pain
+//717,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_MAXPAIN_ATK,Max Pain Attack
+//718,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_DEATHSUMMON,Death Summon
+//719,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_HELLBURNING,Hell Burning
+//720,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_JACKFROST,Jack Frost 2
1001,9,6,1,-1,0,0,1,1,no,0,0x1,0,weapon,0, KN_CHARGEATK,Charge Attack
1002,0,6,4,0,0x1,0,1,0,no,0,0x1,0,weapon,2, CR_SHRINK,Shrink
@@ -1014,9 +1026,9 @@
// Episode 13.3
//2533,0,0,4,0,0x1,0,1,0,no,0,0,0,none,0, ALL_ODINS_RECALL,Odin's Recall
-2534,0,0,4,0,0x1,0,1,0,no,0,0,0,none,0, RETURN_TO_ELDICASTES,Return To Eldicastes
+2534,0,0,4,0,0x1,0,1,0,no,0,0,0,none,0, RETURN_TO_ELDICASTES,Return To Eldicastes
2535,0,0,4,0,0x1,0,1,0,no,0,0x1,0,none,0, ALL_BUYING_STORE,Open Buying Store
-2536,0,0,4,0,0x1,0,1,0,no,0,0,0,none,0, ALL_GUARDIAN_RECALL,Guardian's Recall
+2536,0,0,4,0,0x1,0,1,0,no,0,0,0,none,0, ALL_GUARDIAN_RECALL,Guardian's Recall
2537,9,6,16,0,0x1,0,2,1,yes,0,0,0,magic,0, ALL_ODINS_POWER,Odin's Power
//2538,0,0,0,0,0,0,??,0,no,0,0,0,none,0, BEER_BOTTLE_CAP,Beer Bottle Cap
//2539,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_ASSASSINCROSS,Assassin Cross of Sunset 2
@@ -1025,8 +1037,11 @@
//2542,0,0,0,0,0,0,??,0,no,0,0,0,none,0, ALL_TETANY,Tetany
//2543,0,0,0,0,0,0,??,0,no,0,0,0,none,0, ALL_RAY_OF_PROTECTION,Ray of Protection
//2544,0,0,0,0,0,0,??,0,no,0,0,0,none,0, MC_CARTDECORATE,Decorate Cart
+//2545,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GM_ITEM_ATKMAX#Maximum Attack#
+//2546,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GM_ITEM_ATKMIN#Minimal Attack#
+//2547,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GM_ITEM_MATKMAX#Maximum Magic Attack#
+//2548,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GM_ITEM_MATKMIN#Minimal Magic Attack#
-//****
// Kagerou & Oboro
3001,0,6,4,0,0,0,1,1,no,0,0,0,none,0, KO_YAMIKUMO,Yamikumo
3002,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0, KO_RIGHT,Right Hand Mastery
@@ -1055,9 +1070,57 @@
3025,7,6,16,0,0x1,0,5,1,no,0,0,0,none,0, KG_KAGEMUSYA,Kagemusha
3026,7,6,16,0,0x1,0,5,1,no,0,0,0,none,0, OB_ZANGETSU,Zangetsu
3027,7,6,16,0,0x1,0,5,1,no,0,0,0,none,0, OB_OBOROGENSOU,Oboro Gensou
-3028,1,6,4,0,0x2,3,1,1,no,0,0,0,weapon,0, OB_OBOROGENSOU_TRANSITION_ATK,
+3028,1,6,4,0,0x2,3,1,1,no,0,0,0,weapon,0, OB_OBOROGENSOU_TRANSITION_ATK,Hazy Moonlight Illusion Transition Attack
3029,7,6,1,0,0x1,0,5,0,no,0,0,0,none,0, OB_AKAITSUKI,Akaitsuki
+// Eclage Skills
+3031,7,6,16,0,0x1,0,1,1,no,0,0,0,none,0, ECL_SNOWFLIP,Snow Flip
+3032,7,6,16,0,0x1,0,1,1,no,0,0,0,none,0, ECL_PEONYMAMY,Peony Mamy
+3033,7,6,16,0,0x1,0,1,1,no,0,0,0,none,0, ECL_SADAGUI,Sadagui
+3034,7,6,16,0,0x1,0,1,1,no,0,0,0,none,0, ECL_SEQUOIADUST,Sequoia Dust
+3035,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0, ECLAGE_RECALL,Return To Eclage
+
+// EP 14.3 Part 2 3rd Job Skills
+//5001,0,0,22:34:46:58:70,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_DARKCROW#Dark Claw#
+//5002,0,0,100:120:140:160:180,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RA_UNLIMIT#Unlimited#
+//5003,0,0,60:70:80:90:100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GN_ILLUSIONDOPING#Illusion Doping#
+//5004,0,0,30:35:40:45:50:55:60:65:70:75,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RK_DRAGONBREATH_WATER#Dragon Breath - Water#
+//5005,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RK_LUXANIMA#Lux Anima#
+//5006,0,0,60:70:80:90:100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
+//5007,0,0,200:230:260:290:320,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#Frigg's Song#
+//5008,0,0,120:120:120:120:120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_ELEMENTAL_SHIELD#Elemental Shield#
+//5009,0,0,75:65:55:45:35,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FLASHCOMBO#Flash Combo#
+//5010,0,0,30:26:22:18:14,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SC_ESCAPE#Emergency Escape#
+//5011,0,0,30:60:90:120:150,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_OFFERTORIUM#Offertorium#
+//5012,0,0,100:150:200:250:300,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WL_TELEKINESIS_INTENSE#Intense Telekinesis#
+//5013,0,0,200:180:160:140:120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_KINGS_GRACE#King's Grace#
+//5014,0,0,1:1:1:1:1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+//5015,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FLASHCOMBO_ATK_STEP1#Flash Combo Attack Step 1#//All 4 steps are using temp req SP values for now.
+//5016,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FLASHCOMBO_ATK_STEP2#Flash Combo Attack Step 2#
+//5017,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FLASHCOMBO_ATK_STEP3#Flash Combo Attack Step 3#
+//5018,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FLASHCOMBO_ATK_STEP4#Flash Combo Attack Step 4#
+
+
+// EP 14.3 Part 2 3rd Job Skills
+//5001,1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, GC_DARKCROW,Dark Claw
+//5002,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, RA_UNLIMIT,Unlimited
+//5003,7,6,1,-1,0x2,4:5:6:7:8,5,1,no,0,0,0,weapon,0,GN_ILLUSIONDOPING,Illusion Doping
+//5004,9,6,2,1,0x2,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0,0,weapon,0, RK_DRAGONBREATH_WATER,Dragon Breath - Water
+//5005,0,6,4,0,0x3,3,1,1,no,0,0,0,none,0, RK_LUXANIMA,Lux Anima
+//5006,1,6,2,3,0,0,5,1,no,0,0,3,misc,0, NC_MAGMA_ERUPTION,Magma Eruption
+//5007,0,6,4,0,0x3,5:6:7:8:9,5,1,no,0,0,0,none,0, WM_FRIGG_SONG,Frigg's Song
+//5008,0,6,4,0,0x3,15,5,1,no,0,0,0,none,0, SO_ELEMENTAL_SHIELD,Elemental Shield
+//5009,1,6,1,0,0x1,0,5,1,no,0,0,0,none,0, SR_FLASHCOMBO,Flash Combo//I can mark this as a no damage skill right?
+//5010,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, SC_ESCAPE,Emergency Escape//Said places a ankle snare trap. Must confirm before I remove the no damage thing.
+//5011,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, AB_OFFERTORIUM,Offertorium
+//5012,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, WL_TELEKINESIS_INTENSE,Intense Telekinesis
+//5013,0,6,4,0,0x3,5,5,1,no,0,0,0,none,0, LG_KINGS_GRACE,King's Grace//Need to know the splash AoE
+//5014,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, ALL_FULL_THROTTLE,Full Throttle
+//5015,-2,8,4,-1,0,0,10,-2,no,0,0x200,0,weapon,0, SR_FLASHCOMBO_ATK_STEP1,Flash Combo Attack Step 1//Dragon Combo
+//5016,-2,8,4,-1,0,0,5,-2,no,0,0x200,0,weapon,0, SR_FLASHCOMBO_ATK_STEP2,Flash Combo Attack Step 2//Fallen Empire
+//5017,-2,6,4,-1,0x42,1:1:1:1:1:2:2:2:2:2,10,1,no,0,0x200,0,weapon,0, SR_FLASHCOMBO_ATK_STEP3,Flash Combo Attack Step 3//Tiger Cannon
+//5018,0,8,4,-1,0x2,2,5,-3,no,0,0,0,weapon,0, SR_FLASHCOMBO_ATK_STEP4,Flash Combo Attack Step 4//Skynet Blow
+
8001,9,6,4,0,0x1,0,5,1,no,0,0,0,magic,0, HLIF_HEAL,Healing Touch
8002,0,6,4,0,0x3,-1,5,1,no,0,0,0,none,0, HLIF_AVOID,Avoid
8003,0,0,0,0,0,1,5,0,no,0,0,0,none,0, HLIF_BRAIN,Brain Surgery
@@ -1143,6 +1206,7 @@
8238,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0, MER_KYRIE,Kyrie Eleison
8239,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0, MER_BLESSING,Blessing
8240,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0, MER_INCAGI,Increase Agility
+//8241,2,6,2,0,0,0,1,1,no,0,0,0,none,0, MER_INVINCIBLEOFF2,Mind Blaster
// Elemental Spirits Skills
8401,0,6,4,3,0,0,1,1,no,0,0,0,weapon,2, EL_CIRCLE_OF_FIRE,Circle of Fire
diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt
index 438444a14..d89ad3281 100644
--- a/npc/custom/quests/hunting_missions.txt
+++ b/npc/custom/quests/hunting_missions.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Euphy
//===== Current Version: =====================================
-//= 1.2b
+//= 1.3
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -50,7 +50,7 @@ function Chk; function Cm;
close;
}
mes "You must hunt:";
- query_sql("SELECT ID FROM mob_db WHERE left(Sprite, 4) != 'meta' AND left(Sprite, 2) != 'E_' AND ~Mode & 32 AND EXP > 0 AND MVP1id = 0 AND DropCardid > 4000 AND DropCardid < 5000 AND ID < 2000 ORDER BY rand() LIMIT "+.Quests, .@mob);
+ query_sql("SELECT ID FROM `mob_db` WHERE left(Sprite, 4) != 'meta' AND left(Sprite, 2) != 'E_' AND ~Mode & 32 AND EXP > 0 AND MVP1id = 0 AND DropCardid > 4000 AND DropCardid < 5000 AND ID < 2000 AND instr('"+.Blacklist$+"',ID) = 0 ORDER BY rand() LIMIT "+.Quests, .@mob);
for (set .@i,0; .@i<.Quests; set .@i,.@i+1) {
setd "Mission"+.@i, .@mob[.@i];
setd "Mission"+.@i +"_",0;
@@ -268,6 +268,12 @@ OnInit:
getbattleflag("base_exp_rate")/100,getbattleflag("job_exp_rate")/100,60;
setarray .Shop[0], // Reward items: <ID>,<point cost> (about 10~20 points per hunt).
512,1,513,1,514,1,538,5,539,5,558,10,561,10;
+ set .Blacklist$, // Blacklisted mob IDs.
+ "1062,1088,1183,1186,1200,1212,1220,1221,1234,1235,"+
+ "1244,1245,1250,1268,1290,1293,1294,1296,1298,1299,"+
+ "1300,1301,1303,1304,1305,1306,1308,1309,1311,1313,"+
+ "1515,1588,1618,1676,1677,1678,1679,1796,1797,1974,"+
+ "1975,1976,1977,1978,1979";
npcshopdelitem "mission_shop",512;
for(set .@i,0; .@i<getarraysize(.Shop); set .@i,.@i+2)
diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt
new file mode 100644
index 000000000..04fa93ce8
--- /dev/null
+++ b/npc/re/merchants/coin_exchange.txt
@@ -0,0 +1,827 @@
+//===== Hercules Script =======================================
+//= Coin Merchants
+//===== By: ==================================================
+//= rAthena Dev Team
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Hercules
+//===== Description: =========================================
+//= [Official Conversion]
+//= Renewal coin redemption NPCs.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy/Lemongrass]
+//= 1.1 Added remaining Malangdo traders. [Euphy/Lemongrass]
+//============================================================
+
+// Malangdo
+//============================================================
+malangdo,220,167,5 script Coin Exchanger CX-1 564,{
+ if (checkweight(1201,1) == 0) {
+ mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";
+ close;
+ }
+ if (MaxWeight - Weight < 10000) {
+ mes "Can't continue because you have too many heavy objects. Let's try to continue after reducing the weight.";
+ close;
+ }
+ mes "[Coin Exchanger CX-1]";
+ mes "Welcome to CX-1. If you have coins, you can exchange them to high or low grade coins.";
+ next;
+ setarray .@coins[1],
+ 6417, //Silvervine
+ 6418, //Agrade_Coin
+ 6419, //Bgrade_Coin
+ 6420, //Cgrade_Coin
+ 6421, //Dgrade_Coin
+ 6422; //Egrade_Coin
+ set .@menu$,"Stop:";
+ for(set .@i,1; .@i<=6; set .@i,.@i+1) {
+ if (countitem(.@coins[.@i]))
+ set .@menu$, .@menu$+getitemname(.@coins[.@i])+":";
+ else
+ set .@menu$, .@menu$+"^aaaaaa"+getitemname(.@coins[.@i])+" (None)^000000:";
+ }
+ set .@i, select(.@menu$);
+ switch(.@i) {
+ case 1:
+ mes "[Coin Exchanger CX-1]";
+ mes "Thank you for coming.";
+ close;
+ default:
+ set .@coin, .@coins[.@i-1];
+ set .@coin_select, .@i-1;
+ break;
+ }
+ if (countitem(.@coin) == 0) {
+ mes "[Coin Exchanger CX-1]";
+ mes "You chose a coin that you don't have.";
+ mes "Thank you for coming.";
+ close;
+ }
+ mes "[Coin Exchanger CX-1]";
+ mes "----Rate of exchange----";
+ mes "Higher exchange - 30 to 10";
+ mes "Lower exchange - 10 to 30";
+ mes "------------------------";
+ mes "^ff3333When you exchange, we charge a fee according to the current market price.^000000";
+ next;
+ setarray .@exchange_name$[0],"higher","lower";
+ setarray .@exchange_rate[0],30,10;
+ setarray .@exchange_loss[0],rand(1,4),rand(1,2); // Amount deducted per exchange.
+ setarray .@exchange_id[0],.@coins[.@coin_select-1],.@coins[.@coin_select+1];
+ if (.@exchange_id[0] == .@coins[1]) set .@exchange_id[0],0; // Cannot exchange for Silvervine.
+ set .@menu$,"Stop:";
+ for(set .@i,0; .@i<2; set .@i,.@i+1) {
+ if (.@exchange_id[.@i] == 0)
+ set .@menu$, .@menu$+"^ff3333Unavailable exchange to "+.@exchange_name$[.@i]+" coin^000000:";
+ else if (countitem(.@coin) < .@exchange_rate[.@i])
+ set .@menu$, .@menu$+"^aaaaaaExchange to "+.@exchange_name$[.@i]+" coin (null)^000000:";
+ else
+ set .@menu$, .@menu$+"Exchange to "+.@exchange_name$[.@i]+" coin - "+getitemname(.@coin)+" ("+.@exchange_rate[.@i]+" needed):";
+ }
+ set .@i, select(.@menu$)-2;
+ if (.@i == -1) {
+ mes "[Coin Exchanger CX-1]";
+ mes "Thank you for coming.";
+ close;
+ }
+ if (.@exchange_id[.@i] == 0) {
+ mes "[Coin Exchanger CX-1]";
+ mes "This coin is not available to exchange to "+.@exchange_name$[.@i]+" coin.";
+ mes "Thank you for coming.";
+ close;
+ }
+ if (countitem(.@coin) < .@exchange_rate[.@i]) {
+ mes "[Coin Exchanger CX-1]";
+ mes "You don't have enough coins to exchange to "+.@exchange_name$[.@i]+" coin.";
+ mes "Thank you for coming.";
+ close;
+ }
+ set .@exchange_total, .@exchange_rate[(!.@i)] - .@exchange_loss[(!.@i)];
+ delitem .@coin, .@exchange_rate[.@i];
+ getitem .@exchange_id[.@i], .@exchange_total;
+ mes "[Coin Exchanger CX-1]";
+ mes "^003399"+.@exchange_rate[.@i]+"^000000 unit(s) of ^003399 "+getitemname(.@coin)+"^000000 taken.";
+ mes "I exchanged them for ^003399"+.@exchange_name$[.@i]+" coins^000000, after deducting ^003399"+.@exchange_loss[(!.@i)]+"^000000 unit(s), ^003399"+.@exchange_total+"^000000 unit(s) remaining.";
+ close;
+}
+
+malangdo,218,165,5 script Special Vending Machine 562,{
+ if (checkweight(1201,1) == 0) {
+ mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";
+ close;
+ }
+ if (MaxWeight - Weight < 10000) {
+ mes "Can't continue because you have too many heavy objects. Let's try to continue after reducing the weight.";
+ close;
+ }
+ mes "[Special Vending Machine]";
+ mes "Welcome to CX-82. You have a Silvervine Fruit, so you can purchase the Malangdo Specialty that has special ability.";
+ next;
+ callsub L_AddItem, //DisplayName,ItemID,Cost
+ "Seagod's Protection [23 hours]",16740,4,
+ "Seagod's Protection [7 days]",16763,12,
+ "Seagod's Protection [15 days]",16764,24,
+ "Octopus Hunting Stick [23 hours]",16765,2,
+ "Octopus Hunting Stick [3 days]",16766,5,
+ "Octopus Hunting Stick [7 days]",16767,10,
+ "Premium Lubricant",6441,56,
+ "Ordinary Lubricant",6440,36,
+ "Sillit Pong",6443,192;
+L_AddItem:
+ set .@menu$,"Explanation:";
+ for(set .@i,0; .@i<getargcount(); set .@i,.@i+3)
+ set .@menu$, .@menu$+getarg(.@i)+":";
+ set .@i, select(.@menu$)-2;
+ if (.@i == -1) {
+ mes "[Special Vending Machine]";
+ mes "Seagod's Protection is an item used for entering the Culvert memorial dungeon during a certain period.";
+ next;
+ mes "[Special Vending Machine]";
+ mes "Octopus Hunting Stick is an item used for entering the Culvert memorial dungeon during a certain period.";
+ next;
+ mes "[Special Vending Machine]";
+ mes "Premium and Ordinary Lubricant are items used for separation of equipment and cards. If you visit the specialist Jeremy with either item, he will explain more details of the effects.";
+ next;
+ mes "[Special Vending Machine]";
+ mes "Sillit Pong is special item that separates sockets with MVP cards. Unable to separate MVP card by Premium and Ordinary Lubricant.";
+ close;
+ }
+ set .@cost, getarg(.@i*3+2);
+ mes "[Special Vending Machine]";
+ mes "You choose ^005500"+getarg(.@i*3)+"^000000. For purchasing, you need ^005500"+.@cost+"^000000 unit(s) of Silvervine Fruit.";
+ next;
+ if (countitem(6417) < .@cost)
+ set .@ven_menu$, "^999999Silvervine Fruit (missing "+(.@cost - countitem(6417))+")^000000";
+ else
+ set .@ven_menu$, "Purchase - Silvervine Fruit (have "+countitem(6417)+")";
+ switch(select("Stop:"+.@ven_menu$)) {
+ case 1:
+ mes "[Special Vending Machine]";
+ mes "Thank you for coming.";
+ close;
+ case 2:
+ if (countitem(6417) < .@cost) {
+ mes "[Special Vending Machine]";
+ mes "Not enough Silvervine Fruit.";
+ mes "Closing the transaction.";
+ mes "Thank you for coming.";
+ close;
+ }
+ mes "[Special Vending Machine]";
+ mes "The transaction is completed. Thank you for coming.";
+ delitem 6417,.@cost; //Silvervine
+ getitem getarg(.@i*3+1),1;
+ close;
+ }
+}
+
+malangdo,236,179,5 script Dark Merchant K 554,{
+ if (checkweight(1201,1) == 0) {
+ mes "It seems you have too much in your inventory. Let's try again after getting rid of some of your belongings.";
+ close;
+ }
+ if (MaxWeight - Weight < 1000) {
+ mes "Your inventory is too heavy now. Please come back after getting rid of some of your belongings.";
+ close;
+ }
+ mes "[Merchant K]";
+ mes "Thank you for the trade.";
+ mes "We exchange ^ff000010 C Grade Coin^000000 to ^3333ff1 Mora Coin^000000. Shall we begin then?";
+ next;
+ setarray .@coin_amount[0],10,100,500,1000;
+ while(1) {
+ set .@menu$,"";
+ for(set .@i,0; .@i<getarraysize(.@coin_amount); set .@i,.@i+1) {
+ if (countitem(6420) >= .@coin_amount[.@i])
+ set .@menu$, .@menu$+"Exchange "+(.@coin_amount[.@i]/10)+" Mora Coin:";
+ else
+ set .@menu$, .@menu$+"^aaaaaaExchange "+(.@coin_amount[.@i]/10)+" Mora Coin (Not Enough)^000000:";
+ }
+ set .@i, select(.@menu$+"Quit")-1;
+ if (.@i == getarraysize(.@coin_amount)) {
+ mes "[Merchant K]";
+ mes "Let's exchange some other time.";
+ close;
+ }
+ if (countitem(6420) < .@coin_amount[.@i]) {
+ mes "[Merchant K]";
+ mes "You need ^ff0000"+.@coin_amount[.@i]+"^000000 C Grade Coin to perform the exchange. But you don't seem to have enough now.";
+ close;
+ }
+ delitem 6420,.@coin_amount[.@i]; //Cgrade_Coin
+ getitem 6380,.@coin_amount[.@i]/10; //Mora_Coin
+ mes "[Merchant K]";
+ mes "C Grade Coin ^003399"+.@coin_amount[.@i]+"^000000 well received."; //FIXME: Dialogue.
+ mes "Exchanged to ^003399"+(.@coin_amount[.@i]/10)+"^000000 Mora Coin.";
+ next;
+ mes "[Merchant K]";
+ mes "Would you like to continue?";
+ next;
+ }
+}
+
+malangdo,233,180,3 script Dark MachineTX100 564,{
+ if (checkweight(1201,1) == 0) {
+ mes "It seems you have too much in your inventory. Let's try again after getting rid of some of your belongings.";
+ close;
+ }
+ if (MaxWeight - Weight < 1000) {
+ mes "Your inventory is too heavy now. Please come back after getting rid of some of your belongings.";
+ close;
+ }
+ mes "[Dark Machine TX100]";
+ mes "Thank you for visiting TX100. You can exchange coins into higher or lower level coins.";
+ next;
+ mes "[Dark Machine TX100]";
+ mes "For a lower level coin exchange you can do 500 as a 1 time maximum, and for higher level coin exchange you can do 99 as a 1 time maximum.";
+ next;
+ setarray .@coins[1],
+ 6417, //Silvervine
+ 6418, //Agrade_Coin
+ 6419, //Bgrade_Coin
+ 6420, //Cgrade_Coin
+ 6421, //Dgrade_Coin
+ 6422; //Egrade_Coin
+ set .@menu$,"Quit:";
+ for(set .@i,1; .@i<=6; set .@i,.@i+1) {
+ if (countitem(.@coins[.@i]))
+ set .@menu$, .@menu$+getitemname(.@coins[.@i])+" (have "+countitem(.@coins[.@i])+"):";
+ else
+ set .@menu$, .@menu$+"^aaaaaa"+getitemname(.@coins[.@i])+" (None)^000000:";
+ }
+ set .@i, select(.@menu$)-1;
+ if (.@i == 0) {
+ mes "[Dark Machine TX100]";
+ mes "Thank you for coming.";
+ close;
+ }
+ set .@coin, .@coins[.@i];
+ setarray .@exchange_name$[0],"higher","lower";
+ setarray .@exchange_id[0],.@coins[.@i-1],.@coins[.@i+1];
+ if (.@exchange_id[0] == .@coins[1]) set .@exchange_id[0],0; // Cannot exchange for Silvervine.
+ if (.@i > getarraysize(.@coins)) {
+ mes "[Dark Machine TX100]";
+ mes "You've chosen abnormal menu.";
+ mes "Aborting process. Thank you for coming.";
+ close;
+ }
+ if (countitem(.@coin) == 0) {
+ mes "[Dark Machine TX100]";
+ mes "You chose a coin that you don't have.";
+ mes "Aborting process. Thank you for coming.";
+ close;
+ }
+ mes "[Dark Machine TX100]";
+ mes "----Exchange Rate----";
+ mes "Higher Coin - 3 to 1";
+ mes "Lower Coin - 1 to 3";
+ mes "---------------------";
+ mes "^ff3333We take a small vendor fee from your exchanged coins.^000000";
+ next;
+ set .@menu$, "Quit:";
+ if (.@exchange_id[0] == 0)
+ set .@menu$, .@menu$+"^ff3333Cannot exchange to higher level coin^000000:";
+ else {
+ if (countitem(.@coin) >= 99)
+ set .@menu$, .@menu$+"Exchange 99 "+getitemname(.@coin)+" into higher level coin:";
+ else
+ set .@menu$, .@menu$+"^aaaaaaExchange to higher level coin (Not enough)^000000:";
+ }
+ if (.@exchange_id[1] == 0)
+ set .@menu$, .@menu$+"^ff3333Cannot exchange to lower level coin^000000:";
+ else {
+ if (countitem(.@coin) > 500)
+ set .@menu$, .@menu$+"Exchange 500 "+getitemname(.@coin)+" into lower level coin:";
+ else if (countitem(.@coin))
+ set .@menu$, .@menu$+"Exchange "+countitem(.@coin)+" "+getitemname(.@coin)+" into lower level coin:";
+ else
+ set .@menu$, .@menu$+"^aaaaaaExchange to lower level coin (Not enough)^000000:";
+ }
+ set .@i, select(.@menu$)-2;
+ if (.@i == -1) {
+ mes "[Dark Machine TX100]";
+ mes "Thank you for coming.";
+ close;
+ }
+ if (.@exchange_id[.@i] == 0) {
+ mes "[Dark Machine TX100]";
+ mes "This coin cannot be exchanged to a "+.@exchange_name$[.@i]+" level coin.";
+ mes "Aborting process. Thank you for coming.";
+ close;
+ }
+ if ((.@i == 0 && countitem(.@coin) < 100) || (.@i == 1 && countitem(.@coin) == 0)) {
+ mes "[Dark Machine TX100]";
+ mes "You have not enough coins for a "+.@exchange_name$[.@i]+" level coin exchange.";
+ mes "Aborting process. Thank you for coming.";
+ close;
+ }
+ if (countitem(.@exchange_id[.@i]) > 28000) {
+ mes "[Dark Machine TX100]";
+ mes "You have too many "+.@exchange_name$[.@i]+" level coins already. Please come back with less coins.";
+ close;
+ }
+ switch(.@i) {
+ case 0:
+ set .@payment_amount,99;
+ set .@reward_amount, .@payment_amount/3;
+ set .@coin_text$,"High";
+ break;
+ case 1:
+ set .@payment_amount,(((countitem(.@coin) > 500))?500:countitem(.@coin));
+ set .@reward_amount, .@payment_amount*3;
+ set .@coin_text$,"Low";
+ break;
+ }
+ set .@fee, rand(1,3);
+ delitem .@coin, .@payment_amount;
+ getitem .@exchange_id[.@i], .@reward_amount - .@fee;
+ mes "[Dark Machine TX100]";
+ mes "Received ^003399"+getitemname(.@coin)+"^000000 for ^003399"+.@payment_amount+"^000000 unit(s).";
+ mes "We have excanged your coin to ^003399"+(.@reward_amount-.@fee)+"^000000 unit(s) of ^003399"+.@coin_text$+" Level Coin^000000, deducted ^003399"+.@fee+"^000000 unit(s) as exchanging fee.";
+ close;
+}
+
+malangdo,175,145,4 script Can Agency Guard 549,{
+ if (checkweight(1201,1) == 0) {
+ mes "You seem to have too many items. Give it a try after sorting out the item kinds.";
+ close;
+ }
+ if (MaxWeight - Weight < 1000) {
+ mes "You're not likely to be able to go on due to the heavy items you've got. Give it a try after lightening the weight.";
+ close;
+ }
+ mes "[Can Agency Guard]";
+ mes "Hey, you there... Have you seen any ^0000ffMalangdo Cat Can^000000s around here?";
+ next;
+ switch(select("Why are you asking?:Oh, you mean these?")) {
+ case 1:
+ mes "[Can Agency Guard]";
+ mes "Umm.";
+ mes "We at the Can Agency recently got some suspicious intelligence about them...";
+ next;
+ mes "[Can Agency Guard]";
+ mes "There were faulty products in bulk on the can production line for Malangdo specialty. These products, to be discarded, seem to have fallen into a retail dealer's hands.";
+ next;
+ mes "[Can Agency Guard]";
+ mes "Actually they were hard to distinguish from normal products. But it obviously says ^0000ffMalangdo Cat Can^000000 outside.";
+ next;
+ mes "[Can Agency Guard]";
+ mes "As faulty products are moving around on the market, we've been collecting them as is our duty. Have you ever seen anyone who has things like what I'm describing?";
+ next;
+ mes "[Can Agency Guard]";
+ mes "If you find anyone selling these products, please come and tell me.";
+ close;
+ case 2:
+ if (countitem(12633) == 0) {
+ mes "[Can Agency Guard]";
+ mes "Umm? I cannot see the ^0000ffMalangdo Cat Can^000000 from you. Don't forget to bring it to me if you've found out...";
+ close;
+ }
+ break;
+ }
+ mes "[Can Agency Guard]";
+ mes "The Malangdo Cat Can is a faulty product. Let me exchange it to 3 E Grade Coins. How about that?";
+ next;
+ switch(select("I won't exchange:^0000ff1^000000 Can -> ^0000ff3^000000 E Grade Coin:^0000ff10^000000 Can -> ^0000ff30^000000 E Grade Coin:^0000ff100^000000 Can -> ^0000ff300^000000 E Grade Coin:Exchange all I've got")) {
+ case 1:
+ mes "[Can Agency Guard]";
+ mes "Umm, I'm not here forever, so come to me if you'd like to exchange while I still am.";
+ close;
+ case 2:
+ set .@check,1;
+ set .@count,1;
+ break;
+ case 3:
+ set .@check,10;
+ set .@count,10;
+ break;
+ case 4:
+ set .@check,100;
+ set .@count,100;
+ break;
+ case 5:
+ set .@check,1;
+ set .@count,countitem(12633);
+ break;
+ }
+ if (countitem(12633) < .@check) {
+ if (.@check == 1) {
+ mes "[Can Agency Guard]";
+ mes "Umm? I cannot see the ^0000ffMalangdo Cat Can^000000 from you. Don't forget to bring it to me if you've found out...";
+ close;
+ } else {
+ mes "[Can Agency Guard]";
+ mes "Umm? I don't think you have enough to exchange... Come to me again when the amount is exactly decided.";
+ close;
+ }
+ }
+ delitem 12633,.@count; //Malang_Cat_Can
+ getitem 6422,.@count*3; //Egrade_Coin
+ mes "[Can Agency Guard]";
+ mes "Exchanged "+.@count+" Malangdo Cat Can to "+(.@count*3)+" E Class Coin. Check it out.";
+ close;
+}
+
+function script F_mal_coin {
+
+// Initial dialogue and checks:
+// -- callfunc "F_mal_coin",0,"[<NPC Name>]",<NPC ID>;
+ if (getarg(0) == 0) {
+ if (getarg(2) != 2 && BaseLevel < 50) {
+ mes getarg(1);
+ mes "Ahaaa~";
+ mes "If you want to buy this stuff,";
+ mes "you can talk to me";
+ mes "when you grow up little more.";
+ mes "This stuff is too expensive";
+ mes "for a child~";
+ close;
+ }
+ mes getarg(1);
+ mes "Nice to meet you~~";
+ mes "I am! YES~~ That's right!";
+ mes "I'm selling special stuff";
+ mes "which you can see only here on Meow Meow Island!";
+ next;
+ mes getarg(1);
+ mes "How about it? What are you waiting for?";
+ mes "Why don't you take a look at";
+ mes "what kinds of stuff I have?";
+ next;
+ switch(getarg(2)) {
+ case 1:
+ mes "[Wandering Merchant]";
+ mes "Oh~";
+ mes "These are rental items, so make sure you know if you have the ^0000FF1 hour^000000 or ^0000FF7 day^000000 version.";
+ next;
+ break;
+ case 2:
+ break;
+ case 3:
+ mes "[Roving Merchant]";
+ mes "Just for your information,";
+ mes "Sow Bug, Starfish, Dried Squid, and Flying Fish are the items which you can use for 1 hour.";
+ next;
+ break;
+ }
+ mes getarg(1);
+ mes "Well then, do you want to take a look at what I have now?";
+ next;
+ switch(select("Yes:No")) {
+ case 1:
+ if (checkweight(1201,1) == 0) {
+ mes getarg(1);
+ mes "It seems that there are too many items in your inventory.";
+ mes "Please make space and come back again~";
+ close;
+ }
+ if (MaxWeight - Weight < 2500) {
+ mes getarg(1);
+ mes "It seems that you're overweight.";
+ mes "Please reduce your weight and come back again~";
+ close;
+ }
+ mes getarg(1);
+ mes "Well, take a good look at them~~~";
+ next;
+ return;
+ case 2:
+ mes getarg(1);
+ mes "Well, then. I'll see you next time.";
+ mes "Goodbye.";
+ close;
+ }
+ }
+
+// Exchange function:
+// -- callfunc "F_mal_coin",1,"[<NPC Name>]","<Display Name>",<Item ID>,<Egrade_Coin>,<Malang_Sp_Can>,<Silvervine>
+ if (getarg(0) == 1) {
+ mes getarg(1);
+ mes "The price of ^0000FF["+getarg(2)+"]^000000 is";
+ if (getarg(4) && getarg(5)) { // Type 1: Egrade_Coin or Malang_Sp_Can
+ mes getarg(4)+" E Grade Coin or "+getarg(5)+" Malangdo Canned Specialties.";
+ set .@type,1;
+ set .@menu$,"Yes.:No, I'll purchase with cans.:I don't want to purchase any.";
+ } else if (getarg(5)) { // Type 2: Malang_Sp_Can only
+ mes getarg(5)+" Malangdo Canned Specialties.";
+ set .@type,2;
+ set .@menu$,"Yes.::No.";
+ } else { // Type 3: Silvervine only
+ mes getarg(6)+" Silvervine Fruit.";
+ set .@type,3;
+ set .@menu$,"Yes.::I don't want to purchase any.";
+ }
+ next;
+ mes getarg(1);
+ if (.@type == 1) {
+ mes "Would you like to purchase";
+ mes "^0000FF["+getarg(2)+"]^000000 with E Grade Coins?";
+ } else {
+ mes "Would you like to";
+ mes "purchase ^0000FF["+getarg(2)+"]^000000?";
+ }
+ next;
+ switch(select(.@menu$)) {
+ case 2:
+ set .@type,2;
+ case 1:
+ switch(.@type) {
+ case 1:
+ set .@item,6422; //Egrade_Coin
+ set .@amount,getarg(4);
+ set .@str$,"coins";
+ break;
+ case 2:
+ set .@item,12636; //Malang_Sp_Can
+ set .@amount,getarg(5);
+ set .@str$,"cans";
+ break;
+ case 3:
+ set .@item,6417; //Silvervine
+ set .@amount,getarg(6);
+ set .@str$,"Silvervine Fruit";
+ break;
+ }
+ if (countitem(.@item) < .@amount) {
+ mes getarg(1);
+ mes "I'm sorry, you need more "+.@str$+".";
+ close;
+ }
+ if (MaxWeight - Weight < getiteminfo(getarg(3),6)) {
+ mes getarg(1);
+ mes "Sorry, you've purchased too many.";
+ mes "You need to make more space in your inventory. Please come back later.";
+ close;
+ }
+ mes getarg(1);
+ mes "Thank you.";
+ delitem .@item,.@amount;
+ getitem getarg(3),1;
+ return;
+ case 3:
+ mes getarg(1);
+ mes "Always be careful";
+ mes "when you purchase items.";
+ close;
+ }
+ }
+}
+malangdo,162,146,5 script Wandering Merchant#mal 495,{
+ callfunc "F_mal_coin",0,"[Wandering Merchant]",1;
+ setarray .@items[1],
+ 16743,16747,16741,16745,16749,16751, // 1 hour items.
+ 16742,16744,16746,16748,16752,16750; // 7 day items.
+ setarray .@names$[1],
+ "Spearfish","Tuna","Hairtail","Saurel","Malang Snow Crab","Brindle Eel",
+ "Hairtail (7Days)","Spearfish (7Days)","Saurel (7Days)","Tuna (7Days)","Brindle Eel (7Days)","Malang Snow Crab (7Days)";
+ while(1) {
+ set .@i, select(
+ "[Spearfish(1hr)] 8 E-Coins/50 Cans",
+ "[Tuna(1hr)] 8 E-Coins/50 Cans",
+ "[Hairtail(1hr)] 8 E-Coins/50 Cans",
+ "[Saurel(1hr)] 8 E-Coins/50 Can",
+ "[Malang Snow Crab(1hr)] 8 E-Coins/50 Can",
+ "[Brindle Eel(1hr)] 8 E-Coins/50 Can",
+ "[Hairtail(7Days)] 10 Silvervine Fruit",
+ "[Spearfish(7Days)] 10 Silvervine Fruit",
+ "[Saurel(7Days)] 10 Silvervine Fruit",
+ "[Tuna(7Days)] 10 Silvervine Fruit",
+ "[Brindle Eel(7Days)] 10 Silvervine Fruit",
+ "[Malang Snow Crab(7Days)] 10 Silvervine Fruit",
+ "End purchasing."
+ );
+ if (.@i == 13) {
+ mes "[Wandering Merchant]";
+ mes "Well, then. I'll see you next time.";
+ mes "Goodbye.";
+ close;
+ }
+ mes "[Wandering Merchant]";
+ mes "Are you interested in ^0000FF["+.@names$[.@i]+"]^000000?";
+ switch(.@i) {
+ case 1: //Spearfish_Box1
+ case 8: //Spearfish_Box2
+ mes "This is... a fish that moves according to the season, very tasty!";
+ mes "But this is only a food that I'm talking about, yummy~";
+ next;
+ mes "[Wandering Merchant]";
+ mes "Of course, this is ^DC143CTwo-Handed Spear^000000.";
+ mes "It gives a high chance of";
+ mes "causing the Bleeding status";
+ mes "when you're using Pierce or Clashing Spiral~";
+ next;
+ mes "[Wandering Merchant]";
+ mes "More details are...";
+ mes "Increase 100% of Clashing Spiral ATK and 50% of Inspiration ATK,";
+ mes "additional ATK + 30 when Base Lv. is over 100.";
+ mes "Base ATK is 220.";
+ next;
+ break;
+ case 2: //Tuna_Box1
+ case 10: //Tuna_Box2
+ mes "This is a very popular fish";
+ mes "which is used in various dishes.";
+ mes "Swordman, Merchant, and Acolyte classes can use it";
+ mes "as a ^DC143CMace^000000.";
+ next;
+ mes "[Wandering Merchant]";
+ mes "It gives a high chance of executing the Stun or Auto-Spell Bash";
+ mes "when using close-range physical attacks.";
+ mes "Base ATK is 180.";
+ next;
+ mes "[Wandering Merchant]";
+ mes "More details are...";
+ mes "additional ATK + 20 when Base Lv. is over 100,";
+ mes "freeze self with low rate.";
+ next;
+ break;
+ case 3: //Hairtail_Box1
+ case 7: //Hairtail_Box2
+ mes "This fish looks like a long belt.";
+ next;
+ mes "[Wandering Merchant]";
+ mes "This is a ^DC143CTwo-Handed Sword^000000";
+ mes "which most swordmen can use.";
+ mes "It increases 50% of critical damage when attacking and CRI + 20.";
+ mes "Base ATK is 220.";
+ next;
+ mes "[Wandering Merchant]";
+ mes "More details are...";
+ mes "additional ATK + 50 when Base Lv. is over 100.";
+ next;
+ break;
+ case 4: //Saurel_Box1
+ case 9: //Saurel_Box2
+ mes "This is a ^DC143CDagger^000000 which gives MATK + 100";
+ mes "and ATK + 30 for 7sec at a certain rate with physical attacks.";
+ next;
+ mes "[Wandering Merchant]";
+ mes "More details are...";
+ mes "gives MATK + 20 for 7sec at a certain rate with magical attacks";
+ mes "and additional MATK + 10, ATK + 10 when Base Lv. is over 100.";
+ mes "Base ATK is 160.";
+ next;
+ break;
+ case 5: //Malang_Crab_Box1
+ case 12: //Malang_Crab_Box2
+ mes "This is a ^DC143CBow^000000 which increases LUK + 3 and 50% of critical damage,";
+ mes "and increases 20% of long rage phyical ATK when Base Lv. is over 100.";
+ mes "Base ATK is 120.";
+ next;
+ mes "[Wandering Merchant]";
+ mes "More details are...";
+ mes "can be used by Archer, Thief, and Rogue classes.";
+ next;
+ break;
+ case 6: //Brindle_Eel_Box1
+ case 11: //Brindle_Eel_Box2
+ mes "This is a ^DC143CBow^000000.";
+ mes "Because it has elastic force,";
+ mes "we started to use it as a Bow.";
+ mes "Base ATK is 180.";
+ next;
+ mes "[Wandering Merchant]";
+ mes "More details are...";
+ mes "AGI + 3, and ASPD + 2 for 5sec at a certain rate with long range physical attacks.";
+ mes "Also gives additional 20% of long range physical ATK when Base Lv. is over 100.";
+ mes "Hunter, Bard, and Dancer classes can use it.";
+ next;
+ break;
+ }
+ if (.@i < 7)
+ setarray .@price[0],8,50,0; // 1 hour items cost 8 Egrade_Coin or 50 Malang_Sp_Can.
+ else
+ setarray .@price[0],0,0,10; // 7 day items cost 10 Silvervine.
+ callfunc "F_mal_coin",1,"[Wandering Merchant]",.@names$[.@i],.@items[.@i],.@price[0],.@price[1],.@price[2];
+ next;
+ }
+}
+
+malangdo,173,145,4 script Stinky Merchant 496,{
+ callfunc "F_mal_coin",0,"[Stinky Merchant]",2;
+ setarray .@items[1],2873,16015;
+ setarray .@names$[1],"Cat Hand Glove","Cat Club";
+ while(1) {
+ set .@i, select(
+ "[Cat Hand Glove] 32 E-Coins/200 Cans",
+ "[Cat Club] 32 E-Coins/200 Cans",
+ "End purchasing."
+ );
+ if (.@i == 3) {
+ mes "[Stinky Merchant]";
+ mes "Well, then. I'll see you next time.";
+ mes "Goodbye.";
+ close;
+ }
+ mes "[Stinky Merchant]";
+ mes "Are you interested in ^0000FF["+.@names$[.@i]+"]^000000?";
+ switch(.@i) {
+ case 1: //Cat_Hand_Glove
+ mes "This is a glove which can give happiness";
+ mes "just by wearing it.";
+ next;
+ mes "[Stinky Merchant]";
+ mes "This is an ^DC143CAccessory^000000";
+ mes "and its defense is 5.";
+ mes "It also gives";
+ mes "VIT + 1, AGI + 1, DEX + 1, LUK + 1.";
+ next;
+ mes "[Stinky Merchant]";
+ mes "More details are...";
+ mes "SLOT : 1 / Refine : Unable / Destruction : Unable";
+ next;
+ break;
+ case 2: //Cat_Club
+ mes "It looks like it wouldn't hurt, don't you think so?";
+ mes "But I'm telling you, it can hurt someone.";
+ next;
+ mes "[Stinky Merchant]";
+ mes "This is a ^DC143CMace^000000 that increases 15% of damage to the animal type of monster.";
+ mes "Base ATK is 88.";
+ mes "The other details are";
+ mes "Weapon Lv : 1 / SLOT : 3 / Refine : Able / Destruction : Unable";
+ next;
+ break;
+ }
+ callfunc "F_mal_coin",1,"[Stinky Merchant]",.@names$[.@i],.@items[.@i],32,200,0;
+ next;
+ }
+}
+
+malangdo,150,135,5 script Roving Merchant 495,{
+ callfunc "F_mal_coin",0,"[Roving Merchant]",3;
+ setarray .@items[1],12639,12637,12638,12640;
+ setarray .@names$[1],"Flying Fish","Sow Bug","Dried Squid","Starfish";
+ while(1) {
+ set .@i, select(
+ "[Flying Fish] 200 Cans",
+ "[Sow Bug] 200 Cans",
+ "[Dried Squid] 200 Cans",
+ "[Starfish] 200 Cans",
+ "End purchasing."
+ );
+ if (.@i == 5) {
+ mes "[Roving Merchant]";
+ mes "Well, then. I'll see you next time.";
+ mes "Goodbye.";
+ close;
+ }
+ mes "[Roving Merchant]";
+ mes "Are you interested in ^0000FF["+.@names$[.@i]+"]^000000?";
+ switch(.@i) {
+ case 1: //Flying_Fish_Box
+ mes "This is the one that flies";
+ mes "with a big pectoral.";
+ next;
+ mes "[Roving Merchant]";
+ mes "This is a ^DC143CThrowing Weapon^000000.";
+ mes "Of course, it can give fatal wounds to the enemy";
+ mes "at a certain rate when attacking.";
+ next;
+ mes "[Roving Merchant]";
+ mes "Its property is neutral and ATK is 50.";
+ next;
+ break;
+ case 2: //Gong_Bug_Pocket
+ mes "In that case, I'll explain for you.";
+ mes "This is a ^DC143CBullet^000000 which stuns the enemy at a certain rate when attacking.";
+ next;
+ mes "[Roving Merchant]";
+ mes "I feel somthing bad";
+ mes "is moving in my pocket but...";
+ mes "it is neutral property and its ATK is 50.";
+ next;
+ break;
+ case 3: //Dried_Squid_Box
+ mes "I'll explain about this item.";
+ mes "This is a ^DC143CThrowing Weapon^000000 which causes darkness at a certain rate.";
+ mes "It's neutral property and its ATK is 50.";
+ next;
+ mes "[Roving Merchant]";
+ mes "It is compressed";
+ mes "and put into a very small box,";
+ mes "so be careful when you open it.";
+ next;
+ break;
+ case 4: //Starfish_Box
+ mes "I'll explain about this item.";
+ mes "This is a ^DC143CThrowing Weapon^000000 which stuns the enemy at a certain rate.";
+ next;
+ mes "[Roving Merchant]";
+ mes "It is perfectly organized and packed";
+ mes "so you can't even see inside.";
+ mes "It is neutral property and its ATK is 110.";
+ next;
+ break;
+ }
+ mes "[Roving Merchant]";
+ mes "For your information,";
+ mes "one box contains";
+ mes "200 units.";
+ next;
+ callfunc "F_mal_coin",1,"[Roving Merchant]",.@names$[.@i],.@items[.@i],0,200,0;
+ next;
+ }
+} \ No newline at end of file
diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt
index 5229cbc2e..bf5317195 100644
--- a/npc/re/quests/quests_dicastes.txt
+++ b/npc/re/quests/quests_dicastes.txt
@@ -436,11 +436,11 @@ function script que_dic {
delitem getarg(3), getarg(4);
}
else if (getarg(0) == 2) {
- for(set .@size, getargcount(); .@i <= .@size; set .@i, .@i + 1) {
+ for(.@i = 1; .@i < getargcount(); .@i++) {
if (checkquest(getarg(.@i)) >= 0)
erasequest getarg(.@i);
}
- return;
+ return;
}
getexp getarg(2),0;
erasequest getarg(1);
diff --git a/npc/re/scripts_athena.conf b/npc/re/scripts_athena.conf
index 0f7502717..47b2cb7e0 100644
--- a/npc/re/scripts_athena.conf
+++ b/npc/re/scripts_athena.conf
@@ -54,6 +54,7 @@ npc: npc/re/merchants/refine.txt
npc: npc/re/merchants/renters.txt
npc: npc/re/merchants/shops.txt
npc: npc/re/merchants/enchan_mal.txt
+npc: npc/re/merchants/coin_exchange.txt
// --------------------------- Others ---------------------------
npc: npc/re/other/mercenary_rent.txt
diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql
index 69d3a9022..44c6102fe 100644
--- a/sql-files/item_db_re.sql
+++ b/sql-files/item_db_re.sql
@@ -5824,6 +5824,8 @@ REPLACE INTO `item_db_re` VALUES (12773,'Victory_Hat_Box2','Victory Hat Box2',2,
#
REPLACE INTO `item_db_re` VALUES (12775,'Ancient_Spirit_Amulet','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 (12786,'Change_Slot_Card','Character Position Change Coupon',2,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'set CharMoves, CharMoves + 1;',NULL,NULL);
+#
REPLACE INTO `item_db_re` VALUES (12848,'Falcon_Flute','Falcon Flute',11,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'if(getskilllv("HT_FALCON")) { if(checkoption(Option_Wug)||checkoption(Option_Wugrider)) end; if(checkfalcon()==1) { setfalcon 0; } else { setfalcon 1; } }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12900,'Battle_Manual_Box','Battle Manual Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12208,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12901,'Insurance_Package','Insurance Package',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12209,10;',NULL,NULL);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 05:41:38 +0000