Преглед на файлове

* Item DB Updates:
-- kRO 2013-09-25
-- kRO 2013-10-23
-- kRO 2013-11-06 Bar Cookie Festival
-- kRO 2013-11-20
-- kRO 2013-12-18 Casualties Of The Sepulcher & Xmas Event
-- kRO 2013-12-25 Episode 15.2
-- kRO New Year Event 2014 & Octopus Festival Malangdo
-- kRO 2014-01-08 Jumping Event
-- kRO 2014-01-22
-- kRO 2014-01-29 New Year Day Event
-- kRO 2014-02-05
-- kRO 2014-02-12 San Valentin
-- kRO 2014-02-19
-- kRO 2014-02-26
-- kRO 2014-03-12
-- kRO 2014-03-19
-- kRO 2014-03-26
-- Slot & View ID
* Bug fixes:
-- Removed Rebellion job from dagger type weapon (bugreport:8972)
-- Costume leftover on db/import-tmpl/item_db.txt (bugreport:8895)
-- Invalid flag for 12258,Bombring_Box (bugreport:8997)
-- Wrong combo criteria (bugreport:8984)
-- Wrong values in skill_changematerial_db.txt
Thank's to Kido & Bug Reporters

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>

Cydh Ramdh преди 11 години
родител
ревизия
28c90bb841

+ 17 - 0
db/const.txt

@@ -1135,6 +1135,23 @@ IG_LottoBox2	398
 IG_LottoBox3	399
 IG_LottoBox4	400
 IG_LottoBox5	401
+IG_Support_Package_III	402
+IG_Support_Package_III10	403
+IG_Unlimited_Box	404
+IG_Unlimited_Box10	405
+IG_Unlimited_Box_II	406
+IG_Unlimited_Box_II10	407
+IG_Three_Master_Package_III	408
+IG_Three_Master_Package_III10	409
+IG_2013_RWC_Scroll	410
+IG_Support_Package_II	411
+IG_Support_Package_II10	412
+IG_Level_Up_Box100	413
+IG_Level_Up_Box120	414
+IG_Level_Up_Box130	415
+IG_Level_Up_Box140	416
+IG_Level_Up_Box150	417
+IG_Level_Up_Box160	418
 
 SC_ALL	-1
 SC_STONE	0

+ 32 - 32
db/import-tmpl/item_db.txt

@@ -11,53 +11,53 @@
 //1999,Zed's_Staff,Zed's Staff,3,,10,10,,,,,,,,,,,,,{},{},{}
 
 // Official Event Items that had their Effects removed after the event was completed
-//585,Wurst,Brusti,11,2,,40,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(15,20),0; itemskill "PR_MAGNIFICAT",3; },{},{}
-//679,Gold_Pill,Pilule,0,5000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 50,50; },{},{}
-
-//2681,Republic_Ring,Republic Anniversary Ring,4,20,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bAllStats,3; },{},{}
-
-//5134,Pumpkin_Hat,Pumpkin-Head,4,20,,200,,2,,0,0xFFFFFFFF,7,2,256,,0,1,206,{ bonus2 bSubRace,RC_Demon,5; },{},{}
-//5136,Santa's_Hat_,Louise's Santa Hat,4,20,,100,,3,,0,0xFFFFFFFF,7,2,256,,0,1,20,{ bonus bMdef,1; bonus bLuk,1; bonus3 bAutoSpellWhenHit,"AL_HEAL",3,50; bonus3 bAutoSpellWhenHit,"AL_BLESSING",10,50; },{},{}
-//5145,Carnival_Joker_Jester,Carnival Jester,4,10,,100,,0,,0,0xFFFFFFFF,7,2,256,,0,1,89,{ bonus bAllStats,3; },{},{}
-//5147,Baseball_Cap,Baseball Cap,4,0,,200,,3,,0,0xFFFFFFFF,7,2,256,,0,1,216,{ bonus2 bExpAddRace,RC_Boss,50; bonus2 bExpAddRace,RC_NonBoss,50; },{},{}
-//5201,Party_Hat_B,2nd Anniversary Party Hat,4,20,,300,,3,,0,0xFFFFFFFF,7,2,256,,0,1,144,{ bonus bAllStats,3; },{},{}
-//5202,Pumpkin_Hat_,Pumpkin Hat,4,20,,200,,2,,0,0xFFFFFFFF,7,2,256,,0,1,206,{ bonus bAllStats,2; bonus2 bSubRace,RC_Demon,5; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,1500; },{},{}
-//5204,Event_Pierrot_Nose,Rudolf's Red Nose,4,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,0,0,49,{ bonus2 bResEff,Eff_Blind,3000; bonus2 bAddMonsterDropItem,12130,30; },{},{}
-//5264,Aussie_Flag_Hat,Australian Flag Hat,4,20,,500,,4,,0,0xFFFFFFFF,7,2,256,,0,1,304,{ bonus bAllStats,2; },{},{}
-//5356,Pumpkin_Hat_H,Pumpkin Hat,4,20,,200,,2,,0,0xFFFFFFFF,7,2,256,,0,1,206,{ bonus bAllStats,2; bonus2 bSubRace,RC_Demon,5; bonus2 bMagicAddRace,RC_Demon,5; },{},{}
-//5811,Santa_Beard,Santa Beard,4,20,,100,,5,,0,0xFFFFFFFF,7,2,1,,0,0,25,{ bonus2 bSubRace,RC_Brute,5; },{},{}
-
-//11702,Moon_Cookie,Moon Cookie,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_end SC_Poison; sc_end SC_Silence; sc_end SC_Blind; sc_end SC_Confusion; sc_end SC_Curse; sc_end SC_Hallucination; itemskill "AL_BLESSING",7; },{},{}
-//12131,Lucky_Potion,Lucky Potion,0,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood,180000,15; },{},{}
-//12143,Red_Can,Red Can,2,50000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 25,25; },{},{}
+//585,Wurst,Brusti,11,2,,40,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(15,20),0; itemskill "PR_MAGNIFICAT",3; },{},{}
+//679,Gold_Pill,Pilule,0,5000,,300,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 50,50; },{},{}
+
+//2681,Republic_Ring,Republic Anniversary Ring,4,20,,100,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bAllStats,3; },{},{}
+
+//5134,Pumpkin_Hat,Pumpkin-Head,4,20,,200,,2,,0,0xFFFFFFFF,63,2,256,,0,1,206,{ bonus2 bSubRace,RC_Demon,5; },{},{}
+//5136,Santa's_Hat_,Louise's Santa Hat,4,20,,100,,3,,0,0xFFFFFFFF,63,2,256,,0,1,20,{ bonus bMdef,1; bonus bLuk,1; bonus3 bAutoSpellWhenHit,"AL_HEAL",3,50; bonus3 bAutoSpellWhenHit,"AL_BLESSING",10,50; },{},{}
+//5145,Carnival_Joker_Jester,Carnival Jester,4,10,,100,,0,,0,0xFFFFFFFF,63,2,256,,0,1,89,{ bonus bAllStats,3; },{},{}
+//5147,Baseball_Cap,Baseball Cap,4,0,,200,,3,,0,0xFFFFFFFF,63,2,256,,0,1,216,{ bonus2 bExpAddRace,RC_Boss,50; bonus2 bExpAddRace,RC_NonBoss,50; },{},{}
+//5201,Party_Hat_B,2nd Anniversary Party Hat,4,20,,300,,3,,0,0xFFFFFFFF,63,2,256,,0,1,144,{ bonus bAllStats,3; },{},{}
+//5202,Pumpkin_Hat_,Pumpkin Hat,4,20,,200,,2,,0,0xFFFFFFFF,63,2,256,,0,1,206,{ bonus bAllStats,2; bonus2 bSubRace,RC_Demon,5; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,1500; },{},{}
+//5204,Event_Pierrot_Nose,Rudolf's Red Nose,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1,,0,0,49,{ bonus2 bResEff,Eff_Blind,3000; bonus2 bAddMonsterDropItem,12130,30; },{},{}
+//5264,Aussie_Flag_Hat,Australian Flag Hat,4,20,,500,,4,,0,0xFFFFFFFF,63,2,256,,0,1,304,{ bonus bAllStats,2; },{},{}
+//5356,Pumpkin_Hat_H,Pumpkin Hat,4,20,,200,,2,,0,0xFFFFFFFF,63,2,256,,0,1,206,{ bonus bAllStats,2; bonus2 bSubRace,RC_Demon,5; bonus2 bMagicAddRace,RC_Demon,5; },{},{}
+//5811,Santa_Beard,Santa Beard,4,20,,100,,5,,0,0xFFFFFFFF,63,2,1,,0,0,25,{ bonus2 bSubRace,RC_Brute,5; },{},{}
+
+//11702,Moon_Cookie,Moon Cookie,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_end SC_POISON; sc_end SC_SILENCE; sc_end SC_BLIND; sc_end SC_CONFUSION; sc_end SC_CURSE; sc_end SC_HALLUCINATION; itemskill "AL_BLESSING",7; },{},{}
+//12131,Lucky_Potion,Lucky Potion,0,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_LUKFOOD,180000,15; },{},{}
+//12143,Red_Can,Red Can,2,50000,,300,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 25,25; },{},{}
 //Event effect: Summon monster? Probably Rice_Cake. x_x
