From 9356134ecfc5bf2287473a8fcfd9fd0e20b3e473 Mon Sep 17 00:00:00 2001
From: Kenpachi Developer <Kenpachi.Developer@gmx.de>
Date: Sat, 2 May 2020 17:12:28 +0200
Subject: Update item scripts of Resist_* potions and Undead_Element_Scroll

---
 db/pre-re/item_db.conf | 17 +++++------------
 db/re/item_db.conf     | 17 +++++------------
 2 files changed, 10 insertions(+), 24 deletions(-)

(limited to 'db')

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 cf2bd7da2..ddc38dd15 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -86901,8 +86901,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);
 	">
 },
 {
@@ -86914,8 +86913,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);
 	">
 },
 {
@@ -86927,8 +86925,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);
 	">
 },
 {
@@ -86940,8 +86937,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);
 	">
 },
 {
@@ -89165,10 +89161,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);
 	">
 },
 {
-- 
cgit v1.2.3-70-g09d2