From c0afd048169aa9d66c739ac548df05ed498a0a34 Mon Sep 17 00:00:00 2001
From: Jedzkie <jedzkie13@rocketmail.com>
Date: Wed, 23 Dec 2015 14:41:23 +0800
Subject: Item Update: - Fix typo MOBID_GUARIDAN to MOBID_GUARDIAN - Added
 official item effect for Magic Candy.

---
 db/const.txt       |  1 +
 db/re/item_db.conf | 15 +++++++++++----
 db/sc_config.txt   |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'db')

diff --git a/db/const.txt b/db/const.txt
index 4837b3898..a77a612bf 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1345,6 +1345,7 @@ SC_BUCHEDENOEL	634
 SC_PHI_DEMON	635
 SC_PROMOTE_HEALTH_RESERCH	636
 SC_ENERGY_DRINK_RESERCH	637
+SC_MAGIC_CANDY	638
 
 e_gasp	0
 e_what	1
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index c63e71bc5..b85203710 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -84462,18 +84462,23 @@ item_db: (
 	Id: 12596
 	AegisName: "Magic_Candy"
 	Name: "Magic Candy"
-	Type: 11
+	Type: 2
 	Buy: 0
 	Weight: 10
+	Delay: 180000
 	Trade: {
 		nodrop: true
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
+	Script: <"
+		specialeffect2 EF_HASTEUP;
+		sc_start2 SC_MAGIC_CANDY, 60000, 30, 70;
+	">
 },
 {
 	Id: 12597
@@ -116556,17 +116561,19 @@ item_db: (
 	Id: 16666
 	AegisName: "Magic_Candy_Box10"
 	Name: "Magic Candy Box(10)"
-	Type: 2
+	Type: 18
 	Buy: 20
+	Weight: 10
 	Trade: {
 		nodrop: true
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
+	Script: <" getitem Magic_Candy, 10; ">
 },
 {
 	Id: 16673
diff --git a/db/sc_config.txt b/db/sc_config.txt
index a521dd8ed..afc75b8e5 100644
--- a/db/sc_config.txt
+++ b/db/sc_config.txt
@@ -399,7 +399,7 @@ SC_LIGHT_OF_REGENE, 1
 //SC_CBC, 2
 //SC_CBC_POSTDELAY, 2
 //SC_EQC, 2
-//SC_MAGIC_CANDY, 92
+SC_MAGIC_CANDY, 92
 //SC_ALL_RIDING_REUSE_LIMIT, 1
 //SC_HANDICAPSTATE_DEEP_SLEEP, 80
 SC_MONSTER_TRANSFORM, 12
-- 
cgit v1.2.3-70-g09d2