From 180dbc88fb74f0ae6e99e1a07b8076691f407255 Mon Sep 17 00:00:00 2001 From: rAthenaAPI Date: Sat, 12 Mar 2016 16:34:16 +0100 Subject: [PATCH 1/2] SQL synchronization [ci skip] --- sql-files/item_db_re.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index fa701e99f0..6ea200d025 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -2154,8 +2154,8 @@ REPLACE INTO `item_db_re` VALUES (2984,'Glove_Save_Rimnil','Glove Save Rimnil',4 REPLACE INTO `item_db_re` VALUES (2985,'Gyges_Ring','Gyges Ring',4,10,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'50',NULL,NULL,'bonus bInt,3; bonus bMatk,30; skill "TF_HIDING",1;',NULL,'sc_end SC_HIDING;'); REPLACE INTO `item_db_re` VALUES (2986,'Snake_Ring','Snake Ring',4,20,NULL,100,NULL,2,NULL,1,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus bDex,3; bonus bMdef,2;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2987,'Snake_Pendant','Snake Pendant',4,20,NULL,100,NULL,3,NULL,1,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus bAgi,3; bonus bLuk,2; bonus bMdef,3;',NULL,NULL); -REPLACE INTO `item_db_re` VALUES (2988,'Ozs_New_Wing_Ring','Oz\'s New Wing Ring',4,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,136,NULL,'130',NULL,NULL,'bonus bVariableCastrate,-25;',NULL,NULL); -REPLACE INTO `item_db_re` VALUES (2989,'Bloody_Floral_Decoration_Bracelet','Bloody Floral Decoration Bracelet',4,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,136,NULL,'130',NULL,NULL,'bonus bVariableCastrate,-25;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (2988,'Ozs_New_Wing_Ring','Oz\'s New Wing Ring',4,20,NULL,100,NULL,0,NULL,1,0x00080000,56,1,136,NULL,'130',NULL,NULL,'bonus bVariableCastrate,-25;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (2989,'Bloody_Floral_Decoration_Bracelet','Bloody Floral Decoration Bracelet',4,20,NULL,100,NULL,0,NULL,1,0x00080000,56,0,136,NULL,'130',NULL,NULL,'bonus bVariableCastrate,-25;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2990,'Pendant_of_Harmony','Pendant of Harmony',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'130',NULL,NULL,'bonus bMatkRate,6; bonus bHPrecovRate,50; bonus bSPrecovRate,50; bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Earth,5; bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Wind,5; bonus2 bSubEle,Ele_Poison,5; bonus2 bSubEle,Ele_Ghost,5; bonus2 bSubEle,Ele_Undead,5; bonus4 bAutoSpellWhenHit,"PR_SANCTUARY",3,100,0; bonus3 bAutoSpellWhenHit,"AB_RENOVATIO",1,100; bonus bStr,-5;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2991,'Pendant_of_Chaos','Pendant of Chaos',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'130',NULL,NULL,'bonus bAtkRate,6; bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Earth,5; bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Wind,5; bonus2 bSubEle,Ele_Poison,5; bonus2 bSubEle,Ele_Ghost,5; bonus2 bSubEle,Ele_Undead,5; bonus2 bResEff,Eff_Confusion,10000; bonus2 bAddEff,Eff_Confusion,500; bonus4 bAutoSpellWhenHit,"SC_CHAOSPANIC",1,100,1; bonus bInt,-5;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2992,'Pendant_of_Maelstrom','Pendant of Maelstrom',4,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,136,NULL,'130',NULL,NULL,'bonus bAtkRate,6; bonus bMatkRate,6; bonus bAllStats,1; bonus5 bAutoSpellWhenHit,"SC_MAELSTROM",1,100,BF_MAGIC,0;',NULL,NULL); From 081b03c646803d4da33442714641df697d7366f5 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Sat, 12 Mar 2016 16:40:24 +0100 Subject: [PATCH 2/2] Added placeholders for mob db entries from kRO patch 2016-03-09 --- db/re/mob_db.txt | 15 +++++++++++++++ sql-files/mob_db_re.sql | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt index 4c45c59e32..6f0938638b 100644 --- a/db/re/mob_db.txt +++ b/db/re/mob_db.txt @@ -2686,3 +2686,18 @@ // //3569,POPE_MD_H_MERC_NORMAL //3570,POPE_MD_H_MERC_CASUAL +// +//3621,EP16_2_MM_CUTIE +//3622,EP16_2_MM_S_GUARDS +//3623,EP16_2_MM_U_ENERGY_R +//3624,EP16_2_MM_U_ENERGY_G +//3625,EP16_2_MM_U_ENERGY_B +//3626,EP16_2_H_HUNTER_V +//3627,EP16_2_H_HUNTER_MD +//3628,EP16_2_H_HUNTER_EV +//3629,EP16_2_BROKEN_GUN +//3630,EP16_2_E_BOLKOBA +//3631,EP16_2_HUMAN_KIMERA +//3632,EP16_2_MATTER_KIMERA +//3633,EP16_2_VENOM_KIMERA +//3634,MYSTCASE_GIANT diff --git a/sql-files/mob_db_re.sql b/sql-files/mob_db_re.sql index 97a54a095b..8af323562d 100644 --- a/sql-files/mob_db_re.sql +++ b/sql-files/mob_db_re.sql @@ -2752,4 +2752,19 @@ REPLACE INTO `mob_db_re` VALUES (3203,'INORGANIC_JAKK','Inorganic Pumpkin','Inor # #3569,POPE_MD_H_MERC_NORMAL #3570,POPE_MD_H_MERC_CASUAL +# +#3621,EP16_2_MM_CUTIE +#3622,EP16_2_MM_S_GUARDS +#3623,EP16_2_MM_U_ENERGY_R +#3624,EP16_2_MM_U_ENERGY_G +#3625,EP16_2_MM_U_ENERGY_B +#3626,EP16_2_H_HUNTER_V +#3627,EP16_2_H_HUNTER_MD +#3628,EP16_2_H_HUNTER_EV +#3629,EP16_2_BROKEN_GUN +#3630,EP16_2_E_BOLKOBA +#3631,EP16_2_HUMAN_KIMERA +#3632,EP16_2_MATTER_KIMERA +#3633,EP16_2_VENOM_KIMERA +#3634,MYSTCASE_GIANT