-//12199,Rice_Scroll,Rice Scroll,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-//12200,Event_Cake,Event Cake,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "PR_MAGNIFICAT",3; },{},{}
-//12238,New_Year_Rice_Cake_1,New Year Rice Cake,0,20,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 20,15; sc_start SC_STRFood,1200000,3; sc_start SC_INTFood,1200000,3; sc_start SC_LUKFood,1200000,3; sc_start SC_SpeedUp1,5000,0; },{},{}
-//12239,New_Year_Rice_Cake_2,New Year Rice Cake,0,20,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 20,15; sc_start SC_DEXFood,1200000,3; sc_start SC_AGIFood,1200000,3; sc_start SC_VITFood,1200000,3; sc_start SC_SpeedUp1,5000,0; },{},{}
+//12199,Rice_Scroll,Rice Scroll,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+//12200,Event_Cake,Event Cake,2,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "PR_MAGNIFICAT",3; },{},{}
+//12238,New_Year_Rice_Cake_1,New Year Rice Cake,0,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 20,15; sc_start SC_STRFOOD,1200000,3; sc_start SC_INTFOOD,1200000,3; sc_start SC_LUKFOOD,1200000,3; sc_start SC_SPEEDUP1,5000,0; },{},{}
+//12239,New_Year_Rice_Cake_2,New Year Rice Cake,0,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 20,15; sc_start SC_DEXFOOD,1200000,3; sc_start SC_AGIFOOD,1200000,3; sc_start SC_VITFOOD,1200000,3; sc_start SC_SPEEDUP1,5000,0; },{},{}
 
 // iRO St. Patrick's Day Event 2008
 //=============================================================
-//12715,Black_Treasure_Chest,Black Treasure Chest,2,0,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_08stpattyseventbox"; },{},{}
+//12715,Black_Treasure_Chest,Black Treasure Chest,2,0,,200,,,,,0xFFFFFFFF,63,2,,,,,,{ callfunc "F_08stpattyseventbox"; },{},{}
 
 // iRO Valentine's Day Event 2009
 //=============================================================
-//12742,Valentine_Gift_Box_M,Valentine Gift Box,2,10,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7946,1; },{},{}
-//12743,Valentine_Gift_Box_F,Valentine Gift Box,2,10,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7947,1; },{},{}
-//12744,Chocolate_Box,Chocolate Box,2,10,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 558,1; },{},{}
-//14466,Valentine's_Emblem_Box,Valentine's Emblem Box,2,10,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5817,1; },{},{}
+//12742,Valentine_Gift_Box_M,Valentine Gift Box,2,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 7946,1; },{},{}
+//12743,Valentine_Gift_Box_F,Valentine Gift Box,2,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 7947,1; },{},{}
+//12744,Chocolate_Box,Chocolate Box,2,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 558,1; },{},{}
+//14466,Valentine's_Emblem_Box,Valentine's Emblem Box,2,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5817,1; },{},{}
 //7946,Gold_Ring_Of_Valentine,Gold Ring Of Valentine,3,10,,0,,,,,,,,,,,,,{},{},{}
 //7947,Silver_Ring_Of_Valentine,Silver Ring Of Valentine,3,10,,0,,,,,,,,,,,,,{},{},{}
 //7948,Box,Box,3,10,,10,,,,,,,,,,,,,{},{},{}
-//5817,Valentine's_Emblem,Valentine's Emblem,4,10,,0,,3,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bAtkRate,3; bonus bMatkRate,3; bonus bAllStats,2; bonus bFlee,10; bonus bAspd,1; bonus bMdef,3; bonus2 bSkillAtk,"AL_HEAL",10; bonus2 bSkillHeal,"AL_HEAL",10; bonus2 bSkillHeal,"AM_POTIONPITCHER",10; bonus2 bAddItemGroupHealRate,IG_Potion,10; },{},{}
+//5817,Valentine's_Emblem,Valentine's Emblem,4,10,,0,,3,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bAtkRate,3; bonus bMatkRate,3; bonus bAllStats,2; bonus bFlee,10; bonus bAspd,1; bonus bMdef,3; bonus2 bSkillAtk,"AL_HEAL",10; bonus2 bSkillHeal,"AL_HEAL",10; bonus2 bSkillHeal,"AM_POTIONPITCHER",10; bonus2 bAddItemGroupHealRate,IG_Potion,10; },{},{}
 
 // iRO Halloween Event 2009
 //=============================================================
-//5668,Weird_Pumpkin_Hat,Weird Pumpkin Hat,4,20,,0,,5,,0,0xFFFFFFFF,7,2,256,,0,1,206,{ bonus bMdef,5; bonus2 bAddMonsterDropItem,12192,2500; },{},{}
+//5668,Weird_Pumpkin_Hat,Weird Pumpkin Hat,4,20,,0,,5,,0,0xFFFFFFFF,63,2,256,,0,1,206,{ bonus bMdef,5; bonus2 bAddMonsterDropItem,12192,2500; },{},{}
 //6298,Crushed_Pumpkin,Crushed Pumpkin,3,0,,0,,,,,,,,,,,,,{},{},{}
 //6299,Worn_Fabric,Worn Fabric,3,0,,0,,,,,,,,,,,,,{},{},{}
 
 // Old Tuxedo and Wedding Dress, will display the outfit when worn.
 //==================================================================
