From d9ad1cc97be0a90b3ef2f653ae2d2cdd77dddd83 Mon Sep 17 00:00:00 2001
From: Jedzkie <jedzkie13@rocketmail.com>
Date: Thu, 19 Nov 2015 20:44:18 +0800
Subject: ItemDB Updates:  - Fix 'Light Concentration Potion', 'Light Awakening
 Potion' and 'Light Berserk Potion' not giving additional ASPD when used.
 Thanks to Emistry. (Ref:
 http://herc.ws/board/tracker/issue-8482-light-centerawakeningbersek-potion/) 
 - Change the 'Fools Day Box' and 'Fools Day Box2' variable from .@i to
 .@temp.  - Added 9 New Items and its trade restriction based on
 itemmoveinfov5.txt of kRO.    • Infinite Concentration Potion (ID#12884)
 (Ref: http://www.divine-pride.net/database/item/12884)    • Infinite
 Awakening Potion (ID#12885) (Ref:
 http://www.divine-pride.net/database/item/12885)    • Infinite Berserk Potion
 (ID#12886) (Ref: http://www.divine-pride.net/database/item/12886)    •
 Infinite Fly Wing (ID:12887) (Ref:
 http://www.divine-pride.net/database/item/12887)    • Infinite Concentration
 Potion Box (ID#17226) (Ref: http://www.divine-pride.net/database/item/17226) 
   • Infinite Awakening Potion Box (ID#17227) (Ref:
 http://www.divine-pride.net/database/item/17227)    • Infinite Berserk Potion
 Box (ID#17228) (Ref: http://www.divine-pride.net/database/item/17228)    •
 Infinite Fly Wing Box (ID:17229) (Ref:
 http://www.divine-pride.net/database/item/17229)    • Infinite Fly Wing Box
 3Days (ID:17251) (Ref: http://www.divine-pride.net/database/item/17251)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/pre-re/item_db.conf |  46 +++++------
 db/re/item_db.conf     | 206 +++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 204 insertions(+), 48 deletions(-)

(limited to 'db')

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index cbd28b8b6..6bca307e7 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -67027,16 +67027,16 @@ item_db: (
 		sitting: true
 	}
 	Script: <"
-		.@i = rand(1,10);
-		if (.@i == 1) itemskill AL_TELEPORT,1;
-		else if (.@i == 2) itemskill AL_TELEPORT,3;
-		else if (.@i == 3) percentheal 50,0;
-		else if (.@i == 4) percentheal 0,50;
-		else if (.@i == 5) percentheal 50,50;
-		else if (.@i == 6) getitem Apple,1;
-		else if (.@i == 7) itemskill ALL_REVERSEORCISH,1;
-		else if (.@i == 8) specialeffect2 EF_MAPPILLAR2;
-		else if (.@i == 9) specialeffect2 EF_ANGEL2;
+		.@temp = rand(1,10);
+		if (.@temp == 1) itemskill AL_TELEPORT,1;
+		else if (.@temp == 2) itemskill AL_TELEPORT,3;
+		else if (.@temp == 3) percentheal 50,0;
+		else if (.@temp == 4) percentheal 0,50;
+		else if (.@temp == 5) percentheal 50,50;
+		else if (.@temp == 6) getitem Apple,1;
+		else if (.@temp == 7) itemskill ALL_REVERSEORCISH,1;
+		else if (.@temp == 8) specialeffect2 EF_MAPPILLAR2;
+		else if (.@temp == 9) specialeffect2 EF_ANGEL2;
 		else specialeffect2 EF_COIN;
 	">
 },
@@ -67056,16 +67056,16 @@ item_db: (
 		sitting: true
 	}
 	Script: <"
-		.@i = rand(1,10);
-		if (.@i == 1) itemskill TF_DETOXIFY,1;
-		else if (.@i == 2) itemskill TF_PICKSTONE,1;
-		else if (.@i == 3) itemskill BA_FROSTJOKER,1;
-		else if (.@i == 4) itemskill DC_SCREAM,1;
-		else if (.@i == 5) percentheal 50,50;
-		else if (.@i == 6) getitem Jellopy,1;
-		else if (.@i == 7) itemskill AL_RUWACH,1;
-		else if (.@i == 8) specialeffect2 EF_BEGINASURA;
-		else if (.@i == 9) specialeffect2 EF_MVP;
+		.@temp = rand(1,10);
+		if (.@temp == 1) itemskill TF_DETOXIFY,1;
+		else if (.@temp == 2) itemskill TF_PICKSTONE,1;
+		else if (.@temp == 3) itemskill BA_FROSTJOKER,1;
+		else if (.@temp == 4) itemskill DC_SCREAM,1;
+		else if (.@temp == 5) percentheal 50,50;
+		else if (.@temp == 6) getitem Jellopy,1;
+		else if (.@temp == 7) itemskill AL_RUWACH,1;
+		else if (.@temp == 8) specialeffect2 EF_BEGINASURA;
+		else if (.@temp == 9) specialeffect2 EF_MVP;
 		else specialeffect2 EF_CURSEATTACK;
 	">
 },
@@ -86717,7 +86717,7 @@ item_db: (
 	Type: 2
 	Buy: 800
 	Weight: 20
-	Script: <" sc_start SC_ATTHASTE_POTION1,1800000,0; ">
+	Script: <" sc_start SC_ATTHASTE_POTION1,1800000,4; ">
 },
 {
 	Id: 14510
@@ -86728,7 +86728,7 @@ item_db: (
 	Weight: 20
 	Job: 0xFFF7FEEF
 	EquipLv: 40
-	Script: <" sc_start SC_ATTHASTE_POTION2,1800000,0; ">
+	Script: <" sc_start SC_ATTHASTE_POTION2,1800000,6; ">
 },
 {
 	Id: 14511
@@ -86739,7 +86739,7 @@ item_db: (
 	Weight: 20
 	Job: 0x01E646A6
 	EquipLv: 85
-	Script: <" sc_start SC_ATTHASTE_POTION3,1800000,0; ">
+	Script: <" sc_start SC_ATTHASTE_POTION3,1800000,9; ">
 },
 {
 	Id: 14512
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 13c31302f..b7fefa9bd 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -81882,16 +81882,16 @@ item_db: (
 		sitting: true
 	}
 	Script: <"
-		.@i = rand(1,10);
-		if (.@i == 1) itemskill AL_TELEPORT,1;
-		else if (.@i == 2) itemskill AL_TELEPORT,3;
-		else if (.@i == 3) percentheal 50,0;
-		else if (.@i == 4) percentheal 0,50;
-		else if (.@i == 5) percentheal 50,50;
-		else if (.@i == 6) getitem Apple,1;
-		else if (.@i == 7) itemskill ALL_REVERSEORCISH,1;
-		else if (.@i == 8) specialeffect2 EF_MAPPILLAR2;
-		else if (.@i == 9) specialeffect2 EF_ANGEL2;
+		.@temp = rand(1,10);
+		if (.@temp == 1) itemskill AL_TELEPORT,1;
+		else if (.@temp == 2) itemskill AL_TELEPORT,3;
+		else if (.@temp == 3) percentheal 50,0;
+		else if (.@temp == 4) percentheal 0,50;
+		else if (.@temp == 5) percentheal 50,50;
+		else if (.@temp == 6) getitem Apple,1;
+		else if (.@temp == 7) itemskill ALL_REVERSEORCISH,1;
+		else if (.@temp == 8) specialeffect2 EF_MAPPILLAR2;
+		else if (.@temp == 9) specialeffect2 EF_ANGEL2;
 		else specialeffect2 EF_COIN;
 	">
 },
@@ -81906,16 +81906,16 @@ item_db: (
 		sitting: true
 	}
 	Script: <"
-		.@i = rand(1,10);
-		if (.@i == 1) itemskill TF_DETOXIFY,1;
-		else if (.@i == 2) itemskill TF_PICKSTONE,1;
-		else if (.@i == 3) itemskill BA_FROSTJOKER,1;
-		else if (.@i == 4) itemskill DC_SCREAM,1;
-		else if (.@i == 5) percentheal 50,50;
-		else if (.@i == 6) getitem Jellopy,1;
-		else if (.@i == 7) itemskill AL_RUWACH,1;
-		else if (.@i == 8) specialeffect2 EF_BEGINASURA;
-		else if (.@i == 9) specialeffect2 EF_MVP;
+		.@temp = rand(1,10);
+		if (.@temp == 1) itemskill TF_DETOXIFY,1;
+		else if (.@temp == 2) itemskill TF_PICKSTONE,1;
+		else if (.@temp == 3) itemskill BA_FROSTJOKER,1;
+		else if (.@temp == 4) itemskill DC_SCREAM,1;
+		else if (.@temp == 5) percentheal 50,50;
+		else if (.@temp == 6) getitem Jellopy,1;
+		else if (.@temp == 7) itemskill AL_RUWACH,1;
+		else if (.@temp == 8) specialeffect2 EF_BEGINASURA;
+		else if (.@temp == 9) specialeffect2 EF_MVP;
 		else specialeffect2 EF_CURSEATTACK;
 	">
 },
@@ -86776,6 +86776,89 @@ item_db: (
 	Buy: 20
 	Weight: 10
 },
+{
+	Id: 12884
+	AegisName: "C_Center_Potion"
+	Name: "Infinite Concentration Potion"
+	Type: 11
+	Trade: {
+		nodrop: true
+		notrade: true
+		nostorage: true
+		nocart: true
+		noselltonpc: true
+		nomail: true
+		noauction: true
+		nogstorage: true
+	}
+	Script: <"
+		sc_start SC_ATTHASTE_POTION1,1800000,4;
+		specialeffect EF_POTION_CON;  /* NOTE: No special effect when used. */
+	">
+},
+{
+	Id: 12885
+	AegisName: "C_Awakening_Potion"
+	Name: "Infinite Awakening Potion"
+	Type: 11
+	Job: 0xFFF7FEEF
+	EquipLv: 40
+	Trade: {
+		nodrop: true
+		notrade: true
+		nostorage: true
+		nocart: true
+		noselltonpc: true
+		nomail: true
+		noauction: true
+		nogstorage: true
+	}
+	Script: <"
+		sc_start SC_ATTHASTE_POTION2,1800000,6;
+		specialeffect EF_POTION_;  /* NOTE: No special effect when used. */
+	">
+},
+{
+	Id: 12886
+	AegisName: "C_Berserk_Potion"
+	Name: "Infinite Berserk Potion"
+	Type: 11
+	Job: 0x01E646A6
+	EquipLv: 85
+	Trade: {
+		nodrop: true
+		notrade: true
+		nostorage: true
+		nocart: true
+		noselltonpc: true
+		nomail: true
+		noauction: true
+		nogstorage: true
+	}
+	Script: <"
+		sc_start SC_ATTHASTE_POTION3,1800000,9;
+		specialeffect EF_POTION_BERSERK; /* NOTE: No special effect when used. */
+	">
+},
+{
+	Id: 12887
+	AegisName: "C_Wing_Of_Fly"
+	Name: "Infinite Fly Wing"
+	Type: 11
+	Trade: {
+		nodrop: true
+		notrade: true
+		nostorage: true
+		nocart: true
+		noselltonpc: true
+		nomail: true
+		noauction: true
+		nogstorage: true
+	}
+	Script: <"
+		//itemskill AL_TELEPORT,1; /* NOTE: Temporary disabled, this item must not be removed from inventory when used. */
+	">
+},
 {
 	Id: 12900
 	AegisName: "Battle_Manual_Box"
@@ -109690,7 +109773,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" sc_start SC_ATTHASTE_POTION1,1800000,0; ">
+	Script: <" sc_start SC_ATTHASTE_POTION1,1800000,4; ">
 },
 {
 	Id: 14510
@@ -109709,7 +109792,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" sc_start SC_ATTHASTE_POTION2,1800000,0; ">
+	Script: <" sc_start SC_ATTHASTE_POTION2,1800000,6; ">
 },
 {
 	Id: 14511
@@ -109728,7 +109811,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" sc_start SC_ATTHASTE_POTION3,1800000,0; ">
+	Script: <" sc_start SC_ATTHASTE_POTION3,1800000,9; ">
 },
 {
 	Id: 14512
@@ -117666,6 +117749,78 @@ item_db: (
 	Buy: 20
 	Script: <" packageitem(); ">
 },
+{
+	Id: 17226
+	AegisName: "C_Center_Potion_Box"
+	Name: "Infinite Concentration Potion Box"
+	Type: 18
+	Buy: 10
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" rentitem C_Center_Potion,604800; ">
+},
+{
+	Id: 17227
+	AegisName: "C_Awakening_Potion_Box"
+	Name: "Infinite Awakening Potion Box"
+	Type: 18
+	Buy: 10
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" rentitem C_Awakening_Potion,604800; ">
+},
+{
+	Id: 17228
+	AegisName: "C_Berserk_Potion_Box"
+	Name: "Infinite Berserk Potion Box"
+	Type: 18
+	Buy: 10
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" rentitem Infinite_Berserk_Potion,604800; ">
+},
+{
+	Id: 17229
+	AegisName: "C_Wing_Of_Fly_Box"
+	Name: "Infinite Fly Wing Box"
+	Type: 18
+	Buy: 10
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" rentitem C_Wing_Of_Fly,604800; ">
+},
 {
 	Id: 17233
 	AegisName: "Scroll_Of_Death"
@@ -117775,12 +117930,13 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
+	Script: <" rentitem C_Wing_Of_Fly,259200; ">
 },
 {
 	Id: 17252
-- 
cgit v1.2.3-70-g09d2