summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/battle/client.conf2
-rw-r--r--db/abra_db.txt7
-rw-r--r--db/cashshop_db.conf8
-rw-r--r--db/const.txt1
-rw-r--r--db/elemental_skill_db.txt38
-rw-r--r--db/pre-re/map_zone_db.conf21
-rw-r--r--db/pre-re/skill_tree.conf2
-rw-r--r--db/re/item_db.txt124
-rw-r--r--db/re/map_zone_db.conf21
-rw-r--r--db/re/skill_tree.conf2
-rw-r--r--db/skill_changematerial_db.txt156
-rw-r--r--db/spellbook_db.txt53
-rw-r--r--npc/re/mobs/dungeons/moc_pryd.txt17
-rw-r--r--sql-files/item_db_re.sql184
-rw-r--r--src/map/battle.c4
-rw-r--r--src/map/clif.c47
-rw-r--r--src/map/clif.h1
-rw-r--r--src/map/irc-bot.c9
-rw-r--r--src/map/mail.c2
-rw-r--r--src/map/packets_struct.h7
-rw-r--r--src/map/pc.c18
-rw-r--r--src/map/pc.h3
-rw-r--r--src/map/skill.c4
-rw-r--r--src/map/status.c4
-rw-r--r--src/map/status.h3
-rw-r--r--src/map/storage.c10
26 files changed, 490 insertions, 258 deletions
diff --git a/conf/battle/client.conf b/conf/battle/client.conf
index c832163be..eae8aad3b 100644
--- a/conf/battle/client.conf
+++ b/conf/battle/client.conf
@@ -117,4 +117,4 @@ client_sort_storage: no
// Note: Do not enable this, if you enabled commands for players,
// because the client sees multiple commands in succession as spam.
// Default: 0 (means disabled)
-client_accept_chatdori: 1
+client_accept_chatdori: 0
diff --git a/db/abra_db.txt b/db/abra_db.txt
index 41c1b6eae..2eb770abd 100644
--- a/db/abra_db.txt
+++ b/db/abra_db.txt
@@ -1,16 +1,17 @@
// Hocus-Pocus (Abrakadabra) Castable Skills Database
//
// Structure of Database:
-// SkillID,DummyName,RequiredHocusPocusLevel,Rate
+// SkillID,DummyName,RequiredHocusPocusLevel,Rate
//
// 01. SkillID Skill ID to be casted by hocus pocus.
// 02. DummyName Name of the skill (informative, not used by server).
// 03. RequiredHocusPocusLevel Minimum skill level of hocus pocus for the current skill to be selected.
-// 04. Rate Chance at which the skill is selected (1 = 0.01%, 10000 = 100%).
+// 04. Rate Chance at which a skill is selected (1 = 0.01%, 10000 = 100%).
//
// NOTE: The skill is picked at random from the entire database and then tested for rate. If it
-// does not succeed at that rate, an another skill is picked and tested. This continues
+// does not succeed at that rate, another skill is picked and tested. This continues
// until a skill succeeds.
+//====================================================
//1,Basic Skill,1,0
diff --git a/db/cashshop_db.conf b/db/cashshop_db.conf
index 381d898e0..05bf5b270 100644
--- a/db/cashshop_db.conf
+++ b/db/cashshop_db.conf
@@ -7,8 +7,14 @@
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
//=
//= http://hercules.ws/board/
-//====================================================
+//================= More Information =================
//= http://hercules.ws/board/topic/367-introducing-cash-shop-support/
+//====================================================
+// This file handles the entire Cashshop. You can simply
+// add in any amount of items you like within each category.
+// Please keep in mind that the Cashshop does not work
+// with ragexere clients.
+//====================================================
cash_shop: (
{
diff --git a/db/const.txt b/db/const.txt
index d479e79cd..3b1aa6490 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -627,6 +627,7 @@ Eff_Confusion 7
Eff_Blind 8
Eff_Bleeding 9
Eff_DPoison 10
+Eff_Burning 11
Ele_Neutral 0
Ele_Water 1
diff --git a/db/elemental_skill_db.txt b/db/elemental_skill_db.txt
index a0852e5f3..aa0a428ef 100644
--- a/db/elemental_skill_db.txt
+++ b/db/elemental_skill_db.txt
@@ -1,55 +1,91 @@
// Elemental Summons Skill Database
//
// Structure of Database:
-// ElementalID,SkillID,SkillLevel,ReqMode
+// ElementalID,SkillID,SkillLevel,ReqMode
//
// Spirit Modes: 1 = Passive, 2 = Defensive, 4 = Aggressive
+//====================================================
+//================
// EL_AGNI_S
+//================
2114,8413,1,1 //EL_PYROTECHNIC,Pyrotechnic
2114,8401,1,2 //EL_CIRCLE_OF_FIRE,Circle of Fire
2114,8425,1,4 //EL_FIRE_ARROW,Fire Arrow
+
+//================
// EL_AGNI_M
+//================
2115,8414,1,1 //EL_HEATER,Heater
2115,8402,1,2 //EL_FIRE_CLOAK,Fire Cloak
2115,8426,1,4 //EL_FIRE_BOMB,Fire Bomb
+
+//================
// EL_AGNI_L
+//================
2116,8415,1,1 //EL_TROPIC,Tropic
2116,8403,1,2 //EL_FIRE_MANTLE,Fire Mantle
2116,8428,1,4 //EL_FIRE_WAVE,Fire Wave
+
+//================
// EL_AQUA_S
+//================
2117,8416,1,1 //EL_AQUAPLAY,Aqua Play
2117,8404,1,2 //EL_WATER_SCREEN,Water Screen
2117,8430,1,4 //EL_ICE_NEEDLE,Ice Needle
+
+//================
// EL_AQUA_M
+//================
2118,8417,1,1 //EL_COOLER,Cooler
2118,8405,1,2 //EL_WATER_DROP,Water Drop
2118,8431,1,4 //EL_WATER_SCREW,Water Screw
+
+//================
// EL_AQUA_L
+//================
2119,8418,1,1 //EL_CHILLY_AIR,Cool Air
2119,8406,1,2 //EL_WATER_BARRIER,Water Barrier
2119,8433,1,4 //EL_TIDAL_WEAPON,Tidal Weapon
+
+//================
// EL_VENTUS_S
+//================
2120,8419,1,1 //EL_GUST,Gust
2120,8407,1,2 //EL_WIND_STEP,Wind Step
2120,8434,1,4 //EL_WIND_SLASH,Wind Slasher
+
+//================
// EL_VENTUS_M
+//================
2121,8420,1,1 //EL_BLAST,Blast
2121,8408,1,2 //EL_WIND_CURTAIN,Wind Curtain
2121,8435,1,4 //EL_HURRICANE,Hurricane Rage
+
+//================
// EL_VENTUS_L
+//================
2122,8421,1,1 //EL_WILD_STORM,Wild Storm
2122,8409,1,2 //EL_ZEPHYR,Zephyr
2122,8437,1,4 //EL_TYPOON_MIS,Typhoon Missile
+
+//================
// EL_TERA_S
+//================
2123,8422,1,1 //EL_PETROLOGY,Petrology
2123,8410,1,2 //EL_SOLID_SKIN,Solid Skin
2123,8439,1,4 //EL_STONE_HAMMER,Stone Hammer
+
+//================
// EL_TERA_M
+//================
2124,8423,1,1 //EL_CURSED_SOIL,Cursed Soil
2124,8411,1,2 //EL_STONE_SHIELD,Stone Shield
2124,8440,1,4 //EL_ROCK_CRUSHER,Rock Launcher
+
+//================
// EL_TERA_L
+//================
2125,8424,1,1 //EL_UPHEAVAL,Upheaval
2125,8412,1,2 //EL_POWER_OF_GAIA,Power of Gaia
2125,8442,1,4 //EL_STONE_RAIN,Stone Rain
diff --git a/db/pre-re/map_zone_db.conf b/db/pre-re/map_zone_db.conf
index 96dbd0c7a..f51fd8fc6 100644
--- a/db/pre-re/map_zone_db.conf
+++ b/db/pre-re/map_zone_db.conf
@@ -9,17 +9,22 @@
//= http://hercules.ws/board/
//====================================================
//= Hercules Map Zone Database [Ind/Hercules]
-//==
+//================ More Information ==================
+//= http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/
+//= (TODO: replace with wiki link and detail the wiki page in a decent format ^)
+//====================================================
+//================ Description =======================
//= A unlimited number of zones may be created, a zone
//= may be used to create a set of disabled items, disabled skills
-//= and mapflags to be used by as many maps as one chooses,
-//= maps can be linked to a specific zone through the zone mapflag
-//= '<map name><tab>mapflag<tab>zone<tab><zone name>'
-//== available types for 'disabled_skills':
+//= and mapflags to be used by as many maps as one chooses.
+//= Maps can be linked to a specific zone through the zone mapflag
+//= '<map name><tab>mapflag<tab>zone<tab><zone name>'.
+//====================================================
+//= Available types for 'disabled_skills':
//= PLAYER, HOMUN, MERCENARY, MONSTER, PET, ELEMENTAL, MOB_BOSS, CLONE, ALL and NONE
-//== More on
-//= http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/
-//= (TODO: replace with wiki link and detail the wiki page in a decent format ^)
+//====================================================
+
+
zones: (
{
/* All zone is a dynamic (very special) zone that is forcebly inherited by ALL maps automatically */
diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf
index a6eb10626..45aea7a20 100644
--- a/db/pre-re/skill_tree.conf
+++ b/db/pre-re/skill_tree.conf
@@ -8,7 +8,7 @@
//=
//= http://hercules.ws/board/
//================= More Information =================
-// http://hercules.ws/board/topic/1188-skill-tree-db-redesign/ <desc~!>
+// http://hercules.ws/board/topic/1188-skill-tree-db-redesign/
//================ Structure Example =================
/*
Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there)
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index e42443d73..92571ec8a 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -3352,7 +3352,7 @@
5658,Imp_Hat,Imp Hat,5,20,,400,,1,,0,0xFFFFFFFF,7,2,256,,1,1,589,{ bonus3 bAutoSpell,"SA_FLAMELAUNCHER",1,5; },{},{}
5659,Sleeper_Hat,Sleeper Hat,5,20,,400,,1,,0,0xFFFFFFFF,7,2,256,,1,1,590,{ bonus3 bAutoSpell,"SA_SEISMICWEAPON",1,5; },{},{}
5660,Gryphon_Hat,Gryphon Hat,5,20,,400,,1,,0,0xFFFFFFFF,7,2,256,,1,1,591,{ bonus3 bAutoSpell,"SA_LIGHTNINGLOADER",1,5; },{},{}
-//5661,Red_Pirate_Bandana,Red Pirate Banada,5,0,,0,,3,,0,0xFFFFFFFF,7,2,256,,10,1,592,{ bonus bStr,1; bonus bDex,1; bonus bAspdRate,2; bonus bVariableCastrate,-2; bonus3 bAutoSpell,"MO_EXTREMITYFIST",1,30; },{},{}
+5661,Red_Pirate_Bandana,Red Pirate Bandana,5,0,,0,,3,,0,0xFFFFFFFF,7,2,256,,10,1,592,{ bonus bStr,1; bonus bDex,1; bonus bAspdRate,2; bonus bVariableCastrate,-2; bonus3 bAutoSpell,"MO_EXTREMITYFIST",1,3; },{},{}
//5662,Libra_Crown,Libra Crown,5,10,,300,,3,,0,0xFFFFFFFF,7,2,256,,1,1,593,{ bonus bDex,3; },{},{}
//5663,Libra_Diadem,Libra Diadem,5,10,,300,,3,,0,0xFFFFFFFF,7,2,256,,1,1,594,{ bonus bDex,3; },{},{}
5664,Filir_Wing,Filir's Pinions,5,20,,100,,1,,0,0xFFFFFFFF,7,2,512,,70,1,595,{ bonus bAspdRate,2; bonus bVariableCastrate,-2; },{},{}
@@ -3455,7 +3455,7 @@
//5761,Sloth_Hat,Sloth Hat,5,20,,800,,3,,1,0xFFFFFFFF,7,2,256,,1,1,638,{ bonus bAgi,2; },{},{}
//5762,Duneyrr_Helm,Duneyrr Helm,5,20,,100,,5,,0,0xFFFFFFFF,7,2,256,,1,1,639,{ bonus bAllStats,1; bonus bMdef,5; },{},{}
5763,Red_Bunny_Band,Red Bunny Band,5,0,,200,,4,,0,0xFFFFFFFF,7,2,256,,1,1,640,{ bonus bAgi,2; bonus bMdef,3; },{},{}
-//5764,Love_Rabbit_Hood,Love Rabbit Hood,5,20,,300,0,1,0,1,0xFFFFFFFF,7,2,769,,549,0,549,{},{},{}
+5764,Love_Rabbit_Hood,Love Rabbit Hood,5,20,,300,,1,,1,0xFFFFFFFF,7,2,769,,10,0,549,{ bonus3 bAutoSpell,"PR_GLORIA",3,((readparam(bAgi)>=80)?30:10); },{},{}
5765,Black_Tail_Ribbon,Black Tail Ribbon,5,20,,100,,0,,1,0xFFFFFFFF,7,2,256,,10,1,642,{ bonus bMdef,5; bonus bLongAtkDef,10; bonus2 bSubEle,Ele_Neutral,5; },{},{}
5766,Amistr_Cap,Amistr Cap,5,20,,500,,4,,0,0xFFFFFFFF,7,2,256,,50,1,643,{ bonus bVit,5; bonus3 bAutoSpellWhenHit,"NPC_STONESKIN",6,20; },{},{}
5767,Samurai_Mask,Samurai Mask,5,20,,300,,1,,0,0xFFFFFFFF,7,2,1,,50,0,644,{ bonus2 bAddRace,RC_NonBoss,1; bonus2 bAddRace,RC_Boss,1; },{},{}
@@ -3473,7 +3473,7 @@
//5779,Drooping_Boto,Drooping Boto,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,1,1,657,{ bonus bInt,2; },{},{}
//5780,Tendrilion_Hat,Tendrilion Hat,5,20,,100,,0,,0,0xFFFFFFFF,7,2,256,,1,1,658,{},{},{}
5781,Persika,Persika,5,20,,100,,0,,1,0xFFFFFFFF,7,2,256,,0,0,659,{ bonus bFlee,1; bonus bMaxSP,20; },{},{}
-//5782,Hoplite_Helmet,Hoplite Helmet,5,20,,700,0,4,0,1,0xFFFFFFFF,7,2,769,,660,1,660,{},{},{}
+5782,Hoplite_Helmet,Hoplite Helmet,5,20,,700,0,4,0,1,0xFFFFFFFF,7,2,769,,1,1,660,{},{},{}
//5783,YellowBunny_Hairband,YellowBunny Hairband,5,20,,200,,0,,1,0xFFFFFFFF,7,2,256,,1,1,662,{ bonus bStr,1; bonus bInt,1; bonus bDex,2; },{},{}
//5784,PinkBunny_Hairband,PinkBunny Hairband,5,20,,200,,0,,1,0xFFFFFFFF,7,2,256,,1,1,663,{ bonus bStr,1; bonus bInt,2; bonus bDex,1; },{},{}
//5785,Green_Bunny_Hairband,Green Bunny Hairband,5,20,,200,,0,,1,0xFFFFFFFF,7,2,256,,1,1,664,{ bonus bStr,2; bonus bInt,1; bonus bDex,1; },{},{}
@@ -3505,7 +3505,7 @@
5811,Santa_Beard,Santa's Beard,5,20,,100,,5,,0,0xFFFFFFFF,7,2,1,,0,0,25,{ bonus2 bSubRace,RC_Brute,5; },{},{}
5812,Hat_Of_Expert,Hat Of Expert,5,0,,0,,2,,0,0xFFFFFFFF,7,2,256,,0,1,16,{ bonus3 bAddEffWhenHit,Eff_Bleeding,500,ATF_TARGET|ATF_SELF; bonus3 bAddEffWhenHit,Eff_Silence,500,ATF_TARGET|ATF_SELF; bonus3 bAddEffWhenHit,Eff_Confusion,500,ATF_TARGET|ATF_SELF; bonus3 bAddEffWhenHit,Eff_Curse,500,ATF_TARGET|ATF_SELF; bonus3 bAddEffWhenHit,Eff_Blind,500,ATF_TARGET|ATF_SELF; },{},{}
//5813,Red_Ph.D_Hat,Red Ph.D Hat,5,1000,,500,,0,,0,0xFFFFFFFF,7,2,256,,0,1,481,{ bonus bInt,1; },{},{}
-//5814,Ati_Atihan_Hat3,Ati Atihan Hat3,5,20,,0,,2,,0,0xFFFFFFFF,7,2,769,,20,0,303,{},{},{}
+5814,Ati_Atihan_Hat3,Ati Atihan Hat3,5,20,,0,,2,,0,0xFFFFFFFF,7,2,769,,20,0,303,{},{},{}
5815,Cowboy_Hat_J,Purple Cowboy Hat,5,20,,500,,2,,0,0xFFFFFFFF,7,2,256,,0,1,475,{ bonus bStr,1; bonus2 bSubSize,Size_Small,5; bonus2 bSubSize,Size_Medium,5; bonus2 bSubSize,Size_Large,5; },{},{}
5816,Classic_Hat_J,Classic Hat,5,20,,500,,0,,0,0xFFFFFFFF,7,2,256,,0,1,411,{},{},{}
5817,Valentine_Pledge,Valentine Pledge,5,20,,0,,3,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bAllStats,2; bonus bMdef,3; bonus bHealPower,10; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; bonus bMatkRate,3; bonus bFlee,10; bonus bAspdRate,1; },{},{}
@@ -3543,7 +3543,7 @@
//5849,Doctor_Hairband,Doctor Hairband,5,20,,0,,0,,0,0xFFFFFFFF,7,2,256,,1,0,60,{},{},{}
//5850,Golden_Savage_Hat,Golden Savage Hat,5,20,,500,,5,,0,0xFFFFFFFF,7,2,256,,50,1,648,{},{},{}
5851,Summer_Knight,Summer Knight,5,20,,0,,1,,0,0xFFFFFFFF,7,2,768,,60,0,138,{},{},{}
-//5852,Resurrect_Egg_Shell,Resurrect Egg Shell,5,20,,500,,-7,,0,0xFFFFFFFF,7,2,256,,40,1,537,{ bonus bMdef,-7; },{},{}
+5852,Easter_Egg_Shell,Easter Egg Shell,5,20,,500,,0,,0,0xFFFFFFFF,7,2,256,,40,1,537,{ bonus bDef,-7; bonus bMdef,-7; bonus2 bHPRegenRate,(MaxHp/100),10000; if (getrefine()>=7) bonus bFlee,2; if (getrefine() >= 9) bonus2 bSPRegenRate,(MaxSp/100),10000; },{},{}
//
5856,Passion_FB_Hat,Passion FB Hat,5,20,,600,,2,,1,0xFFFFFFFF,7,2,256,,1,1,671,{ bonus bStr,2; bonus bDex,2; },{},{}
5857,Cool_FB_Hat,Cool FB Hat,5,20,,600,,2,,1,0xFFFFFFFF,7,2,256,,1,1,672,{ bonus bInt,2; bonus bVit,2; },{},{}
@@ -3978,9 +3978,11 @@
6432,Full_Bucket,Full Bucket,3,0,,3000,,,,,,,,,,,,,{},{},{}
6433,Cleaning_Brush,Cleaning Brush,3,20,,300,,,,,,,,,,,,,{},{},{}
6434,Fix_Kit,Fix Kit,3,0,,1000,,,,,,,,,,,,,{},{},{}
+6435,Fresh_Fruit,Fresh Fruit,3,0,,100,,,,,,,,,,,,,{},{},{}
6436,Sea_God's_Call,Sea God's Call,3,20,,0,,,,,,,,,,,,,{},{},{}
6437,Scaraba_Perfume,Scaraba Perfume,3,0,,0,,,,,,,,,,,,,{},{},{}
6438,Unbreakable_Weap,Unbreakable Weap,3,0,,10,,,,,,,,,,,,,{},{},{}
+6439,Unbreakable_Def,Unbreakable Armor,3,0,,10,,,,,,,,,,,,,{},{},{}
6440,General_Lubrication,General Lubrication,3,20,,0,,,,,,,,,,,,,{},{},{}
6441,High_RankLubricant,High Ranked Lubricant,3,20,,0,,,,,,,,,,,,,{},{},{}
6442,Octopus_Hunt_Stick,Octopus Hunting Stick,3,0,,0,,,,,,,,,,,,,{},{},{}
@@ -5226,6 +5228,7 @@
11057,Feb_Sweets,Feb Sweets,3,20,,50,,,,,,,,,,,,,{},{},{}
// More Usable Items
//===================================================================
+11058,Novice_Combi_Book,Novice Combi Book,3,0,,10,,,,,,,,,,,,,{},{},{}
11500,Light_Yellow_Pot,Light Yellow Potion,0,550,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(175,235),0; },{},{}
11501,Light_White_Pot,Light White Potion,0,1200,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(325,405),0; },{},{}
11502,Light_Blue_Pot,Light Blue Potion,0,5000,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 0,rand(40,60); },{},{}
@@ -5876,6 +5879,7 @@
12581,Vending_Search_Scroll2,Universal Catalog Gold,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ searchstores 10,1; },{},{}
12591,Vending_Search_Scroll3,Universal Catalog Bronze,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ searchstores 10,1; },{},{}
//
+12595,Lucky_Egg_C7,Lucky Egg C7,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12601,Fresh_Watermelon_Juice,Fresh Watermelon Juice,0,20,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 5,5; },{},{}
//
12612,Old_Coin_Bag,Old Coin Bag,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
@@ -5892,13 +5896,17 @@
12623,Advanced_Weapons_Box,Advanced Weapons Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getrandgroupitem 12623,1; },{},{}
12624,Delicious_Jelly,Delicious Jelly,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 3,3; },{},{}
//
+12625,Sapa_Feat_Cert_Pack,Sapa Feat Cert Pack,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12636,Malangdo_Canned_Specialties,Malangdo Canned Specialties,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ warp "malangdo",140,114; },{},{}
//
+12637,Gong_Bug_Pocket,Sow Bug Pocket,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13208,200; },{},{}
12642,Terra_Mars_100_Box,Terra_Mars_100_Box,0,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 504,100; },{},{}
//
+12643,E_Coin_Pack50,E Coin Pack50,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6422,50; },{},{}
12646,Fried_Octopus_Legs,Fried Octopus Legs,2,20,,30,,,,,,,,,,,,,{},{},{}
12647,Sea_Ink,Sea Ink,2,20,,30,,,,,,,,,,,,,{},{},{}
//
+12654,Lucky_Egg_C9,Lucky Egg C9,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12658,Transformation_Scroll(Deviruchi),Transformation Scroll(Deviruchi),2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_MONSTER_TRANSFORM,1200000,1109,0,0,0; },{},{}
12659,Transformation_Scroll(Raydric),Transformation Scroll(Raydric),2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_MONSTER_TRANSFORM,1200000,1276,0,0,0; },{},{}
12660,Transformation_Scroll(Mavka),Transformation Scroll(Mavka),2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_MONSTER_TRANSFORM,1200000,1884,0,0,0; },{},{}
@@ -5909,6 +5917,7 @@
//
// ID,AegisName,Name,Type,Buy,Sell,Weight,ATK,DEF,Range,Slots,Job,Upper,Gender,Loc,wLV,eLV,Refineable,View,{ Script },{ OnEquip_Script },{ OnUnequip_Script }
+12665,Grovel_Buff,Grovel Buff,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12690,Old_C_Album_Helm,Old Card Album Helm,2,20,,50,,,,,0xFFFFFFFF,7,2,,,1,,,{},{},{}
12691,Old_C_Album_Armor,Old Card Album Armor,2,20,,50,,,,,0xFFFFFFFF,7,2,,,1,,,{},{},{}
12692,Old_C_Album_Shield,Old Card Album Shield,2,20,,50,,,,,0xFFFFFFFF,7,2,,,1,,,{},{},{}
@@ -5916,8 +5925,10 @@
12694,Old_C_Album_Shoes,Old Card Album Shoes,2,20,,50,,,,,0xFFFFFFFF,7,2,,,1,,,{},{},{}
12695,Old_C_Album_Acc,Old Card Album Acc,2,20,,50,,,,,0xFFFFFFFF,7,2,,,1,,,{},{},{}
//
+12696,RWC_Cele_Fire,RWC Celebration Firecracker,2,0,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD,10000,3; sc_start SC_VITFOOD,10000,3; sc_start SC_INTFOOD,10000,3; sc_start SC_DEXFOOD,10000,3; sc_start SC_AGIFOOD,10000,3; sc_start SC_LUKFOOD,10000,3; },{},{}
12698,Old_C_Album_Weapon,Old Card Album Weapon,2,20,,50,,,,,0xFFFFFFFF,7,2,,,1,,,{},{},{}
//
+12774,Empty_Potion_Bottle,Empty Potion Bottle,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12818,High_Weapon_Box,High Weapon Box,2,20,,50,,,,,0xFFFFFFFF,7,2,,,100,,,{},{},{}
//
12699,Tikbalang_Belt,Tikbalang Belt,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 2313; },{},{}
@@ -6004,10 +6015,14 @@
//
12775,Ancient_Spirit_Amulet,Ancient Spirit Amulet,2,20,,600,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
//
+12776,Agi_Dish20,Agi Dish20,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12786,Change_Slot_Card,Character Position Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set SlotChange, SlotChange + 1; },{},{}
+12787,Diabolic_Scroll,Diabolic Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ mercenary_create 2342,1800000; },{},{}
12790,Char_Rename_Card,Character Name Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set CharRename, CharRename + 1; },{},{}
//
+12791,Combat_Pill,Combat Pill,2,20,,150,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
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; } } },{},{}
+12849,Combination_Kit,Combination Kit,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
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; },{},{}
12902,Bubble_Gum_Box,Bubble Gum Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12210,10; },{},{}
@@ -6174,9 +6189,9 @@
13060,E_Counter_Dagger_C,Counter Dagger,4,1,,0,209,,1,0,0x00810204,7,2,2,4,1,0,1,{},{},{}
13061,Black_Wing,Black Wing,4,20,,600,142,,1,1,0x00020000,7,2,2,3,102,1,1,{ bonus2 bSkillAtk,"SC_FATALMENACE",30+(getrefine()*2); bonus bMatkRate,(getrefine()*3); },{},{}
13062,Ancient_Dagger,Ancient Dagger,4,20,,600,107,,0,0,0x028F5EEE,2,2,2,4,120,1,1,{ bonus bMatk,120; bonus bMaxSP,100; bonus bSPrecovRate,5; bonus2 bAddEff2,Eff_Curse,20; bonus3 bAddEff,Eff_Curse,20,ATF_SELF|ATF_SKILL; },{},{}
-//13063,
-//13064,
-//13065,
+13063,Adventure_Knife,Adventure Knife,4,0,,0,60,,1,0,0x02021040,7,2,2,1,1,0,1,{ bonus bUnbreakableWeapon,0; },{},{}
+13064,Academy_Knife,Academy Knife,4,0,,700,110,,1,1,0x02021040,7,2,2,1,1,1,1,{ bonus bUnbreakableWeapon,0; },{},{}
+13065,Academy_Eti_Knife,Academy Eti Knife,4,0,,1200,120,,1,1,0x00000001,7,2,2,1,1,1,1,{ bonus bUnbreakableWeapon,0; },{},{}
13066,P_Dagger3,Eden Dagger III,4,0,,0,165:80,,1,0,0xFE9F7EEF,7,2,2,3,60,0,1,{},{},{}
13067,Caress,Keris,4,20,,700,107:70,,1,1,0xFE9F7EEF,2,2,2,3,30,1,1,{ bonus2 bHpDrainRate,20,10; },{},{}
13068,Pompano,Pompano,4,0,,0,160:100,,3,0,0xFE9F7EEF,7,2,2,1,50,0,1,{ bonus bUnbreakableWeapon,0; autobonus "{ bonus bBaseAtk,30; }",10,7000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; autobonus "{ bonus bMatk,20; }",10,7000,BF_MAGIC,"{ specialeffect2 EF_SUFFRAGIUM; }"; if(BaseLevel>99) { bonus bBaseAtk,10; bonus bMatk,10; } },{},{}
@@ -6184,13 +6199,14 @@
13070,Scarlet-nail,Scarlet-nail,4,56000,,500,160:80,,1,0,0x000654E2,7,2,2,4,110,1,1,{ bonus bAtkEle,Ele_Fire; bonus2 bAddEff,Eff_Stone,100+(getrefine()*50); },{},{}
13071,Upg_Dagger,Upg Dagger,4,20,,600,55,,1,1,0xFE9F7EEF,7,2,2,3,1,1,1,{ bonus bBaseAtk,(getrefine()*10); bonus bMatk,(getrefine()*5); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*5); },{},{}
13072,Velum_Damascus,Vellum Damascus,4,20,,1000,180,,1,0,0xFE9F7EEF,7,2,2,4,95,1,1,{ bonus bAspdRate,getrefine(); },{},{}
-//13073,
+13073,Counter_Dagger_,Counter Dagger,4,120000,,550,140,,1,1,0x00810204,7,2,2,4,55,1,1,{},{},{}
13074,Ninja_Sword_Prototype,Ninja Sword Prototype,4,0,,0,0,,1,0,0x02000000,7,2,2,4,99,0,1,{},{},{}
13075,Kurenai,Kurenai,4,5000,,700,130,,1,0,0x02000000,7,2,2,3,99,1,1,{ bonus bInt,3; },{},{}
13076,Nachal_Sword,Nachal Sword,4,40000,,600,120:100,,1,1,0x02000000,7,2,2,3,110,1,1,{ bonus bInt,3; },{},{}
-//13077,
+13077,Kagekiri,Kagekiri,4,40000,,600,50:120,,1,0,74,7,2,2,4,100,1,1,{},{},{}
13078,Mikacheuki,Mikacheuki,4,40000,,600,50:120,,1,1,0x02000000,7,2,2,4,100,1,1,{},{},{}
// Revolvers
+13079,Metal_Dagger,Metal Dagger,4,20,,0,55,0,,1,0x02021040,7,2,2,3,1,1,1,{},{},{}
13100,Six_Shooter,Six Shooter,4,4500,,400,30,,7,1,0x01000000,7,2,34,1,10,1,17,{ bonus bHit,-10; },{},{}
13101,Six_Shooter_,Six Shooter,4,4500,,400,30,,7,2,0x01000000,7,2,34,1,10,1,17,{ bonus bHit,-10; },{},{}
13102,Crimson_Bolt,Crimson Bolt,4,20000,,450,45,,7,1,0x01000000,7,2,34,2,35,1,17,{ bonus bHit,-10; },{},{}
@@ -6353,8 +6369,8 @@
13429,E_Cutlas_C,Cutlus,4,2,,0,185,,1,0,0x000654E2,7,2,2,4,0,0,2,{ bonus bStr,2; },{},{}
13430,E_Solar_Sword_C,Solar Sword,4,2,,0,120,,1,0,0x000654E2,7,2,2,4,0,0,2,{ bonus bAtkEle,Ele_Fire; },{},{}
13431,Chrome_Sword,Chrome Sword,4,20,,2200,180,,1,0,0x000444A2,2,2,2,3,110,1,2,{ bonus bAgi,1; },{},{}
-//13432,
-//13433,
+13432,Adventure_Sword,Adventure Sword,4,0,,0,80,,1,0,0x00004082,7,2,2,1,1,0,2,{},{},{}
+13433,Academy_Sword,Academy Sword,4,0,,1200,120,,1,1,0x00004082,7,2,2,1,1,1,2,{},{},{}
13434,P_Saber3,Eden Saber III,4,0,,0,185,,1,0,0x000654E2,7,2,2,3,60,0,2,{},{},{}
// More Cash Shop Items
13500,Insurance60_Package,Life Insurrance Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14500,10; },{},{}
@@ -7161,6 +7177,7 @@
14304,Scuba_Mask_Box,Scuba Mask Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5397,1; },{},{}
14306,RWC_Special_Scroll,RWC Special Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ packageitem(); },{},{}
14307,RWC_Limited_Scroll,RWC Limited Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ packageitem(); },{},{}
+14308,Ardor_Scroll,Ardor Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
14314,Phreeoni_Scroll_Box,Phreeoni Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14597,10; },{},{}
14315,Ghostring_Scroll_Box,Ghostring Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14598,10; },{},{}
14316,July7_Scroll,July7 Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ packageitem(); },{},{}
@@ -7172,15 +7189,22 @@
14350,Mental_Potion50_Box,Mental Potion 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14600,50; },{},{}
14351,Tyr's_Blessing20_Box,Tyr's Blessing 20 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14601,20; },{},{}
14352,Tyr's_Blessing50_Box,Tyr's Blessing 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14601,50; },{},{}
+14361,Orc_HeroS_Box,Orc HeroS Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14604,10; },{},{}
14363,Heart_Scroll,Heart Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ packageitem(); },{},{}
+14372,Powder_Snow_Box,Powder Snow Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12317,1; },{},{}
14375,Holy_Celestial_Axe_Box,Celestial Axe Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1383,1; },{},{}
14376,Angeling_Pot_Box,Angeling Potion Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12350,1; },{},{}
14377,Shout_Megaphone_Box,Scream Megaphone Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12351,1; },{},{}
+14379,Love_Daddy_Box,Love Daddy Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5489,1; },{},{}
14380,Anubis_Helm_Box,Anubis Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5490,1; },{},{}
+14381,Piercing_Box_M,Piercing Box M,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1644,1; },{},{}
14393,Almighty_Charm_Box,Universal Amulet Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7945,1; },{},{}
+14407,Xmas_Scroll,Xmas Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
14408,New_Year_Scroll,New Year Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ packageitem(); },{},{}
+14438,Honglyun's_Sword_Box,Honglyun's Sword Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13420,1; },{},{}
14440,Dice_Hat_Box,Dice Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5496,1; },{},{}
14441,King_Tiger_Doll_Hat_Box,King Tiger Doll Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5497,1; },{},{}
+14442,Wondering_Wolf_Helm_Box,Wondering Wolf Helm Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5498,1; },{},{}
14447,Pirate's_Pride_Box,Pirate's Pride Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5501,1; },{},{}
14448,Necromencer's_Hood_Box,Necromancer's Hood Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5502,1; },{},{}
14459,Rabbit_Magic_Hat_Box,Magic Rabbit Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5503,1; },{},{}
@@ -7188,6 +7212,7 @@
14461,Asara_Fairy_Hat_Box,Ashura Fairy Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5505,1; },{},{}
14466,Valentine_Pledge_Box,Valentine's Emblem Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ packageitem(); },{},{}
14469,Ox_Tail_Scroll,Ox Tail Egg,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ packageitem(); },{},{}
+14485,Academy_Badge_Box,Academy Badge Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2751,1; },{},{}
14500,Insurance60,Life Insurrance Certificate,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_CASH_DEATHPENALTY,3600000,0; },{},{}
14508,Zeny_Scroll,Zeny Pet Egg Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
14509,Light_Center_Pot,Light Concentration Potion,2,800,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ATTHASTE_POTION1,1800000,0; },{},{}
@@ -7292,6 +7317,7 @@
14608,Luxurious_Dinner_E,Manchu-Han Imperial Feast,2,20000,,1200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCALLSTATUS,3600000,6; },{},{}
14609,Spoiled_Cuisine,Spoiled Cuisine,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 10,10; },{},{}
// More Armors
+14613,RWC_Scroll_2012,RWC Scroll 2012,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
15000,Bone_Plate,Bone Plate,5,20,,1000,,60,,1,0x000654E2,2,2,16,,85,1,0,{ bonus bStr,1; bonus bMdef,3; bonus2 bIgnoreDefRate,RC_DemiHuman,10; bonus2 bIgnoreDefRate,RC_Brute,10; bonus3 bAutoSpellWhenHit,"NPC_WIDEBLEEDING",1,10; },{},{}
15001,Odin's_Blessing_I,Odin's Blessing,5,0,,0,,10,,0,0xFFFFFFFE,7,2,16,,0,0,0,{},{},{}
15002,Rune_Plate,Rune Plate,5,0,,0,,95,,1,0x00000080,7,2,16,,99,1,0,{},{},{}
@@ -7325,24 +7351,24 @@
15030,Judgement_Robe,Judgement Robe,5,20,,300,,22,,0,0x00000100,2,2,16,,100,1,0,{ bonus bDefEle,Ele_Dark; bonus bMdef,10; bonus bStr,2; bonus bInt,1; bonus2 bSubRace,RC_Demon,10; bonus2 bSubRace,RC_Undead,10; bonus2 bSubRace,RC_Formless,-10; bonus2 bSubRace,RC_Brute,-10; bonus2 bSubRace,RC_DemiHuman,-10; bonus2 bSubRace,RC_Plant,-10; bonus2 bSubRace,RC_Insect,-10; bonus2 bSubRace,RC_Fish,-10; bonus2 bSubRace,RC_Angel,-10; bonus2 bSubRace,RC_Dragon,-10; },{},{}
15031,Paradise_Uniform4,Paradise Uniform IV,5,0,,0,,58,,0,0xFFFFFFFF,7,2,16,,60,0,0,{ bonus bMdef,5; bonus bMaxHP,500; bonus bMaxSP,50; bonus bStr,1; bonus bInt,1; bonus bDex,1; },{},{}
15032,Tidon,Tidon,5,20,,500,,2,,1,0xFFFFFFFE,7,2,16,,1,1,0,{ bonus bMdef,10; bonus2 bResEff,Eff_Stun,1500; bonus2 bResEff,Eff_Freeze,1500; bonus2 bSubRace,RC_NonBoss,5; bonus2 bSubRace,RC_Boss,5; },{},{}
-//15033,
-//15034,
-//15035,
+15033,Tutorial_Mattle,Tutorial Mantle,5,0,,600,,37,,0,0x00000000,7,2,16,,1,0,0,{},{},{}
+15034,Tutorial_Mattle_,Tutorial Mantle,5,0,,600,,37,,1,0x00000000,7,2,16,,1,0,0,{},{},{}
+15035,2010_Love_Dad,2010 Love Dad,5,10,,100,,6,,1,0xFFFFFFFF,7,2,16,,0,1,0,{ bonus bAllStats,1; bonus bMaxHP,150; bonus bMaxSP,150; bonus2 bResEff,Eff_Stone,9000; bonus2 bResEff,Eff_Freeze,9000; bonus2 bResEff,Eff_Stun,9000; bonus2 bResEff,Eff_Sleep,9000; bonus2 bResEff,Eff_Silence,9000; bonus2 bResEff,Eff_Curse,9000; bonus2 bResEff,Eff_Confusion,9000; bonus2 bResEff,Eff_Blind,9000; bonus2 bResEff,Eff_Poison,9000; bonus2 bResEff,Eff_Bleeding,9000; },{},{}
15036,Ur_Plate,Urj Plate,5,20,,3000,,110,,0,0x00000080,8,2,16,,100,1,0,{ bonus bMdef,10; bonus bMaxHPRate,getequiprefinerycnt(EQI_ARMOR); bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubEle,Ele_Neutral,5; },{},{}
15037,Peuz_Plate,Pertz Plate,5,20,,3000,,110,,0,0x00000080,8,2,16,,100,1,0,{ bonus bMdef,10; bonus bBaseAtk,20; bonus bFlee,17; },{},{}
15038,Sabah_Cloth,Sabath's Cloth,5,20,,100,,45,,1,0x00001000,7,2,16,,100,1,0,{ bonus bLuk,3; bonus3 bAutoSpell,"ASC_METEORASSAULT",getskilllv("ASC_METEORASSAULT"),10; },{},{}
15039,Nab_Cloth,Nabeu's Cloth,5,20,,100,,45,,1,0x00001000,7,2,16,,100,1,0,{ bonus bStr,2; bonus bInt,2; },{},{}
-//15040,
-//15041,
+15040,Prison_Uniform,Prison Uniform,5,10,,1500,,5,,0,0xFFFFFFFF,7,2,16,,50,1,0,{ set .@rate,(getrefine()>10)?10:getrefine(); bonus bHit,.@rate; bonus bFlee,.@rate; },{},{}
+15041,Boitata_Armor,Boitata Armor,5,20,,600,,45,,1,0xFFFFFFFF,7,2,16,,60,1,0,{ bonus bMdef,3; bonus2 bSubEle,Ele_Neutral,7; bonus bMaxHPrate,5; bonus bFlee,5; },{},{}
15042,White_Wing_Suit,White Wing Suit,5,20,,100,,45,,1,0x00000800,7,2,16,,100,1,0,{ bonus bLongAtkRate,getrefine()*2; bonus bFlee,getrefine(); },{},{}
15043,Black_Wing_Suit,Black Wing Suit,5,20,,100,,45,,1,0x00000800,8,2,16,,100,1,0,{ bonus bInt,2; bonus bBaseAtk,getequiprefinerycnt(EQI_ARMOR)*3; },{},{}
15044,Green_Surgical_Gown,Green Surgical Gown,5,56000,,660,,66,,1,0x00040000,7,2,16,,100,1,0,{ bonus bDex,1; bonus bMaxSP,30; },{},{}
-//15045,
+15045,Armor_Of_Valor,Armor Of Valor,5,0,,0,,4,,0,0xFFFFFFFF,7,2,16,,0,0,0,{},{},{}
15046,Siege_Plate,Siege Plate,5,0,,3300,,85,,1,0x006444A2,7,2,16,,95,1,0,{ bonus bMdef,5; bonus2 bSubRace,RC_DemiHuman,2; if(getrefine()>5) { bonus bHealpower2,12; bonus bAddItemHealRate,12; } if(getrefine()>8) { bonus bMaxHPRate,25; } },{},{}
15047,Siege_Suits,Siege Suit,5,0,,750,,50,,1,0x036E5CEA,7,2,16,,95,1,0,{ bonus bMdef,10; bonus2 bSubRace,RC_DemiHuman,2; if(getrefine()>5) { bonus bFlee2,5; bonus bLongAtkDef,20; } if(getrefine()>8) { bonus bMaxHPRate,15; } },{},{}
15048,Siege_Robe,Siege Robe,5,0,,500,,40,,1,0x00818315,7,2,16,,95,1,0,{ bonus bMdef,20; bonus2 bSubRace,RC_DemiHuman,2; if(getrefine()>5) { bonus bFlee,5; bonus bLongAtkDef,15; } if(getrefine()>8) { bonus bMaxHP,1000; bonus bMaxSP,100; } },{},{}
-//15049,
-//15050,
+15049,Armor_Of_Faith,Armor Of Faith,5,20,,1000,,0,,0,0xFFFFFFFF,7,2,16,,50,1,0,{ bonus bStr,4; bonus bInt,4; bonus bVit,4; bonus bDex,4; bonus bAgi,4; bonus bLuk,4; },{},{}
+15050,Armor_Of_Sanctity,Armor Of Sanctity,5,20,,1000,,0,,0,0xFFFFFFFF,7,2,16,,50,1,0,{ bonus bStr,4; bonus bInt,4; bonus bVit,4; bonus bDex,4; bonus bAgi,4; bonus bLuk,4; },{},{}
15051,Bakonawa_Armor,Bakunawa Scale Armor,5,20,,500,,55,,0,0xFFFFFFFF,7,2,16,,1,1,0,{ bonus2 bSubRace,RC_Boss,getrefine()/2; bonus bAllStats,1; },{},{}
15052,Bayani_Bakonawa_Armor,Bayani Bakunawa Scale Armor,5,20,,500,,55,,1,0xFFFFFFFF,7,2,16,,1,1,0,{ bonus2 bSubRace,RC_Boss,getrefine()/2; bonus bAllStats,2; },{},{}
15053,Special_Ninja_Suit,Special Ninja Suit,5,10000,,1200,,70,,0,0x02000000,7,2,16,,100,1,0,{ bonus bAgi,1+(getrefine()/3); },{},{}
@@ -7350,6 +7376,7 @@
15055,Armor_of_Nothingness,Armor of Nothingness,5,10000,,1500,,60,,1,0x02000000,7,2,16,,100,1,0,{ bonus bAgi,1; },{},{}
15056,Special_Ninja_Suit_,Special Ninja Suit,5,10000,,1200,,70,,1,0x02000000,7,2,16,,100,1,0,{ bonus bAgi,1+(getrefine()/3); },{},{}
// More Maces
+15057,Pure_White_Apron,Pure White Apron,5,20,,600,0,50,0,1,0xFFFFFFFF,7,2,16,,0,1,0,{},{},{}
16000,Erde,Erde,4,20,,500,130,,1,2,0x0004C5B2,2,2,2,4,50,1,8,{ bonus2 bSkillAtk,"AM_ACIDTERROR",20; bonus2 bSkillAtk,"AM_DEMONSTRATION",20; bonus bMaxSP,50; bonus bHealPower,10; },{},{}
16001,Red_Square_Bag,Red Square Bag,4,20,,500,130,,1,2,0x0004C5B2,2,2,2,3,50,1,8,{ bonus bMaxHP,200; bonus2 bSkillAtk,"AM_ACIDTERROR",20; bonus2 bSkillAtk,"AM_DEMONSTRATION",20; bonus2 bAddMonsterDropItem,501,50; bonus2 bAddMonsterDropItem,502,20; bonus2 bAddMonsterDropItem,503,20; bonus2 bAddMonsterDropItem,504,20; bonus2 bAddMonsterDropItem,505,10; if(readparam(bStr)>=95) bonus2 bAddEff,Eff_Stun,500; },{},{}
16002,Stunner_C,Stunner,4,0,,0,175,,1,0,0x00008110,7,2,2,3,1,0,8,{ bonus2 bAddEff,Eff_Stun,1000; bonus2 bAddSize,Size_Small,40; bonus2 bAddSize,Size_Medium,40; bonus2 bAddSize,Size_Large,40; },{},{}
@@ -7361,8 +7388,8 @@
16008,F_Spanner_C,Spanner,4,2,,0,150,,1,0,0x00008110,7,2,2,3,0,0,8,{},{},{}
16009,E_Spanner_C,Spanner,4,2,,0,150,,1,0,0x00008110,7,2,2,3,0,0,8,{},{},{}
16010,Red_Ether_Bag,Red Ether Bag,4,20,,0,15:100,,1,1,0x0004C5B2,7,2,2,3,102,1,8,{ if(getrefine()>=6){ bonus2 bSkillAtk,"GN_CRAZYWEED",20+((getrefine()-5)*2); bonus2 bSkillAtk,"GN_DEMONIC_FIRE",20+((getrefine()-5)*2); } else { bonus2 bSkillAtk,"GN_CRAZYWEED",20; bonus2 bSkillAtk,"GN_DEMONIC_FIRE",20; } },{},{}
-//16011,
-//16012,
+16011,Adventure_Mace,Adventure Mace,4,0,,0,60,,1,0,0x00008110,7,2,2,1,1,0,8,{},{},{}
+16012,Academy_Mace,Academy Mace,4,0,,1000,110,,1,1,0x00008110,7,2,2,1,1,1,8,{},{},{}
16013,Judgement_Mace1,Judgement Mace I,4,20,,1200,140:180,,1,2,0x00000100,2,2,2,3,100,1,8,{ bonus bStr,1; bonus bInt,1; autobonus "{ bonus2 bAddRace,RC_Demon,20; }",10,7000,BF_WEAPON|BF_MAGIC,"{ specialeffect2 EF_BLOODDRAIN; }"; },{},{}
16014,P_Mace3,Eden Mace III,4,0,,0,172,,1,0,0x0004C5B3,7,2,2,3,60,0,8,{},{},{}
16015,Cat_Club,Cat Club,4,20,,700,88,,1,3,0x0004C5B3,7,2,2,1,1,1,8,{ bonus2 bAddRace,RC_Brute,15; },{},{}
@@ -7373,39 +7400,43 @@
16020,Velum_Stunner,Vellum Stunner,4,20,,1500,170,,1,0,0x0004C5B3,7,2,2,4,95,1,8,{ bonus bUnbreakableWeapon,0; bonus2 bAddEff,Eff_Stun,1000+getrefine(); bonus bAspdRate,getrefine(); },{},{}
16021,Velum_Flail,Vellum Flail,4,20,,1500,170,,1,0,0x0004C5B3,7,2,2,4,95,1,8,{ bonus bUnbreakableWeapon,0; bonus3 bAutoSpell,"NPC_CRITICALWOUND",5,10; bonus bHit,getrefine(); bonus bCritical,getrefine(); },{},{}
// More Rental Boxes
+16022,Nemesis_,Nemesis ,4,20,,900,120,,1,2,0x00008110,7,2,2,4,60,1,8,{ bonus bUnbreakableWeapon,0; bonus bAtkEle,Ele_Holy; },{},{}
16134,King_Frog_Hat_Box,Frog King Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5528,1; },{},{}
16135,Evil's_Bone_Hat_Box,Satanic Bone Helm Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5529,1; },{},{}
-//16186,Baby_Dragon_Hat_Box,
-//16226,Aries_Diadem_Box,
-//16227,Aries_Crown_Box,
-//16230,Taurus_Diadem_Box,
-//16231,Taurus_Crown_Box,
-//16246,Crown_of_Deceit_Box,
+16186,B_Dragon_Hat_Box,Baby Dragon Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5531,1; },{},{}
+16226,Aries_Diadem_Box,Aries Diadem Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5545,1; },{},{}
+16227,Aries_Crown_Box,Aries Crown Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5546,1; },{},{}
+16230,Taurus_Diadem_Box,Taurus Diadem Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5549,1; },{},{}
+16231,Taurus_Crown_Box,Taurus Crown Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5550,1; },{},{}
+16246,Crown_Of_Deceit_Box,Crown Of Deceit Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5564,1; },{},{}
+16185,Raven_Cap_Box,Raven Cap Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5530,1; },{},{}
16247,Dragon_Arhat_Mask_Box,Dragon Arhat Mask Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5565,1; },{},{}
16248,Tiger_Arhat_Mask_Box,Tiger Arhat Mask Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5566,1; },{},{}
-//16249,Knight's_Gift_Box
+16249,Knight_Gift_Box,Knight Gift Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
//16250,Valkyrie's_Gift_Box
-//16251,Gemini_Diadem_Box
-//16252,Gemini_Crown_Box
+16251,Gemini_Diadem_Box,Gemini Diadem Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5569,1; },{},{}
+16252,Gemini_Crown_Box,Gemini Crown Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5570,1; },{},{}
+16253,Rabbit_Scroll,Rabbit Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
16257,Buddah_Scroll,Buddah Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ packageitem(); },{},{}
-//16258,HD_Bradium_5_Box,
-//16259,HD_Carnium_5_Box,
-//16260,HD_Bradium_10_Box,
-//16261,HD_Carnium_10_Box,
+16258,HD_Bradium_5_Box,HD Bradium 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6226,5; },{},{}
+16259,HD_Carnium_5_Box,HD Carnium 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6225,5; },{},{}
+16260,HD_Bradium_10_Box,HD Bradium 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6226,10; },{},{}
+16261,HD_Carnium_10_Box,HD Carnium 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6225,10; },{},{}
//16262,HD_Bradium_5_Box,
//16263,HD_Carnium_5_Box,
//16264,HD_Bradium_10_Box,
//16265,HD_Carnium_10_Box,
//16267,HE_Battle_Manual_Box
//16268,HE_Bubble_Gum_Box
-//16269,Cancer_Diadem_Box
-//16270,Cancer_Crown_Box,
+16269,Cancer_Diadem_Box,Cancer Diadem Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5581,1; },{},{}
+16270,Cancer_Crown_Box,Cancer Crown Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5582,1; },{},{}
16304,Evil_Incarnation,Evil Incarnation,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ packageitem(); },{},{}
-//16343,Leo_Crown_Box
-//16344,Leo_Diadem_Box
-//16345,Leo_Crown_Box
-//16346,Leo_Diadem_Box
-//16368,Virgo_Crown_Box
+16343,Leo_Crown_Box,Leo Crown Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5588,1; },{},{}
+16344,Leo_Diadem_Box,Leo Diadem Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5589,1; },{},{}
+16345,F_Leo_Crown_Box,F Leo Crown Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5588,1; },{},{}
+16346,F_Leo_Diadem_Box,F Leo Diadem Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5589,1; },{},{}
+16368,Virgo_Crown_Box,Virgo Crown Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5598,1; },{},{}
+16305,Upg_Guard_Box,Upg Guard Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2149,1; },{},{}
16371,Tw_Aug_Scroll,Tw Aug Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ packageitem(); },{},{}
16372,F_Clover_Box_Mouth,F Clover Box Mouth,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
16374,Mouth_Bubble_Gum_Box,Mouth Bubble Gum Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ packageitem(); },{},{}
@@ -7418,7 +7449,7 @@
16394,HD_Ori_Box10,HD Ori Box10,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6240,10; },{},{}
16395,HD_Elu_Box5,HD Elu Box5,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6241,5; },{},{}
16396,HD_Elu_Box10,HD Elu Box10,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6241,10; },{},{}
-//16397,Virgo_Diadem_Box
+16397,Virgo_Diadem_Box,Virgo Diadem Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5599,1; },{},{}
//16398,Virgo_Crown_Box
//16399,Virgo_Diadem_Box
16405,Midgard_Coin_Box,Midgard Coin Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6242,1; },{},{}
@@ -7909,11 +7940,13 @@
18673,Tare_Pope_,Tare Pope,5,20,,300,,0,,1,0xFFFFFFFF,7,2,256,,1,0,817,{ bonus bUnbreakableHelm,0; },{},{}
18674,Planewing_Hat,Planewing Hat,5,20,,200,,3,,1,0xFFFFFFFE,7,2,256,,1,1,11,{ bonus bAgi,3; },{},{}
18675,Green_Apple_Hat,Green Apple Hat,5,20,,200,,3,,1,0xFFFFFFFE,7,2,256,,20,1,11,{ bonus bDex,2; },{},{}
+18676,Hexagon_Spectacles,Hexagon Spectacles,5,20,,400,,3,,0,0xFFFFFFFE,7,2,512,,20,0,822,{ bonus bFlee,2; },{},{}
18677,Cherry_Twig_In_Mouth,Cherry Twig In Mouth,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,823,{},{},{}
18678,Leek_In_Mouth,Leek In Mouth,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,824,{},{},{}
18679,Abacus_In_Mouth,Abacus In Mouth,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,825,{},{},{}
18680,Tw_Frog_Hat,Tw Frog Hat,5,20,,200,,2,,0,0xFFFFFFFF,7,2,256,,35,0,11,{ bonus bAgi,1; },{},{}
18681,Puppy_Ears_Hat,Puppy Ears Hat,5,20,,200,,2,,0,0xFFFFFFFF,7,2,256,,1,1,11,{ bonus bVit,2; },{},{}
+18682,Teardrop,Teardrop,5,20,,100,,1,,0,0xFFFFFFFF,7,2,512,,1,1,828,{ bonus bMaxSP,15; },{},{}
18683,Carrot_In_Mouth,Carrot In Mouth,5,20,,200,,1,,0,0xFFFFFFFF,7,2,1,,1,0,829,{},{},{}
18684,Showy_High_Cap,Showy High Cap,5,20,,200,,3,,1,0xFFFFFFFE,7,2,256,,1,1,11,{ bonus bStr,3; bonus bInt,2; },{},{}
18685,Stardust_Hairband,Stardust Hairband,5,20,,1000,,0,,0,0xFFFFFFFF,7,2,256,,10,0,831,{},{},{}
@@ -7988,6 +8021,7 @@
19500,T_Mr_Smile,T Mr Smile,5,0,,0,,0,,0,0xFFFFFFFF,7,2,6144,,0,0,65,{ bonus bStr,2; },{},{}
19501,T_Spinx_Helm,T Spinx Helm,5,0,,0,,0,,1,0xFFFFFFFF,7,2,5120,,0,0,137,{},{},{}
//
+19502,T_Goggle,T Goggle,5,0,,0,,0,,0,0xFFFFFFFF,7,2,3072,,0,0,1,{},{},{}
19504,T_Sunglasses,T Sunglasses,5,0,,0,,0,,0,0xFFFFFFFF,7,2,2048,,0,0,12,{},{},{}
19505,T_Cigarette,T Cigarette,5,0,,0,,0,,0,0xFFFFFFFF,7,2,4096,,0,0,54,{},{},{}
19506,T_Valkyrie_Feather_Band,T Valkyrie Feather Band,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,0,1,300,{},{},{}
@@ -8015,6 +8049,7 @@
19528,C_Iron_Cain,Costume Iron Cain,5,0,,0,,0,,0,0xFFFFFFFF,7,2,4096,,1,0,53,{ bonus bUnbreakableHelm,0; },{},{}
19529,C_Angel_Wing,Costume Angel Wing,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,38,{ bonus bUnbreakableHelm,0; bonus bVit,1; bonus bAgi,1; },{},{}
19530,C_Wild_Rose,Costume Wild Rose,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,541,{ bonus bUnbreakableHelm,0; bonus bAtk,2; bonus bMatk,2; },{},{}
+19531,C_Cube_Mask,Costume Cube Mask,5,0,,0,,0,,0,0xFFFFFFFF,7,2,6144,,0,0,472,{ bonus bUnbreakableHelm,0; },{},{}
19532,C_Red_Bunny_Band,Red Bunny Band,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,640,{ bonus bUnbreakableHelm,0; bonus bDex,1; },{},{}
19533,C_Spore_Hat,Costume Spore Hat,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,114,{ bonus bUnbreakableHelm,0; bonus bVit,1; bonus2 bExpAddRace,RC_NonBoss,1; bonus2 bExpAddRace,RC_Boss,1;},{},{}
19534,C_Tha_Despero_Mask,Tha Despero Mask,5,20,,0,,0,,0,0xFFFFFFFF,7,2,513,,1,0,693,{ bonus bAtkRate,1; bonus bMatkRate,1; bonus bHealPower,1; },{},{}
@@ -8038,11 +8073,14 @@
19552,C_Centimental_Flower,Costume Centimental Flower,5,20,,100,,0,,0,0xFFFFFFFF,7,2,4096,,100,0,56,{ bonus bUnbreakableHelm,0; },{},{}
19553,C_Assassin_Mask_,Costume Assassin Mask,5,20,,100,,0,,0,0xFFFFFFFF,7,2,4096,,100,0,180,{ bonus bUnbreakableHelm,0; },{},{}
19573,C_Heart_Wing_Hairband,Costume Heart Wing Hairband,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,1,733,{},{},{}
+19574,C_Lord_of_Death,Costume Lord of Death,5,0,,0,,0,,0,0xFFFFFFFF,7,2,3072,,0,1,742,{ bonus bUnbreakableHelm,0; },{},{}
19587,C_King_Poring_Hat,Costume King Poring Hat,5,0,,100,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,905,{ bonus bUnbreakableHelm,0; },{},{}
19650,C_Rainbow_Feather_Deco,Costume Rainbow Feather Deco,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,1,934,{},{},{}
+19707,C_Polar_Bear_Cap,Costume Polar Bear Cap,5,20,,0,,0,,0,0xFFFFFFFF,7,2,1024,,0,0,966,{ bonus bUnbreakableHelm,0; },{},{}
20500,T_Archangel_Wing,Archangel Wing,5,0,,0,,0,,0,0xFFFFFFFF,7,2,8192,,1,0,1,{ bonus bUnbreakableHelm,0; },{},{}
20600,Fantastic_Aura,Fantastic Aura,5,0,,0,,0,,0,0xFFFFFFFF,7,2,16384,,1,0,0,{ bonus bUnbreakableHelm,0; },{},{}
20700,Egir_Manteau,Egir Manteau,5,200000,,300,,10,,1,0xFFFFFFFF,7,2,4,,110,1,0,{ bonus bUnbreakableHelm,0; },{},{}
+20711,Manteau_Of_Diego,Manteau Of Diego,5,20,,600,,15,,1,0xFFFFFFFF,7,2,4,,0,1,0,{ bonus bInt,1; bonus bDex,1; bonus bMdef,3; },{},{}
20724,Love_Dad_Wings_2012,Love Dad Wings 2012,5,0,,100,,15,,1,0xFFFFFFFF,7,2,4,,1,1,5,{},{},{}
// More 2-Handed Swords
21000,Upg_Twohand_Sword,Upg Two-Handed Sword,4,20,,1500,100,,1,1,0x00004082,7,2,34,3,1,1,3,{ bonus bBaseAtk,(getrefine()*12); bonus bMatk,(getrefine()*5); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*10); },{},{}
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index 96dbd0c7a..f51fd8fc6 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -9,17 +9,22 @@
//= http://hercules.ws/board/
//====================================================
//= Hercules Map Zone Database [Ind/Hercules]
-//==
+//================ More Information ==================
+//= http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/
+//= (TODO: replace with wiki link and detail the wiki page in a decent format ^)
+//====================================================
+//================ Description =======================
//= A unlimited number of zones may be created, a zone
//= may be used to create a set of disabled items, disabled skills
-//= and mapflags to be used by as many maps as one chooses,
-//= maps can be linked to a specific zone through the zone mapflag
-//= '<map name><tab>mapflag<tab>zone<tab><zone name>'
-//== available types for 'disabled_skills':
+//= and mapflags to be used by as many maps as one chooses.
+//= Maps can be linked to a specific zone through the zone mapflag
+//= '<map name><tab>mapflag<tab>zone<tab><zone name>'.
+//====================================================
+//= Available types for 'disabled_skills':
//= PLAYER, HOMUN, MERCENARY, MONSTER, PET, ELEMENTAL, MOB_BOSS, CLONE, ALL and NONE
-//== More on
-//= http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/
-//= (TODO: replace with wiki link and detail the wiki page in a decent format ^)
+//====================================================
+
+
zones: (
{
/* All zone is a dynamic (very special) zone that is forcebly inherited by ALL maps automatically */
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 3cd90f201..28908c0e7 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -8,7 +8,7 @@
//=
//= http://hercules.ws/board/
//================= More Information =================
-// http://hercules.ws/board/topic/1188-skill-tree-db-redesign/ <desc~!>
+// http://hercules.ws/board/topic/1188-skill-tree-db-redesign/
//================ Structure Example =================
/*
Job_Name: { //Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there)
diff --git a/db/skill_changematerial_db.txt b/db/skill_changematerial_db.txt
index 35b123f66..72b2b1e17 100644
--- a/db/skill_changematerial_db.txt
+++ b/db/skill_changematerial_db.txt
@@ -1,85 +1,87 @@
// Change Material Database
//
// Structure of Database:
-// ProductID,BaseRate,MakeAmount1,MakeAmountRate1...,MakeAmount5,MakeAmountRate5
-//
+// ProductID,BaseRate,MakeAmount1,MakeAmountRate1,MakeAmount2,MakeAmountRate2
+// MakeAmount3,MakeAmountRate3,MakeAmount4,MakeAmountRate4,MakeAmount5,MakeAmountRate5
+//====================================================
// NOTE:
// Up to 5 ID/Amount pairs can be specified.
// Rate = n/10%
+//====================================================
-703,4,800,2,200 // Hinalle
-958,800,9,1000 // Horrendous_Mouth
-959,800,7,1000 // Rotten_Scale
-960,1000,6,800,9,200 // Nipper
-961,800,3,1000 // Conch
-962,1000,4,800,6,200 // Tentacle
-963,800,3,1000 // Sharp_Scale
-964,800,8,1000 // Crap_Shell
-967,800,4,1000 // Turtle_Shell
-968,800,5,1000 // Voucher_Of_Orcish_Hero
-970,800,9,1000 // Alchol
-971,800,5,1000 // Detrimindexta
-973,800,4,1000 // Counteragent
-974,1000,4,800,6,200 // Mixture
-991,1000,1,500,1,500 // Crystal_Blue
-992,1000,1,500,1,500 // Wind_Of_Verdure
-999,1000,10,1000 // Steel
-1003,500,1,1000 // Coal
-1008,800,6,1000 // Frozen_Heart
-1009,800,4,1000 // Sacred_Marks
-1010,800,8,1000 // Phracon
-1011,800,4,1000 // Emveretarcon
-1012,800,3,1000 // Lizard_Scruff
-1013,9,800,13,200 // Colorful_Shell
-1014,4,800,6,200 // Jaws_Of_Ant
-1016,1000,7,800,10,200 // Rat_Tail
-1019,800,2,1000 // Wooden_Block
-1020,1000,4,800,6,200 // Long_Hair
-1021,800,4,1000 // Dokkaebi_Horn
-1022,1000,2,800,3,200 // Fox_Tail
-1024,800,4,1000 // Chinese_Ink
-1025,800,8,1000 // Spiderweb
-1026,800,4,1000 // Acorn
-1030,800,2,1000 // Tiger_Footskin
-1033,1000,4,800,6,200 // Root_Of_Maneater
-1034,1000,6,800,9,200 // Cobold_Hair
-1035,1000,8,800,12,200 // Dragon_Canine
-1037,800,6,1000 // Dragon_Train
-1038,1000,1,1000 // Petite_Dablofs_Horn
-1040,1000,8,800,12,200 // Elder_Pixie's_Beard
-1041,800,3,1000 // Lantern
-1042,800,6,1000 // Short_Leg
-1043,800,6,1000 // Nail_Of_Orc
-1045,800,8,1000 // Sacred_Masque
-1046,800,4,1000 // Tweezer
-1049,800,6,1000 // Skirt_Of_Virgin
-1050,800,3,1000 // Tendon
-1051,800,7,1000 // Detonator
-1053,1000,6,800,9,200 // Tooth_Of_Ancient_Fish
-1056,800,8,1000 // Grit
-1058,800,5,1000 // Wing_Of_Moth
-1059,1000,5,1000 // Transparent_Cloth
-1061,80,2,1000 // Starsand_Of_Witch
-1061,1000,1,1000 // Starsand_Of_Witch
-1064,800,8,1000 // Reins
-1615,200,1,1000 // Bone_Wand
-2267,1000,1,1000 // Cigar
-2267,1000,1,1000 // Cigar
-7063,1000,1,200,1,200,1,100 // Soft_Feather
-7166,1000,2,1000 // Soft_Silk_Cloth
-13269,1000,5,500,2,250,1,100 // Boost500_To_Throw
-13270,1000,5,500,2,250,1,100 // Full_SwingK_To_Throw
-13271,1000,5,500,2,250,1,100 // Mana_Plus_To_Throw
-13272,1000,5,500,2,250,1,100 // Cure_Free_To_Throw
-13273,1000,5,500,2,250,1,100 // Stamina_Up_M_To_Throw
-13274,1000,5,500,2,250,1,100 // Digestive_F_To_Throw
-13275,1000,10,1000 // HP_Inc_PotS_To_Throw
-13276,1000,10,1000 // HP_Inc_PotM_To_Throw
-13277,1000,10,1000 // HP_Inc_PotL_To_Throw
-13278,1000,10,1000 // SP_Inc_PotS_To_Throw
-13279,1000,10,1000 // SP_Inc_PotM_To_Throw
-13280,1000,10,1000 // SP_Inc_PotL_To_Throw
-13281,1000,10,1000 // En_White_PotZ_To_Throw
-13282,1000,10,1000 // Vitata500_To_Throw
-13283,1000,10,1000 // En_Cel_Juice_To_Throw
+703,4,800,2,200 // Hinalle
+958,800,9,1000 // Horrendous_Mouth
+959,800,7,1000 // Rotten_Scale
+960,1000,6,800,9,200 // Nipper
+961,800,3,1000 // Conch
+962,1000,4,800,6,200 // Tentacle
+963,800,3,1000 // Sharp_Scale
+964,800,8,1000 // Crap_Shell
+967,800,4,1000 // Turtle_Shell
+968,800,5,1000 // Voucher_Of_Orcish_Hero
+970,800,9,1000 // Alchol
+971,800,5,1000 // Detrimindexta
+973,800,4,1000 // Counteragent
+974,1000,4,800,6,200 // Mixture
+991,1000,1,500,1,500 // Crystal_Blue
+992,1000,1,500,1,500 // Wind_Of_Verdure
+999,1000,10,1000 // Steel
+1003,500,1,1000 // Coal
+1008,800,6,1000 // Frozen_Heart
+1009,800,4,1000 // Sacred_Marks
+1010,800,8,1000 // Phracon
+1011,800,4,1000 // Emveretarcon
+1012,800,3,1000 // Lizard_Scruff
+1013,9,800,13,200 // Colorful_Shell
+1014,4,800,6,200 // Jaws_Of_Ant
+1016,1000,7,800,10,200 // Rat_Tail
+1019,800,2,1000 // Wooden_Block
+1020,1000,4,800,6,200 // Long_Hair
+1021,800,4,1000 // Dokkaebi_Horn
+1022,1000,2,800,3,200 // Fox_Tail
+1024,800,4,1000 // Chinese_Ink
+1025,800,8,1000 // Spiderweb
+1026,800,4,1000 // Acorn
+1030,800,2,1000 // Tiger_Footskin
+1033,1000,4,800,6,200 // Root_Of_Maneater
+1034,1000,6,800,9,200 // Cobold_Hair
+1035,1000,8,800,12,200 // Dragon_Canine
+1037,800,6,1000 // Dragon_Train
+1038,1000,1,1000 // Petite_Dablofs_Horn
+1040,1000,8,800,12,200 // Elder_Pixie's_Beard
+1041,800,3,1000 // Lantern
+1042,800,6,1000 // Short_Leg
+1043,800,6,1000 // Nail_Of_Orc
+1045,800,8,1000 // Sacred_Masque
+1046,800,4,1000 // Tweezer
+1049,800,6,1000 // Skirt_Of_Virgin
+1050,800,3,1000 // Tendon
+1051,800,7,1000 // Detonator
+1053,1000,6,800,9,200 // Tooth_Of_Ancient_Fish
+1056,800,8,1000 // Grit
+1058,800,5,1000 // Wing_Of_Moth
+1059,1000,5,1000 // Transparent_Cloth
+1061,80,2,1000 // Starsand_Of_Witch
+1061,1000,1,1000 // Starsand_Of_Witch
+1064,800,8,1000 // Reins
+1615,200,1,1000 // Bone_Wand
+2267,1000,1,1000 // Cigar
+2267,1000,1,1000 // Cigar
+7063,1000,1,200,1,200,1,100 // Soft_Feather
+7166,1000,2,1000 // Soft_Silk_Cloth
+13269,1000,5,500,2,250,1,100 // Boost500_To_Throw
+13270,1000,5,500,2,250,1,100 // Full_SwingK_To_Throw
+13271,1000,5,500,2,250,1,100 // Mana_Plus_To_Throw
+13272,1000,5,500,2,250,1,100 // Cure_Free_To_Throw
+13273,1000,5,500,2,250,1,100 // Stamina_Up_M_To_Throw
+13274,1000,5,500,2,250,1,100 // Digestive_F_To_Throw
+13275,1000,10,1000 // HP_Inc_PotS_To_Throw
+13276,1000,10,1000 // HP_Inc_PotM_To_Throw
+13277,1000,10,1000 // HP_Inc_PotL_To_Throw
+13278,1000,10,1000 // SP_Inc_PotS_To_Throw
+13279,1000,10,1000 // SP_Inc_PotM_To_Throw
+13280,1000,10,1000 // SP_Inc_PotL_To_Throw
+13281,1000,10,1000 // En_White_PotZ_To_Throw
+13282,1000,10,1000 // Vitata500_To_Throw
+13283,1000,10,1000 // En_Cel_Juice_To_Throw
diff --git a/db/spellbook_db.txt b/db/spellbook_db.txt
index 11c447365..c7be7b8db 100644
--- a/db/spellbook_db.txt
+++ b/db/spellbook_db.txt
@@ -1,29 +1,36 @@
// Reading Spellbook Preserve Points Database
//
// Structure of Database:
-// SkillID,PreservePoints,Required Book
-//
-// To add more entries, increase MAX_SKILL_SPELLBOOK_DB in skill.h.
+// SkillID,PreservePoints,Required Book
+//====================================================
+// To add more entries, increase MAX_SKILL_SPELLBOOK_DB in /src/map/skill.h.
+//====================================================
-//Mage
-14,7,6190 //Cold Bolt
-19,7,6189 //Fire Bolt
-20,7,6191 //Lightning Bolt
-21,9,6197 //Thunder Storm
+//================
+// Mage
+//================
+14,7,6190 // Cold Bolt
+19,7,6189 // Fire Bolt
+20,7,6191 // Lightning Bolt
+21,9,6197 // Thunder Storm
-//Wizard
-83,10,6194 //Meteor Storm
-84,9,6198 //Jupitel Thunder
-85,10,6193 //Lord of Vermillion
-86,9,6199 //Water Ball
-89,10,6192 //Storm Gust
-90,8,6201 //Earth Spike
-91,9,6200 //Heaven's Drive
+//================
+// Wizard
+//================
+83,10,6194 // Meteor Storm
+84,9,6198 // Jupitel Thunder
+85,10,6193 // Lord of Vermillion
+86,9,6199 // Water Ball
+89,10,6192 // Storm Gust
+90,8,6201 // Earth Spike
+91,9,6200 // Heaven's Drive
-//Warlock
-2210,8,6205 //Drain Life
-2211,12,6204 //Crimson Rock
-2213,22,6195 //Comet
-2214,12,6203 //Chain Lightning
-2216,12,6202 //Earth Strain
-2217,22,6196 //Tetra Vortex
+//================
+// Warlock
+//================
+2210,8,6205 // Drain Life
+2211,12,6204 // Crimson Rock
+2213,22,6195 // Comet
+2214,12,6203 // Chain Lightning
+2216,12,6202 // Earth Strain
+2217,22,6196 // Tetra Vortex
diff --git a/npc/re/mobs/dungeons/moc_pryd.txt b/npc/re/mobs/dungeons/moc_pryd.txt
index dcd5197f1..6fc0dbb8a 100644
--- a/npc/re/mobs/dungeons/moc_pryd.txt
+++ b/npc/re/mobs/dungeons/moc_pryd.txt
@@ -10,6 +10,7 @@
//= 1.1 Official kRO 10.1 spawns [Playtester]
//= 1.2 More accurate spawns [Playtester]
//= 1.3 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.4 Added Nightmare spawns. [Euphy]
//============================================================
//==================================================
@@ -62,3 +63,19 @@ moc_pryd06,0,0,0,0 monster Verit 1032,30,5000,0,0
moc_pryd06,0,0,0,0 monster Arclouze 1194,20,5000,0,0
moc_pryd06,0,0,0,0 monster Ancient Mummy 1297,20,5000,0,0
moc_pryd06,102,85,1,1 boss_monster Amon Ra 1511,1,3600000,600000,0
+
+//==================================================
+// moc_prydn1 - Nightmare Mode
+//==================================================
+moc_prydn1,0,0,0,0 monster Nightmare Minorous 2353,60,5000,0,0
+moc_prydn1,0,0,0,0 monster Nightmare Mummy 2354,10,5000,0,0
+moc_prydn1,0,0,0,0 monster Nightmare Verit 2355,50,5000,0,0
+
+//==================================================
+// moc_prydn2 - Nightmare Mode
+//==================================================
+moc_prydn2,0,0,0,0 monster Nightmare Mimic 2356,30,5000,0,0
+moc_prydn2,0,0,0,0 monster Nightmare Verit 2355,30,5000,0,0
+moc_prydn2,0,0,0,0 monster Nightmare Arclouze 2358,20,5000,0,0
+moc_prydn2,0,0,0,0 monster Nightmare Ancient Mummy 2360,20,5000,0,0
+moc_prydn2,102,85,1,1 boss_monster Nightmare Amon Ra 2362,1,3600000,600000,1
diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql
index 1df585585..5dc94985c 100644
--- a/sql-files/item_db_re.sql
+++ b/sql-files/item_db_re.sql
@@ -3310,6 +3310,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(5658, 'Imp_Hat', 'Imp Hat', 5, 20, 10, 400, 0, 0, 1, 0, 0, 4294967295, 7, 2, 256, 0, 1, 0, 1, 589, 'bonus3 bAutoSpell,"SA_FLAMELAUNCHER",1,5;', '', ''),
(5659, 'Sleeper_Hat', 'Sleeper Hat', 5, 20, 10, 400, 0, 0, 1, 0, 0, 4294967295, 7, 2, 256, 0, 1, 0, 1, 590, 'bonus3 bAutoSpell,"SA_SEISMICWEAPON",1,5;', '', ''),
(5660, 'Gryphon_Hat', 'Gryphon Hat', 5, 20, 10, 400, 0, 0, 1, 0, 0, 4294967295, 7, 2, 256, 0, 1, 0, 1, 591, 'bonus3 bAutoSpell,"SA_LIGHTNINGLOADER",1,5;', '', ''),
+(5661, 'Red_Pirate_Bandana', 'Red Pirate Bandana', 5, 0, 0, 0, 0, 0, 3, 0, 0, 4294967295, 7, 2, 256, 0, 10, 0, 1, 592, 'bonus bStr,1; bonus bDex,1; bonus bAspdRate,2; bonus bVariableCastrate,-2; bonus3 bAutoSpell,"MO_EXTREMITYFIST",1,3;', '', ''),
(5664, 'Filir_Wing', 'Filir''s Pinions', 5, 20, 10, 100, 0, 0, 1, 0, 0, 4294967295, 7, 2, 512, 0, 70, 0, 1, 595, 'bonus bAspdRate,2; bonus bVariableCastrate,-2;', '', ''),
(5665, 'Shaman_Hat', 'Shaman Hat', 5, 20, 10, 400, 0, 0, 1, 0, 1, 4294967295, 7, 2, 256, 0, 1, 0, 1, 596, 'bonus2 bSubEle,Ele_Neutral,3; bonus2 bSubEle,Ele_Water,3; bonus2 bSubEle,Ele_Earth,3; bonus2 bSubEle,Ele_Fire,3; bonus2 bSubEle,Ele_Wind,3; bonus2 bSubEle,Ele_Poison,3; bonus2 bSubEle,Ele_Holy,3; bonus2 bSubEle,Ele_Dark,3; bonus2 bSubEle,Ele_Ghost,3; bonus2 bSubEle,Ele_Undead,3;', '', ''),
(5666, 'Golden_Crown', 'Golden Crown', 5, 20, 10, 500, 0, 0, 8, 0, 1, 4294967295, 7, 2, 256, 0, 1, 0, 1, 597, 'bonus bInt,1; bonus bDex,1; bonus bLuk,1;', '', ''),
@@ -3391,6 +3392,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(5759, 'Noah_Hat', 'Noah Hat', 5, 20, 10, 500, 0, 0, 1, 0, 1, 4294967295, 7, 2, 256, 0, 1, 0, 1, 636, 'bonus bMdef,3;', '', ''),
(5760, 'Driver_Band_', 'Driver Band', 5, 20, 10, 100, 0, 0, 12, 0, 1, 1024, 8, 0, 256, 0, 100, 0, 1, 637, 'bonus bStr,1; bonus bDex,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bBaseAtk,10; bonus bCritical,3; }', '', ''),
(5763, 'Red_Bunny_Band', 'Red Bunny Band', 5, 0, 0, 200, 0, 0, 4, 0, 0, 4294967295, 7, 2, 256, 0, 1, 0, 1, 640, 'bonus bAgi,2; bonus bMdef,3;', '', ''),
+(5764, 'Love_Rabbit_Hood', 'Love Rabbit Hood', 5, 20, 10, 300, 0, 0, 1, 0, 1, 4294967295, 7, 2, 769, 0, 10, 0, 0, 549, 'bonus3 bAutoSpell,"PR_GLORIA",3,((readparam(bAgi)>=80)?30:10);', '', ''),
(5765, 'Black_Tail_Ribbon', 'Black Tail Ribbon', 5, 20, 10, 100, 0, 0, 0, 0, 1, 4294967295, 7, 2, 256, 0, 10, 0, 1, 642, 'bonus bMdef,5; bonus bLongAtkDef,10; bonus2 bSubEle,Ele_Neutral,5;', '', ''),
(5766, 'Amistr_Cap', 'Amistr Cap', 5, 20, 10, 500, 0, 0, 4, 0, 0, 4294967295, 7, 2, 256, 0, 50, 0, 1, 643, 'bonus bVit,5; bonus3 bAutoSpellWhenHit,"NPC_STONESKIN",6,20;', '', ''),
(5767, 'Samurai_Mask', 'Samurai Mask', 5, 20, 10, 300, 0, 0, 1, 0, 0, 4294967295, 7, 2, 1, 0, 50, 0, 0, 644, 'bonus2 bAddRace,RC_NonBoss,1; bonus2 bAddRace,RC_Boss,1;', '', ''),
@@ -3401,6 +3403,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(5775, 'Choco_Donut_In_Mouth', 'Choco Donut In Mouth', 5, 20, 10, 50, 0, 0, 1, 0, 0, 4294967295, 7, 2, 1, 0, 1, 0, 0, 653, 'bonus bMaxHP,50;', '', ''),
(5776, 'Blazing_Sun', 'Blazing Sun', 5, 0, 0, 500, 0, 0, 0, 0, 0, 4294967295, 7, 2, 256, 0, 1, 0, 1, 654, 'bonus2 bVariableCastrate,"MG_FIREBOLT",-5; bonus2 bSkillAtk,"MG_FIREBOLT",5; bonus2 bVariableCastrate,"MG_FIREBALL",-5; bonus2 bSkillAtk,"MG_FIREBALL",5; bonus2 bSkillAtk,"MG_FIREWALL",3; bonus2 bSkillAtk,"WZ_METEOR",3; bonus bUseSPrate,5;', '', ''),
(5781, 'Persika', 'Persika', 5, 20, 10, 100, 0, 0, 0, 0, 1, 4294967295, 7, 2, 256, 0, 0, 0, 0, 659, 'bonus bFlee,1; bonus bMaxSP,20;', '', ''),
+(5782, 'Hoplite_Helmet', 'Hoplite Helmet', 5, 20, 10, 700, 0, 0, 4, 0, 1, 4294967295, 7, 2, 769, 0, 1, 0, 1, 660, '', '', ''),
(5786, 'Ancient_Elven_Ear', 'Ancient Elven Ear', 5, 10, 5, 200, 0, 0, 1, 0, 0, 4294967295, 7, 2, 512, 0, 1, 0, 0, 665, 'bonus bLuk,1; bonus bMaxHP,100; bonus bMaxSP,30;', '', ''),
(5787, 'Tha_Maero_Mask', 'Tha Maero Mask', 5, 20, 10, 100, 0, 0, 0, 0, 0, 4294967295, 7, 2, 513, 0, 30, 0, 0, 666, 'bonus bMdef,2;', '', ''),
(5788, '3D_Glasses', '3D Glasses', 5, 20, 10, 100, 0, 0, 1, 0, 0, 4294967295, 7, 2, 512, 0, 1, 0, 0, 661, 'bonus2 bSubEle,Ele_Neutral,5; bonus2 bMagicAddRace,RC_Formless,4;', '', ''),
@@ -3425,6 +3428,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(5810, 'Ph.D_Hat_V', 'Ph.D Hat V', 5, 20, 10, 100, 0, 0, 3, 0, 0, 4294967294, 7, 2, 256, 0, 0, 0, 1, 98, 'bonus bInt,5; bonus bVit,3; bonus bDex,3;', '', ''),
(5811, 'Santa_Beard', 'Santa''s Beard', 5, 20, 10, 100, 0, 0, 5, 0, 0, 4294967295, 7, 2, 1, 0, 0, 0, 0, 25, 'bonus2 bSubRace,RC_Brute,5;', '', ''),
(5812, 'Hat_Of_Expert', 'Hat Of Expert', 5, 0, 0, 0, 0, 0, 2, 0, 0, 4294967295, 7, 2, 256, 0, 0, 0, 1, 16, 'bonus3 bAddEffWhenHit,Eff_Bleeding,500,ATF_TARGET|ATF_SELF; bonus3 bAddEffWhenHit,Eff_Silence,500,ATF_TARGET|ATF_SELF; bonus3 bAddEffWhenHit,Eff_Confusion,500,ATF_TARGET|ATF_SELF; bonus3 bAddEffWhenHit,Eff_Curse,500,ATF_TARGET|ATF_SELF; bonus3 bAddEffWhenHit,Eff_Blind,500,ATF_TARGET|ATF_SELF;', '', ''),
+(5814, 'Ati_Atihan_Hat3', 'Ati Atihan Hat3', 5, 20, 10, 0, 0, 0, 2, 0, 0, 4294967295, 7, 2, 769, 0, 20, 0, 0, 303, '', '', ''),
(5815, 'Cowboy_Hat_J', 'Purple Cowboy Hat', 5, 20, 10, 500, 0, 0, 2, 0, 0, 4294967295, 7, 2, 256, 0, 0, 0, 1, 475, 'bonus bStr,1; bonus2 bSubSize,Size_Small,5; bonus2 bSubSize,Size_Medium,5; bonus2 bSubSize,Size_Large,5;', '', ''),
(5816, 'Classic_Hat_J', 'Classic Hat', 5, 20, 10, 500, 0, 0, 0, 0, 0, 4294967295, 7, 2, 256, 0, 0, 0, 1, 411, '', '', ''),
(5817, 'Valentine_Pledge', 'Valentine Pledge', 5, 20, 10, 0, 0, 0, 3, 0, 0, 4294967295, 7, 2, 136, 0, 0, 0, 0, 0, 'bonus bAllStats,2; bonus bMdef,3; bonus bHealPower,10; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; bonus bMatkRate,3; bonus bFlee,10; bonus bAspdRate,1;', '', ''),
@@ -3450,15 +3454,16 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(5837, 'Woe_Sunglass', 'Woe Sunglass', 5, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 512, 0, 70, 0, 0, 12, '', '', ''),
(5838, 'Woe_Fin_Helm', 'Woe Fin Helm', 5, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 512, 0, 70, 0, 0, 100, '', '', ''),
(5839, 'Woe_Blush', 'Woe Blush', 5, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 512, 0, 70, 0, 0, 125, '', '', ''),
-(5840, 'Woe_Elven_Ears', 'Woe Elven Ears', 5, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 512, 0, 70, 0, 0, 73, '', '', ''),
+(5840, 'Woe_Elven_Ears', 'Woe Elven Ears', 5, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 512, 0, 70, 0, 0, 73, '', '', '');
+INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
(5841, 'Shaman_Hat_', 'Shaman_Hat', 5, 20, 10, 100, 0, 0, 1, 0, 1, 4294967295, 7, 2, 256, 0, 30, 0, 1, 596, 'bonus bLuk,2; bonus3 bSubEle,Ele_Neutral,3,BF_MAGIC; bonus3 bSubEle,Ele_Water,3,BF_MAGIC; bonus3 bSubEle,Ele_Earth,3,BF_MAGIC; bonus3 bSubEle,Ele_Fire,3,BF_MAGIC; bonus3 bSubEle,Ele_Wind,3,BF_MAGIC; bonus3 bSubEle,Ele_Poison,3,BF_MAGIC; bonus3 bSubEle,Ele_Holy,3,BF_MAGIC; bonus3 bSubEle,Ele_Dark,3,BF_MAGIC; bonus3 bSubEle,Ele_Ghost,3,BF_MAGIC; bonus3 bSubEle,Ele_Undead,3,BF_MAGIC;', '', ''),
(5842, 'Loyal_Ring1', 'Loyal Ring1', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 136, 0, 1, 0, 1, 0, '', '', ''),
(5843, 'Loyal_Ring2', 'Loyal Ring2', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 136, 0, 1, 0, 1, 0, 'bonus bAllStats,2;', '', ''),
-(5844, 'Loyal_Ring3', 'Loyal Ring3', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 136, 0, 1, 0, 1, 0, 'bonus bAllStats,3;', '', '');
-INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
+(5844, 'Loyal_Ring3', 'Loyal Ring3', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 136, 0, 1, 0, 1, 0, 'bonus bAllStats,3;', '', ''),
(5845, 'Buzzy_Ball_Board', 'Buzzy Ball Board', 5, 50, 25, 400, 0, 0, 0, 0, 0, 4294967295, 7, 2, 256, 0, 1, 0, 1, 641, '', '', ''),
(5846, 'Buzzy_Ball_Gum', 'Buzzy Ball Gum', 5, 50, 25, 100, 0, 0, 1, 0, 0, 4294967295, 7, 2, 1, 0, 1, 0, 0, 572, 'bonus bMdef,5;', '', ''),
(5851, 'Summer_Knight', 'Summer Knight', 5, 20, 10, 0, 0, 0, 1, 0, 0, 4294967295, 7, 2, 768, 0, 60, 0, 0, 138, '', '', ''),
+(5852, 'Easter_Egg_Shell', 'Easter Egg Shell', 5, 20, 10, 500, 0, 0, 0, 0, 0, 4294967295, 7, 2, 256, 0, 40, 0, 1, 537, 'bonus bDef,-7; bonus bMdef,-7; bonus2 bHPRegenRate,(MaxHp/100),10000; if (getrefine()>=7) bonus bFlee,2; if (getrefine() >= 9) bonus2 bSPRegenRate,(MaxSp/100),10000;', '', ''),
(5856, 'Passion_FB_Hat', 'Passion FB Hat', 5, 20, 10, 600, 0, 0, 2, 0, 1, 4294967295, 7, 2, 256, 0, 1, 0, 1, 671, 'bonus bStr,2; bonus bDex,2;', '', ''),
(5857, 'Cool_FB_Hat', 'Cool FB Hat', 5, 20, 10, 600, 0, 0, 2, 0, 1, 4294967295, 7, 2, 256, 0, 1, 0, 1, 672, 'bonus bInt,2; bonus bVit,2;', '', ''),
(5858, 'Victory_FB_Hat', 'Victory FB Hat', 5, 20, 10, 600, 0, 0, 2, 0, 1, 4294967295, 7, 2, 256, 0, 1, 0, 1, 673, 'bonus bInt,2; bonus bDex,2;', '', ''),
@@ -3881,7 +3886,8 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(6423, 'Sea_God''s_Wrath', 'Sea God''s Wrath', 3, 20, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(6424, 'Halloween_Fragment', 'Halloween Fragment', 3, 20, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(6425, 'Halloween_Certificate', 'Halloween Certificate', 3, 20, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
-(6426, 'Bad_Canned_Food', 'Bad Canned Food', 3, 20, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
+(6426, 'Bad_Canned_Food', 'Bad Canned Food', 3, 20, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', '');
+INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
(6427, 'Bad_Can_Sack', 'Bad Can Sack', 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(6428, 'Adventure_Card_A', 'Adventure Card A', 3, 20, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(6429, 'Adventure_Card_B', 'Adventure Card B', 3, 20, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
@@ -3890,10 +3896,11 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(6432, 'Full_Bucket', 'Full Bucket', 3, 0, 0, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(6433, 'Cleaning_Brush', 'Cleaning Brush', 3, 20, 10, 300, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(6434, 'Fix_Kit', 'Fix Kit', 3, 0, 0, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
+(6435, 'Fresh_Fruit', 'Fresh Fruit', 3, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(6436, 'Sea_God''s_Call', 'Sea God''s Call', 3, 20, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(6437, 'Scaraba_Perfume', 'Scaraba Perfume', 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
-(6438, 'Unbreakable_Weap', 'Unbreakable Weap', 3, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', '');
-INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
+(6438, 'Unbreakable_Weap', 'Unbreakable Weap', 3, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
+(6439, 'Unbreakable_Def', 'Unbreakable Armor', 3, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(6440, 'General_Lubrication', 'General Lubrication', 3, 20, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(6441, 'High_RankLubricant', 'High Ranked Lubricant', 3, 20, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(6442, 'Octopus_Hunt_Stick', 'Octopus Hunting Stick', 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
@@ -4329,7 +4336,8 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(7289, 'Olivine', 'Peridot', 3, 3000, 1500, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7290, 'Phlogopite', 'Phlogopite', 3, 3000, 1500, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7291, 'Agate', 'Agate', 3, 3000, 1500, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
-(7292, 'Muscovite', 'Muscovite', 3, 3000, 1500, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
+(7292, 'Muscovite', 'Muscovite', 3, 3000, 1500, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', '');
+INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
(7293, 'Rose_Quartz', 'Rose Quartz', 3, 3000, 1500, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7294, 'Turquoise', 'Turquoise', 3, 3000, 1500, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7295, 'Citrine', 'Citrin', 3, 3000, 1500, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
@@ -4342,8 +4350,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(7302, 'KRATHONG', 'Krathong', 3, 2, 1, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7303, 'Bag_Of_Rice', 'Straw Rice Bag', 3, 0, 0, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7304, 'Witch''s_Spell_Book', 'Witch''s Spell Scroll', 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
-(7305, 'Authority_Of_Nine_World', 'Symbol of the Nine Realms', 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', '');
-INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
+(7305, 'Authority_Of_Nine_World', 'Symbol of the Nine Realms', 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7306, 'Fragment_Of_Soul', 'Piece of Spirit', 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7307, 'Whisper_Of_Soul', 'Spiritual Whispers', 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7308, 'Witch''s_Potion', 'Witch''s Tonic', 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
@@ -4786,7 +4793,8 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(7808, 'Gold_Hammer', 'God Hammer', 3, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7809, 'Gold_Furnace', 'God Furnace', 3, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7810, 'Yellow_Cat_Eyed_Stone', 'Symbol of Richness', 3, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
-(7811, 'Gold_Anvil', 'Anvil', 3, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
+(7811, 'Gold_Anvil', 'Anvil', 3, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', '');
+INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
(7812, 'Red_Cat_Eyed_Stone', 'Symbol of Bravery', 3, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7813, 'Th_Red_Ring', 'Red Jenoss''s Family Ring', 3, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7814, 'Green_Ring', 'Green Jenoss''s Family Ring', 3, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
@@ -4798,8 +4806,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(7820, 'Morroc_Skin', 'Piece of Morocc Skin', 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7821, 'Green_Apple', 'Green Apple', 3, 20, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7822, 'Whole_Barbecue', 'Whole Barbecue', 3, 20, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
-(7823, 'Meat_Veg_Skewer', 'Meat Veg Skewer', 3, 20, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', '');
-INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
+(7823, 'Meat_Veg_Skewer', 'Meat Veg Skewer', 3, 20, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7824, 'Spirit_Liquor', 'Spirit Liquor', 3, 20, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7825, 'Heroic_Stone', 'Heroic Stone', 3, 20, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(7826, 'Continental_Guard_Paper', 'Continental Guard Paper', 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
@@ -5130,6 +5137,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(11055, 'Basic_Adventure', 'Basic Adventure', 3, 20, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(11056, 'Elemental_Spirit_Guide', 'Elemental Spirit Guide', 3, 1000, 500, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(11057, 'Feb_Sweets', 'Feb Sweets', 3, 20, 10, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
+(11058, 'Novice_Combi_Book', 'Novice Combi Book', 3, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(11500, 'Light_Yellow_Pot', 'Light Yellow Potion', 0, 550, 275, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'itemheal rand(175,235),0;', '', ''),
(11501, 'Light_White_Pot', 'Light White Potion', 0, 1200, 600, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'itemheal rand(325,405),0;', '', ''),
(11502, 'Light_Blue_Pot', 'Light Blue Potion', 0, 5000, 2500, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'itemheal 0,rand(40,60);', '', ''),
@@ -5210,7 +5218,8 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(12009, 'Silver_Arrow_Container', 'Silver Arrow Quiver', 2, 2, 1, 250, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 1751,500;', '', ''),
(12010, 'Wind_Arrow_Container', 'Wind Arrow Quiver', 2, 2, 1, 250, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 1755,500;', '', ''),
(12011, 'Stone_Arrow_Container', 'Stone Arrow Quiver', 2, 2, 1, 250, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 1756,500;', '', ''),
-(12012, 'Crystal_Arrow_Container', 'Crystal Arrow Quiver', 2, 2, 1, 250, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 1754,500;', '', ''),
+(12012, 'Crystal_Arrow_Container', 'Crystal Arrow Quiver', 2, 2, 1, 250, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 1754,500;', '', '');
+INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
(12013, 'Shadow_Arrow_Container', 'Shadow Arrow Quiver', 2, 2, 1, 250, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 1767,500;', '', ''),
(12014, 'Imma_Arrow_Container', 'Immaterial Arrow Quiver', 2, 2, 1, 250, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 1757,500;', '', ''),
(12015, 'Rusty_Arrow_Container', 'Rusty Arrow Quiver', 2, 2, 1, 250, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 1762,500;', '', ''),
@@ -5221,8 +5230,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(12020, 'Water_Of_Darkness', 'Cursed Water', 11, 2, 1, 30, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'itemskill "ITEM_ENCHANTARMS",8;', '', ''),
(12021, 'Pork_Belly', 'Pork', 0, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'itemheal rand(70,99),0;', '', ''),
(12022, 'Spareribs', 'Galbi', 0, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'itemheal rand(70,99),0;', '', ''),
-(12023, 'Giftbox_China', 'Wrapped Box', 2, 1000, 500, 200, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getrandgroupitem 12023,1;', '', '');
-INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
+(12023, 'Giftbox_China', 'Wrapped Box', 2, 1000, 500, 200, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getrandgroupitem 12023,1;', '', ''),
(12024, 'Red_Pouch_Of_Surprise', 'Red Pouch', 2, 50, 25, 50, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'monster "this",-1,-1,"--ja--",-4,1,"";', '', ''),
(12025, 'Egg_Boy', 'Dano Festival Egg', 2, 1000, 500, 200, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getrandgroupitem 12025,1;', '', ''),
(12026, 'Egg_Girl', 'Dano Festival Egg', 2, 1000, 500, 200, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getrandgroupitem 12026,1;', '', ''),
@@ -5317,10 +5325,10 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(12115, 'Elemental_Water', 'Elemental Converter', 11, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'itemskill "ITEM_ENCHANTARMS",2;', '', ''),
(12116, 'Elemental_Earth', 'Elemental Converter', 11, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'itemskill "ITEM_ENCHANTARMS",3;', '', ''),
(12117, 'Elemental_Wind', 'Elemental Converter', 11, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'itemskill "ITEM_ENCHANTARMS",5;', '', ''),
-(12118, 'Resist_Fire', 'Fireproof Potion', 2, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start4 SC_ARMOR_ELEMENT,1200000,-15,0,20,0;', '', ''),
-(12119, 'Resist_Water', 'Coldproof Potion', 2, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start4 SC_ARMOR_ELEMENT,1200000,20,0,0,-15;', '', ''),
-(12120, 'Resist_Earth', 'Earthproof Potion', 2, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start4 SC_ARMOR_ELEMENT,1200000,0,20,-15,0;', '', ''),
-(12121, 'Resist_Wind', 'Thunderproof Potion', 2, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start4 SC_ARMOR_ELEMENT,1200000,0,-15,0,20;', '', ''),
+(12118, 'Resist_Fire', 'Fireproof Potion', 2, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start4 SC_ARMORPROPERTY,1200000,-15,0,20,0;', '', ''),
+(12119, 'Resist_Water', 'Coldproof Potion', 2, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start4 SC_ARMORPROPERTY,1200000,20,0,0,-15;', '', ''),
+(12120, 'Resist_Earth', 'Earthproof Potion', 2, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start4 SC_ARMORPROPERTY,1200000,0,20,-15,0;', '', ''),
+(12121, 'Resist_Wind', 'Thunderproof Potion', 2, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start4 SC_ARMORPROPERTY,1200000,0,-15,0,20;', '', ''),
(12122, 'Sesame_Pastry', 'Sesame Pastry', 2, 2, 1, 70, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_FOOD_BASICHIT,1200000,30;', '', ''),
(12123, 'Honey_Pastry', 'Honey Pastry', 2, 2, 1, 70, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_FOOD_BASICAVOIDANCE,1200000,30;', '', ''),
(12124, 'Rainbow_Cake', 'Rainbow Cake', 2, 2, 1, 70, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_BATKFOOD,1200000,10; sc_start SC_MATKFOOD,120000,10;', '', ''),
@@ -5479,7 +5487,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(12280, 'Holy_Element_Scroll', 'Holy Elemental Scroll', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'specialeffect2 EF_BENEDICTIO; sc_start SC_BENEDICTIO,300000,1;', '', ''),
(12281, 'Tresure_Box_WoE', 'Event Treasure Box', 2, 20, 10, 150, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
(12282, 'Internet_Cafe1', 'Internet Cafe1', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_INCALLSTATUS,5400000,3; sc_start SC_PLUSATTACKPOWER,5400000,15; sc_start SC_PLUSMAGICPOWER,5400000,15;', '', ''),
-(12283, 'Internet_Cafe2', 'Internet Cafe2', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_INCSTR,5400000,8; sc_start SC_INCDEX,5400000,4; sc_start SC_INCAGI,5400000,6; sc_start SC_PLUSATTACKPOWER,5400000,32; sc_start SC_INCFLEE,5400000,5;', '', ''),
+(12283, 'Internet_Cafe2', 'Internet Cafe2', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_CHASEWALK2,5400000,8; sc_start SC_INCDEX,5400000,4; sc_start SC_INCAGI,5400000,6; sc_start SC_PLUSATTACKPOWER,5400000,32; sc_start SC_INCFLEE,5400000,5;', '', ''),
(12284, 'Internet_Cafe3', 'Internet Cafe3', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_INCINT,5400000,8; sc_start SC_INCVIT,5400000,4; sc_start SC_INCDEX,5400000,6; sc_start SC_PLUSMAGICPOWER,5400000,40;', '', ''),
(12285, 'Internet_Cafe4', 'Internet Cafe4', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_INCDEX,5400000,8; sc_start SC_INCLUK,5400000,4; sc_start SC_INCAGI,5400000,6; sc_start SC_PLUSATTACKPOWER,5400000,24; sc_start SC_PLUSMAGICPOWER,5400000,24;', '', ''),
(12286, 'Masquerade_Ball_Box2', 'Masquerade Ball Box2', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getrandgroupitem 12286,1;', '', ''),
@@ -5495,7 +5503,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(12296, 'PC_Bang_Coin_Box3', 'PC-Room Coin Box', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 2738,1;', '', ''),
(12297, 'PC_Bang_Coin_Box4', 'PC-Room Coin Box', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 2738,2;', '', ''),
(12298, 'SP_Potion', 'SP Consumption Reduction Potion', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_ATKER_BLOOD,3600000,15;', '', ''),
-(12299, 'Mega_Resist_Potion', 'Mega Resist Potion', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_COMMONSC_RESIST,3600000,10;', '', ''),
+(12299, 'Mega_Resist_Potion', 'Mega Resist Potion', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_TARGET_BLOOD,3600000,10;', '', ''),
(12300, 'Wild_Rose_Scroll', 'Wild Rose Contract', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'mercenary_create 1965,1800000;', '', ''),
(12301, 'Doppelganger_Scroll', 'Doppelganger Contract', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'mercenary_create 1966,1800000;', '', ''),
(12302, 'Ygnizem_Scroll', 'Egnigem Cenia Contract', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'mercenary_create 1967,1800000;', '', ''),
@@ -5513,18 +5521,18 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(12314, 'Noive_Box', 'Noive Box', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12315, 'Goddess_Bless', 'Goddess Of Blessing', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12316, 'Angel_Bless', 'Angel Of Blessing', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
-(12317, 'Powder_Snow', 'Snow Powder', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'end;', '', ''),
+(12317, 'Powder_Snow', 'Snow Powder', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'end;', '', '');
+INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
(12318, 'Little_Heart', 'Small Hearts', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12319, 'Strawberry_Cake', 'Rune Strawberry Cake', 2, 0, 0, 300, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_INCATKRATE,600000,5; sc_start SC_INCMATKRATE,600000,5;', '', ''),
-(12320, 'Pineapple_Juice', 'Schwartzwald Pine Jubilee', 2, 0, 0, 300, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_INCHIT,600000,10; sc_start SC_INCFLEE2,600000,20;', '', ''),
+(12320, 'Pineapple_Juice', 'Schwartzwald Pine Jubilee', 2, 0, 0, 300, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_INCHIT,600000,10; sc_start SC_PLUSAVOIDVALUE,600000,20;', '', ''),
(12321, 'Spicy_Sandwich', 'Arunafeltz Desert Sandwich', 2, 0, 0, 300, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_CRITICALPERCENT,600000,7;', '', ''),
(12322, 'Chocolate_Pie', 'Chocolate Pie', 0, 0, 0, 50, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'percentheal 5,5;', '', ''),
(12323, 'N_Fly_Wing', 'Novice Fly Wing', 11, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'itemskill "AL_TELEPORT",1;', '', ''),
(12324, 'N_Butterfly_Wing', 'Novice Butterfly Wing', 11, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'itemskill "AL_TELEPORT",3;', '', ''),
(12325, 'N_Magnifier', 'Novice Magnifier', 11, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'itemskill "MC_IDENTIFY",1;', '', ''),
(12326, 'J_Firecracker', 'Large Firecracker', 2, 2, 1, 20, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
-(12327, 'Charm_Of_Luck', 'Charm Of Luck', 2, 1000, 500, 50, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', '');
-INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
+(12327, 'Charm_Of_Luck', 'Charm Of Luck', 2, 1000, 500, 50, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12328, 'Charm_Of_Happiness', 'Charm Of Happiness', 2, 1800, 900, 100, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_INCLUK,3600000,20;', '', ''),
(12329, 'Recall_MaleGM', 'Summon Male GameMaster Scroll', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'mercenary_create 2000,1800000;', '', ''),
(12330, 'Recall_FemaleGM', 'Summon Female GameMaster Scroll', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'mercenary_create 2001,1800000;', '', ''),
@@ -5535,7 +5543,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(12335, 'Yummy_Skewered_Dish', 'Grilled Delicious Skewer', 0, 1000, 500, 350, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'percentheal 60,60;', '', ''),
(12336, 'Baked_Mushroom', 'Grilled Mushroom', 0, 500, 250, 300, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'percentheal 30,30;', '', ''),
(12337, 'Grilled_Sausage', 'Grilled Sausages', 0, 300, 150, 200, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'percentheal 20,20;', '', ''),
-(12338, 'Grilled_Corn', 'Grilled Corn', 2, 100, 50, 100, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_INCSTR,180000,2; sc_start SC_INCINT,180000,2; sc_start SC_INCAGI,180000,2;', '', ''),
+(12338, 'Grilled_Corn', 'Grilled Corn', 2, 100, 50, 100, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_CHASEWALK2,180000,2; sc_start SC_INCINT,180000,2; sc_start SC_INCAGI,180000,2;', '', ''),
(12339, 'Cherish_Box_Ori', 'Treasure Edition Box', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getrandgroupitem 12339,1;', '', ''),
(12340, 'Mysterious_Rice_Powder', 'Chewy Rice Powder', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'pet 1815;', '', ''),
(12341, 'Special_Alloy_Trap_Box', 'Special Alloy Trap Box', 2, 30000, 15000, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 7940,100;', '', ''),
@@ -5670,7 +5678,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(12472, 'F_Convex_Mirror', 'F Convex Mirror', 2, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12473, 'RWC_Parti_Box', 'RWC Parti Box', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
(12474, 'RWC_Final_Comp_Box', 'RWC Final Comp Box', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem(12474);', '', ''),
-(12475, 'Cure_Free', 'Cure Free', 2, 20, 10, 50, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_end SC_SILENCE; sc_end SC_BLOODING; sc_end SC_POISON; sc_end SC_CURSE; sc_end SC_ORCISH; sc_end SC_CHANGEUNDEAD; itemheal 500,0;', '', ''),
+(12475, 'Cure_Free', 'Cure Free', 2, 20, 10, 50, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_end SC_SILENCE; sc_end SC_BLOODING; sc_end SC_POISON; sc_end SC_CURSE; sc_end SC_ORCISH; sc_end SC_PROPERTYUNDEAD; itemheal 500,0;', '', ''),
(12476, 'PCBang_Coupon_Box3', 'PCBang Coupon Box3', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12477, 'Gift_Bundle', 'Gift Bundle', 2, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
(12478, 'Chance_Box', 'Chance Box', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
@@ -5778,6 +5786,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(12580, 'Vending_Search_Scroll', 'Universal Catalog Silver', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'searchstores 10,0;', '', ''),
(12581, 'Vending_Search_Scroll2', 'Universal Catalog Gold', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'searchstores 10,1;', '', ''),
(12591, 'Vending_Search_Scroll3', 'Universal Catalog Bronze', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'searchstores 10,1;', '', ''),
+(12595, 'Lucky_Egg_C7', 'Lucky Egg C7', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12601, 'Fresh_Watermelon_Juice', 'Fresh Watermelon Juice', 0, 20, 10, 100, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'percentheal 5,5;', '', ''),
(12612, 'Old_Coin_Bag', 'Old Coin Bag', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12613, 'Improved_Coin_Bag', 'Improved Coin Bag', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getrandgroupitem 12613,1; getrandgroupitem 12613,1; getrandgroupitem 12613,1; getrandgroupitem 12613,1;', '', ''),
@@ -5792,10 +5801,14 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(12622, 'Reins_Of_Mount', 'Reins Of Mount', 11, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'setmounting();', '', ''),
(12623, 'Advanced_Weapons_Box', 'Advanced Weapons Box', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getrandgroupitem 12623,1;', '', ''),
(12624, 'Delicious_Jelly', 'Delicious Jelly', 0, 20, 10, 50, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'percentheal 3,3;', '', ''),
+(12625, 'Sapa_Feat_Cert_Pack', 'Sapa Feat Cert Pack', 2, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12636, 'Malangdo_Canned_Specialties', 'Malangdo Canned Specialties', 2, 20, 10, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'warp "malangdo",140,114;', '', ''),
+(12637, 'Gong_Bug_Pocket', 'Sow Bug Pocket', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 13208,200;', '', ''),
(12642, 'Terra_Mars_100_Box', 'Terra_Mars_100_Box', 0, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 504,100;', '', ''),
+(12643, 'E_Coin_Pack50', 'E Coin Pack50', 2, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 6422,50;', '', ''),
(12646, 'Fried_Octopus_Legs', 'Fried Octopus Legs', 2, 20, 10, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
(12647, 'Sea_Ink', 'Sea Ink', 2, 20, 10, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', ''),
+(12654, 'Lucky_Egg_C9', 'Lucky Egg C9', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12658, 'Transformation_Scroll(Deviruchi)', 'Transformation Scroll(Deviruchi)', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start4 SC_MONSTER_TRANSFORM,1200000,1109,0,0,0;', '', ''),
(12659, 'Transformation_Scroll(Raydric)', 'Transformation Scroll(Raydric)', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start4 SC_MONSTER_TRANSFORM,1200000,1276,0,0,0;', '', ''),
(12660, 'Transformation_Scroll(Mavka)', 'Transformation Scroll(Mavka)', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start4 SC_MONSTER_TRANSFORM,1200000,1884,0,0,0;', '', ''),
@@ -5803,13 +5816,16 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(12662, 'Transformation_Scroll(Banshee)', 'Transformation Scroll(Banshee)', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start4 SC_MONSTER_TRANSFORM,1200000,1867,0,0,0;', '', ''),
(12663, 'Transformation_Scroll(Poring)', 'Transformation Scroll(Poring)', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start4 SC_MONSTER_TRANSFORM,1200000,1002,0,0,0;', '', ''),
(12664, 'Transformation_Scroll(Golem)', 'Transformation Scroll(Golem)', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start4 SC_MONSTER_TRANSFORM,1200000,1040,0,0,0;', '', ''),
+(12665, 'Grovel_Buff', 'Grovel Buff', 2, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12690, 'Old_C_Album_Helm', 'Old Card Album Helm', 2, 20, 10, 50, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 1, 0, 0, 0, '', '', ''),
(12691, 'Old_C_Album_Armor', 'Old Card Album Armor', 2, 20, 10, 50, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 1, 0, 0, 0, '', '', ''),
(12692, 'Old_C_Album_Shield', 'Old Card Album Shield', 2, 20, 10, 50, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 1, 0, 0, 0, '', '', ''),
(12693, 'Old_C_Album_Garment', 'Old Card Album Garment', 2, 20, 10, 50, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 1, 0, 0, 0, '', '', ''),
(12694, 'Old_C_Album_Shoes', 'Old Card Album Shoes', 2, 20, 10, 50, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 1, 0, 0, 0, '', '', ''),
(12695, 'Old_C_Album_Acc', 'Old Card Album Acc', 2, 20, 10, 50, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 1, 0, 0, 0, '', '', ''),
+(12696, 'RWC_Cele_Fire', 'RWC Celebration Firecracker', 2, 0, 0, 20, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_STRFOOD,10000,3; sc_start SC_VITFOOD,10000,3; sc_start SC_INTFOOD,10000,3; sc_start SC_DEXFOOD,10000,3; sc_start SC_AGIFOOD,10000,3; sc_start SC_LUKFOOD,10000,3;', '', ''),
(12698, 'Old_C_Album_Weapon', 'Old Card Album Weapon', 2, 20, 10, 50, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 1, 0, 0, 0, '', '', ''),
+(12774, 'Empty_Potion_Bottle', 'Empty Potion Bottle', 2, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12818, 'High_Weapon_Box', 'High Weapon Box', 2, 20, 10, 50, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 100, 0, 0, 0, '', '', ''),
(12699, 'Tikbalang_Belt', 'Tikbalang Belt', 2, 20, 10, 50, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'pet 2313;', '', ''),
(12700, 'Upside_Down_Shirt', 'Upside Down Shirt', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'warp "malaya",242,211;', '', ''),
@@ -5853,7 +5869,8 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(12738, 'Runstone_Rare', 'Rare Rune', 0, 2, 1, 100, 0, 0, 0, 0, 0, 128, 8, 2, 0, 0, 0, 0, 0, 0, 'makerune 8;', '', ''),
(12739, 'Snow_Flower', 'Snow Flowers', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12740, 'Inc_Str_Scroll', 'Amplification Scroll', 2, 1, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
-(12741, 'Inc_Int_Scroll', 'Intellect Amplification Scroll', 2, 1, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
+(12741, 'Inc_Int_Scroll', 'Intellect Amplification Scroll', 2, 1, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', '');
+INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
(12742, 'Valentine_Gift_Box1', 'Valentine Gift Box', 2, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12743, 'Valentine_Gift_Box2', 'Valentine Gift Box', 2, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12744, 'Chocotate_Box', 'Chocolate Box', 2, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
@@ -5874,8 +5891,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(12759, 'Loyal_Ring3_Box', 'Loyal Ring3 Box', 2, 10, 5, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12760, 'Bubble_Gum_Green', 'Bubble Gum Green', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12761, 'Bubble_Gum_Yellow', 'Bubble Gum Yellow', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
-(12762, 'Bubble_Gum_Orange', 'Bubble Gum Orange', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', '');
-INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
+(12762, 'Bubble_Gum_Orange', 'Bubble Gum Orange', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12763, 'Bubble_Gum_Red', 'Bubble Gum Red', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12764, 'Fools_Day_Box_Tw', 'Fools Day Box Tw', 2, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12765, 'Summer_Knight_Box', 'Summer Knight Box', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
@@ -5888,9 +5904,13 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(12772, 'Cool_Hat_Box2', 'Cool Hat Box2', 2, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
(12773, 'Victory_Hat_Box2', 'Victory Hat Box2', 2, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
(12775, 'Ancient_Spirit_Amulet', 'Ancient Spirit Amulet', 2, 20, 10, 600, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
+(12776, 'Agi_Dish20', 'Agi Dish20', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12786, 'Change_Slot_Card', 'Character Position Change Coupon', 2, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'set SlotChange, SlotChange + 1;', '', ''),
+(12787, 'Diabolic_Scroll', 'Diabolic Scroll', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'mercenary_create 2342,1800000;', '', ''),
(12790, 'Char_Rename_Card', 'Character Name Change Coupon', 2, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'set CharRename, CharRename + 1;', '', ''),
+(12791, 'Combat_Pill', 'Combat Pill', 2, 20, 10, 150, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12848, 'Falcon_Flute', 'Falcon Flute', 11, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'if(getskilllv("HT_FALCON")) { if(checkoption(Option_Wug)||checkoption(Option_Wugrider)) end; if(checkfalcon()==1) { setfalcon 0; } else { setfalcon 1; } }', '', ''),
+(12849, 'Combination_Kit', 'Combination Kit', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(12900, 'Battle_Manual_Box', 'Battle Manual Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 12208,10;', '', ''),
(12901, 'Insurance_Package', 'Insurance Package', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 12209,10;', '', ''),
(12902, 'Bubble_Gum_Box', 'Bubble Gum Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 12210,10;', '', ''),
@@ -6054,6 +6074,9 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(13060, 'E_Counter_Dagger_C', 'Counter Dagger', 4, 1, 0, 0, 209, 0, 0, 1, 0, 8454660, 7, 2, 2, 4, 1, 0, 0, 1, '', '', ''),
(13061, 'Black_Wing', 'Black Wing', 4, 20, 10, 600, 142, 0, 0, 1, 1, 131072, 7, 2, 2, 3, 102, 0, 1, 1, 'bonus2 bSkillAtk,"SC_FATALMENACE",30+(getrefine()*2); bonus bMatkRate,(getrefine()*3);', '', ''),
(13062, 'Ancient_Dagger', 'Ancient Dagger', 4, 20, 10, 600, 107, 0, 0, 0, 0, 42950382, 2, 2, 2, 4, 120, 0, 1, 1, 'bonus bMatk,120; bonus bMaxSP,100; bonus bSPrecovRate,5; bonus2 bAddEff2,Eff_Curse,20; bonus3 bAddEff,Eff_Curse,20,ATF_SELF|ATF_SKILL;', '', ''),
+(13063, 'Adventure_Knife', 'Adventure Knife', 4, 0, 0, 0, 60, 0, 0, 1, 0, 33689664, 7, 2, 2, 1, 1, 0, 0, 1, 'bonus bUnbreakableWeapon,0;', '', ''),
+(13064, 'Academy_Knife', 'Academy Knife', 4, 0, 0, 700, 110, 0, 0, 1, 1, 33689664, 7, 2, 2, 1, 1, 0, 1, 1, 'bonus bUnbreakableWeapon,0;', '', ''),
+(13065, 'Academy_Eti_Knife', 'Academy Eti Knife', 4, 0, 0, 1200, 120, 0, 0, 1, 1, 1, 7, 2, 2, 1, 1, 0, 1, 1, 'bonus bUnbreakableWeapon,0;', '', ''),
(13066, 'P_Dagger3', 'Eden Dagger III', 4, 0, 0, 0, 165, 80, 0, 1, 0, 4271865583, 7, 2, 2, 3, 60, 0, 0, 1, '', '', ''),
(13067, 'Caress', 'Keris', 4, 20, 10, 700, 107, 70, 0, 1, 1, 4271865583, 2, 2, 2, 3, 30, 0, 1, 1, 'bonus2 bHpDrainRate,20,10;', '', ''),
(13068, 'Pompano', 'Pompano', 4, 0, 0, 0, 160, 100, 0, 3, 0, 4271865583, 7, 2, 2, 1, 50, 0, 0, 1, 'bonus bUnbreakableWeapon,0; autobonus "{ bonus bBaseAtk,30; }",10,7000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; autobonus "{ bonus bMatk,20; }",10,7000,BF_MAGIC,"{ specialeffect2 EF_SUFFRAGIUM; }"; if(BaseLevel>99) { bonus bBaseAtk,10; bonus bMatk,10; }', '', ''),
@@ -6061,10 +6084,13 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(13070, 'Scarlet-nail', 'Scarlet-nail', 4, 56000, 28000, 500, 160, 80, 0, 1, 0, 414946, 7, 2, 2, 4, 110, 0, 1, 1, 'bonus bAtkEle,Ele_Fire; bonus2 bAddEff,Eff_Stone,100+(getrefine()*50);', '', ''),
(13071, 'Upg_Dagger', 'Upg Dagger', 4, 20, 10, 600, 55, 0, 0, 1, 1, 4271865583, 7, 2, 2, 3, 1, 0, 1, 1, 'bonus bBaseAtk,(getrefine()*10); bonus bMatk,(getrefine()*5); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*5);', '', ''),
(13072, 'Velum_Damascus', 'Vellum Damascus', 4, 20, 10, 1000, 180, 0, 0, 1, 0, 4271865583, 7, 2, 2, 4, 95, 0, 1, 1, 'bonus bAspdRate,getrefine();', '', ''),
+(13073, 'Counter_Dagger_', 'Counter Dagger', 4, 120000, 60000, 550, 140, 0, 0, 1, 1, 8454660, 7, 2, 2, 4, 55, 0, 1, 1, '', '', ''),
(13074, 'Ninja_Sword_Prototype', 'Ninja Sword Prototype', 4, 0, 0, 0, 0, 0, 0, 1, 0, 33554432, 7, 2, 2, 4, 99, 0, 0, 1, '', '', ''),
(13075, 'Kurenai', 'Kurenai', 4, 5000, 2500, 700, 130, 0, 0, 1, 0, 33554432, 7, 2, 2, 3, 99, 0, 1, 1, 'bonus bInt,3;', '', ''),
(13076, 'Nachal_Sword', 'Nachal Sword', 4, 40000, 20000, 600, 120, 100, 0, 1, 1, 33554432, 7, 2, 2, 3, 110, 0, 1, 1, 'bonus bInt,3;', '', ''),
+(13077, 'Kagekiri', 'Kagekiri', 4, 40000, 20000, 600, 50, 120, 0, 1, 0, 74, 7, 2, 2, 4, 100, 0, 1, 1, '', '', ''),
(13078, 'Mikacheuki', 'Mikacheuki', 4, 40000, 20000, 600, 50, 120, 0, 1, 1, 33554432, 7, 2, 2, 4, 100, 0, 1, 1, '', '', ''),
+(13079, 'Metal_Dagger', 'Metal Dagger', 4, 20, 10, 0, 55, 0, 0, 0, 1, 33689664, 7, 2, 2, 3, 1, 0, 1, 1, '', '', ''),
(13100, 'Six_Shooter', 'Six Shooter', 4, 4500, 2250, 400, 30, 0, 0, 7, 1, 16777216, 7, 2, 34, 1, 10, 0, 1, 17, 'bonus bHit,-10;', '', ''),
(13101, 'Six_Shooter_', 'Six Shooter', 4, 4500, 2250, 400, 30, 0, 0, 7, 2, 16777216, 7, 2, 34, 1, 10, 0, 1, 17, 'bonus bHit,-10;', '', ''),
(13102, 'Crimson_Bolt', 'Crimson Bolt', 4, 20000, 10000, 450, 45, 0, 0, 7, 1, 16777216, 7, 2, 34, 2, 35, 0, 1, 17, 'bonus bHit,-10;', '', ''),
@@ -6151,7 +6177,8 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(13273, 'Stamina_Up_M_To_Throw', 'Throwing Muramura M', 10, 100, 50, 10, 0, 0, 0, 0, 0, 262144, 8, 2, 32768, 0, 99, 0, 0, 9, 'sc_start SC_MUSTLE_M,500000,5;', '', ''),
(13274, 'Digestive_F_To_Throw', 'Throwing Falmons F', 10, 100, 50, 10, 0, 0, 0, 0, 0, 262144, 8, 2, 32768, 0, 99, 0, 0, 9, 'sc_start SC_LIFE_FORCE_F,500000,5;', '', ''),
(13275, 'HP_Inc_PotS_To_Throw', 'Throwing Increase HP Potion (Small)', 10, 100, 50, 20, 0, 0, 0, 0, 0, 262144, 8, 2, 32768, 0, 99, 0, 0, 9, 'sc_start SC_INCMHPRATE,500000,1; percentheal 1,0;', '', ''),
-(13276, 'HP_Inc_PotM_To_Throw', 'Throwing Increase HP Potion (Medium)', 10, 100, 50, 40, 0, 0, 0, 0, 0, 262144, 8, 2, 32768, 0, 99, 0, 0, 9, 'sc_start SC_INCMHPRATE,500000,2; percentheal 2,0;', '', ''),
+(13276, 'HP_Inc_PotM_To_Throw', 'Throwing Increase HP Potion (Medium)', 10, 100, 50, 40, 0, 0, 0, 0, 0, 262144, 8, 2, 32768, 0, 99, 0, 0, 9, 'sc_start SC_INCMHPRATE,500000,2; percentheal 2,0;', '', '');
+INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
(13277, 'HP_Inc_PotL_To_Throw', 'Throwing Increase HP Potion (Large)', 10, 100, 50, 80, 0, 0, 0, 0, 0, 262144, 8, 2, 32768, 0, 99, 0, 0, 9, 'sc_start SC_INCMHPRATE,500000,5; percentheal 5,0;', '', ''),
(13278, 'SP_Inc_PotS_To_Throw', 'Throwing Increase SP Potion (Small)', 10, 100, 50, 20, 0, 0, 0, 0, 0, 262144, 8, 2, 32768, 0, 99, 0, 0, 9, 'sc_start SC_INCMSPRATE,500000,2; percentheal 0,2;', '', ''),
(13279, 'SP_Inc_PotM_To_Throw', 'Throwing Increase SP Potion (Medium)', 10, 100, 50, 40, 0, 0, 0, 0, 0, 262144, 8, 2, 32768, 0, 99, 0, 0, 9, 'sc_start SC_INCMSPRATE,500000,4; percentheal 0,4;', '', ''),
@@ -6172,8 +6199,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(13294, 'Explosive_Kunai', 'Explosive Kunai', 10, 100, 50, 30, 50, 0, 0, 0, 0, 33554432, 7, 2, 32768, 0, 100, 0, 0, 7, 'bonus bAtkEle,Ele_Neutral;', '', ''),
(13300, 'Huuma_Bird_Wing', 'Huuma Wing Shuriken', 4, 90000, 45000, 3000, 150, 0, 0, 1, 0, 33554432, 7, 2, 34, 4, 65, 0, 1, 22, 'bonus bUnbreakableWeapon,0; bonus bAtkEle,Ele_Wind; bonus bDex,-2; bonus bAgi,-1;', '', ''),
(13301, 'Huuma_Giant_Wheel', 'Huuma Giant Wheel Shuriken', 4, 40000, 20000, 2500, 50, 0, 0, 1, 3, 33554432, 7, 2, 34, 4, 42, 0, 1, 22, 'bonus bUnbreakableWeapon,0; bonus2 bAddEff,Eff_Bleeding,100;', '', ''),
-(13302, 'Huuma_Giant_Wheel_', 'Huuma Giant Wheel Shuriken', 4, 40000, 20000, 2500, 50, 0, 0, 1, 4, 33554432, 7, 2, 34, 4, 42, 0, 1, 22, 'bonus bUnbreakableWeapon,0; bonus2 bAddEff,Eff_Bleeding,100;', '', '');
-INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
+(13302, 'Huuma_Giant_Wheel_', 'Huuma Giant Wheel Shuriken', 4, 40000, 20000, 2500, 50, 0, 0, 1, 4, 33554432, 7, 2, 34, 4, 42, 0, 1, 22, 'bonus bUnbreakableWeapon,0; bonus2 bAddEff,Eff_Bleeding,100;', '', ''),
(13303, 'Huuma_Blaze', 'Huuma Blaze Shuriken', 4, 78000, 39000, 1500, 185, 0, 0, 1, 0, 33554432, 7, 2, 34, 4, 55, 0, 1, 22, 'bonus bUnbreakableWeapon,0; bonus bAtkEle,Ele_Fire; bonus bDex,-2; bonus3 bAutoSpell,"MG_FIREBALL",5,30;', '', ''),
(13304, 'Huuma_Calm_Mind', 'Huuma Calm Mind', 4, 20, 10, 1550, 112, 0, 0, 1, 2, 33554432, 7, 2, 34, 3, 70, 0, 1, 22, 'bonus bUnbreakableWeapon,0; bonus2 bSkillAtk,"NJ_HUUMA",30; bonus bNoCastCancel,0;', '', ''),
(13305, 'BF_Huuma_Shuriken1', 'Brave Huuma Front Shuriken', 4, 20, 10, 0, 55, 0, 0, 1, 0, 33554432, 7, 2, 34, 3, 80, 0, 1, 22, 'bonus bStr,2; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0;', '', ''),
@@ -6220,6 +6246,8 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(13429, 'E_Cutlas_C', 'Cutlus', 4, 2, 1, 0, 185, 0, 0, 1, 0, 414946, 7, 2, 2, 4, 0, 0, 0, 2, 'bonus bStr,2;', '', ''),
(13430, 'E_Solar_Sword_C', 'Solar Sword', 4, 2, 1, 0, 120, 0, 0, 1, 0, 414946, 7, 2, 2, 4, 0, 0, 0, 2, 'bonus bAtkEle,Ele_Fire;', '', ''),
(13431, 'Chrome_Sword', 'Chrome Sword', 4, 20, 10, 2200, 180, 0, 0, 1, 0, 279714, 2, 2, 2, 3, 110, 0, 1, 2, 'bonus bAgi,1;', '', ''),
+(13432, 'Adventure_Sword', 'Adventure Sword', 4, 0, 0, 0, 80, 0, 0, 1, 0, 16514, 7, 2, 2, 1, 1, 0, 0, 2, '', '', ''),
+(13433, 'Academy_Sword', 'Academy Sword', 4, 0, 0, 1200, 120, 0, 0, 1, 1, 16514, 7, 2, 2, 1, 1, 0, 1, 2, '', '', ''),
(13434, 'P_Saber3', 'Eden Saber III', 4, 0, 0, 0, 185, 0, 0, 1, 0, 414946, 7, 2, 2, 3, 60, 0, 0, 2, '', '', ''),
(13500, 'Insurance60_Package', 'Life Insurrance Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14500,10;', '', ''),
(13501, 'Assorted_Scroll_Box', 'Experience Scroll Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
@@ -6451,7 +6479,8 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(13727, 'Silver_Box_', 'Silver Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 7778,1;', '', ''),
(13728, 'Gold_Key1_Box', 'Golden Key 1 Box', 18, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 7779,1;', '', ''),
(13729, 'Gold_Key5_Box', 'Golden Key 5 Box', 18, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 7779,5;', '', ''),
-(13730, 'Silver_Key1_Box', 'Silver Key 1 Box', 18, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 7780,1;', '', ''),
+(13730, 'Silver_Key1_Box', 'Silver Key 1 Box', 18, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 7780,1;', '', '');
+INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
(13731, 'Silver_Key5_Box', 'Silver Key 5 Box', 18, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 7780,5;', '', ''),
(13734, 'Pecopeco_Hairband_Box1', 'Peco Peco Hairband Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5286,1;', '', ''),
(13735, 'Red_Glasses_Box1', 'Red Glasses Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5288,1;', '', ''),
@@ -6479,8 +6508,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(13757, 'B_Mdef_Potion_Box50', 'Big Magic Defense Potion 50 Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14544,50;', '', ''),
(13758, 'Battle_Manual_X3_Box', 'Field Manual 300% Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14545,20;', '', ''),
(13759, 'In_Blue_Herb_Box', 'Blue Herb Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 510,50;', '', ''),
-(13760, 'Honey_Box', 'Honey Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 518,100;', '', '');
-INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
+(13760, 'Honey_Box', 'Honey Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 518,100;', '', ''),
(13761, 'Empty_Bottle_Box', 'Empty Bottle Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 713,500;', '', ''),
(13762, 'In_Royal_Jelly_Box', 'Royal Jelly Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 526,70;', '', ''),
(13763, '5_Anniversary_Coin_Box', 'Coin Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 2709,1;', '', ''),
@@ -6550,7 +6578,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(13827, 'Power_Box2', 'Power Box 2', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 683,1; getitem 12123,1; getitem 12122,1;', '', ''),
(13828, 'Resist_Box1', 'Resist Box 1', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 12118,1; getitem 12119,1;', '', ''),
(13829, 'Resist_Box2', 'Resist Box 2', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 12120,1; getitem 12121,1;', '', ''),
-(13830, 'Stat_Boost1', 'Stat Boost 1', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_INCSTR,60000,5; sc_start SC_INCAGI,60000,5; sc_start SC_INCVIT,60000,5;', '', ''),
+(13830, 'Stat_Boost1', 'Stat Boost 1', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_CHASEWALK2,60000,5; sc_start SC_INCAGI,60000,5; sc_start SC_INCVIT,60000,5;', '', ''),
(13831, 'Stat_Boost2', 'Stat Boost 2', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_INCINT,60000,5; sc_start SC_INCLUK,60000,5; sc_start SC_INCDEX,60000,5;', '', ''),
(13832, 'Stat_Boost3', 'Stat Boost 3', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_INCAGI,60000,5; sc_start SC_INCVIT,60000,5; sc_start SC_INCDEX,60000,5;', '', ''),
(13833, 'Stat_Boost4', 'Stat Boost 4', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_INCINT,60000,5; sc_start SC_INCVIT,60000,5; sc_start SC_INCDEX,60000,5;', '', ''),
@@ -6772,7 +6800,8 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(14052, 'F_Dun_Tel_Scroll2_Box10', 'Dungeon Teleport Scroll II 10 Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14581,10;', '', ''),
(14053, 'F_Little_Angel_Doll_Box', 'Little Angel Doll Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5324,1;', '', ''),
(14054, 'F_Triple_Poring_Hat_Box', 'Poring 3 Hats Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5255,1;', '', ''),
-(14055, 'F_Nagan_Box', 'Refined Nagan Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'rentitem 13407,604800;', '', ''),
+(14055, 'F_Nagan_Box', 'Refined Nagan Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'rentitem 13407,604800;', '', '');
+INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
(14056, 'F_Skewer_Box', 'Refined Brocca Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'rentitem 1424,604800;', '', ''),
(14057, 'F_Survival_Rod_Box', 'Refined Survivor''s Rod Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'rentitem 1628,604800;', '', ''),
(14058, 'F_Quadrille_Box', 'Refined Quadrille Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'rentitem 1537,604800;', '', ''),
@@ -6799,8 +6828,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(14079, 'F_Holy_Armor_S_Box5', 'Scroll of Holy Armor 5 Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14540,5;', '', ''),
(14080, 'F_Holy_Armor_S_Box10', 'Scroll of Holy Armor 10 Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14540,10;', '', ''),
(14081, 'F_Holy_Armor_S_Box30', 'Scroll of Holy Armor 30 Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14540,30;', '', ''),
-(14082, 'FS_Def_Potion_Box10', 'Small Defense Potion 10 Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14541,10;', '', '');
-INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
+(14082, 'FS_Def_Potion_Box10', 'Small Defense Potion 10 Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14541,10;', '', ''),
(14083, 'FS_Def_Potion_Box30', 'Small Physical Defense Potion 30 Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14541,30;', '', ''),
(14084, 'FS_Def_Potion_Box50', 'Small Physical Defense Potion 50 Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14541,50;', '', ''),
(14085, 'FB_Def_Potion_Box10', 'Big Defense Potion 10 Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14542,10;', '', ''),
@@ -7022,6 +7050,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(14304, 'Scuba_Mask_Box', 'Scuba Mask Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5397,1;', '', ''),
(14306, 'RWC_Special_Scroll', 'RWC Special Scroll', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
(14307, 'RWC_Limited_Scroll', 'RWC Limited Scroll', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
+(14308, 'Ardor_Scroll', 'Ardor Scroll', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(14314, 'Phreeoni_Scroll_Box', 'Phreeoni Scroll Box', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14597,10;', '', ''),
(14315, 'Ghostring_Scroll_Box', 'Ghostring Scroll Box', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14598,10;', '', ''),
(14316, 'July7_Scroll', 'July7 Scroll', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
@@ -7033,15 +7062,22 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(14350, 'Mental_Potion50_Box', 'Mental Potion 50 Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14600,50;', '', ''),
(14351, 'Tyr''s_Blessing20_Box', 'Tyr''s Blessing 20 Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14601,20;', '', ''),
(14352, 'Tyr''s_Blessing50_Box', 'Tyr''s Blessing 50 Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14601,50;', '', ''),
+(14361, 'Orc_HeroS_Box', 'Orc HeroS Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 14604,10;', '', ''),
(14363, 'Heart_Scroll', 'Heart Scroll', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
+(14372, 'Powder_Snow_Box', 'Powder Snow Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 12317,1;', '', ''),
(14375, 'Holy_Celestial_Axe_Box', 'Celestial Axe Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 1383,1;', '', ''),
(14376, 'Angeling_Pot_Box', 'Angeling Potion Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 12350,1;', '', ''),
(14377, 'Shout_Megaphone_Box', 'Scream Megaphone Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 12351,1;', '', ''),
+(14379, 'Love_Daddy_Box', 'Love Daddy Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5489,1;', '', ''),
(14380, 'Anubis_Helm_Box', 'Anubis Hat Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5490,1;', '', ''),
+(14381, 'Piercing_Box_M', 'Piercing Box M', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 1644,1;', '', ''),
(14393, 'Almighty_Charm_Box', 'Universal Amulet Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 7945,1;', '', ''),
+(14407, 'Xmas_Scroll', 'Xmas Scroll', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(14408, 'New_Year_Scroll', 'New Year Scroll', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
+(14438, 'Honglyun''s_Sword_Box', 'Honglyun''s Sword Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 13420,1;', '', ''),
(14440, 'Dice_Hat_Box', 'Dice Hat Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5496,1;', '', ''),
(14441, 'King_Tiger_Doll_Hat_Box', 'King Tiger Doll Hat Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5497,1;', '', ''),
+(14442, 'Wondering_Wolf_Helm_Box', 'Wondering Wolf Helm Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5498,1;', '', ''),
(14447, 'Pirate''s_Pride_Box', 'Pirate''s Pride Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5501,1;', '', ''),
(14448, 'Necromencer''s_Hood_Box', 'Necromancer''s Hood Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5502,1;', '', ''),
(14459, 'Rabbit_Magic_Hat_Box', 'Magic Rabbit Hat Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5503,1;', '', ''),
@@ -7049,6 +7085,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(14461, 'Asara_Fairy_Hat_Box', 'Ashura Fairy Hat Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5505,1;', '', ''),
(14466, 'Valentine_Pledge_Box', 'Valentine''s Emblem Box', 2, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
(14469, 'Ox_Tail_Scroll', 'Ox Tail Egg', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
+(14485, 'Academy_Badge_Box', 'Academy Badge Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 2751,1;', '', ''),
(14500, 'Insurance60', 'Life Insurrance Certificate', 2, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_CASH_DEATHPENALTY,3600000,0;', '', ''),
(14508, 'Zeny_Scroll', 'Zeny Pet Egg Scroll', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(14509, 'Light_Center_Pot', 'Light Concentration Potion', 2, 800, 400, 20, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_ATTHASTE_POTION1,1800000,0;', '', ''),
@@ -7080,9 +7117,10 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(14535, 'Med_Life_Potion', 'Medium Life Potion', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'specialeffect2 320; sc_start4 SC_L_LIFEPOTION,600000,-7,4,0,0;', '', ''),
(14536, 'Abrasive', 'Abrasive', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'specialeffect2 182; sc_start SC_CRITICALPERCENT,300000,30;', '', ''),
(14537, 'Regeneration_Potion', 'Regeneration Potion', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'specialeffect2 348; sc_start SC_HEALPLUS,1800000,20;', '', ''),
-(14538, 'Glass_Of_Illusion', 'Glass of Illusion', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'specialeffect2 EF_STEAL; sc_start SC_INCFLEE2,60000,20;', '', ''),
+(14538, 'Glass_Of_Illusion', 'Glass of Illusion', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'specialeffect2 EF_STEAL; sc_start SC_PLUSAVOIDVALUE,60000,20;', '', ''),
(14539, 'Shadow_Armor_S', 'Shadow Armor Scroll', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'specialeffect2 EF_CLOAKING; sc_start4 SC_ARMOR_PROPERTY,1800000,1,Ele_Dark,1,0;', '', ''),
-(14540, 'Holy_Armor_S', 'Holy Armor Scroll', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'specialeffect2 91; sc_start4 SC_ARMOR_PROPERTY,1800000,1,Ele_Holy,1,0;', '', ''),
+(14540, 'Holy_Armor_S', 'Holy Armor Scroll', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'specialeffect2 91; sc_start4 SC_ARMOR_PROPERTY,1800000,1,Ele_Holy,1,0;', '', '');
+INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
(14541, 'S_Def_Potion', 'Small Defense Potion', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'specialeffect2 EF_GUARD; sc_start SC_PROTECT_DEF,60000,3;', '', ''),
(14542, 'B_Def_Potion', 'Big Defense Potion', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'specialeffect2 EF_GUARD; sc_start SC_PROTECT_DEF,180000,3;', '', ''),
(14543, 'S_Mdef_Potion', 'Small Magic Defense Potion', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'specialeffect2 EF_SPELLBREAKER; sc_start SC_PROTECT_MDEF,60000,3;', '', ''),
@@ -7117,8 +7155,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(14572, 'Holy_Marble', 'Holy Marble', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'pet 1385;', '', ''),
(14573, 'Red_Burning_Stone', 'Red Burning Stone', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'pet 1382;', '', ''),
(14574, 'Skull_Of_Vagabond', 'Vagabond''s Skull', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'pet 1208;', '', ''),
-(14575, 'Str_Dish05_', 'Lutie Lady''s Pancake', 0, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_FOOD_STR,1200000,5; percentheal 10,0;', '', '');
-INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
+(14575, 'Str_Dish05_', 'Lutie Lady''s Pancake', 0, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_FOOD_STR,1200000,5; percentheal 10,0;', '', ''),
(14576, 'Int_Dish05_', 'Mastela Fruit Wine', 0, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_FOOD_INT,1200000,5; percentheal 0,10;', '', ''),
(14577, 'Vit_Dish05_', 'Spicy Fried Bao', 0, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_FOOD_VIT,1200000,5; percentheal 10,0;', '', ''),
(14578, 'Agi_Dish05_', 'Steamed Bat Wing in Pumpkin', 0, 2, 1, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_FOOD_AGI,1200000,5; percentheal 6,2;', '', ''),
@@ -7153,6 +7190,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(14607, 'Luxurious_Dinner_W', 'Luxurious Western Food', 2, 10000, 5000, 600, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_INCALLSTATUS,3600000,3;', '', ''),
(14608, 'Luxurious_Dinner_E', 'Manchu-Han Imperial Feast', 2, 20000, 10000, 1200, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'sc_start SC_INCALLSTATUS,3600000,6;', '', ''),
(14609, 'Spoiled_Cuisine', 'Spoiled Cuisine', 2, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'percentheal 10,10;', '', ''),
+(14613, 'RWC_Scroll_2012', 'RWC Scroll 2012', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(15000, 'Bone_Plate', 'Bone Plate', 5, 20, 10, 1000, 0, 0, 60, 0, 1, 414946, 2, 2, 16, 0, 85, 0, 1, 0, 'bonus bStr,1; bonus bMdef,3; bonus2 bIgnoreDefRate,RC_DemiHuman,10; bonus2 bIgnoreDefRate,RC_Brute,10; bonus3 bAutoSpellWhenHit,"NPC_WIDEBLEEDING",1,10;', '', ''),
(15001, 'Odin''s_Blessing_I', 'Odin''s Blessing', 5, 0, 0, 0, 0, 0, 10, 0, 0, 4294967294, 7, 2, 16, 0, 0, 0, 0, 0, '', '', ''),
(15002, 'Rune_Plate', 'Rune Plate', 5, 0, 0, 0, 0, 0, 95, 0, 1, 128, 7, 2, 16, 0, 99, 0, 1, 0, '', '', ''),
@@ -7186,22 +7224,31 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(15030, 'Judgement_Robe', 'Judgement Robe', 5, 20, 10, 300, 0, 0, 22, 0, 0, 256, 2, 2, 16, 0, 100, 0, 1, 0, 'bonus bDefEle,Ele_Dark; bonus bMdef,10; bonus bStr,2; bonus bInt,1; bonus2 bSubRace,RC_Demon,10; bonus2 bSubRace,RC_Undead,10; bonus2 bSubRace,RC_Formless,-10; bonus2 bSubRace,RC_Brute,-10; bonus2 bSubRace,RC_DemiHuman,-10; bonus2 bSubRace,RC_Plant,-10; bonus2 bSubRace,RC_Insect,-10; bonus2 bSubRace,RC_Fish,-10; bonus2 bSubRace,RC_Angel,-10; bonus2 bSubRace,RC_Dragon,-10;', '', ''),
(15031, 'Paradise_Uniform4', 'Paradise Uniform IV', 5, 0, 0, 0, 0, 0, 58, 0, 0, 4294967295, 7, 2, 16, 0, 60, 0, 0, 0, 'bonus bMdef,5; bonus bMaxHP,500; bonus bMaxSP,50; bonus bStr,1; bonus bInt,1; bonus bDex,1;', '', ''),
(15032, 'Tidon', 'Tidon', 5, 20, 10, 500, 0, 0, 2, 0, 1, 4294967294, 7, 2, 16, 0, 1, 0, 1, 0, 'bonus bMdef,10; bonus2 bResEff,Eff_Stun,1500; bonus2 bResEff,Eff_Freeze,1500; bonus2 bSubRace,RC_NonBoss,5; bonus2 bSubRace,RC_Boss,5;', '', ''),
+(15033, 'Tutorial_Mattle', 'Tutorial Mantle', 5, 0, 0, 600, 0, 0, 37, 0, 0, 0, 7, 2, 16, 0, 1, 0, 0, 0, '', '', ''),
+(15034, 'Tutorial_Mattle_', 'Tutorial Mantle', 5, 0, 0, 600, 0, 0, 37, 0, 1, 0, 7, 2, 16, 0, 1, 0, 0, 0, '', '', ''),
+(15035, '2010_Love_Dad', '2010 Love Dad', 5, 10, 5, 100, 0, 0, 6, 0, 1, 4294967295, 7, 2, 16, 0, 0, 0, 1, 0, 'bonus bAllStats,1; bonus bMaxHP,150; bonus bMaxSP,150; bonus2 bResEff,Eff_Stone,9000; bonus2 bResEff,Eff_Freeze,9000; bonus2 bResEff,Eff_Stun,9000; bonus2 bResEff,Eff_Sleep,9000; bonus2 bResEff,Eff_Silence,9000; bonus2 bResEff,Eff_Curse,9000; bonus2 bResEff,Eff_Confusion,9000; bonus2 bResEff,Eff_Blind,9000; bonus2 bResEff,Eff_Poison,9000; bonus2 bResEff,Eff_Bleeding,9000;', '', ''),
(15036, 'Ur_Plate', 'Urj Plate', 5, 20, 10, 3000, 0, 0, 110, 0, 0, 128, 8, 2, 16, 0, 100, 0, 1, 0, 'bonus bMdef,10; bonus bMaxHPRate,getequiprefinerycnt(EQI_ARMOR); bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubEle,Ele_Neutral,5;', '', ''),
(15037, 'Peuz_Plate', 'Pertz Plate', 5, 20, 10, 3000, 0, 0, 110, 0, 0, 128, 8, 2, 16, 0, 100, 0, 1, 0, 'bonus bMdef,10; bonus bBaseAtk,20; bonus bFlee,17;', '', ''),
(15038, 'Sabah_Cloth', 'Sabath''s Cloth', 5, 20, 10, 100, 0, 0, 45, 0, 1, 4096, 7, 2, 16, 0, 100, 0, 1, 0, 'bonus bLuk,3; bonus3 bAutoSpell,"ASC_METEORASSAULT",getskilllv("ASC_METEORASSAULT"),10;', '', ''),
(15039, 'Nab_Cloth', 'Nabeu''s Cloth', 5, 20, 10, 100, 0, 0, 45, 0, 1, 4096, 7, 2, 16, 0, 100, 0, 1, 0, 'bonus bStr,2; bonus bInt,2;', '', ''),
+(15040, 'Prison_Uniform', 'Prison Uniform', 5, 10, 5, 1500, 0, 0, 5, 0, 0, 4294967295, 7, 2, 16, 0, 50, 0, 1, 0, 'set .@rate,(getrefine()>10)?10:getrefine(); bonus bHit,.@rate; bonus bFlee,.@rate;', '', ''),
+(15041, 'Boitata_Armor', 'Boitata Armor', 5, 20, 10, 600, 0, 0, 45, 0, 1, 4294967295, 7, 2, 16, 0, 60, 0, 1, 0, 'bonus bMdef,3; bonus2 bSubEle,Ele_Neutral,7; bonus bMaxHPrate,5; bonus bFlee,5;', '', ''),
(15042, 'White_Wing_Suit', 'White Wing Suit', 5, 20, 10, 100, 0, 0, 45, 0, 1, 2048, 7, 2, 16, 0, 100, 0, 1, 0, 'bonus bLongAtkRate,getrefine()*2; bonus bFlee,getrefine();', '', ''),
(15043, 'Black_Wing_Suit', 'Black Wing Suit', 5, 20, 10, 100, 0, 0, 45, 0, 1, 2048, 8, 2, 16, 0, 100, 0, 1, 0, 'bonus bInt,2; bonus bBaseAtk,getequiprefinerycnt(EQI_ARMOR)*3;', '', ''),
(15044, 'Green_Surgical_Gown', 'Green Surgical Gown', 5, 56000, 28000, 660, 0, 0, 66, 0, 1, 262144, 7, 2, 16, 0, 100, 0, 1, 0, 'bonus bDex,1; bonus bMaxSP,30;', '', ''),
+(15045, 'Armor_Of_Valor', 'Armor Of Valor', 5, 0, 0, 0, 0, 0, 4, 0, 0, 4294967295, 7, 2, 16, 0, 0, 0, 0, 0, '', '', ''),
(15046, 'Siege_Plate', 'Siege Plate', 5, 0, 0, 3300, 0, 0, 85, 0, 1, 6571170, 7, 2, 16, 0, 95, 0, 1, 0, 'bonus bMdef,5; bonus2 bSubRace,RC_DemiHuman,2; if(getrefine()>5) { bonus bHealpower2,12; bonus bAddItemHealRate,12; } if(getrefine()>8) { bonus bMaxHPRate,25; }', '', ''),
(15047, 'Siege_Suits', 'Siege Suit', 5, 0, 0, 750, 0, 0, 50, 0, 1, 57564394, 7, 2, 16, 0, 95, 0, 1, 0, 'bonus bMdef,10; bonus2 bSubRace,RC_DemiHuman,2; if(getrefine()>5) { bonus bFlee2,5; bonus bLongAtkDef,20; } if(getrefine()>8) { bonus bMaxHPRate,15; }', '', ''),
(15048, 'Siege_Robe', 'Siege Robe', 5, 0, 0, 500, 0, 0, 40, 0, 1, 8487701, 7, 2, 16, 0, 95, 0, 1, 0, 'bonus bMdef,20; bonus2 bSubRace,RC_DemiHuman,2; if(getrefine()>5) { bonus bFlee,5; bonus bLongAtkDef,15; } if(getrefine()>8) { bonus bMaxHP,1000; bonus bMaxSP,100; }', '', ''),
+(15049, 'Armor_Of_Faith', 'Armor Of Faith', 5, 20, 10, 1000, 0, 0, 0, 0, 0, 4294967295, 7, 2, 16, 0, 50, 0, 1, 0, 'bonus bStr,4; bonus bInt,4; bonus bVit,4; bonus bDex,4; bonus bAgi,4; bonus bLuk,4;', '', ''),
+(15050, 'Armor_Of_Sanctity', 'Armor Of Sanctity', 5, 20, 10, 1000, 0, 0, 0, 0, 0, 4294967295, 7, 2, 16, 0, 50, 0, 1, 0, 'bonus bStr,4; bonus bInt,4; bonus bVit,4; bonus bDex,4; bonus bAgi,4; bonus bLuk,4;', '', ''),
(15051, 'Bakonawa_Armor', 'Bakunawa Scale Armor', 5, 20, 10, 500, 0, 0, 55, 0, 0, 4294967295, 7, 2, 16, 0, 1, 0, 1, 0, 'bonus2 bSubRace,RC_Boss,getrefine()/2; bonus bAllStats,1;', '', ''),
(15052, 'Bayani_Bakonawa_Armor', 'Bayani Bakunawa Scale Armor', 5, 20, 10, 500, 0, 0, 55, 0, 1, 4294967295, 7, 2, 16, 0, 1, 0, 1, 0, 'bonus2 bSubRace,RC_Boss,getrefine()/2; bonus bAllStats,2;', '', ''),
(15053, 'Special_Ninja_Suit', 'Special Ninja Suit', 5, 10000, 5000, 1200, 0, 0, 70, 0, 0, 33554432, 7, 2, 16, 0, 100, 0, 1, 0, 'bonus bAgi,1+(getrefine()/3);', '', ''),
(15054, 'Ninja_Scale_Armor', 'Ninja Scale Armor', 5, 10000, 5000, 1800, 0, 0, 90, 0, 1, 33554432, 7, 2, 16, 0, 100, 0, 1, 0, 'bonus bMaxHPRate,15; bonus bMaxSPRate,-30;', '', ''),
(15055, 'Armor_of_Nothingness', 'Armor of Nothingness', 5, 10000, 5000, 1500, 0, 0, 60, 0, 1, 33554432, 7, 2, 16, 0, 100, 0, 1, 0, 'bonus bAgi,1;', '', ''),
(15056, 'Special_Ninja_Suit_', 'Special Ninja Suit', 5, 10000, 5000, 1200, 0, 0, 70, 0, 1, 33554432, 7, 2, 16, 0, 100, 0, 1, 0, 'bonus bAgi,1+(getrefine()/3);', '', ''),
+(15057, 'Pure_White_Apron', 'Pure White Apron', 5, 20, 10, 600, 0, 0, 50, 0, 1, 4294967295, 7, 2, 16, 0, 0, 0, 1, 0, '', '', ''),
(16000, 'Erde', 'Erde', 4, 20, 10, 500, 130, 0, 0, 1, 2, 312754, 2, 2, 2, 4, 50, 0, 1, 8, 'bonus2 bSkillAtk,"AM_ACIDTERROR",20; bonus2 bSkillAtk,"AM_DEMONSTRATION",20; bonus bMaxSP,50; bonus bHealPower,10;', '', ''),
(16001, 'Red_Square_Bag', 'Red Square Bag', 4, 20, 10, 500, 130, 0, 0, 1, 2, 312754, 2, 2, 2, 3, 50, 0, 1, 8, 'bonus bMaxHP,200; bonus2 bSkillAtk,"AM_ACIDTERROR",20; bonus2 bSkillAtk,"AM_DEMONSTRATION",20; bonus2 bAddMonsterDropItem,501,50; bonus2 bAddMonsterDropItem,502,20; bonus2 bAddMonsterDropItem,503,20; bonus2 bAddMonsterDropItem,504,20; bonus2 bAddMonsterDropItem,505,10; if(readparam(bStr)>=95) bonus2 bAddEff,Eff_Stun,500;', '', ''),
(16002, 'Stunner_C', 'Stunner', 4, 0, 0, 0, 175, 0, 0, 1, 0, 33040, 7, 2, 2, 3, 1, 0, 0, 8, 'bonus2 bAddEff,Eff_Stun,1000; bonus2 bAddSize,Size_Small,40; bonus2 bAddSize,Size_Medium,40; bonus2 bAddSize,Size_Large,40;', '', ''),
@@ -7213,6 +7260,8 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(16008, 'F_Spanner_C', 'Spanner', 4, 2, 1, 0, 150, 0, 0, 1, 0, 33040, 7, 2, 2, 3, 0, 0, 0, 8, '', '', ''),
(16009, 'E_Spanner_C', 'Spanner', 4, 2, 1, 0, 150, 0, 0, 1, 0, 33040, 7, 2, 2, 3, 0, 0, 0, 8, '', '', ''),
(16010, 'Red_Ether_Bag', 'Red Ether Bag', 4, 20, 10, 0, 15, 100, 0, 1, 1, 312754, 7, 2, 2, 3, 102, 0, 1, 8, 'if(getrefine()>=6){ bonus2 bSkillAtk,"GN_CRAZYWEED",20+((getrefine()-5)*2); bonus2 bSkillAtk,"GN_DEMONIC_FIRE",20+((getrefine()-5)*2); } else { bonus2 bSkillAtk,"GN_CRAZYWEED",20; bonus2 bSkillAtk,"GN_DEMONIC_FIRE",20; }', '', ''),
+(16011, 'Adventure_Mace', 'Adventure Mace', 4, 0, 0, 0, 60, 0, 0, 1, 0, 33040, 7, 2, 2, 1, 1, 0, 0, 8, '', '', ''),
+(16012, 'Academy_Mace', 'Academy Mace', 4, 0, 0, 1000, 110, 0, 0, 1, 1, 33040, 7, 2, 2, 1, 1, 0, 1, 8, '', '', ''),
(16013, 'Judgement_Mace1', 'Judgement Mace I', 4, 20, 10, 1200, 140, 180, 0, 1, 2, 256, 2, 2, 2, 3, 100, 0, 1, 8, 'bonus bStr,1; bonus bInt,1; autobonus "{ bonus2 bAddRace,RC_Demon,20; }",10,7000,BF_WEAPON|BF_MAGIC,"{ specialeffect2 EF_BLOODDRAIN; }";', '', ''),
(16014, 'P_Mace3', 'Eden Mace III', 4, 0, 0, 0, 172, 0, 0, 1, 0, 312755, 7, 2, 2, 3, 60, 0, 0, 8, '', '', ''),
(16015, 'Cat_Club', 'Cat Club', 4, 20, 10, 700, 88, 0, 0, 1, 3, 312755, 7, 2, 2, 1, 1, 0, 1, 8, 'bonus2 bAddRace,RC_Brute,15;', '', ''),
@@ -7222,12 +7271,36 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(16019, 'Upg_Mace', 'Upg Mace', 4, 20, 10, 800, 80, 0, 0, 1, 1, 312755, 7, 2, 2, 3, 1, 0, 1, 8, 'bonus bBaseAtk,(getrefine()*10); bonus bHealPower,getrefine(); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*5);', '', ''),
(16020, 'Velum_Stunner', 'Vellum Stunner', 4, 20, 10, 1500, 170, 0, 0, 1, 0, 312755, 7, 2, 2, 4, 95, 0, 1, 8, 'bonus bUnbreakableWeapon,0; bonus2 bAddEff,Eff_Stun,1000+getrefine(); bonus bAspdRate,getrefine();', '', ''),
(16021, 'Velum_Flail', 'Vellum Flail', 4, 20, 10, 1500, 170, 0, 0, 1, 0, 312755, 7, 2, 2, 4, 95, 0, 1, 8, 'bonus bUnbreakableWeapon,0; bonus3 bAutoSpell,"NPC_CRITICALWOUND",5,10; bonus bHit,getrefine(); bonus bCritical,getrefine();', '', ''),
+(16022, 'Nemesis_', 'Nemesis ', 4, 20, 10, 900, 120, 0, 0, 1, 2, 33040, 7, 2, 2, 4, 60, 0, 1, 8, 'bonus bUnbreakableWeapon,0; bonus bAtkEle,Ele_Holy;', '', ''),
(16134, 'King_Frog_Hat_Box', 'Frog King Hat Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5528,1;', '', ''),
(16135, 'Evil''s_Bone_Hat_Box', 'Satanic Bone Helm Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5529,1;', '', ''),
+(16186, 'B_Dragon_Hat_Box', 'Baby Dragon Hat Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5531,1;', '', ''),
+(16226, 'Aries_Diadem_Box', 'Aries Diadem Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5545,1;', '', ''),
+(16227, 'Aries_Crown_Box', 'Aries Crown Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5546,1;', '', ''),
+(16230, 'Taurus_Diadem_Box', 'Taurus Diadem Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5549,1;', '', ''),
+(16231, 'Taurus_Crown_Box', 'Taurus Crown Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5550,1;', '', ''),
+(16246, 'Crown_Of_Deceit_Box', 'Crown Of Deceit Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5564,1;', '', ''),
+(16185, 'Raven_Cap_Box', 'Raven Cap Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5530,1;', '', ''),
(16247, 'Dragon_Arhat_Mask_Box', 'Dragon Arhat Mask Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5565,1;', '', ''),
(16248, 'Tiger_Arhat_Mask_Box', 'Tiger Arhat Mask Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5566,1;', '', ''),
+(16249, 'Knight_Gift_Box', 'Knight Gift Box', 2, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
+(16251, 'Gemini_Diadem_Box', 'Gemini Diadem Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5569,1;', '', ''),
+(16252, 'Gemini_Crown_Box', 'Gemini Crown Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5570,1;', '', ''),
+(16253, 'Rabbit_Scroll', 'Rabbit Scroll', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(16257, 'Buddah_Scroll', 'Buddah Scroll', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
+(16258, 'HD_Bradium_5_Box', 'HD Bradium 5 Box', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 6226,5;', '', ''),
+(16259, 'HD_Carnium_5_Box', 'HD Carnium 5 Box', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 6225,5;', '', ''),
+(16260, 'HD_Bradium_10_Box', 'HD Bradium 10 Box', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 6226,10;', '', ''),
+(16261, 'HD_Carnium_10_Box', 'HD Carnium 10 Box', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 6225,10;', '', ''),
+(16269, 'Cancer_Diadem_Box', 'Cancer Diadem Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5581,1;', '', ''),
+(16270, 'Cancer_Crown_Box', 'Cancer Crown Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5582,1;', '', ''),
(16304, 'Evil_Incarnation', 'Evil Incarnation', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
+(16343, 'Leo_Crown_Box', 'Leo Crown Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5588,1;', '', ''),
+(16344, 'Leo_Diadem_Box', 'Leo Diadem Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5589,1;', '', ''),
+(16345, 'F_Leo_Crown_Box', 'F Leo Crown Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5588,1;', '', ''),
+(16346, 'F_Leo_Diadem_Box', 'F Leo Diadem Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5589,1;', '', ''),
+(16368, 'Virgo_Crown_Box', 'Virgo Crown Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5598,1;', '', ''),
+(16305, 'Upg_Guard_Box', 'Upg Guard Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 2149,1;', '', ''),
(16371, 'Tw_Aug_Scroll', 'Tw Aug Scroll', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
(16372, 'F_Clover_Box_Mouth', 'F Clover Box Mouth', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, '', '', ''),
(16374, 'Mouth_Bubble_Gum_Box', 'Mouth Bubble Gum Box', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
@@ -7239,6 +7312,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(16394, 'HD_Ori_Box10', 'HD Ori Box10', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 6240,10;', '', ''),
(16395, 'HD_Elu_Box5', 'HD Elu Box5', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 6241,5;', '', ''),
(16396, 'HD_Elu_Box10', 'HD Elu Box10', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 6241,10;', '', ''),
+(16397, 'Virgo_Diadem_Box', 'Virgo Diadem Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 5599,1;', '', ''),
(16405, 'Midgard_Coin_Box', 'Midgard Coin Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 6242,1;', '', ''),
(16406, 'FMidgard_Coin_Box', 'FMidgard Coin Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 6242,1;', '', ''),
(16409, 'Tw_Sep_Scroll', 'Tw Sep Scroll', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
@@ -7361,7 +7435,8 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(16996, 'Capri_Crown_Scroll', 'Capri Crown Scroll', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
(16997, 'Capri_Crown_Scroll_Box', 'Capri Crown Scroll Box', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
(16998, 'Archangel_Wings_Box', 'Archangel Wings Box', 2, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 2573,1;', '', ''),
-(16999, 'Bravery_Bag_Box', 'Bravery Bag Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 2576,1;', '', ''),
+(16999, 'Bravery_Bag_Box', 'Bravery Bag Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 2576,1;', '', '');
+INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
(17000, 'Wander_Man_Box5', 'Wander Man Box5', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 12626,5;', '', ''),
(17001, 'Wander_Man_Box10', 'Wander Man Box10', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 12626,10;', '', ''),
(17002, 'Wicked_Nymph_Box5', 'Wicked Nymph Box5', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 12627,5;', '', ''),
@@ -7440,8 +7515,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(17092, 'Upg_Bow_Box', 'Upg Bow Box', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 18112,1;', '', ''),
(17093, 'Upg_Twohand_Sword_Box', 'Upg Two-Handed Sword Box', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 21000,1;', '', ''),
(17104, 'HD_Oridecon_50Box', 'HD Oridecon 50Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 6240,50;', '', ''),
-(17105, 'HD_Elunium_50Box', 'HD Elunium 50Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 6241,50;', '', '');
-INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
+(17105, 'HD_Elunium_50Box', 'HD Elunium 50Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 6241,50;', '', ''),
(17106, 'Max_Weight_Up_10Box', 'Max Weight Up 10Box', 18, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'getitem 7776,10;', '', ''),
(17107, 'Gemi_Crown_Scroll', 'Gemi Crown Scroll', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
(17108, 'Gemi_Crown_Scroll_Box', 'Gemi Crown Scroll Box', 2, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'packageitem();', '', ''),
@@ -7685,11 +7759,13 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(18673, 'Tare_Pope_', 'Tare Pope', 5, 20, 10, 300, 0, 0, 0, 0, 1, 4294967295, 7, 2, 256, 0, 1, 0, 0, 817, 'bonus bUnbreakableHelm,0;', '', ''),
(18674, 'Planewing_Hat', 'Planewing Hat', 5, 20, 10, 200, 0, 0, 3, 0, 1, 4294967294, 7, 2, 256, 0, 1, 0, 1, 11, 'bonus bAgi,3;', '', ''),
(18675, 'Green_Apple_Hat', 'Green Apple Hat', 5, 20, 10, 200, 0, 0, 3, 0, 1, 4294967294, 7, 2, 256, 0, 20, 0, 1, 11, 'bonus bDex,2;', '', ''),
+(18676, 'Hexagon_Spectacles', 'Hexagon Spectacles', 5, 20, 10, 400, 0, 0, 3, 0, 0, 4294967294, 7, 2, 512, 0, 20, 0, 0, 822, 'bonus bFlee,2;', '', ''),
(18677, 'Cherry_Twig_In_Mouth', 'Cherry Twig In Mouth', 5, 20, 10, 200, 0, 0, 0, 0, 0, 4294967294, 7, 2, 1, 0, 20, 0, 0, 823, '', '', ''),
(18678, 'Leek_In_Mouth', 'Leek In Mouth', 5, 20, 10, 200, 0, 0, 0, 0, 0, 4294967294, 7, 2, 1, 0, 20, 0, 0, 824, '', '', ''),
(18679, 'Abacus_In_Mouth', 'Abacus In Mouth', 5, 20, 10, 200, 0, 0, 0, 0, 0, 4294967294, 7, 2, 1, 0, 20, 0, 0, 825, '', '', ''),
(18680, 'Tw_Frog_Hat', 'Tw Frog Hat', 5, 20, 10, 200, 0, 0, 2, 0, 0, 4294967295, 7, 2, 256, 0, 35, 0, 0, 11, 'bonus bAgi,1;', '', ''),
(18681, 'Puppy_Ears_Hat', 'Puppy Ears Hat', 5, 20, 10, 200, 0, 0, 2, 0, 0, 4294967295, 7, 2, 256, 0, 1, 0, 1, 11, 'bonus bVit,2;', '', ''),
+(18682, 'Teardrop', 'Teardrop', 5, 20, 10, 100, 0, 0, 1, 0, 0, 4294967295, 7, 2, 512, 0, 1, 0, 1, 828, 'bonus bMaxSP,15;', '', ''),
(18683, 'Carrot_In_Mouth', 'Carrot In Mouth', 5, 20, 10, 200, 0, 0, 1, 0, 0, 4294967295, 7, 2, 1, 0, 1, 0, 0, 829, '', '', ''),
(18684, 'Showy_High_Cap', 'Showy High Cap', 5, 20, 10, 200, 0, 0, 3, 0, 1, 4294967294, 7, 2, 256, 0, 1, 0, 1, 11, 'bonus bStr,3; bonus bInt,2;', '', ''),
(18685, 'Stardust_Hairband', 'Stardust Hairband', 5, 20, 10, 1000, 0, 0, 0, 0, 0, 4294967295, 7, 2, 256, 0, 10, 0, 0, 831, '', '', ''),
@@ -7699,7 +7775,8 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(18689, '2011_RMSC_4', '2011 RMSC 4', 5, 20, 10, 10, 0, 0, 0, 0, 0, 4294967295, 7, 2, 256, 0, 1, 0, 0, 832, 'bonus bUnbreakableHelm,0;', '', ''),
(18690, 'Sirt_Evil_Eye', 'Sirt Evil Eye', 5, 20, 10, 400, 0, 0, 0, 0, 0, 4294967295, 7, 2, 512, 0, 50, 0, 0, 345, 'bonus bUnbreakableHelm,0; bonus bStr,1;', '', ''),
(18691, 'Rising_Black_Dragon', 'Rising Black Dragon', 5, 20, 10, 100, 0, 0, 3, 0, 0, 4294967295, 7, 2, 256, 0, 1, 0, 1, 166, '', '', ''),
-(18692, 'Mike_Hat', 'Mike Hat', 5, 20, 10, 200, 0, 0, 3, 0, 1, 4294967294, 7, 2, 256, 0, 1, 0, 1, 837, 'bonus bDex,2; bonus bLuk,1;', '', ''),
+(18692, 'Mike_Hat', 'Mike Hat', 5, 20, 10, 200, 0, 0, 3, 0, 1, 4294967294, 7, 2, 256, 0, 1, 0, 1, 837, 'bonus bDex,2; bonus bLuk,1;', '', '');
+INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
(18693, 'Sleeping_Kitty_Cat', 'Sleeping Kitty Cat', 5, 20, 10, 200, 0, 0, 4, 0, 1, 4294967294, 7, 2, 256, 0, 20, 0, 1, 838, '', '', ''),
(18694, 'Red_Hood', 'Red Hood', 5, 20, 10, 200, 0, 0, 3, 0, 1, 4294967294, 7, 2, 256, 0, 20, 0, 1, 839, '', '', ''),
(18695, 'Phoenix_Crown', 'Phoenix Crown', 5, 20, 10, 400, 0, 0, 3, 0, 1, 4294967294, 7, 2, 256, 0, 20, 0, 1, 840, 'bonus bInt,2;', '', ''),
@@ -7755,6 +7832,7 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(18873, 'Sweet_Valentine_Out', 'Sweet Valentine Out', 5, 20, 10, 100, 0, 0, 1, 0, 0, 4294967295, 7, 2, 256, 0, 1, 0, 1, 965, '', '', ''),
(19500, 'T_Mr_Smile', 'T Mr Smile', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 6144, 0, 0, 0, 0, 65, 'bonus bStr,2;', '', ''),
(19501, 'T_Spinx_Helm', 'T Spinx Helm', 5, 0, 0, 0, 0, 0, 0, 0, 1, 4294967295, 7, 2, 5120, 0, 0, 0, 0, 137, '', '', ''),
+(19502, 'T_Goggle', 'T Goggle', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 3072, 0, 0, 0, 0, 1, '', '', ''),
(19504, 'T_Sunglasses', 'T Sunglasses', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 2048, 0, 0, 0, 0, 12, '', '', ''),
(19505, 'T_Cigarette', 'T Cigarette', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 4096, 0, 0, 0, 0, 54, '', '', ''),
(19506, 'T_Valkyrie_Feather_Band', 'T Valkyrie Feather Band', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 1024, 0, 0, 0, 1, 300, '', '', ''),
@@ -7780,9 +7858,9 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(19526, 'C_Helm', 'Costume Helm', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 1024, 0, 1, 0, 0, 40, 'bonus bUnbreakableHelm,0;', '', ''),
(19527, 'C_Spiky_Band', 'Costume Spiky Band', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 1024, 0, 1, 0, 0, 43, 'bonus bUnbreakableHelm,0;', '', ''),
(19528, 'C_Iron_Cain', 'Costume Iron Cain', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 4096, 0, 1, 0, 0, 53, 'bonus bUnbreakableHelm,0;', '', ''),
-(19529, 'C_Angel_Wing', 'Costume Angel Wing', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 1024, 0, 1, 0, 0, 38, 'bonus bUnbreakableHelm,0; bonus bVit,1; bonus bAgi,1;', '', '');
-INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_buy`, `price_sell`, `weight`, `atk`, `matk`, `defence`, `range`, `slots`, `equip_jobs`, `equip_upper`, `equip_genders`, `equip_locations`, `weapon_level`, `equip_level_min`, `equip_level_max`, `refineable`, `view`, `script`, `equip_script`, `unequip_script`) VALUES
+(19529, 'C_Angel_Wing', 'Costume Angel Wing', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 1024, 0, 1, 0, 0, 38, 'bonus bUnbreakableHelm,0; bonus bVit,1; bonus bAgi,1;', '', ''),
(19530, 'C_Wild_Rose', 'Costume Wild Rose', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 1024, 0, 1, 0, 0, 541, 'bonus bUnbreakableHelm,0; bonus bAtk,2; bonus bMatk,2;', '', ''),
+(19531, 'C_Cube_Mask', 'Costume Cube Mask', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 6144, 0, 0, 0, 0, 472, 'bonus bUnbreakableHelm,0;', '', ''),
(19532, 'C_Red_Bunny_Band', 'Red Bunny Band', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 1024, 0, 1, 0, 0, 640, 'bonus bUnbreakableHelm,0; bonus bDex,1;', '', ''),
(19533, 'C_Spore_Hat', 'Costume Spore Hat', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 1024, 0, 1, 0, 0, 114, 'bonus bUnbreakableHelm,0; bonus bVit,1; bonus2 bExpAddRace,RC_NonBoss,1; bonus2 bExpAddRace,RC_Boss,1;', '', ''),
(19534, 'C_Tha_Despero_Mask', 'Tha Despero Mask', 5, 20, 10, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 513, 0, 1, 0, 0, 693, 'bonus bAtkRate,1; bonus bMatkRate,1; bonus bHealPower,1;', '', ''),
@@ -7806,15 +7884,19 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
(19552, 'C_Centimental_Flower', 'Costume Centimental Flower', 5, 20, 10, 100, 0, 0, 0, 0, 0, 4294967295, 7, 2, 4096, 0, 100, 0, 0, 56, 'bonus bUnbreakableHelm,0;', '', ''),
(19553, 'C_Assassin_Mask_', 'Costume Assassin Mask', 5, 20, 10, 100, 0, 0, 0, 0, 0, 4294967295, 7, 2, 4096, 0, 100, 0, 0, 180, 'bonus bUnbreakableHelm,0;', '', ''),
(19573, 'C_Heart_Wing_Hairband', 'Costume Heart Wing Hairband', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 1024, 0, 1, 0, 1, 733, '', '', ''),
+(19574, 'C_Lord_of_Death', 'Costume Lord of Death', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 3072, 0, 0, 0, 1, 742, 'bonus bUnbreakableHelm,0;', '', ''),
(19587, 'C_King_Poring_Hat', 'Costume King Poring Hat', 5, 0, 0, 100, 0, 0, 0, 0, 0, 4294967295, 7, 2, 1024, 0, 1, 0, 0, 905, 'bonus bUnbreakableHelm,0;', '', ''),
(19650, 'C_Rainbow_Feather_Deco', 'Costume Rainbow Feather Deco', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 1024, 0, 1, 0, 1, 934, '', '', ''),
+(19707, 'C_Polar_Bear_Cap', 'Costume Polar Bear Cap', 5, 20, 10, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 1024, 0, 0, 0, 0, 966, 'bonus bUnbreakableHelm,0;', '', ''),
(20500, 'T_Archangel_Wing', 'Archangel Wing', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 8192, 0, 1, 0, 0, 1, 'bonus bUnbreakableHelm,0;', '', ''),
(20600, 'Fantastic_Aura', 'Fantastic Aura', 5, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 7, 2, 16384, 0, 1, 0, 0, 0, 'bonus bUnbreakableHelm,0;', '', ''),
(20700, 'Egir_Manteau', 'Egir Manteau', 5, 200000, 100000, 300, 0, 0, 10, 0, 1, 4294967295, 7, 2, 4, 0, 110, 0, 1, 0, 'bonus bUnbreakableHelm,0;', '', ''),
+(20711, 'Manteau_Of_Diego', 'Manteau Of Diego', 5, 20, 10, 600, 0, 0, 15, 0, 1, 4294967295, 7, 2, 4, 0, 0, 0, 1, 0, 'bonus bInt,1; bonus bDex,1; bonus bMdef,3;', '', ''),
(20724, 'Love_Dad_Wings_2012', 'Love Dad Wings 2012', 5, 0, 0, 100, 0, 0, 15, 0, 1, 4294967295, 7, 2, 4, 0, 1, 0, 1, 5, '', '', ''),
(21000, 'Upg_Twohand_Sword', 'Upg Two-Handed Sword', 4, 20, 10, 1500, 100, 0, 0, 1, 1, 16514, 7, 2, 34, 3, 1, 0, 1, 3, 'bonus bBaseAtk,(getrefine()*12); bonus bMatk,(getrefine()*5); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*10);', '', ''),
(21001, 'Velum_Claymore', 'Vellum Claymore', 4, 20, 10, 3500, 260, 0, 0, 1, 0, 16514, 7, 2, 34, 4, 95, 0, 1, 3, 'bonus2 bAddRace,RC_DemiHuman,80; bonus2 bIgnoreDefRate,RC_DemiHuman,30; if(getrefine()>=6) { bonus2 bAddRace,RC_DemiHuman,40; } if(getrefine()>=9) { autobonus2 "{ bonus bShortWeaponDamageReturn,20; bonus bMagicDamageReturn,20; }",200,1000,BF_WEAPON,"{ specialeffect2 EF_REFLECTSHIELD; }"; }', '', ''),
(21002, 'Velum_Katzbalger', 'Vellum Katzbalger', 4, 20, 10, 2500, 100, 0, 0, 1, 0, 16514, 7, 2, 34, 4, 95, 0, 1, 3, 'bonus2 bSPVanishRate,10000,8;', '', ''),
(21003, 'Muramasa_', 'Muramasa ', 4, 20, 10, 1000, 155, 0, 0, 1, 2, 16514, 7, 2, 34, 4, 48, 0, 1, 3, '', '', ''),
(21004, 'Alca_Bringer_', 'Alca Bringer ', 4, 20, 10, 3400, 280, 0, 0, 2, 2, 125, 7, 2, 34, 3, 100, 0, 1, 3, '', '', ''),
-(21005, 'Metal_Two_Hand_Sword', 'Metal Two Hand Sword', 4, 20, 10, 0, 95, 0, 0, 1, 1, 16514, 7, 2, 34, 3, 1, 0, 1, 3, '', '', '');
+(21005, 'Metal_Two_Hand_Sword', 'Metal Two Hand Sword', 4, 20, 10, 0, 95, 0, 0, 1, 1, 16514, 7, 2, 34, 3, 1, 0, 1, 3, '', '', ''),
+(22540, 'Runstone_Luxanima', 'Lux Anima Rune', 11, 2, 1, 100, 0, 0, 0, 0, 0, 4294967295, 7, 2, 0, 0, 0, 0, 0, 0, 'itemskill "RK_LUXANIMA",1;', '', ''); \ No newline at end of file
diff --git a/src/map/battle.c b/src/map/battle.c
index 135247734..2016efa3b 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -444,8 +444,8 @@ int battle_calc_weapon_damage(struct block_list *src, struct block_list *bl, uin
if( flag&2 && sd->bonus.arrow_atk )
damage += sd->bonus.arrow_atk;
- if( sd->bonus.eatk > 0 )
- eatk = sd->bonus.eatk;
+ if( sd->battle_status.equip_atk != 0 )
+ eatk = sd->base_status.equip_atk;
}
if( sc && sc->count ){
diff --git a/src/map/clif.c b/src/map/clif.c
index f17766f50..1b96d45fb 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11133,13 +11133,16 @@ void clif_parse_StopAttack(int fd,struct map_session_data *sd)
/// Request to move an item from inventory to cart (CZ_MOVE_ITEM_FROM_BODY_TO_CART).
/// 0126 <index>.W <amount>.L
-void clif_parse_PutItemToCart(int fd,struct map_session_data *sd)
-{
+void clif_parse_PutItemToCart(int fd,struct map_session_data *sd) {
+ int flag = 0;
if (pc_istrading(sd))
return;
if (!pc_iscarton(sd))
return;
- pc->putitemtocart(sd,RFIFOW(fd,2)-2,RFIFOL(fd,4));
+ if ( (flag = pc->putitemtocart(sd,RFIFOW(fd,2)-2,RFIFOL(fd,4))) ) {
+ clif->dropitem(sd, RFIFOW(fd,2)-2,0);
+ clif->cart_additem_ack(sd,flag == 1?0x0:0x1);
+ }
}
@@ -11859,9 +11862,9 @@ void clif_parse_ResetChar(int fd, struct map_session_data *sd) {
char cmd[15];
if( RFIFOW(fd,2) )
- sprintf(cmd,"%cresetskill",atcommand->at_symbol);
+ sprintf(cmd,"%cskreset",atcommand->at_symbol);
else
- sprintf(cmd,"%cresetstat",atcommand->at_symbol);
+ sprintf(cmd,"%cstreset",atcommand->at_symbol);
atcommand->parse(fd, sd, cmd, 1);
}
@@ -13376,23 +13379,25 @@ void clif_parse_GMRecall2(int fd, struct map_session_data* sd)
void clif_parse_GM_Monster_Item(int fd, struct map_session_data *sd)
{
char *monster_item_name;
+ struct mob_db *mob_data;
+ struct item_data *item_data;
char command[NAME_LENGTH+10];
monster_item_name = (char*)RFIFOP(fd,2);
monster_item_name[NAME_LENGTH-1] = '\0';
- // FIXME: Should look for item first, then for monster.
- // FIXME: /monster takes mob_db Sprite_Name as argument
- if( mobdb_searchname(monster_item_name) ) {
- snprintf(command, sizeof(command)-1, "%cmonster %s", atcommand->at_symbol, monster_item_name);
+ if( (item_data=itemdb->search_name(monster_item_name)) != NULL
+ && strcmp(item_data->name, monster_item_name) != 0 ) { // It only accepts aegis name
+ if( item_data->type == IT_WEAPON || item_data->type == IT_ARMOR ) // nonstackable
+ snprintf(command, sizeof(command)-1, "%citem2 %d 1 0 0 0 0 0 0 0", atcommand->at_symbol, item_data->nameid);
+ else
+ snprintf(command, sizeof(command)-1, "%citem %d 20", atcommand->at_symbol, item_data->nameid);
atcommand->parse(fd, sd, command, 1);
return;
}
- // FIXME: Stackables have a quantity of 20.
- // FIXME: Equips are supposed to be unidentified.
-
- if( itemdb->search_name(monster_item_name) ) {
- snprintf(command, sizeof(command)-1, "%citem %s", atcommand->at_symbol, monster_item_name);
+ if( (mob_data=mob_db(mobdb_searchname(monster_item_name)))
+ && strcmp(mob_data->sprite, monster_item_name) != 0 ) { // It only accepts sprite name
+ snprintf(command, sizeof(command)-1, "%cmonster %s", atcommand->at_symbol, mob_data->name);
atcommand->parse(fd, sd, command, 1);
return;
}
@@ -17580,7 +17585,18 @@ void clif_skill_cooldown_list(int fd, struct skill_cd* cd) {
WFIFOSET(fd,4+(offset*count));
}
-
+/* [Ind/Hercules] - Data Thanks to Yommy
+ * - ADDITEM_TO_CART_FAIL_WEIGHT = 0x0
+ * - ADDITEM_TO_CART_FAIL_COUNT = 0x1
+ */
+void clif_cart_additem_ack(struct map_session_data *sd, int flag) {
+ struct packet_cart_additem_ack p;
+
+ p.PacketType = cart_additem_ackType;
+ p.result = (char)flag;
+
+ clif->send(&p,sizeof(p), &sd->bl, SELF);
+}
/* */
unsigned short clif_decrypt_cmd( int cmd, struct map_session_data *sd ) {
if( sd ) {
@@ -17917,6 +17933,7 @@ void clif_defaults(void) {
clif->addcards2 = clif_addcards2;
clif->item_sub = clif_item_sub;
clif->getareachar_item = clif_getareachar_item;
+ clif->cart_additem_ack = clif_cart_additem_ack;
/* unit-related */
clif->clearunit_single = clif_clearunit_single;
clif->clearunit_area = clif_clearunit_area;
diff --git a/src/map/clif.h b/src/map/clif.h
index a0946a48a..e1744b4e8 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -501,6 +501,7 @@ struct clif_interface {
void (*addcards2) (unsigned short *cards, struct item* item);
void (*item_sub) (unsigned char *buf, int n, struct item *i, struct item_data *id, int equip);
void (*getareachar_item) (struct map_session_data* sd,struct flooritem_data* fitem);
+ void (*cart_additem_ack) (struct map_session_data *sd, int flag);
void (*cashshop_load) (void);
void (*package_announce) (struct map_session_data *sd, unsigned short nameid, unsigned short containerid);
/* unit-related */
diff --git a/src/map/irc-bot.c b/src/map/irc-bot.c
index 0be8074c8..d3782bd9b 100644
--- a/src/map/irc-bot.c
+++ b/src/map/irc-bot.c
@@ -120,15 +120,12 @@ void irc_parse_source(char *source, char *nick, char *ident, char *host) {
for(i = 0; i < len; i++) {
if( stage == 0 && source[i] == '!' ) {
- memcpy(nick, &source[0], min(i,IRC_NICK_LENGTH));
- nick[i] = '\0';
+ safestrncpy(nick, &source[0], min(i + 1, IRC_NICK_LENGTH));
pos = i+1;
stage = 1;
} else if( stage == 1 && source[i] == '@' ) {
- memcpy(ident, &source[pos], min(i - pos,IRC_IDENT_LENGTH));
- ident[i-pos] = '\0';
- memcpy(host, &source[i+1], min(len - i,IRC_HOST_LENGTH));
- host[len] = '\0';
+ safestrncpy(ident, &source[pos], min(i - pos + 1, IRC_IDENT_LENGTH));
+ safestrncpy(host, &source[i+1], min(len - i, IRC_HOST_LENGTH));
break;
}
}
diff --git a/src/map/mail.c b/src/map/mail.c
index 021a51cde..93304bac0 100644
--- a/src/map/mail.c
+++ b/src/map/mail.c
@@ -200,4 +200,4 @@ void mail_defaults(void)
mail->openmail = mail_openmail;
mail->deliveryfail = mail_deliveryfail;
mail->invalid_operation = mail_invalid_operation;
-} \ No newline at end of file
+}
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index f6e6a8a3f..d56e9ce01 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -18,6 +18,7 @@ struct EQUIPSLOTINFO {
*
**/
enum packet_headers {
+ cart_additem_ackType = 0x12c,
sc_notickType = 0x196,
#if PACKETVER < 20061218
additemType = 0xa0,
@@ -459,6 +460,7 @@ struct packet_script_clear {
short PacketType;
unsigned int NpcID;
} __attribute__((packed));
+
/* made possible thanks to Yommy!! */
struct packet_package_item_announce {
short PacketType;
@@ -471,6 +473,11 @@ struct packet_package_item_announce {
unsigned short BoxItemID;
} __attribute__((packed));
+struct packet_cart_additem_ack {
+ short PacketType;
+ char result;
+} __attribute__((packed));
+
#pragma pack(pop)
#endif /* _PACKETS_STRUCT_H_ */
diff --git a/src/map/pc.c b/src/map/pc.c
index 87e80c264..84cfe7eb3 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -2091,8 +2091,7 @@ int pc_bonus(struct map_session_data *sd,int type,int val)
case SP_BASE_ATK:
if(sd->state.lr_flag != 2) {
#ifdef RENEWAL
- sd->bonus.eatk += val;
- clif->updatestatus(sd,SP_ATK2);
+ status->equip_atk += val;
#else
bonus = status->batk + val;
status->batk = cap_value(bonus, 0, USHRT_MAX);
@@ -4432,7 +4431,7 @@ int pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amoun
if( !itemdb_cancartstore(item_data, pc->get_group_level(sd)) )
{ // Check item trade restrictions [Skotlex]
clif->message (sd->fd, msg_txt(264));
- return 1;
+ return 1;/* TODO: there is no official response to this? */
}
if( (w = data->weight*amount) + sd->cart_weight > sd->cart_weight_max )
@@ -4450,7 +4449,7 @@ int pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amoun
if( i < MAX_CART )
{// item already in cart, stack it
if( amount > MAX_AMOUNT - sd->status.cart[i].amount || ( data->stack.cart && amount > data->stack.amount - sd->status.cart[i].amount ) )
- return 1; // no room
+ return 2; // no room
sd->status.cart[i].amount+=amount;
clif->cart_additem(sd,i,amount,0);
@@ -4459,7 +4458,7 @@ int pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amoun
{// item not stackable or not present, add it
ARR_FIND( 0, MAX_CART, i, sd->status.cart[i].nameid == 0 );
if( i == MAX_CART )
- return 1; // no room
+ return 2; // no room
memcpy(&sd->status.cart[i],item_data,sizeof(sd->status.cart[0]));
sd->status.cart[i].amount=amount;
@@ -4513,6 +4512,7 @@ int pc_cart_delitem(struct map_session_data *sd,int n,int amount,int type,e_log_
int pc_putitemtocart(struct map_session_data *sd,int idx,int amount)
{
struct item *item_data;
+ int flag;
nullpo_ret(sd);
@@ -4524,10 +4524,10 @@ int pc_putitemtocart(struct map_session_data *sd,int idx,int amount)
if( item_data->nameid == 0 || amount < 1 || item_data->amount < amount || sd->state.vending )
return 1;
- if( pc->cart_additem(sd,item_data,amount,LOG_TYPE_NONE) == 0 )
+ if( (flag = pc->cart_additem(sd,item_data,amount,LOG_TYPE_NONE)) == 0 )
return pc->delitem(sd,idx,amount,0,5,LOG_TYPE_NONE);
- return 1;
+ return flag;
}
/*==========================================
@@ -4569,11 +4569,11 @@ int pc_getitemfromcart(struct map_session_data *sd,int idx,int amount)
if(item_data->nameid==0 || amount < 1 || item_data->amount<amount || sd->state.vending )
return 1;
+
if((flag = pc->additem(sd,item_data,amount,LOG_TYPE_NONE)) == 0)
return pc->cart_delitem(sd,idx,amount,0,LOG_TYPE_NONE);
- clif->additem(sd,0,0,flag);
- return 1;
+ return flag;
}
/*==========================================
diff --git a/src/map/pc.h b/src/map/pc.h
index 7f0e8cf46..58dd85083 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -327,7 +327,6 @@ struct map_session_data {
int fixcastrate,varcastrate;
int add_fixcast,add_varcast;
int ematk; // matk bonus from equipment
- int eatk; // atk bonus from equipment
} bonus;
// zeroed vars end here.
int castrate,delayrate,hprate,sprate,dsprate;
@@ -655,7 +654,7 @@ enum equip_pos {
// clientside display macros (values to the left/right of the "+")
#ifdef RENEWAL
#define pc_leftside_atk(sd) ((sd)->battle_status.batk)
- #define pc_rightside_atk(sd) ((sd)->battle_status.rhw.atk + (sd)->battle_status.lhw.atk + (sd)->battle_status.rhw.atk2 + (sd)->battle_status.lhw.atk2 + (sd)->bonus.eatk )
+ #define pc_rightside_atk(sd) ((sd)->battle_status.rhw.atk + (sd)->battle_status.lhw.atk + (sd)->battle_status.rhw.atk2 + (sd)->battle_status.lhw.atk2 + (sd)->battle_status.equip_atk )
#define pc_leftside_def(sd) ((sd)->battle_status.def2)
#define pc_rightside_def(sd) ((sd)->battle_status.def)
#define pc_leftside_mdef(sd) ((sd)->battle_status.mdef2)
diff --git a/src/map/skill.c b/src/map/skill.c
index deb6643c1..1b350f74c 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -744,10 +744,10 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, uint
temp = skill->get_time2(iStatus->sc2skill(type),7);
if (sd->addeff[i].flag&ATF_TARGET)
- iStatus->change_start(bl,type,rate,7,0,0,0,temp,0);
+ iStatus->change_start(bl,type,rate,7,0,(type == SC_BURNING)?src->id:0,0,temp,0);
if (sd->addeff[i].flag&ATF_SELF)
- iStatus->change_start(src,type,rate,7,0,0,0,temp,0);
+ iStatus->change_start(src,type,rate,7,0,(type == SC_BURNING)?src->id:0,0,temp,0);
}
}
diff --git a/src/map/status.c b/src/map/status.c
index 20d88e296..0d8bedc5e 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4045,6 +4045,10 @@ void status_calc_bl_(struct block_list* bl, enum scb_flag flag, bool first)
clif->updatestatus(sd,SP_HP);
if(b_status.sp != status->sp)
clif->updatestatus(sd,SP_SP);
+#ifdef RENEWAL
+ if(b_status.equip_atk != status->equip_atk)
+ clif->updatestatus(sd,SP_ATK2);
+#endif
} else if( bl->type == BL_HOM ) {
TBL_HOM* hd = BL_CAST(BL_HOM, bl);
if( hd->master && memcmp(&b_status, status, sizeof(struct status_data)) != 0 )
diff --git a/src/map/status.h b/src/map/status.h
index 11a78dc9f..5f8a515f6 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -1632,6 +1632,9 @@ struct status_data {
size, race;
struct weapon_atk rhw, lhw; //Right Hand/Left Hand Weapon.
+#ifdef RENEWAL
+ int equip_atk;
+#endif
};
//Additional regen data that only players have.
diff --git a/src/map/storage.c b/src/map/storage.c
index 7a4649a98..e0b751863 100644
--- a/src/map/storage.c
+++ b/src/map/storage.c
@@ -294,8 +294,8 @@ int storage_storageaddfromcart(struct map_session_data* sd, int index, int amoun
* 0 : fail
* 1 : success
*------------------------------------------*/
-int storage_storagegettocart(struct map_session_data* sd, int index, int amount)
-{
+int storage_storagegettocart(struct map_session_data* sd, int index, int amount) {
+ int flag = 0;
nullpo_ret(sd);
if( index < 0 || index >= MAX_STORAGE )
@@ -307,8 +307,12 @@ int storage_storagegettocart(struct map_session_data* sd, int index, int amount)
if( amount < 1 || amount > sd->status.storage.items[index].amount )
return 0;
- if( pc->cart_additem(sd,&sd->status.storage.items[index],amount,LOG_TYPE_STORAGE) == 0 )
+ if( (flag = pc->cart_additem(sd,&sd->status.storage.items[index],amount,LOG_TYPE_STORAGE)) == 0 )
storage->delitem(sd,index,amount);
+ else {
+ clif->dropitem(sd, index,0);
+ clif->cart_additem_ack(sd,flag == 1?0x0:0x1);
+ }
return 1;
}
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-21 03:02:43 +0000