-//2338,Wedding_Dress,Wedding Dress,4,43000,,500,,0,,0,0xFFFFFFFE,7,0,16,,0,1,0,{},{ setoption Option_Wedding,1; },{ setoption Option_Wedding,0; }
-//7170,Tuxedo,Tuxedo,4,43000,,10,,0,,0,0xFFFFFFFE,7,1,16,,0,1,0,{},{ setoption Option_Wedding,1; },{ setoption Option_Wedding,0; }
+//2338,Wedding_Dress,Wedding Dress,4,43000,,500,,0,,0,0xFFFFFFFE,63,0,16,,0,1,0,{},{ sc_start SC_WEDDING,-1,0; },{ sc_end SC_WEDDING; }
+//7170,Tuxedo,Tuxedo,4,43000,,10,,0,,0,0xFFFFFFFE,63,1,16,,0,1,0,{},{ sc_start SC_WEDDING,-1,0; },{ sc_end SC_WEDDING; }

+ 1 - 1
db/import-tmpl/item_flag.txt

@@ -3,4 +3,4 @@
 //
 // <Flag>:
 // 1 - As Dead Branch item (will be logged at `branchlog` table and cannot be used at 'nobranch' mapflag)
-// 2 - As item group container, check player's inventory and weight before consumed
+// 2 - As item group container, check player's inventory and weight before consumed

+ 1 - 2
db/pre-re/item_flag.txt

@@ -10,7 +10,6 @@
 12103,1 //Bloody_Dead_Branch
 12109,1 //Poring_Box
 12024,1 //Red_Pouch_Of_Surprise
-12258,1 //Bombring_Box
 
 // Item group container
 603,2 //Old_Blue_Box
@@ -50,4 +49,4 @@
 12356,2 //Louise_Costume_Box
 12702,2 //Old_Bleu_Box
 12714,2 //Easter_Scroll
-14596,2 //Pierre_Treasurebox
+14596,2 //Pierre_Treasurebox

+ 22 - 1
db/re/item_combo_db.txt

@@ -185,6 +185,10 @@
 2971:5135:2121,{ bonus bHPrecovRate,15; bonus bSPrecovRate,15; bonus bMatkRate,7; }
 2971:18874:2109,{ bonus bHPrecovRate,15; bonus bSPrecovRate,15; bonus bMatkRate,7; }
 2971:18874:2121,{ bonus bHPrecovRate,15; bonus bSPrecovRate,15; bonus bMatkRate,7; }
+2983:4218,{ bonus bVit,-3; bonus bHPrecovRate,-20; bonus bMaxHP,1000; }
+2983:4269,{ bonus bInt,-3; bonus bSPrecovRate,-20; bonus bMaxSP,150; }
+2983:4218:4269,{ bonus bVit,-3; bonus bHPrecovRate,-20; bonus bMaxHP,1000; bonus bInt,-3; bonus bSPrecovRate,-20; bonus bMaxSP,150; }
+2984:4239:4245:4267:4151:4249:4235:4164:4221:4275:4204,{ bonus2 bExpAddRace,RC_All,2; }
 2986:18872,{ bonus bBaseAtk,BaseLevel/4; }
 2986:2987:18872,{ bonus2 bAddMonsterDropItem,22559,50; }
 2987:18872,{ bonus bMatk,BaseLevel/4; }
@@ -244,6 +248,7 @@
 15068:20710,{ bonus bAgi,5; bonus bFlee,10; }
 15088:18816:18818,{ bonus bMatk,BaseLevel/3; bonus2 bExpAddClass,Class_All,5; }
 15088:18817:18819,{ bonus bBaseAtk,BaseLevel/3; bonus2 bExpAddClass,Class_All,5; }
+15116:20743:22046,{ bonus bMaxSPrate,25; bonus bMaxSPrate,25; bonus bSpeedAddRate,n; }
 18507:18539,{ bonus bUseSPrate,-3; }
 18538:5041,{ bonus2 bSubRace,RC_Angel,9; }
 18538:5048,{ bonus2 bSubRace,RC_Demon,9; }
@@ -268,7 +273,7 @@
 24037:24043,{ bonus bDex,1; }
 24038:24044,{ bonus bVit,1; }
 24039:24045,{ bonus bAgi,1; }
-24046:24051,{ bonus2 bSubEle,Ele_Neutral,1; if(getequiprefinerycnt(EQI_SHADOW_ACC_R) + getequiprefinerycnt(EQI_SHADOW_ACC_L)) { bonus2 bSubEle,Ele_Neutral,1; } }
+24046:24051,{ bonus2 bSubEle,Ele_Neutral,1; if(getequiprefinerycnt(EQI_SHADOW_ACC_R) + getequiprefinerycnt(EQI_SHADOW_ACC_L) >= 15) { bonus2 bSubEle,Ele_Neutral,1; } }
 24052:24062,{ bonus2 bExpAddRace,RC_DemiHuman,3; bonus2 bExpAddRace,RC_Player,3; }
 24053:24063,{ bonus2 bAddRace,10,5; bonus2 bMagicAddRace,10,5; }
 24054:24065,{ bonus2 bExpAddRace,RC_Brute,3; }
@@ -284,3 +289,19 @@
 24074:24077,{ bonus bMaxHPrate,1; bonus bMaxSPrate,1; }
 24078:24079:24080,{ bonus3 bSPDrainRate,10,1+(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)/10),0; }
 24081:24082:24083,{ bonus3 bHPDrainRateRace,11,40,2+(getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_SHOES)/5); }
+24084:24085;24086:24087:24088:24089,{ bonus bAllStats,1; set .@i,getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); if (.@i >= 45) { bonus bNoGemStone,1; } bonus bUseSPrate,100-.@i; }
+24090:24091:24092,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHOES) >= 20) bonus2 bResEff,Eff_Stone,100; }
+24090:24093:24094,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHOES) >= 20) bonus2 bResEff,Eff_Sleep,100; }
+24090:24095:24096,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHOES) >= 20) bonus2 bResEff,Eff_Silence,100; }
+24090:24097:24098,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHOES) >= 20) bonus2 bResEff,Eff_Blind,100; }
+24090:24099:24100:24101,{ bonus bDef,4; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_L)+getequiprefinerycnt(EQI_SHADOW_ACC_R) >= 30) bonus2 bResEff,Eff_Freeze,100; }
+24090:24104:24105:24106,{ bonus bDef,4; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_L)+getequiprefinerycnt(EQI_SHADOW_ACC_R) >= 30) bonus2 bResEff,Eff_Stun,100; }
+24090:24107:24108,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ACC_L)+getequiprefinerycnt(EQI_SHADOW_ACC_R) >= 20) bonus2 bResEff,Eff_Curse,100; }
+24090:24102:24103,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ACC_L)+getequiprefinerycnt(EQI_SHADOW_ACC_R) >= 20) bonus2 bResEff,Eff_Bleeding,100; }
+24109:24110,{ bonus bFixedCastrate,-(getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)); }
+24111:24112:24113,{ bonus bNoCastCancel,1; bonus bUseSPrate,40-getequiprefinerycnt(EQI_SHADOW_SHIELD)-getequiprefinerycnt(EQI_SHADOW_ARMOR)-getequiprefinerycnt(EQI_SHADOW_SHOES); }
+24150:24151,{ bonus bAtkRate,1; if (getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L) >= 15) bonus bNoSizeFix,1; }
+24152:24153,{ bonus bAtk,getequiprefinerycnt(EQI_SHADOW_WEAPON); if (getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R) >= 15) bonus bUnbreakableWeapon,1; }
+24154:24155,{ bonus bDef,getequiprefinerycnt(EQI_SHADOW_ARMOR); if (getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_ACC_L) >= 15) bonus bUnbreakableArmor,1; }
+18997:28326:28327,{ bonus bSpeed,25; bonus bBaseAtk,50; bonus bMatk,50; }
+28326:28327,{ bonus bInt,8; bonus bStr,8; }

