summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2020-02-09 20:24:24 +0100
committerGitHub <noreply@github.com>2020-02-09 20:24:24 +0100
commitfc29c0ce0b460eb81da59e29c610ef504c4146fb (patch)
tree799241e426c617026420216fb85f2d3f29c279a8
parentc76c63d2dddb8c7ec4461dd660b7bb0210f4db96 (diff)
parentca687421289f7d89ae3bdb10c42c0315b95a10fe (diff)
downloadhercules-fc29c0ce0b460eb81da59e29c610ef504c4146fb.tar.gz
hercules-fc29c0ce0b460eb81da59e29c610ef504c4146fb.tar.bz2
hercules-fc29c0ce0b460eb81da59e29c610ef504c4146fb.tar.xz
hercules-fc29c0ce0b460eb81da59e29c610ef504c4146fb.zip
Merge pull request #2614 from Kenpachi2k13/issue#2593
Updated items which used SC_ARMORPROPERTY or SC_ARMOR_RESIST.
-rw-r--r--db/pre-re/item_db.conf27
-rw-r--r--db/re/item_db.conf27
2 files changed, 44 insertions, 10 deletions
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 7d9708f81..38833636d 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -67261,7 +67261,10 @@ item_db: (
Buy: 2
Weight: 10
BuyingStore: true
- Script: <" sc_start4 SC_ARMORPROPERTY,1200000,-15,0,20,0; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_FIRE, 1200000, 20);
+ sc_start(SC_RESIST_PROPERTY_WATER, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON);
+ ">
},
{
Id: 12119
@@ -67271,7 +67274,10 @@ item_db: (
Buy: 2
Weight: 10
BuyingStore: true
- Script: <" sc_start4 SC_ARMORPROPERTY,1200000,20,0,0,-15; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_WATER, 1200000, 20);
+ sc_start(SC_RESIST_PROPERTY_WIND, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON);
+ ">
},
{
Id: 12120
@@ -67281,7 +67287,10 @@ item_db: (
Buy: 2
Weight: 10
BuyingStore: true
- Script: <" sc_start4 SC_ARMORPROPERTY,1200000,0,20,-15,0; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_GROUND, 1200000, 20);
+ sc_start(SC_RESIST_PROPERTY_FIRE, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON);
+ ">
},
{
Id: 12121
@@ -67291,7 +67300,10 @@ item_db: (
Buy: 2
Weight: 10
BuyingStore: true
- Script: <" sc_start4 SC_ARMORPROPERTY,1200000,0,-15,0,20; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_WIND, 1200000, 20);
+ sc_start(SC_RESIST_PROPERTY_GROUND, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON);
+ ">
},
{
Id: 12122
@@ -69521,7 +69533,12 @@ item_db: (
Name: "Undead Elemental Scroll"
Type: "IT_USABLE"
Weight: 10
- Script: <" sc_start4 SC_ARMOR_RESIST,300000,20,20,20,20; ">
+ 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);
+ ">
},
{
Id: 12280
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index d06c02279..fb0df3d2d 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -86890,7 +86890,10 @@ item_db: (
Buy: 2
Weight: 10
BuyingStore: true
- Script: <" sc_start4 SC_ARMORPROPERTY,1200000,-15,0,20,0; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_FIRE, 1200000, 20);
+ sc_start(SC_RESIST_PROPERTY_WATER, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON);
+ ">
},
{
Id: 12119
@@ -86900,7 +86903,10 @@ item_db: (
Buy: 2
Weight: 10
BuyingStore: true
- Script: <" sc_start4 SC_ARMORPROPERTY,1200000,20,0,0,-15; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_WATER, 1200000, 20);
+ sc_start(SC_RESIST_PROPERTY_WIND, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON);
+ ">
},
{
Id: 12120
@@ -86910,7 +86916,10 @@ item_db: (
Buy: 2
Weight: 10
BuyingStore: true
- Script: <" sc_start4 SC_ARMORPROPERTY,1200000,0,20,-15,0; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_GROUND, 1200000, 20);
+ sc_start(SC_RESIST_PROPERTY_FIRE, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON);
+ ">
},
{
Id: 12121
@@ -86920,7 +86929,10 @@ item_db: (
Buy: 2
Weight: 10
BuyingStore: true
- Script: <" sc_start4 SC_ARMORPROPERTY,1200000,0,-15,0,20; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_WIND, 1200000, 20);
+ sc_start(SC_RESIST_PROPERTY_GROUND, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON);
+ ">
},
{
Id: 12122
@@ -89170,7 +89182,12 @@ item_db: (
Name: "Undead Elemental Scroll"
Type: "IT_USABLE"
Weight: 10
- Script: <" sc_start4 SC_ARMOR_RESIST,300000,20,20,20,20; ">
+ 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);
+ ">
},
{
Id: 12280