summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-07-25 06:10:57 +0200
committerGitHub <noreply@github.com>2018-07-25 06:10:57 +0200
commitbd1d37da3e3ac938065e52e264753555339adc66 (patch)
treec45729ec8573004780bd333f6a3713fe80c2829b
parent7209efccb97e6f52e91e0a290fe32bfd094c5943 (diff)
parent7b651e795893e990dadf1031a255ec0b96a65086 (diff)
downloadhercules-bd1d37da3e3ac938065e52e264753555339adc66.tar.gz
hercules-bd1d37da3e3ac938065e52e264753555339adc66.tar.bz2
hercules-bd1d37da3e3ac938065e52e264753555339adc66.tar.xz
hercules-bd1d37da3e3ac938065e52e264753555339adc66.zip
Merge pull request #2117 from HerculesWS/seaottercard_fix
Fix Sea-Otter Card not increasing Sushi Heal Rate
-rw-r--r--db/pre-re/item_db.conf8
-rw-r--r--db/re/item_db.conf8
-rw-r--r--sql-files/item_db.sql2
-rw-r--r--sql-files/item_db_re.sql2
4 files changed, 10 insertions, 10 deletions
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index ccd1a212c..55ddcbd3b 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -34566,10 +34566,10 @@ item_db: (
Weight: 10
Loc: "EQP_ACC"
Script: <"
- bonus2 bAddItemHealRate,Sushi,50;
- bonus2 bAddItemHealRate,Fish_Slice,50;
- bonus3 bAddMonsterDropItem,551,RC_Fish,300;
- bonus3 bAddMonsterDropItem,544,RC_Fish,300;
+ bonus2(bAddItemHealRate, Shusi, 50);
+ bonus2(bAddItemHealRate, Fish_Slice, 50);
+ bonus3(bAddMonsterDropItem, Shusi, RC_Fish, 300);
+ bonus3(bAddMonsterDropItem, Fish_Slice, RC_Fish, 300);
">
},
{
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 5e3435036..21c11f3cd 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -45098,10 +45098,10 @@ item_db: (
Weight: 10
Loc: "EQP_ACC"
Script: <"
- bonus2 bAddItemHealRate,Sushi,50;
- bonus2 bAddItemHealRate,Fish_Slice,50;
- bonus3 bAddMonsterDropItem,551,RC_Fish,300;
- bonus3 bAddMonsterDropItem,544,RC_Fish,300;
+ bonus2(bAddItemHealRate, Shusi, 50);
+ bonus2(bAddItemHealRate, Fish_Slice, 50);
+ bonus3(bAddMonsterDropItem, Shusi, RC_Fish, 300);
+ bonus3(bAddMonsterDropItem, Fish_Slice, RC_Fish, 300);
">
},
{
diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql
index bfd6d20ba..7bd5a5012 100644
--- a/sql-files/item_db.sql
+++ b/sql-files/item_db.sql
@@ -1971,7 +1971,7 @@ REPLACE INTO `item_db` VALUES ('4322','High_Orc_Card','High Orc Card','6','0','2
REPLACE INTO `item_db` VALUES ('4323','Garm_Baby_Card','Hatii Babe Card','6','0','20','10','10','0','0','0','0','0','18446744073709551615','63','2','2','0','0',NULL,'0','1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus3 bAutoSpell,MG_FROSTDIVER,3,50;','','');
REPLACE INTO `item_db` VALUES ('4324','Garm_Card','Hatii Card','6','0','20','10','10','0','0','0','0','0','18446744073709551615','63','2','16','0','0',NULL,'0','1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bAddEffWhenHit,Eff_Freeze,5000;','','');
REPLACE INTO `item_db` VALUES ('4325','Harpy_Card','Harpy Card','6','0','20','10','10','0','0','0','0','0','18446744073709551615','63','2','4','0','0',NULL,'0','1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bSubEle,Ele_Neutral,15; bonus2 bSkillAtk,MG_NAPALMBEAT,5;','','');
-REPLACE INTO `item_db` VALUES ('4326','See_Otter_Card','Sea-Otter Card','6','0','20','10','10','0','0','0','0','0','18446744073709551615','63','2','136','0','0',NULL,'0','1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bAddItemHealRate,Sushi,50; bonus2 bAddItemHealRate,Fish_Slice,50; bonus3 bAddMonsterDropItem,551,RC_Fish,300; bonus3 bAddMonsterDropItem,544,RC_Fish,300;','','');
+REPLACE INTO `item_db` VALUES ('4326','See_Otter_Card','Sea-Otter Card','6','0','20','10','10','0','0','0','0','0','18446744073709551615','63','2','136','0','0',NULL,'0','1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2(bAddItemHealRate, Shusi, 50); bonus2(bAddItemHealRate, Fish_Slice, 50); bonus3(bAddMonsterDropItem, Shusi, RC_Fish, 300); bonus3(bAddMonsterDropItem, Fish_Slice, RC_Fish, 300);','','');
REPLACE INTO `item_db` VALUES ('4327','Blood_Butterfly_Card','Bloody Butterfly Card','6','0','20','10','10','0','0','0','0','0','18446744073709551615','63','2','136','0','0',NULL,'0','1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bCastrate,30; bonus bNoCastCancel,0; bonus2 bSkillAtk,MG_FIREWALL,5;','','');
REPLACE INTO `item_db` VALUES ('4328','Hyegun_Card','Yao Jun Card','6','0','20','10','10','0','0','0','0','0','18446744073709551615','63','2','4','0','0',NULL,'0','1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bFlee,15; bonus bCritical,1;','','');
REPLACE INTO `item_db` VALUES ('4329','Phendark_Card','Phendark Card','6','0','20','10','10','0','0','0','0','0','18446744073709551615','63','2','2','0','0',NULL,'0','1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bSPGainRace,RC_DemiPlayer,5;','','heal 0,-5;');
diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql
index f08559f73..2d62a7a1e 100644
--- a/sql-files/item_db_re.sql
+++ b/sql-files/item_db_re.sql
@@ -2436,7 +2436,7 @@ REPLACE INTO `item_db` VALUES ('4322','High_Orc_Card','High Orc Card','6','0','2
REPLACE INTO `item_db` VALUES ('4323','Garm_Baby_Card','Hatii Bebe Card','6','0','20','10','10','0','0','0','0','0','18446744073709551615','63','2','2','0','0',NULL,'0','1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus3 bAutoSpell,MG_FROSTDIVER,3,50;','','');
REPLACE INTO `item_db` VALUES ('4324','Garm_Card','Hatii Card','6','0','20','10','10','0','0','0','0','0','18446744073709551615','63','2','16','0','0',NULL,'0','1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bAddEffWhenHit,Eff_Freeze,5000;','','');
REPLACE INTO `item_db` VALUES ('4325','Harpy_Card','Harpy Card','6','0','20','10','10','0','0','0','0','0','18446744073709551615','63','2','4','0','0',NULL,'0','1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bAddRaceTolerance,RC_Formless,15; bonus2 bSkillAtk,MG_NAPALMBEAT,5;','','');
-REPLACE INTO `item_db` VALUES ('4326','See_Otter_Card','Sea-Otter Card','6','0','20','10','10','0','0','0','0','0','18446744073709551615','63','2','136','0','0',NULL,'0','1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bAddItemHealRate,Sushi,50; bonus2 bAddItemHealRate,Fish_Slice,50; bonus3 bAddMonsterDropItem,551,RC_Fish,300; bonus3 bAddMonsterDropItem,544,RC_Fish,300;','','');
+REPLACE INTO `item_db` VALUES ('4326','See_Otter_Card','Sea-Otter Card','6','0','20','10','10','0','0','0','0','0','18446744073709551615','63','2','136','0','0',NULL,'0','1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2(bAddItemHealRate, Shusi, 50); bonus2(bAddItemHealRate, Fish_Slice, 50); bonus3(bAddMonsterDropItem, Shusi, RC_Fish, 300); bonus3(bAddMonsterDropItem, Fish_Slice, RC_Fish, 300);','','');
REPLACE INTO `item_db` VALUES ('4327','Blood_Butterfly_Card','Bloody Butterfly Card','6','0','20','10','10','0','0','0','0','0','18446744073709551615','63','2','136','0','0',NULL,'0','1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bVariableCastrate,30; bonus bNoCastCancel,0; bonus2 bSkillAtk,MG_FIREWALL,5;','','');
REPLACE INTO `item_db` VALUES ('4328','Hyegun_Card','Yao Jun Card','6','0','20','10','10','0','0','0','0','0','18446744073709551615','63','2','4','0','0',NULL,'0','1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bFlee,15; bonus bCritical,1;','','');
REPLACE INTO `item_db` VALUES ('4329','Phendark_Card','Phendark Card','6','0','20','10','10','0','0','0','0','0','18446744073709551615','63','2','2','0','0',NULL,'0','1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bSPGainRace,RC_DemiPlayer,5;','','heal 0,-5;');