Файловите разлики са ограничени, защото са твърде много
+ 254 - 162
db/re/item_db.txt


+ 1 - 2
db/re/item_flag.txt

@@ -10,7 +10,6 @@
 12103,1 //Bloody_Dead_Branch
 12109,1 //Poring_Box
 12024,1 //Red_Pouch_Of_Surprise
-12258,1 //Bombring_Box
 
 // Item group container
 603,2 //Old_Blue_Box
@@ -365,4 +364,4 @@
 22514,2 //Candy_Holder
 22558,2 //Lucky_Bag
 22669,2 //HALLOWEEN_G_BOX
-22685,2 //Solo_Christmas_Gift
+22685,2 //Solo_Christmas_Gift

+ 114 - 0
db/re/item_package.txt

@@ -3227,3 +3227,117 @@ IG_LottoBox5,Lotto42,1,1,1
 IG_LottoBox5,Lotto43,1,1,1
 IG_LottoBox5,Lotto44,1,1,1
 IG_LottoBox5,Lotto45,1,1,1
+
+//TODO: Confirm the items & rates
+IG_Support_Package_III,Battle_Manual,1,2,1
+IG_Support_Package_III,Bubble_Gum,1,2,1
+IG_Support_Package_III,Almighty,1,2,1
+IG_Support_Package_III,Mental_Potion,1,2,1
+//IG_Support_Package_III,,1,6,1 //6x Mysterious Water of Life
+IG_Support_Package_III,Sealed_Bacsojin_Scroll,1,1,1
+
+//TODO: Confirm the items & rates
+IG_Support_Package_III10,Battle_Manual,1,20,1
+IG_Support_Package_III10,Bubble_Gum,1,20,1
+IG_Support_Package_III10,Almighty,1,20,1
+IG_Support_Package_III10,Mental_Potion,1,20,1
+//IG_Support_Package_III10,,1,60,1 //60x Mysterious Water of Life
+IG_Support_Package_III10,Sealed_Bacsojin_Scroll,1,11,1
+
+//TODO: Confirm the items & rates
+//IG_Unlimited_Box,,0,5,0 //5 ASPD Enhanced Potion
+//IG_Unlimited_Box,,0,10,0 //10 Red Boost
+IG_Unlimited_Box,Golden_Treasure_Box,0,1,0
+
+//TODO: Confirm the items & rates
+//IG_Unlimited_Box_II,,0,5,0 //50 ASPD Enhanced Potion
+//IG_Unlimited_Box_II,,0,10,0 //100 Red Boost
+IG_Unlimited_Box_II,Golden_Treasure_Box,0,11,0
+
+//TODO: Confirm the items & rates
+//IG_Unlimited_Box_II,,0,5,0 //5 ASPD Enhanced Potion
+//IG_Unlimited_Box_II,,0,10,0 //10 Red Boost
+IG_Unlimited_Box_II,Sealed_Pharaoh_Scroll,0,1,0
+
+//TODO: Confirm the items & rates
+//IG_Unlimited_Box_II10,,0,5,0 //50 ASPD Enhanced Potion
+//IG_Unlimited_Box_II10,,0,10,0 //100 Red Boost
+IG_Unlimited_Box_II10,Sealed_Pharaoh_Scroll,0,11,0
+
+//TODO: Confirm the items & rates
+IG_Three_Master_Package_III,Small_Life_Potion,1,20,1
+IG_Three_Master_Package_III,Med_Life_Potion,1,20,1
+//IG_Three_Master_Package_III,,1,20,1 //60x Mysterious Water of Life
+IG_Three_Master_Package_III,Sealed_Moonlight_Flower_Scroll,1,1,1
+
+//TODO: Confirm the items & rates
+IG_Three_Master_Package_III10,Small_Life_Potion,1,200,1
+IG_Three_Master_Package_III10,Med_Life_Potion,1,200,1
+//IG_Three_Master_Package_III10,,1,200,1 //200x Mysterious Water of Life
+IG_Three_Master_Package_III10,Sealed_Moonlight_Flower_Scroll,1,11,1
+
+//TODO: Confirm the items & rates
+IG_2013_RWC_Scroll,Neutral_Shadow_Weapon,0,1,0
+IG_2013_RWC_Scroll,Neutral_Shadow_Earring,0,1,0
+IG_2013_RWC_Scroll,Neutral_Shadow_Pendant,0,1,0
+IG_2013_RWC_Scroll,Frozen_Curse_Shadow_Earring,0,1,0
+IG_2013_RWC_Scroll,Frozen_Curse_Shadow_Pendant,0,1,0
+IG_2013_RWC_Scroll,Guarantee_Weapon_11Up,0,1,0
+IG_2013_RWC_Scroll,Guarantee_Armor_11Up,0,1,0
+IG_2013_RWC_Scroll,Guarantee_Weapon_9Up,0,1,0
+IG_2013_RWC_Scroll,Guarantee_Armor_9Up,0,1,0
+IG_2013_RWC_Scroll,C_Wings_Of_Victory,0,1,0
+IG_2013_RWC_Scroll,Succu_Pet_Coupon,0,1,0
+
+//TODO: Confirm the items & rates
+IG_Support_Package_II,Battle_Manual,1,2,1
+IG_Support_Package_II,Bubble_Gum,1,2,1
+IG_Support_Package_II,Almighty,1,2,1
+IG_Support_Package_II,Mental_Potion,1,2,1
+//IG_Support_Package_II,,1,6,1 //6x Mysterious Water of Life
+IG_Support_Package_II,14717,1,1,1 //1x 2013_RWC_Scroll
+
+//TODO: Confirm the items & rates
+IG_Support_Package_II10,Battle_Manual,1,20,1
+IG_Support_Package_II10,Bubble_Gum,1,20,1
+IG_Support_Package_II10,Almighty,1,20,1
+IG_Support_Package_II10,Mental_Potion,1,20,1
+//IG_Support_Package_II10,,1,60,1 //60x Mysterious Water of Life
+IG_Support_Package_II10,14717,1,1,1 //1x 2013_RWC_Scroll
+
+IG_Level_Up_Box100,Guarantee_Weapon_6Up,0,1,0
+IG_Level_Up_Box100,Level_Up_Box120,0,1,0
+
+IG_Level_Up_Box120,Battle_Manual,0,5,0
+IG_Level_Up_Box120,Bubble_Gum,0,5,0
+IG_Level_Up_Box120,Insurance,0,5,0
+IG_Level_Up_Box120,Job_Manual50,0,5,0
+IG_Level_Up_Box120,Guarantee_Armor_6Up,0,1,0
+IG_Level_Up_Box120,Level_Up_Box130,0,1,0
+
+IG_Level_Up_Box130,Battle_Manual,0,5,0
+IG_Level_Up_Box130,Bubble_Gum,0,5,0
+IG_Level_Up_Box130,Insurance,0,5,0
+IG_Level_Up_Box130,Job_Manual50,0,5,0
+IG_Level_Up_Box130,Guarantee_Weapon_7Up,0,1,0
+IG_Level_Up_Box130,Level_Up_Box140,0,1,0
+
+IG_Level_Up_Box140,Battle_Manual,0,5,0
+IG_Level_Up_Box140,Bubble_Gum,0,5,0
+IG_Level_Up_Box140,Insurance,0,5,0
+IG_Level_Up_Box140,Job_Manual50,0,5,0
+IG_Level_Up_Box140,Guarantee_Armor_7Up,0,1,0
+IG_Level_Up_Box140,Level_Up_Box150,0,1,0
+
+IG_Level_Up_Box150,Battle_Manual,0,5,0
+IG_Level_Up_Box150,Bubble_Gum,0,5,0
+IG_Level_Up_Box150,Insurance,0,5,0
+IG_Level_Up_Box150,Job_Manual50,0,5,0
+IG_Level_Up_Box150,Guarantee_Weapon_8Up,0,1,0
+IG_Level_Up_Box150,Level_Up_Box160,0,1,0
+
+IG_Level_Up_Box160,Battle_Manual,0,5,0
+IG_Level_Up_Box160,Bubble_Gum,0,5,0
+IG_Level_Up_Box160,Insurance,0,5,0
+IG_Level_Up_Box160,Job_Manual50,0,5,0
+IG_Level_Up_Box160,Guarantee_Armor_8Up,0,2,0

