diff --git a/db/re/item_db.txt b/db/re/item_db.txt index 932976f955..9ffccbb8b6 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -9739,6 +9739,7 @@ 19019,Elemental_Crown,Elemental Crown,4,0,,500,,10,,1,0xFFFFFFFF,63,2,256,,,1,1219,{ .@r = getrefine(); bonus bDex,(3 + (.@r/2)+ (readparam(bDex) > 130 ? .@r : 0)); bonus bLongAtkRate,4; },{},{} 19020,Survive_Circlet,Survive Circlet,4,0,,500,,10,,0,0xFFFFFFFF,63,2,256,,,1,1220,{ .@r = getrefine(); bonus bInt,(3 + (.@r/2)+ (BaseLevel > 130 ? .@r : 0)); bonus bMatkRate,4; },{},{} 19021,Gigant_Helm,Gigant Helm,4,0,,500,,10,,0,0xFFFFFFFF,63,2,256,,,1,1221,{ bonus bStr,3+((BaseLevel > 130) ? getrefine() : 0); bonus bAtkRate,4; },{},{} +19022,Floating_Stone_Of_Intelligence,Floating Stone Of Intelligence,4,,,,,,,,0xFFFFFFFF,63,2,256,,,,1230,{},{ sc_start SC_FSTONE,-1,0; },{ sc_end SC_FSTONE; } // jRO Item 19024,Protect_Feathers,Protect Feathers,4,0,,500,,,,0,0xFFFFFFFF,63,2,512,1,70,1,1232,{ bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player,2; bonus bAspdRate,-5; .@vit = readparam(bVit); if (.@vit >= 108) { bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; bonus bAspdRate,-5; } if (.@vit >= 120) { bonus bMaxHPRate,3; bonus bMdef,3; } },{},{} 19026,Aegir_Helm,Aegir Helm,4,10,,800,,10,,1,0xFFFFFFFF,63,2,256,,40,1,870,{ bonus bVit,3; },{},{} 19030,Pretty_Rabbit_Hood,Pretty Rabbit Hood,4,10,,100,,20,,1,0xFFFFFFFF,63,2,769,,1,1,1085,{ bonus bMaxHP,(15*BaseLevel); },{},{} @@ -10185,7 +10186,7 @@ 20059,C_Welding_Mask,Costume Welding Mask,4,0,,0,,,,0,0xFFFFFFFF,63,2,6144,,1,1,79,{},{},{} 20060,C_Construction_Helmet,Costume Construction Helmet,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,95,{},{},{} 20061,C_Demo_Mask,Costume Demo Mask,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,52,{},{},{} -20062,C_Angel_Stair,Costume Angel Stair,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,,{/*TODO: ViewID*/},{},{} +20062,C_Angel_Stair,Costume Angel Stair,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,,{},{ sc_start SC_HAT_EFFECT,-1,0; },{ sc_end SC_HAT_EFFECT; } 20063,C_Yellow_Brain_Hat,Costume Yellow Brain Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1228,{},{},{} 20064,C_Blue_Brain_Hat,Costume Blue Brain Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1229,{},{},{} 20065,C_Grand_Peco_Hairband,Costume Grand Peco Hairband,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,473,{},{},{} @@ -10221,7 +10222,7 @@ 20096,C_Blue_Ribbon,Costume Blue Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,441,{},{},{} 20097,C_White_Ribbon,Costume White Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,442,{},{},{} 20098,C_Vampire_Hairband,Costume Vampire Hairband,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1238,{},{},{} -20099,C_Flying_Ljosalfar,Flying Ljosalfar,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,1,1,1,1239,{},{},{} +20099,C_Flying_Ljosalfar,Flying Ljosalfar,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,1,1,1,1239,{},{ sc_start SC_LJOSALFAR,-1,0; },{ sc_end SC_LJOSALFAR; } 20100,C_Volume_Fhat,Costume Volume Fhat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1240,{},{},{} 20101,C_Bragi_Wing_Ears,Costume Bragi Wing Ears,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1241,{},{},{} 20102,C_Horse_King_J,Costume Horse King J,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,1,1189,{},{},{} @@ -10273,7 +10274,7 @@ 20151,C_Poison_Spore_Hat,Costume Poison Spore Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,899,{},{},{} 20152,C_Straw_Rice_Bag,Costume Straw Rice Bag,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,1,1273,{},{},{} 20153,C_Monochrome_Cap,Costume Monochrome Cap,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1274,{},{},{} -20154,C_Maple_Which_Falls,Costume Maple Which Falls,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,,1,1275,{},{},{} +20154,C_Maple_Which_Falls,Costume Maple Which Falls,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,,1,1275,{},{ sc_start SC_MAPLE_FALLS,-1,0; },{ sc_end SC_MAPLE_FALLS; } 20155,C_Ladys_Feather_Hat,Costume Lady's Feather Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,1276,{},{},{} 20156,C_Fan_in_Mouth,Costume Fan in Mouth,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,857,{},{},{} 20157,C_Evolved_Blue_Fish,Costume Evolved Blue Fish,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,149,{},{},{} @@ -10328,7 +10329,7 @@ 20206,C_Chicken_Hat,Costume Chicken Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,1,1296,{},{},{} 20207,C_Striped_Hairband,Costume Striped Hairband,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,133,{},{},{} 20208,C_Neck_Tie,Costume Neck Tie,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,443,{},{},{} -20209,C_Mermaid_Bubbles,Costume Mermaid Bubbles,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1299,{},{},{} +20209,C_Mermaid_Bubbles,Costume Mermaid Bubbles,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1299,{},{ sc_start SC_MERMAID_LONGING,-1,0; },{ sc_end SC_MERMAID_LONGING; } // jRO Item 20210,C_Chicken_Hat_,Costume Chicken Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,1,1297,{},{},{} 20211,C_Chicken_Hat__,Costume Chicken Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,1,1298,{},{},{} 20212,C_Loki_&_Nidhoggur's_Hat,Costume Loki & Nidhoggur's Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1304,{},{},{} @@ -10363,7 +10364,7 @@ 20243,C_Choco_Mint_Bonnet,Costume Choco Mint Bonnet,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1314,{},{},{} 20244,C_Zealotus_Mask,Costume Zealotus Mask,4,0,,0,,,,0,0xFFFFFFFF,63,2,3072,,1,1,200,{},{},{} 20245,C_Cat_Paw_Hairpin,Costume Cat Paw Hairpin,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,447,{},{},{} -20246,C_Decoration_Time,Costume Decoration Time,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1309,{},{},{} +20246,C_Decoration_Time,Costume Decoration Time,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1309,{},{ sc_start SC_TIME_ACCESSORY,-1,0; },{ sc_end SC_TIME_ACCESSORY; } 20247,C_Fate_Of_Black_Hand,Costume Fate Of Black Hand,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1310,{},{},{} 20248,C_Black_Strong_Hair,Costume Black Strong Hair,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1315,{},{},{} 20249,C_Red_Strong_Hair,Costume Red Strong Hair,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1316,{},{},{} diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index 998ad4d65a..183838f169 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -9771,6 +9771,7 @@ REPLACE INTO `item_db_re` VALUES (18997,'Reckless_Chip','Reckless Chip',4,10,NUL REPLACE INTO `item_db_re` VALUES (19019,'Elemental_Crown','Elemental Crown',4,0,NULL,500,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,NULL,1,1219,'.@r = getrefine(); bonus bDex,(3 + (.@r/2)+ (readparam(bDex) > 130 ? .@r : 0)); bonus bLongAtkRate,4;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (19020,'Survive_Circlet','Survive Circlet',4,0,NULL,500,NULL,10,NULL,0,0xFFFFFFFF,63,2,256,NULL,NULL,1,1220,'.@r = getrefine(); bonus bInt,(3 + (.@r/2)+ (BaseLevel > 130 ? .@r : 0)); bonus bMatkRate,4;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (19021,'Gigant_Helm','Gigant Helm',4,0,NULL,500,NULL,10,NULL,0,0xFFFFFFFF,63,2,256,NULL,NULL,1,1221,'bonus bStr,3+((BaseLevel > 130) ? getrefine() : 0); bonus bAtkRate,4;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (19022,'Floating_Stone_Of_Intelligence','Floating Stone Of Intelligence',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',0,1230,NULL,'sc_start SC_FSTONE,-1,0;','sc_end SC_FSTONE;'); REPLACE INTO `item_db_re` VALUES (19024,'Protect_Feathers','Protect Feathers',4,0,NULL,500,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,512,1,'70',1,1232,'bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player,2; bonus bAspdRate,-5; .@vit = readparam(bVit); if (.@vit >= 108) { bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; bonus bAspdRate,-5; } if (.@vit >= 120) { bonus bMaxHPRate,3; bonus bMdef,3; }',NULL,NULL); REPLACE INTO `item_db_re` VALUES (19026,'Aegir_Helm','Aegir Helm',4,10,NULL,800,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'40',1,870,'bonus bVit,3;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (19030,'Pretty_Rabbit_Hood','Pretty Rabbit Hood',4,10,NULL,100,NULL,20,NULL,1,0xFFFFFFFF,63,2,769,NULL,'1',1,1085,'bonus bMaxHP,(15*BaseLevel);',NULL,NULL); @@ -10217,7 +10218,7 @@ REPLACE INTO `item_db_re` VALUES (20058,'C_Hot_Blood_Headband','Costume Hot Bloo REPLACE INTO `item_db_re` VALUES (20059,'C_Welding_Mask','Costume Welding Mask',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',1,79,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20060,'C_Construction_Helmet','Costume Construction Helmet',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,95,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20061,'C_Demo_Mask','Costume Demo Mask',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,52,NULL,NULL,NULL); -REPLACE INTO `item_db_re` VALUES (20062,'C_Angel_Stair','Costume Angel Stair',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,NULL,'/*TODO: ViewID*/',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (20062,'C_Angel_Stair','Costume Angel Stair',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,NULL,NULL,'sc_start SC_HAT_EFFECT,-1,0;','sc_end SC_HAT_EFFECT;'); REPLACE INTO `item_db_re` VALUES (20063,'C_Yellow_Brain_Hat','Costume Yellow Brain Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1228,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20064,'C_Blue_Brain_Hat','Costume Blue Brain Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1229,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20065,'C_Grand_Peco_Hairband','Costume Grand Peco Hairband',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,473,NULL,NULL,NULL); @@ -10253,7 +10254,7 @@ REPLACE INTO `item_db_re` VALUES (20095,'C_Red_Ribbon','Costume Red Ribbon',4,0, REPLACE INTO `item_db_re` VALUES (20096,'C_Blue_Ribbon','Costume Blue Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,441,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20097,'C_White_Ribbon','Costume White Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,442,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20098,'C_Vampire_Hairband','Costume Vampire Hairband',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1238,NULL,NULL,NULL); -REPLACE INTO `item_db_re` VALUES (20099,'C_Flying_Ljosalfar','Flying Ljosalfar',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,1,'1',1,1239,NULL,NULL,NULL); +REPLACE INTO `item_db_re` VALUES (20099,'C_Flying_Ljosalfar','Flying Ljosalfar',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,1,'1',1,1239,NULL,'sc_start SC_LJOSALFAR,-1,0;','sc_end SC_LJOSALFAR;'); REPLACE INTO `item_db_re` VALUES (20100,'C_Volume_Fhat','Costume Volume Fhat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1240,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20101,'C_Bragi_Wing_Ears','Costume Bragi Wing Ears',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1241,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20102,'C_Horse_King_J','Costume Horse King J',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',1,1189,NULL,NULL,NULL); @@ -10305,7 +10306,7 @@ REPLACE INTO `item_db_re` VALUES (20150,'C_Wind_Fan','Costume Wind Fan',4,0,NULL REPLACE INTO `item_db_re` VALUES (20151,'C_Poison_Spore_Hat','Costume Poison Spore Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,899,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20152,'C_Straw_Rice_Bag','Costume Straw Rice Bag',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',1,1273,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20153,'C_Monochrome_Cap','Costume Monochrome Cap',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1274,NULL,NULL,NULL); -REPLACE INTO `item_db_re` VALUES (20154,'C_Maple_Which_Falls','Costume Maple Which Falls',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,NULL,1,1275,NULL,NULL,NULL); +REPLACE INTO `item_db_re` VALUES (20154,'C_Maple_Which_Falls','Costume Maple Which Falls',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,NULL,1,1275,NULL,'sc_start SC_MAPLE_FALLS,-1,0;','sc_end SC_MAPLE_FALLS;'); REPLACE INTO `item_db_re` VALUES (20155,'C_Ladys_Feather_Hat','Costume Lady\'s Feather Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,1276,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20156,'C_Fan_in_Mouth','Costume Fan in Mouth',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,857,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20157,'C_Evolved_Blue_Fish','Costume Evolved Blue Fish',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,149,NULL,NULL,NULL); @@ -10360,7 +10361,7 @@ REPLACE INTO `item_db_re` VALUES (20205,'C_Fancy_Flower','Costume Fancy Flower', REPLACE INTO `item_db_re` VALUES (20206,'C_Chicken_Hat','Costume Chicken Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',1,1296,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20207,'C_Striped_Hairband','Costume Striped Hairband',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,133,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20208,'C_Neck_Tie','Costume Neck Tie',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,443,NULL,NULL,NULL); -REPLACE INTO `item_db_re` VALUES (20209,'C_Mermaid_Bubbles','Costume Mermaid Bubbles',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1299,NULL,NULL,NULL); +REPLACE INTO `item_db_re` VALUES (20209,'C_Mermaid_Bubbles','Costume Mermaid Bubbles',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1299,NULL,'sc_start SC_MERMAID_LONGING,-1,0;','sc_end SC_MERMAID_LONGING;'); REPLACE INTO `item_db_re` VALUES (20210,'C_Chicken_Hat_','Costume Chicken Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',1,1297,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20211,'C_Chicken_Hat__','Costume Chicken Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',1,1298,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20212,'C_Loki_&_Nidhoggur\'s_Hat','Costume Loki & Nidhoggur\'s Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1304,NULL,NULL,NULL); @@ -10395,7 +10396,7 @@ REPLACE INTO `item_db_re` VALUES (20242,'C_Snownow_Hat','Costume Snownow Hat',4, REPLACE INTO `item_db_re` VALUES (20243,'C_Choco_Mint_Bonnet','Costume Choco Mint Bonnet',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1314,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20244,'C_Zealotus_Mask','Costume Zealotus Mask',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',1,200,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20245,'C_Cat_Paw_Hairpin','Costume Cat Paw Hairpin',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,447,NULL,NULL,NULL); -REPLACE INTO `item_db_re` VALUES (20246,'C_Decoration_Time','Costume Decoration Time',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1309,NULL,NULL,NULL); +REPLACE INTO `item_db_re` VALUES (20246,'C_Decoration_Time','Costume Decoration Time',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1309,NULL,'sc_start SC_TIME_ACCESSORY,-1,0;','sc_end SC_TIME_ACCESSORY;'); REPLACE INTO `item_db_re` VALUES (20247,'C_Fate_Of_Black_Hand','Costume Fate Of Black Hand',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1310,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20248,'C_Black_Strong_Hair','Costume Black Strong Hair',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1315,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (20249,'C_Red_Strong_Hair','Costume Red Strong Hair',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1316,NULL,NULL,NULL); diff --git a/src/map/status.c b/src/map/status.c index fbd80665dd..b3e204efc3 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -829,11 +829,23 @@ void initChangeTables(void) set_sc_with_vfx( RL_C_MARKER , SC_C_MARKER , SI_C_MARKER , SCB_FLEE ); set_sc_with_vfx( RL_AM_BLAST , SC_ANTI_M_BLAST , SI_ANTI_M_BLAST , SCB_NONE ); + // New Mounts + set_sc_with_vfx_noskill( SC_ALL_RIDING , SI_ALL_RIDING , SCB_SPEED ); + + // Costumes set_sc_with_vfx_noskill( SC_MOONSTAR , SI_MOONSTAR , SCB_NONE ); set_sc_with_vfx_noskill( SC_SUPER_STAR , SI_SUPER_STAR , SCB_NONE ); - set_sc_with_vfx_noskill( SC_ALL_RIDING , SI_ALL_RIDING , SCB_SPEED ); set_sc_with_vfx_noskill( SC_STRANGELIGHTS , SI_STRANGELIGHTS , SCB_NONE ); set_sc_with_vfx_noskill( SC_DECORATION_OF_MUSIC , SI_DECORATION_OF_MUSIC , SCB_NONE ); + set_sc_with_vfx_noskill( SC_LJOSALFAR , SI_LJOSALFAR , SCB_NONE); + set_sc_with_vfx_noskill( SC_MERMAID_LONGING , SI_MERMAID_LONGING , SCB_NONE); + set_sc_with_vfx_noskill( SC_HAT_EFFECT , SI_HAT_EFFECT , SCB_NONE); + set_sc_with_vfx_noskill( SC_FLOWERSMOKE , SI_FLOWERSMOKE , SCB_NONE); + set_sc_with_vfx_noskill( SC_FSTONE , SI_FSTONE , SCB_NONE); + set_sc_with_vfx_noskill( SC_HAPPINESS_STAR , SI_HAPPINESS_STAR , SCB_NONE); + set_sc_with_vfx_noskill( SC_MAPLE_FALLS , SI_MAPLE_FALLS , SCB_NONE); + set_sc_with_vfx_noskill( SC_TIME_ACCESSORY , SI_TIME_ACCESSORY , SCB_NONE); + set_sc_with_vfx_noskill( SC_MAGICAL_FEATHER , SI_MAGICAL_FEATHER , SCB_NONE); /* Summoner */ set_sc( SU_HIDE , SC_SUHIDE , SI_SUHIDE , SCB_NONE ); @@ -1025,12 +1037,8 @@ void initChangeTables(void) StatusIconChangeTable[SC_MTF_MATK] = SI_MTF_MATK; StatusIconChangeTable[SC_MTF_MLEATKED] = SI_MTF_MLEATKED; StatusIconChangeTable[SC_MTF_CRIDAMAGE] = SI_MTF_CRIDAMAGE; - StatusIconChangeTable[SC_MOONSTAR] = SI_MOONSTAR; - StatusIconChangeTable[SC_SUPER_STAR] = SI_SUPER_STAR; StatusIconChangeTable[SC_QD_SHOT_READY] = SI_E_QD_SHOT_READY; StatusIconChangeTable[SC_HEAT_BARREL_AFTER] = SI_HEAT_BARREL_AFTER; - StatusIconChangeTable[SC_STRANGELIGHTS] = SI_STRANGELIGHTS; - StatusIconChangeTable[SC_DECORATION_OF_MUSIC] = SI_DECORATION_OF_MUSIC; StatusIconChangeTable[SC_QUEST_BUFF1] = SI_QUEST_BUFF1; StatusIconChangeTable[SC_QUEST_BUFF2] = SI_QUEST_BUFF2; StatusIconChangeTable[SC_QUEST_BUFF3] = SI_QUEST_BUFF3; @@ -1045,6 +1053,21 @@ void initChangeTables(void) StatusIconChangeTable[SC_MTF_PUMPKIN] = SI_MTF_PUMPKIN; StatusIconChangeTable[SC_NORECOVER_STATE] = SI_HANDICAPSTATE_NORECOVER; + // Costumes + StatusIconChangeTable[SC_MOONSTAR] = SI_MOONSTAR; + StatusIconChangeTable[SC_SUPER_STAR] = SI_SUPER_STAR; + StatusIconChangeTable[SC_STRANGELIGHTS] = SI_STRANGELIGHTS; + StatusIconChangeTable[SC_DECORATION_OF_MUSIC] = SI_DECORATION_OF_MUSIC; + StatusIconChangeTable[SC_LJOSALFAR] = SI_LJOSALFAR; + StatusIconChangeTable[SC_MERMAID_LONGING] = SI_MERMAID_LONGING; + StatusIconChangeTable[SC_HAT_EFFECT] = SI_HAT_EFFECT; + StatusIconChangeTable[SC_FLOWERSMOKE] = SI_FLOWERSMOKE; + StatusIconChangeTable[SC_FSTONE] = SI_FSTONE; + StatusIconChangeTable[SC_HAPPINESS_STAR] = SI_HAPPINESS_STAR; + StatusIconChangeTable[SC_MAPLE_FALLS] = SI_MAPLE_FALLS; + StatusIconChangeTable[SC_TIME_ACCESSORY] = SI_TIME_ACCESSORY; + StatusIconChangeTable[SC_MAGICAL_FEATHER] = SI_MAGICAL_FEATHER; + /* Summoners status icons */ StatusIconChangeTable[SC_SPRITEMABLE] = SI_SPRITEMABLE; @@ -1173,10 +1196,6 @@ void initChangeTables(void) StatusChangeFlagTable[SC_MTF_ASPD] |= SCB_ASPD|SCB_HIT; StatusChangeFlagTable[SC_MTF_MATK] |= SCB_MATK; StatusChangeFlagTable[SC_MTF_MLEATKED] |= SCB_ALL; - StatusChangeFlagTable[SC_MOONSTAR] |= SCB_NONE; - StatusChangeFlagTable[SC_SUPER_STAR] |= SCB_NONE; - StatusChangeFlagTable[SC_STRANGELIGHTS] |= SCB_NONE; - StatusChangeFlagTable[SC_DECORATION_OF_MUSIC] |= SCB_NONE; StatusChangeFlagTable[SC_QUEST_BUFF1] |= SCB_BATK|SCB_MATK; StatusChangeFlagTable[SC_QUEST_BUFF2] |= SCB_BATK|SCB_MATK; StatusChangeFlagTable[SC_QUEST_BUFF3] |= SCB_BATK|SCB_MATK; @@ -1187,6 +1206,21 @@ void initChangeTables(void) StatusChangeFlagTable[SC_MTF_MHP] |= SCB_MAXHP; StatusChangeFlagTable[SC_MTF_MSP] |= SCB_MAXSP; + // Costumes + StatusChangeFlagTable[SC_MOONSTAR] |= SCB_NONE; + StatusChangeFlagTable[SC_SUPER_STAR] |= SCB_NONE; + StatusChangeFlagTable[SC_STRANGELIGHTS] |= SCB_NONE; + StatusChangeFlagTable[SC_DECORATION_OF_MUSIC] |= SCB_NONE; + StatusChangeFlagTable[SC_LJOSALFAR] |= SCB_NONE; + StatusChangeFlagTable[SC_MERMAID_LONGING] |= SCB_NONE; + StatusChangeFlagTable[SC_HAT_EFFECT] |= SCB_NONE; + StatusChangeFlagTable[SC_FLOWERSMOKE] |= SCB_NONE; + StatusChangeFlagTable[SC_FSTONE] |= SCB_NONE; + StatusChangeFlagTable[SC_HAPPINESS_STAR] |= SCB_NONE; + StatusChangeFlagTable[SC_MAPLE_FALLS] |= SCB_NONE; + StatusChangeFlagTable[SC_TIME_ACCESSORY] |= SCB_NONE; + StatusChangeFlagTable[SC_MAGICAL_FEATHER] |= SCB_NONE; + #ifdef RENEWAL // renewal EDP increases your weapon atk StatusChangeFlagTable[SC_EDP] |= SCB_WATK; @@ -1232,12 +1266,23 @@ void initChangeTables(void) StatusDisplayType[SC_ILLUSIONDOPING] = true; StatusDisplayType[SC_C_MARKER] = true; StatusDisplayType[SC_ANTI_M_BLAST] = true; - StatusDisplayType[SC_MOONSTAR] = true; - StatusDisplayType[SC_SUPER_STAR] = true; - StatusDisplayType[SC_STRANGELIGHTS] = true; - StatusDisplayType[SC_DECORATION_OF_MUSIC] = true; StatusDisplayType[SC_SPRITEMABLE] = true; + // Costumes + StatusDisplayType[SC_MOONSTAR] = true; + StatusDisplayType[SC_SUPER_STAR] = true; + StatusDisplayType[SC_STRANGELIGHTS] = true; + StatusDisplayType[SC_DECORATION_OF_MUSIC] = true; + StatusDisplayType[SC_LJOSALFAR] = true; + StatusDisplayType[SC_MERMAID_LONGING] = true; + StatusDisplayType[SC_HAT_EFFECT] = true; + StatusDisplayType[SC_FLOWERSMOKE] = true; + StatusDisplayType[SC_FSTONE] = true; + StatusDisplayType[SC_HAPPINESS_STAR] = true; + StatusDisplayType[SC_MAPLE_FALLS] = true; + StatusDisplayType[SC_TIME_ACCESSORY] = true; + StatusDisplayType[SC_MAGICAL_FEATHER] = true; + /* StatusChangeState (SCS_) NOMOVE */ StatusChangeStateTable[SC_ANKLE] |= SCS_NOMOVE; StatusChangeStateTable[SC_AUTOCOUNTER] |= SCS_NOMOVE; @@ -11082,11 +11127,7 @@ int status_change_clear(struct block_list* bl, int type) case SC_PUSH_CART: case SC_LIGHT_OF_REGENE: case SC_STYLE_CHANGE: - case SC_MOONSTAR: - case SC_SUPER_STAR: case SC_HEAT_BARREL_AFTER: - case SC_STRANGELIGHTS: - case SC_DECORATION_OF_MUSIC: case SC_QUEST_BUFF1: case SC_QUEST_BUFF2: case SC_QUEST_BUFF3: @@ -11111,6 +11152,20 @@ int status_change_clear(struct block_list* bl, int type) case SC_REUSE_STORMBLAST: case SC_ALL_RIDING_REUSE_LIMIT: case SC_SPRITEMABLE: + // Costumes + case SC_MOONSTAR: + case SC_SUPER_STAR: + case SC_STRANGELIGHTS: + case SC_DECORATION_OF_MUSIC: + case SC_LJOSALFAR: + case SC_MERMAID_LONGING: + case SC_HAT_EFFECT: + case SC_FLOWERSMOKE: + case SC_FSTONE: + case SC_HAPPINESS_STAR: + case SC_MAPLE_FALLS: + case SC_TIME_ACCESSORY: + case SC_MAGICAL_FEATHER: continue; } } @@ -11123,10 +11178,20 @@ int status_change_clear(struct block_list* bl, int type) case SC_PUSH_CART: case SC_ALL_RIDING: case SC_STYLE_CHANGE: + // Costumes case SC_MOONSTAR: case SC_SUPER_STAR: case SC_STRANGELIGHTS: case SC_DECORATION_OF_MUSIC: + case SC_LJOSALFAR: + case SC_MERMAID_LONGING: + case SC_HAT_EFFECT: + case SC_FLOWERSMOKE: + case SC_FSTONE: + case SC_HAPPINESS_STAR: + case SC_MAPLE_FALLS: + case SC_TIME_ACCESSORY: + case SC_MAGICAL_FEATHER: continue; } } @@ -12989,16 +13054,12 @@ void status_change_clear_buffs(struct block_list* bl, uint8 type) case SC_STYLE_CHANGE: case SC_MONSTER_TRANSFORM: case SC_ACTIVE_MONSTER_TRANSFORM: - case SC_MOONSTAR: - case SC_SUPER_STAR: case SC_MTF_ASPD: case SC_MTF_RANGEATK: case SC_MTF_MATK: case SC_MTF_MLEATKED: case SC_MTF_CRIDAMAGE: case SC_HEAT_BARREL_AFTER: - case SC_STRANGELIGHTS: - case SC_DECORATION_OF_MUSIC: case SC_QUEST_BUFF1: case SC_QUEST_BUFF2: case SC_QUEST_BUFF3: @@ -13031,6 +13092,20 @@ void status_change_clear_buffs(struct block_list* bl, uint8 type) case SC_ALL_RIDING_REUSE_LIMIT: case SC_SPRITEMABLE: case SC_BITESCAR: + // Costumes + case SC_MOONSTAR: + case SC_SUPER_STAR: + case SC_STRANGELIGHTS: + case SC_DECORATION_OF_MUSIC: + case SC_LJOSALFAR: + case SC_MERMAID_LONGING: + case SC_HAT_EFFECT: + case SC_FLOWERSMOKE: + case SC_FSTONE: + case SC_HAPPINESS_STAR: + case SC_MAPLE_FALLS: + case SC_TIME_ACCESSORY: + case SC_MAGICAL_FEATHER: continue; // Chemical Protection is only removed by some skills case SC_CP_WEAPON: diff --git a/src/map/status.h b/src/map/status.h index da7362d627..923c677c97 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -760,6 +760,16 @@ typedef enum sc_type { SC_CLOUD_KILL, + SC_LJOSALFAR, + SC_MERMAID_LONGING, + SC_HAT_EFFECT, + SC_FLOWERSMOKE, + SC_FSTONE, + SC_HAPPINESS_STAR, + SC_MAPLE_FALLS, + SC_TIME_ACCESSORY, + SC_MAGICAL_FEATHER, + #ifdef RENEWAL SC_EXTREMITYFIST2, //! NOTE: This SC should be right before SC_MAX, so it doesn't disturb if RENEWAL is disabled #endif @@ -1622,6 +1632,8 @@ enum si_type { SI_MTF_MARIONETTE = 860, SI_MTF_LUDE = 861, SI_MTF_CRUISER = 862, + SI_MERMAID_LONGING = 863, + SI_MAGICAL_FEATHER = 864, SI_DRACULA_CARD = 865, SI_LIMIT_POWER_BOOSTER = 867, SI_TIME_ACCESSORY = 872,