diff options
| author | Jedzkie <jedzkie13@rocketmail.com> | 2015-11-22 18:45:29 +0800 |
|---|---|---|
| committer | Jedzkie <jedzkie13@rocketmail.com> | 2015-11-22 18:45:29 +0800 |
| commit | f8a6e3bd80f81b391a94650aaa74a113769d3810 (patch) | |
| tree | 7189f15333c9b91648ff61a56d94ece90e7fb5b9 | |
| parent | ce33936de2fcb9c565437cb80e6329ab76626500 (diff) | |
| parent | b879cea1d9507c6de9c89b2ed0d1d860e0334193 (diff) | |
| download | hercules-f8a6e3bd80f81b391a94650aaa74a113769d3810.tar.gz hercules-f8a6e3bd80f81b391a94650aaa74a113769d3810.tar.bz2 hercules-f8a6e3bd80f81b391a94650aaa74a113769d3810.tar.xz hercules-f8a6e3bd80f81b391a94650aaa74a113769d3810.zip | |
Merge branch 'master' of http://github.com/HerculesWS/Hercules
| -rw-r--r-- | sql-files/item_db.sql | 4 | ||||
| -rw-r--r-- | sql-files/item_db_re.sql | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql index e75a6cb91..797be2210 100644 --- a/sql-files/item_db.sql +++ b/sql-files/item_db.sql @@ -4577,8 +4577,8 @@ REPLACE INTO `item_db` VALUES ('12270','Tasty_Major','Tasty White Ration','2','2 REPLACE INTO `item_db` VALUES ('12271','Mre_A','Military Ration A','0','2','1','70','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','499',NULL,'0',NULL,'0',NULL,'0','percentheal 5,0;','',''); REPLACE INTO `item_db` VALUES ('12272','Mre_B','Military Ration B','2','2','1','70','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','499',NULL,'0',NULL,'0',NULL,'0','sc_start SC_INCHIT,600000,33;','',''); REPLACE INTO `item_db` VALUES ('12273','Mre_C','Military Ration C','2','2','1','70','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','499',NULL,'0',NULL,'0',NULL,'0','sc_start SC_INCFLEE,600000,33;','',''); -REPLACE INTO `item_db` VALUES ('12274','Gold_Pill_1','Daehwandan','0','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start SC_INCMHPRATE,36000000,5; percentheal 10,0;','',''); -REPLACE INTO `item_db` VALUES ('12275','Gold_Pill_2','Taecheongdan','0','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start SC_INCMSPRATE,36000000,5; percentheal 0,10;','',''); +REPLACE INTO `item_db` VALUES ('12274','Gold_Pill_1','Daehwandan','0','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start2 SC_ATKER_ASPD,3600000,5,10;','',''); +REPLACE INTO `item_db` VALUES ('12275','Gold_Pill_2','Taecheongdan','0','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start2 SC_ATKER_MOVESPEED,3600000,5,10;','',''); REPLACE INTO `item_db` VALUES ('12276','Mimic_Scroll','Mimic Scroll','2','2','1','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','73',NULL,'0',NULL,'0',NULL,'0','mercenary_create 2058,1800000;','',''); REPLACE INTO `item_db` VALUES ('12277','Disguise_Scroll','Disguise Scroll','2','2','1','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','73',NULL,'0',NULL,'0',NULL,'0','mercenary_create 2059,1800000;','',''); REPLACE INTO `item_db` VALUES ('12278','Alice_Scroll','Alice Scroll','2','2','1','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','73',NULL,'0',NULL,'0',NULL,'0','mercenary_create 2060,1800000;','',''); diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index 4ef571c6c..d3c14e7b0 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -5849,8 +5849,8 @@ REPLACE INTO `item_db` VALUES ('12270','Tasty_Major','Tasty White Ration','2','2 REPLACE INTO `item_db` VALUES ('12271','Mre_A','Military Ration A','0','2','1','70','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','467',NULL,'0',NULL,'0',NULL,'0','percentheal 5,0;','',''); REPLACE INTO `item_db` VALUES ('12272','Mre_B','Military Ration B','2','2','1','70','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','467',NULL,'0',NULL,'0',NULL,'0','sc_start SC_INCHIT,600000,33;','',''); REPLACE INTO `item_db` VALUES ('12273','Mre_C','Military Ration C','2','2','1','70','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','467',NULL,'0',NULL,'0',NULL,'0','sc_start SC_INCFLEE,600000,33;','',''); -REPLACE INTO `item_db` VALUES ('12274','Gold_Pill_1','Daehwandan','0','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start SC_INCMHPRATE,36000000,5; percentheal 10,0;','',''); -REPLACE INTO `item_db` VALUES ('12275','Gold_Pill_2','Taecheongdan','0','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start SC_INCMSPRATE,36000000,5; percentheal 0,10;','',''); +REPLACE INTO `item_db` VALUES ('12274','Gold_Pill_1','Daehwandan','0','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start2 SC_ATKER_ASPD,3600000,5,10;','',''); +REPLACE INTO `item_db` VALUES ('12275','Gold_Pill_2','Taecheongdan','0','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start2 SC_ATKER_MOVESPEED,3600000,5,10;','',''); REPLACE INTO `item_db` VALUES ('12276','Mimic_Scroll','Mimic Scroll','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','475',NULL,'0',NULL,'0',NULL,'0','mercenary_create 2058,1800000;','',''); REPLACE INTO `item_db` VALUES ('12277','Disguise_Scroll','Disguise Scroll','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','475',NULL,'0',NULL,'0',NULL,'0','mercenary_create 2059,1800000;','',''); REPLACE INTO `item_db` VALUES ('12278','Alice_Scroll','Alice Contract','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','475',NULL,'0',NULL,'0',NULL,'0','mercenary_create 2060,1800000;','',''); |