+ 366 - 255
db/re/item_trade.txt

@@ -2052,322 +2052,433 @@
 4543,457,100	// Sealed Hatii Card
 4544,457,100	// Sealed Evil Snake Lord Card
 
-6839,475,100
-6840,475,100
-6841,475,100
-6842,475,100
-6843,475,100
-6844,475,100
-6845,475,100
-22708,475,100
-
-12507,475,100
-12508,475,100
-12509,475,100
-12510,475,100
-12511,475,100
-12512,475,100
-12513,475,100
-12515,475,100
-12517,475,100
-12518,475,100
-12519,475,100
-12520,475,100
-12521,475,100
-12524,475,100
-12525,475,100
-12526,475,100
-12527,475,100
-12528,475,100
-
-16481,475,100
-16483,475,100
-16505,475,100
-16506,475,100
+12507,475,100	//E_WOB_Rune
+12508,475,100	//E_WOB_Schwaltz
+12509,475,100	//E_WOB_Rachel
+12510,475,100	//E_WOB_Local
+12511,475,100	//E_Siege_Teleport_Scroll
+12512,475,100	//E_Greed_Scroll
+12513,475,100	//E_Glass_Of_Illusion
+12514,475,100	//E_Abrasive
+12515,475,100	//E_Med_Life_Potion
+12516,475,100	//E_Small_Life_Potion
+12517,475,100	//E_Regeneration_Potion
+12518,475,100	//E_B_Mdef_Potion
+12519,475,100	//E_S_Mdef_Potion
+12520,475,100	//E_B_Def_Potion
+12521,475,100	//E_S_Def_Potion
+12522,475,100	//E_Blessing_10_Scroll
+12523,475,100	//E_Inc_Agi_10_Scroll
+12524,475,100	//E_Aspersio_5_Scroll
+12525,475,100	//E_Assumptio_5_Scroll
+12526,475,100	//E_Wind_Walk_10_Scroll
+12527,475,100	//E_Adrenaline_Scroll
+12528,475,100	//E_Convex_Mirror
+
+16481,475,100	//Small_Life_Potion_Box_10
+16483,475,100	//Abrasive_Box_10
+16505,475,100	//Steamed_Tongue_Box_10
+16506,475,100	//Steamed_Desert_Scorpions_Box_10
 
 // kRO 2012-07-16
-7631,475,100
-7630,475,100
-12884,475,100
-12885,475,100
-12886,475,100
-12887,475,100
-17226,475,100
-17227,475,100
-17228,475,100
-17229,475,100
-18760,475,100
-18761,475,100
-18762,475,100
-18763,475,100
-18764,475,100
-18765,475,100
-18766,475,100
-18767,475,100
-18768,475,100
-18769,475,100
-18770,475,100
-18771,475,100
-18772,475,100
-18773,475,100
-18774,475,100
-18775,475,100
-18776,475,100
+7630,475,100	//Clean_Beach_Brush
+7631,475,100	//Trash_Debris
+12884,475,100	//Infinite_Concentration_Potion
+12885,475,100	//Infinite_Awakening_Potion
+12886,475,100	//Infinite_Berserk_Potion
+12887,475,100	//C_Wing_Of_Fly
+17226,475,100	//Infinite_Concentration_Potion
+17227,475,100	//Infinite_Awakening_Potion
+17228,475,100	//Infinite_Berserk_Potion
+17229,475,100	//Infinite_Flywing_Box
+18760,475,100	//Remodel_Wizardry_Hat
+18761,475,100	//Remodel_Magician_Hat
+18762,475,100	//Remodel_Mask_Of_Fox
+18763,475,100	//Remodel_Joker_Jester
+18764,475,100	//Remodel_Bunny_Band
+18765,475,100	//Enhanced_Corsair
+18766,475,100	//Enhanced_Helm_Of_Angel
+18767,475,100	//Enhanced_Helm_Of_Sun
+18768,475,100	//Enhanced_Bone_Helm
+18769,475,100	//Remodel_Munak_Turban,
+18770,475,100	//Remodel_Bongun_Hat
+18771,475,100	//Remodel_Opera_Mask
+18772,475,100	//Improved_Binoculars
+18773,475,100	//Improved_Fin_Helm
+18774,475,100	//Improved_Assassin_Mask
+18775,475,100	//Improved_Welding_Mask
+18776,475,100	//Improved_Kiss_Of_Angel
 
 // kRO 2012-07-25
-17231,475,100
-17232,475,100
-17241,475,100
-22508,475,100
+17231,475,100	//Refinement_Ore_Box
+17232,475,100	//Refinement_box(7)
+17241,475,100	//Amistr_Cap_Box
+22508,475,100	//Para_Team_Mark_
 
 // kRO 2012-08-01
-22510,475,100
+22510,475,100	//King_Wolf_Scroll
 
 // kRO 2012-08-15
-18779,475,100
-18780,475,100
-18781,475,100
-18796,475,100
+18779,475,100	//RWC_Champ_Crown_First_Place
+18780,475,100	//RWC_Champ_Crown_Second_Place
+18781,475,100	//RWC_Champ_Crown_Third_Place
+18796,475,100	//RWC_Champ_Crown_Fourth_Place
 
 // kRO 2012-08-30
-22513,475,100
+22513,475,100	//King_of_Gift_Box
 
 // kRO 2012-10-10
-6671,475,100
-17263,475,100
-17264,475,100
-17265,475,100
-17266,475,100
+6671,475,100	//Geffen_Coin_Magic_Tournament
+17263,475,100	//Infinite_Concentration_Potion_3rd_Box
+17264,475,100	//Infinite_Awakening_Potion_3rd_Box
+17265,475,100	//Infinite_Berserk_Potion_3rd_Box
+17266,475,100	//Limited_Battle_Manual_Package
 
 // kRO 2012-10-17
