diff options
| author | Haru <haru@dotalux.com> | 2020-05-10 21:11:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-10 21:11:40 +0200 |
| commit | 21a579718e5632acf591752ae38d4acf0ad88ed9 (patch) | |
| tree | fdc5eb80b3a8bb977cfc342b505c3544c6e2362e /db | |
| parent | 42daa6d6e700118d40c8df340c27a4b39dac4d7c (diff) | |
| parent | f165d0c080d25559e7fbc4439e52b376acf4c77f (diff) | |
| download | hercules-21a579718e5632acf591752ae38d4acf0ad88ed9.tar.gz hercules-21a579718e5632acf591752ae38d4acf0ad88ed9.tar.bz2 hercules-21a579718e5632acf591752ae38d4acf0ad88ed9.tar.xz hercules-21a579718e5632acf591752ae38d4acf0ad88ed9.zip | |
Merge pull request #2708 from Kenpachi2k13/sc_resist_property_
Implement SC_RESIST_PROPERTY_* and icon display for SC_ARMOR_RESIST
Diffstat (limited to 'db')
| -rw-r--r-- | db/pre-re/item_db.conf | 17 | ||||
| -rw-r--r-- | db/re/item_db.conf | 17 |
2 files changed, 10 insertions, 24 deletions
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index 74aeaa460..493a758cc 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-re/item_db.conf @@ -67262,8 +67262,7 @@ item_db: ( Weight: 10 BuyingStore: true Script: <" - sc_start(SC_RESIST_PROPERTY_FIRE, 1200000, 20); - sc_start(SC_RESIST_PROPERTY_WATER, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON); + sc_start2(SC_RESIST_PROPERTY_FIRE, 1200000, 20, -15); "> }, { @@ -67275,8 +67274,7 @@ item_db: ( Weight: 10 BuyingStore: true Script: <" - sc_start(SC_RESIST_PROPERTY_WATER, 1200000, 20); - sc_start(SC_RESIST_PROPERTY_WIND, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON); + sc_start2(SC_RESIST_PROPERTY_WATER, 1200000, 20, -15); "> }, { @@ -67288,8 +67286,7 @@ item_db: ( Weight: 10 BuyingStore: true Script: <" - sc_start(SC_RESIST_PROPERTY_GROUND, 1200000, 20); - sc_start(SC_RESIST_PROPERTY_FIRE, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON); + sc_start2(SC_RESIST_PROPERTY_GROUND, 1200000, 20, -15); "> }, { @@ -67301,8 +67298,7 @@ item_db: ( Weight: 10 BuyingStore: true Script: <" - sc_start(SC_RESIST_PROPERTY_WIND, 1200000, 20); - sc_start(SC_RESIST_PROPERTY_GROUND, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON); + sc_start2(SC_RESIST_PROPERTY_WIND, 1200000, 20, -15); "> }, { @@ -69503,10 +69499,7 @@ item_db: ( Type: "IT_USABLE" Weight: 10 Script: <" - sc_start(SC_RESIST_PROPERTY_FIRE, 300000, 20); - sc_start(SC_RESIST_PROPERTY_WATER, 300000, 20); - sc_start(SC_RESIST_PROPERTY_WIND, 300000, 20); - sc_start(SC_RESIST_PROPERTY_GROUND, 300000, 20); + sc_start4(SC_ARMOR_RESIST, 300000, 20, 20, 20, 20); "> }, { diff --git a/db/re/item_db.conf b/db/re/item_db.conf index eec334d18..408fb3ef8 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -87138,8 +87138,7 @@ item_db: ( Weight: 10 BuyingStore: true Script: <" - sc_start(SC_RESIST_PROPERTY_FIRE, 1200000, 20); - sc_start(SC_RESIST_PROPERTY_WATER, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON); + sc_start2(SC_RESIST_PROPERTY_FIRE, 1200000, 20, -15); "> }, { @@ -87151,8 +87150,7 @@ item_db: ( Weight: 10 BuyingStore: true Script: <" - sc_start(SC_RESIST_PROPERTY_WATER, 1200000, 20); - sc_start(SC_RESIST_PROPERTY_WIND, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON); + sc_start2(SC_RESIST_PROPERTY_WATER, 1200000, 20, -15); "> }, { @@ -87164,8 +87162,7 @@ item_db: ( Weight: 10 BuyingStore: true Script: <" - sc_start(SC_RESIST_PROPERTY_GROUND, 1200000, 20); - sc_start(SC_RESIST_PROPERTY_FIRE, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON); + sc_start2(SC_RESIST_PROPERTY_GROUND, 1200000, 20, -15); "> }, { @@ -87177,8 +87174,7 @@ item_db: ( Weight: 10 BuyingStore: true Script: <" - sc_start(SC_RESIST_PROPERTY_WIND, 1200000, 20); - sc_start(SC_RESIST_PROPERTY_GROUND, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON); + sc_start2(SC_RESIST_PROPERTY_WIND, 1200000, 20, -15); "> }, { @@ -89402,10 +89398,7 @@ item_db: ( Type: "IT_USABLE" Weight: 10 Script: <" - sc_start(SC_RESIST_PROPERTY_FIRE, 300000, 20); - sc_start(SC_RESIST_PROPERTY_WATER, 300000, 20); - sc_start(SC_RESIST_PROPERTY_WIND, 300000, 20); - sc_start(SC_RESIST_PROPERTY_GROUND, 300000, 20); + sc_start4(SC_ARMOR_RESIST, 300000, 20, 20, 20, 20); "> }, { |