diff options
| author | Dastgir <dastgirpojee@rocketmail.com> | 2015-10-26 21:38:41 +0530 |
|---|---|---|
| committer | Dastgir <dastgirpojee@rocketmail.com> | 2015-10-26 21:38:41 +0530 |
| commit | 0363a6a6ebe2178e9f7f4181b0d54c128467e713 (patch) | |
| tree | 0ed99a6e0f9558ef9f3a41089a3ca4d7fc8eb992 /db | |
| parent | 6420b06df1eff8b6408b327fc73e2c53b7b96780 (diff) | |
| parent | adf5e1462631f6e82cdf4c6b56313b19939a0d3a (diff) | |
| download | hercules-0363a6a6ebe2178e9f7f4181b0d54c128467e713.tar.gz hercules-0363a6a6ebe2178e9f7f4181b0d54c128467e713.tar.bz2 hercules-0363a6a6ebe2178e9f7f4181b0d54c128467e713.tar.xz hercules-0363a6a6ebe2178e9f7f4181b0d54c128467e713.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'db')
| -rw-r--r-- | db/const.txt | 3 | ||||
| -rw-r--r-- | db/re/item_db.conf | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/db/const.txt b/db/const.txt index 78d64345e..8ee4fd84b 100644 --- a/db/const.txt +++ b/db/const.txt @@ -1283,6 +1283,9 @@ SC_MTF_MSP 585 SC_MTF_PUMPKIN 586 SC_MTF_HITFLEE 587 +SC_LJOSALFAR 588 +SC_MERMAID_LONGING 589 + e_gasp 0 e_what 1 e_ho 2 diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 05edbd275..c6e8c9a08 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -129729,6 +129729,8 @@ item_db: ( Type: 5 Loc: 1024 View: 1239 + OnEquipScript: <" sc_start SC_LJOSALFAR,-1,0; "> + OnUnequipScript: <" sc_end SC_LJOSALFAR; "> }, { Id: 20100 @@ -130694,6 +130696,8 @@ item_db: ( Type: 5 Loc: 1024 View: 1299 + OnEquipScript: <" sc_start SC_MERMAID_LONGING,-1,0; "> + OnUnequipScript: <" sc_end SC_MERMAID_LONGING; "> }, { Id: 20210 |