-6654,475,100
-6655,475,100
-6656,475,100
-6657,475,100
-6658,475,100
-6672,475,100
+6654,475,100	//Needle_And_Thread
+6655,475,100	//Firm_Pumpkin
+6656,475,100	//Goast_Free_Charm
+6657,475,100	//Memory_Of_Jack
+6658,475,100	//Halloween_Coin
+6672,475,100	//RWC_Inicializer
 
 // kRO 2012-10-23
-6673,475,100
-14613,475,100
-14614,475,100
-17262,475,100
+6673,475,100	//Bossnia_Tickets
+14613,475,100	//RWC_Scroll_2012
+14614,475,100	//Ex_Def_Potion
+17262,475,100	//Ex_Def_Potion_Box
 
 // kRO 2012-11-07
-14616,475,100
-14617,475,100
-14618,475,100
-14619,475,100
-14620,475,100
-14621,475,100
-17270,475,100
-17271,475,100
-17272,475,100
-17273,475,100
-17274,475,100
-17275,475,100
+14616,475,100	//STR_Biscuit_Stick
+14617,475,100	//VIT_Biscuit_Stick
+14618,475,100	//AGI_Biscuit_Stick
+14619,475,100	//INT_Biscuit_Stick
+14620,475,100	//DEX_Biscuit_Stick
+14621,475,100	//LUK_Biscuit_Stick
+17270,475,100	//STR_Biscuit_Stick_Box
+17271,475,100	//VIT_Biscuit_Stick_Box
+17272,475,100	//AGI_Biscuit_Stick_Box
+17273,475,100	//INT_Biscuit_Stick_Box
+17274,475,100	//DEX_Biscuit_Stick_Box
+17275,475,100	//LUK_Biscuit_Stick_Box
 
 // kRO 2012-11-21
-14623,475,100
-17277,475,100
-17278,475,100
+14623,475,100	//Golden_Treasure_Box
+17277,475,100	//Unlimited_Box
+17278,475,100	//Unlimited_Box(10)
 
 // kRO 2012-12-09
-5864,475,100
-17294,475,100
-17293,475,100
-17292,475,100
+5864,475,100	//Shadow_Booster
+17292,475,100	//Shadow_Box
+17293,475,100	//Shadow_Physical_Package
+17294,475,100	//Shadow_Magical_Package
 
 // kRO 2012-12-12 Ep 14.3
-22535,475,100
-22536,475,100
+22535,475,100	//Scroll_Summoning_Workers(Male)
+22536,475,100	//Scroll_Summoning_Workers(Female)
 
 // kRO 2012-12-18
-14627,475,100
-14628,475,100
-17281,475,100
-17282,475,100
-17283,475,100
+14627,475,100	//Christmas_Scroll
+14628,475,100	//Costume_Festival_Box
+17281,475,100	//Refinement_Ore_Box_IV
+17282,475,100	//Refinement_Ore_Box_IV(10)
+17283,475,100	//Refinement_Ore_Box_IV(20)
 
 // kRO 2012-12-27
-6710,475,100
+6710,475,100	//Tied_Snake
 
 // kRO 2013-02-06 White Day's & Valentine Day's Event kRO
-11565,475,100
-11568,475,100
-11569,475,100
-11570,475,100
-11571,475,100
-11572,475,100
-11573,475,100
-11574,475,100
-11576,475,100
-11577,475,100
-11578,475,100
-11579,475,100
-11580,475,100
-11581,475,100
-11583,475,100
-11584,475,100
-11585,475,100
-11586,475,100
-22549,475,100
-11587,475,100
-11582,475,100
-11575,475,100
-11567,475,100
-11566,475,100
-22542,475,100
-22543,475,100
-22544,475,100
-22545,475,100
-22546,475,100
-22547,475,100
-22548,475,100
-22550,475,100
-22551,475,100
-22552,475,100
-22553,475,100
-22554,475,100
+11565,475,100	//White_Potion
+11566,475,100	//Yellow_Potion
+11567,475,100	//Novice_Potion
+11568,475,100	//Red_Slim_Potion
+11569,475,100	//Orange_Potion
+11570,475,100	//Red_Potion
+11571,475,100	//Green_Potion
+11572,475,100	//Blue_Potion
+11573,475,100	//White_Slim_Potion
+11574,475,100	//Yellow_Slim_Potion
+11575,475,100	//Lucky_Cookie
+11576,475,100	//Lucky_Lollipop
+11577,475,100	//Rice_Ball
+11578,475,100	//Candy_Bar
+11579,475,100	//Lucky_Candy
+11580,475,100	//Candy
+11581,475,100	//Piece_of_Cake
+11582,475,100	//Well-baked_Cookie
+11583,475,100	//Chocolate_Drink
+11584,475,100	//White_Chocolate
+11585,475,100	//Hand-made_Chocolate
+11586,475,100	//Hand-made_Chocolate_
+11587,475,100	//Chocolate
+22542,475,100	//Concentration_Potion
+22543,475,100	//Berserk_Potion
+22544,475,100	//Awakening_Potion
+22545,475,100	//Speed_Potion
+22546,475,100	//Slow_Potion
+22547,475,100	//Anti-Payne_Moment
+22548,475,100	//Wed_Cursed
+22549,475,100	//Poison_Bottle
+22550,475,100	//Sweets_Pocket
+22551,475,100	//Teacake
+22552,475,100	//Fried_Pastry
+22553,475,100	//Rainbow_Bread
+22554,475,100	//First_Aid_Box
 
 // kRO 2013-02-15
-14663,475,100
-17298,475,100
-17299,475,100
+14663,475,100	//Scroll_Sealed_Dark_Lord
+17298,475,100	//Support_Package
+17299,475,100	//Support_Package(10)
 
 // kRO 2013-02-27
-22541,475,100
+22541,475,100	//PC_Room_Coupon_Box_VI
 
 // kRO 2013-03-06 Items
-6700,457,100
-22540,457,100
-18122,457,100
-18123,457,100
-6714,457,100
-6715,457,100
-16378,457,100
-16382,457,100
-16821,457,100
-16822,457,100
-16837,457,100
-16838,457,100
-16864,457,100
-16865,457,100
-16866,457,100
-16867,457,100
-17159,457,100
-17160,457,100
+6713,457,100	//Heart_of_Soul
+6714,457,100	//Sheenas_Soul
+6715,457,100	//Gods_Soul_Piece
+16378,457,100	//Siege_Tele_Scroll_Box_30
+16382,457,100	//WoE_Teleport_Scroll_30_Box
+16821,457,100	//Dungeon_Teleport_Scroll_Box_5
+16822,457,100	//Dungeon_Teleport_Scroll_Box_10
+16837,457,100	//Dungeon_Teleport_Scroll_II_Box_5
+16838,457,100	//Dungeon_Teleport_Scroll_II_Box_10
+16864,457,100	//Siege_Map_Teleport_Scroll_Box_10
+16865,457,100	//Siege_Map_Teleport_Scroll_Box_30
+16866,457,100	//Siege_Map_Teleport_Scroll_II_Box_10
+16867,457,100	//Siege_Map_Teleport_Scroll_II_Box_30
+17159,457,100	//Name_Change_Box
+17160,457,100	//Character_Name_Change_Card_Box
+22540,457,100	//Runstone_Luxanima
 
 // kRO 2013-03-20
-6713,475,100
-6720,475,100
-6721,475,100
-14675,475,100
-17302,475,100
-17303,475,100
-17304,475,100
-17306,475,100
-19764,475,100
-22540,475,100
-22569,475,100
+6713,475,100	//Heart_of_Soul
+6720,475,100	//Status_Reset_Coupon
+6721,475,100	//Status_Reset_Coupon_
+14675,475,100	//Shadow_Box_II
+17302,475,100	//Shadow_Box_II_
+17303,475,100	//Shadow_Set_Box_II
+17304,475,100	//Neuralizer_Box_3
+17306,475,100	//Status_Reset_Coupon_Box
+19764,475,100	//C_Monster_Card
+22540,475,100	//Runstone_Luxanima
+22569,475,100	//Gift_New_start
 
 // kRO 2013-04-03
-22592,475,100
+22592,475,100	//Happy_Call_Box
 
 // kRO 2013-04-17
-14679,475,100
-17314,475,100
+14679,475,100	//Article_Sealed_Storm_Scroll
+17314,475,100	//Infinite_Giant_Fly_Wing_Box
 
 // kRO 2013-05-22
-14682,475,100
-17321,475,100
-17322,475,100
+14682,475,100	//Sealed_Beelzebub_Scroll
+17321,475,100	//Three_Master_Package
+17322,475,100	//Three_Master_Package(10)
 
 // kRO 2013-06-05 Ep.15.1
-22610,475,100
-6748,475,100
-6749,475,100
+6748,475,100	//Daily_Report_He_And_His_Team
+6749,475,100	//Operation_Control_Device
+22610,475,100	//New_Beginnings_Box
 
 // kRO 2013-06-19
-22614,475,100
+22614,475,100	//Premium_Manual
 
 // kRO 2013-06-26
-6752,475,100
-6753,475,100
-6754,475,100
-14689,475,100
-17331,475,100
-17332,475,100
-22617,475,100
-22618,475,100
+6752,475,100	//Charleston_Parts
+6753,475,100	//Token_Of_Destruction
+6754,475,100	//Collected_Medicinal_Herbs
+14689,475,100	//Sealed_Kiel-D-01_Scroll
+17331,475,100	//Event_Almighty_Box
+17332,475,100	//Event_Almighty_Box(100)
+22617,475,100	//Clear_Box_S
+22618,475,100	//Clear_Box_A
 
 // kRO 2013-07-17 Items
-6746,475,100
-6747,475,100
-13118,475,100
+6746,475,100	//Iron_Artifacts
+6747,475,100	//Steel_Workpiece
+13118,475,100	//Spark_Light
 
 // kRO 2013-07-24
-14696,475,100
-17338,475,100
-17339,475,100
-22525,475,100
+14696,475,100	//Sealed_Gloom_Under_Night_Gachapon
+17338,475,100	//Ore_Box_V
+17339,475,100	//Ore_Box_V(10)
+22525,475,100	//Level_Up_Box(140)
 
 // kRO 2013-08-21
-17429,475,100
-17430,475,100
+17429,475,100	//11_Anniversary_Shadow_Box
+17430,475,100	//11_Anniversary_Shadow_Package
+
+// kRO 2013-09-25
+14704,475,100	//Gemstone_Shadow_Box
+14705,475,100	//Sealed_Fallen_Bishop_Hibram_Scroll
+15116,475,100	//Armor_Of_Airship
+20743,475,100	//Cloak_Of_Airship
+28310,475,100	//Sarah's_Left_Earring
+28311,475,100	//Sarah's_Right_Earring
+
+// kRO 2013-11-06 Bar Cookie Festival
+17440,475,100	//Name_Change_Card_Box
+17443,475,100	//Reinforcement_Buckler_Box
+
+// kRO 2013-11-20
+14717,475,100	//2013_RWC_Scroll
+17455,475,100	//Premium_Battle_Manual_Box
+
+// kRO 2013-12-18 Casualties Of The Sepulcher & Xmas Event
+6814,475,100	//Swordman_Soul
+6815,475,100	//Merchant_Soul
+6816,475,100	//Thief_Soul
+6817,475,100	//Mage_Soul
+6818,475,100	//Archer_Soul
+6819,475,100	//Acolyte_Soul
+6820,475,100	//Energy_Debris
+18971,475,100	//Old_Rune_Circlet
+18972,475,100	//Old_Mitra
+18973,475,100	//Old_Driver_Band
+18974,475,100	//Old_Driver_Band(Yellow)
+18975,475,100	//Old_Shadow_Handicraft
+18976,475,100	//Old_Minstrel_Song's_Hat
+18977,475,100	//Old_Midas_Whisper
+18978,475,100	//Old_Magic_Stone_Hat
+18979,475,100	//Old_Blazing_Soul
+18980,475,100	//Old_Wind_Whisper
+18981,475,100	//Old_Dying_Swan
+18982,475,100	//Old_Circlet_Of_Bones
+18983,475,100	//Old_Protect_Of_Crown
+18984,475,100	//Old_Camouflage_Rabbit_Hood
+22521,475,100	//Level_Up_Box
+22522,475,100	//Level_Up_Box100
+22523,475,100	//Level_Up_Box120
+22524,475,100	//Level_Up_Box130
+22525,475,100	//Level_Up_Box140
+22526,475,100	//Level_Up_Box150
+22527,475,100	//Level_Up_Box160
+22533,475,100	//New_Year_Gift_Box
+
+// kRO 2013-12-25 Episode 15.2
+6824,475,100	//Experimental_Dong_Memory_Record
+6825,475,100	//Air_Cleaner_Box
+6826,475,100	//Fresh_Grapes
+6827,475,100	//Complete_Machine_Parts
+6828,475,100	//Gravity_Safety_Device
+6832,475,100	//Questioned_Parts
+6833,475,100	//(Limited)_Token_of_Ziegfried
 
 // kRO 2013-10-02 Items
-2997,475,100
-2999,475,100
-18829,475,100
-18830,475,100
-22652,475,100
+2997,475,100	//RWC_Gold_Brooch
+2999,475,100	//RWC_Brooch
+18828,475,100	//2013 RWC Winners Helmet
+18829,475,100	//2013 RWC Runners-Up Helmet
+18830,475,100	//2013 RWC 3rd Helmet
+22652,475,100	//Briliant_Hat_Box
 
 // kRO 2013-10-08
-22675,475,100
+22675,475,100	//Mysterious_Scroll
 
 // kRO 2013-11-06
-17442,475,100
-17449,475,100
-14616,475,100
-14617,475,100
-14618,475,100
-14619,475,100
-14620,475,100
-14621,475,100
+17442,475,100	//Emperium_G_Box
+17449,475,100	//Cookies_Bar_Set
 
 // kRO 2013-11-13
-16628,475,100
-
-// kRO 08-01-2014
-6674,475,100
-12314,475,100
-12497,475,100
-12501,475,100
-12502,475,100
-12503,475,100
-12504,475,100
-12505,475,100
-12506,475,100
-12514,475,100
-12516,475,100
-12522,475,100
-12523,475,100
-13125,475,100
-13322,475,100
-14723,475,100
-14724,475,100
-16481,475,100
-16483,475,100
-16504,475,100
-16505,475,100
-16506,475,100
-16507,475,100
-16508,475,100
-16509,475,100
-16510,475,100
-16514,475,100
-16515,475,100
-17468,475,100
-17469,475,100
-22700,475,100
+16628,475,100	//Brynhild_Box
+
+// kRO 2014-01-08
+6674,475,100	//GM_Coin
+12314,475,100	//Noive_Box
+12497,475,100	//E_Bubble_Gum
+12501,475,100	//E_Str_Dish10_
+12502,475,100	//E_Agi_Dish10_
+12503,475,100	//E_Int_Dish10_
+12504,475,100	//E_Dex_Dish10_
+12505,475,100	//E_Luk_Dish10_
+12506,475,100	//E_Vit_Dish10_
+12514,475,100	//E_Abrasive
+12515,475,100	//E_Med_Life_Potion
+12516,475,100	//E_Small_Life_Potion
+12522,475,100	//E_Blessing_10_Scroll
+12523,475,100	//E_Inc_Agi_10_Scroll
+13125,475,100	//Metal_Revolver
+13322,475,100	//Huuma_Metal_Shuriken
+14723,475,100	//(Limited)Neuralizer_I
+14724,475,100	//(Limited)Neuralizer_II
+16481,475,100	//Small_Life_Potion_Box_10
+16483,475,100	//Abrasive_Box_10
+16503,475,100	//E_Insurance_Package
+16504,475,100	//Bubble_Gum_Box(10)
+16505,475,100	//Steamed_Tongue_Box_10
+16506,475,100	//Steamed_Desert_Scorpions_Box_10
+16507,475,100	//Dragon_Breath_Cocktail_Box_10
+16508,475,100	//Hwergelmir's_Tonic_Box_10
+16509,475,100	//Cooked_Nine_Tail_Box_10
+16510,475,100	//Immortal_Stew_Box_10
+16514,475,100	//Blessing_Scroll_Box_10
+16515,475,100	//Increase_Agility_Scroll_Box_10
+17468,475,100	//Neuralizer_II_Box_3
+17469,475,100	//Neuralizer_I_Box
+22700,475,100	//Jumping_Support_Box
+
+// kRO 2014-01-22
+14725,475,100	//Sealed_Bacsojin_Scroll
+14726,475,100	//Grid_Shadow_Box
+14727,475,100	//Heal_Shadow_Box
+14728,475,100	//Hiding_Shadow_Box
+14729,475,100	//Cloaking_Shadow_Box
+14730,475,100	//Costume_Festival_Box_II
+17472,475,100	//Support_Package_III
+17473,475,100	//Support_Package_III(10)
+17474,475,100	//Infinite_Giant_Fly_Wing_Box_V
+
+// kRO 2014-01-29 New Year Day Event
+6836,475,100	//Talisman_Of_Soul
+6837,475,100	//Piece_Of_Soul_Mouse
+6838,475,100	//Secret_Orders_Of_Prophet_K
+7690,475,100	//Special_Exchange_Coupons
+19999,475,100	//C_Mouse_Hat1
+20000,475,100	//C_Mouse_Hat2
+20001,475,100	//C_Mouse_Hat3
+20002,475,100	//C_Mouse_Hat4
+20003,475,100	//C_Mouse_Hat5
+
+// kRO 2014-02-05
+17475,475,100	//(Limited)Gym_Membership_Card_Box(10)
+
+// kRO 2014-02-12 San Valentin
+6839,475,100	//Gold_Choco_Coin
+6840,475,100	//Silver_Choco_Coin
+6841,475,100	//Bronze_Choco_Coin
+6842,475,100	//Huge_Jewery
+6843,475,100	//Thin_Ring
+6844,475,100	//Mild_Stone
+6845,475,100	//That_Thing
+22708,475,100	//Exciting_Box
+
+// kRO 2014-02-19
+14731,475,100	//Teleport_Shadow_Box
+14732,475,100	//Steal_Shadow_Box
+14733,475,100	//Sealed_Pharaoh_Scroll
+17477,475,100	//Unlimited_Box_II
+17478,475,100	//Unlimited_Box_II(10)
+
+// kRO 2014-02-26
+6860,475,100	//Piece_Of_Soul_Cow
+20025,475,100	//C_Cow_Hat
+20026,475,100	//C_Cow_Hat
+20027,475,100	//C_Cow_Hat
+20028,475,100	//C_Cow_Hat
+
+// kRO 2014-03-12
+28333,475,100	//Gold_PC_Room_Ring
+
+// kRO 2014-03-19
+17483,475,100	//Three_Master_Package_III
+17484,475,100	//Three_Master_Package_III(10)
+22734,475,100	//Revolution_Quiz_Box
+22735,475,100	//Sealed_Moonlight_Flower_Scroll
+
+// kRO 2014-03-26
+6862,475,100	//Piece_Of_Soul_Tiger
+6863,475,100	//Strong_Piece_Of_Soul_Tiger
+20053,475,100	//C_White_King_Tiger_Doll_Hat
+20063,475,100	//C_Yellow_Brain_Hat
+20064,475,100	//C_Blue_Brain_Hat

+ 3 - 3
db/skill_changematerial_db.txt

@@ -7,7 +7,7 @@
 // Up to 5 ID/Amount pairs can be specified.
 // Rate = n/10%
 
-703,4,800,2,200		// Hinalle 
+703,1000,4,800,2,200		// Hinalle 
 958,800,9,1000		// Horrendous_Mouth
 959,800,7,1000		// Rotten_Scale
 960,1000,6,800,9,200	// Nipper 
@@ -30,8 +30,8 @@
 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
+1013,1000,9,800,13,200	// Colorful_Shell
+1014,1000,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 

+ 4 - 4
doc/item_db.txt

@@ -132,8 +132,8 @@ Loc: Equipment's placement. Values are:
 	2^5      032 = Shield
 	2^2      004 = Garment
 	2^6      064 = Footgear
-	2^3      008 = Accessory 1
-	2^7      128 = Accessory 2
+	2^3      008 = Accessory Right
+	2^7      128 = Accessory Left
 	2^10    1024 = Costume Top Headgear
 	2^11    2048 = Costume Mid Headgear
 	2^12    4096 = Costume Low Headgear
@@ -143,8 +143,8 @@ Loc: Equipment's placement. Values are:
 	2^17  131072 = Shadow Weapon
 	2^18  262144 = Shadow Shield
 	2^18  524288 = Shadow Shoes
-	2^20 1048576 = Shadow Accessory 2
-	2^21 2097152 = Shadow Accessory 1
+	2^20 1048576 = Shadow Accessory Right (Earring)
+	2^21 2097152 = Shadow Accessory Left (Pendant)
 
 ---------------------------------------
 

Файловите разлики са ограничени, защото са твърде много
+ 254 - 162
sql-files/item_db_re.sql


+ 1 - 1
sql-files/upgrades/upgrade_20140523.sql

@@ -1 +1 @@
-ALTER TABLE `char` ADD `font` tinyint(3) unsigned NOT NULL default '0';
+ALTER TABLE `char` ADD `font` tinyint(3) unsigned NOT NULL default '0';

Някои файлове не бяха показани, защото твърде много файлове са промени