Merge branch 'Jedzkie-Pull_12' into hercules

Closes #958

4 files changed, 220 insertions, 81 deletions

diff --git a/db/const.txt b/db/const.txt
index e09200500..100ee1e7a 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -987,7 +987,6 @@ SC_MER_SP	282
 SC_MER_HIT	283
 SC_MER_QUICKEN	284
 SC_REBIRTH	285
-SC_ITEMSCRIPT	290
 SC_S_LIFEPOTION	291
 SC_L_LIFEPOTION	292
 SC_CASH_PLUSONLYJOBEXP	293
@@ -1319,6 +1318,12 @@ SC_CUP_OF_BOZA	611
 SC_OVERLAPEXPUP	612
 SC_MORA_BUFF	613
 
+// MVP Scrolls
+SC_MVPCARD_TAOGUNKA	614
+SC_MVPCARD_MISTRESS	615
+SC_MVPCARD_ORCHERO	616
+SC_MVPCARD_ORCLORD	617
+
 e_gasp	0
 e_what	1
 e_ho	2
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index a4f3a96da..e9d13f16b 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -67190,12 +67190,16 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
+	Script: <"
+		specialeffect2 EF_ENERGYCOAT;
+		sc_start4 SC_ARMOR_PROPERTY, 10000, 1, Ele_Neutral, 1, 0;
+	">
 },
 {
 	Id: 12407
@@ -77414,7 +77418,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 14539,5; ">
+	Script: <" getitem Shadow_Armor_S, 5; ">
 },
 {
 	Id: 13741
@@ -77428,7 +77432,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 14539,10; ">
+	Script: <" getitem Shadow_Armor_S, 10; ">
 },
 {
 	Id: 13742
@@ -77442,7 +77446,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 14539,30; ">
+	Script: <" getitem Shadow_Armor_S, 30; ">
 },
 {
 	Id: 13743
@@ -77456,7 +77460,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 14540,5; ">
+	Script: <" getitem Holy_Armor_S, 5; ">
 },
 {
 	Id: 13744
@@ -77470,7 +77474,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 14540,10; ">
+	Script: <" getitem Holy_Armor_S, 10; ">
 },
 {
 	Id: 13745
@@ -77484,7 +77488,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 14540,30; ">
+	Script: <" getitem Holy_Armor_S, 30; ">
 },
 {
 	Id: 13746
@@ -86294,13 +86298,13 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" getitem 14597,10; ">
+	Script: <" getitem PhreeoniS, 10; ">
 },
 {
 	Id: 14315
@@ -86311,13 +86315,13 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" getitem 14598,10; ">
+	Script: <" getitem GhostringS, 10; ">
 },
 {
 	Id: 14316
@@ -86458,6 +86462,74 @@ item_db: (
 	Script: <" getitem Tyr's_Blessing,50; ">
 },
 {
+	Id: 14359
+	AegisName: "TaogunkaS_Box"
+	Name: "Tao Gunka Scroll Box"
+	Type: 18
+	Buy: 20
+	Trade: {
+		nodrop: true
+		notrade: true
+		nocart: true
+		noselltonpc: true
+		nomail: true
+		noauction: true
+		nogstorage: true
+	}
+	Script: <" getitem TaogunkaS, 10; ">
+},
+{
+	Id: 14360
+	AegisName: "MistressS_Box"
+	Name: "Mistress Scroll Box"
+	Type: 18
+	Buy: 20
+	Trade: {
+		nodrop: true
+		notrade: true
+		nocart: true
+		noselltonpc: true
+		nomail: true
+		noauction: true
+		nogstorage: true
+	}
+	Script: <" getitem MistressS, 10; ">
+},
+{
+	Id: 14361
+	AegisName: "Orc_HeroS_Box"
+	Name: "Orc Hero Scroll Box"
+	Type: 18
+	Buy: 20
+	Trade: {
+		nodrop: true
+		notrade: true
+		nocart: true
+		noselltonpc: true
+		nomail: true
+		noauction: true
+		nogstorage: true
+	}
+	Script: <" getitem Orc_HeroS, 10; ">
+},
+{
+	Id: 14362
+	AegisName: "Orc_LoadS_Box"
+	Name: "Orc Lord Scroll Box"
+	Type: 18
+	Buy: 20
+	Trade: {
+		nodrop: true
+		notrade: true
+		nocart: true
+		noselltonpc: true
+		nomail: true
+		noauction: true
+		nogstorage: true
+	}
+	Script: <" getitem Ord_LoadS, 10; ">
+},
+{
 	Id: 14363
 	AegisName: "Heart_Scroll"
 	Name: "Heart Scroll"
@@ -87934,7 +88006,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" sc_start SC_ITEMSCRIPT,180000,4121; ">
+	Script: <" sc_start SC_FOOD_BASICHIT, 180000, 100; ">
 },
 {
 	Id: 14598
@@ -87952,7 +88024,10 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" sc_start SC_ITEMSCRIPT,60000,4047; ">
+	Script: <"
+		specialeffect2 EF_LIGHTSPHERE;
+		sc_start4 SC_ARMOR_PROPERTY, 60000, 1, Ele_Neutral, 1, 0;
+	">
 },
 {
 	Id: 14599
@@ -88020,13 +88095,16 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" sc_start SC_ITEMSCRIPT,180000,4302; ">
+	Script: <"
+		specialeffect2 EF_LIGHTSPHERE;
+		sc_start4 SC_MVPCARD_TAOGUNKA, 180000, 100, 50, 50, 0;
+	">
 },
 {
 	Id: 14603
@@ -88038,13 +88116,16 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" sc_start SC_ITEMSCRIPT,180000,4132; ">
+	Script: <"
+		specialeffect2 EF_SPELLBREAKER;
+		sc_start SC_MVPCARD_MISTRESS, 180000, 25;
+	">
 },
 {
 	Id: 14604
@@ -88056,13 +88137,13 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" sc_start SC_ITEMSCRIPT,60000,4143; ">
+	Script: <" sc_start SC_MVPCARD_ORCHERO, 180000, 100; ">
 },
 {
 	Id: 14605
@@ -88074,13 +88155,16 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" sc_start SC_ITEMSCRIPT,180000,4135; ">
+	Script: <"
+		specialeffect2 EF_LIGHTSPHERE;
+		sc_start SC_MVPCARD_ORCLORD, 180000, 30;
+	">
 },
 {
 	Id: 14606
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 30f235c90..b6eeba2cf 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -82079,12 +82079,16 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
+	Script: <"
+		specialeffect2 EF_ENERGYCOAT;
+		sc_start4 SC_ARMOR_PROPERTY, 10000, 1, Ele_Neutral, 1, 0;
+	">
 },
 {
 	Id: 12407
@@ -98706,13 +98710,13 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" getitem 14539,5; ">
+	Script: <" getitem Shadow_Armor_S, 5; ">
 },
 {
 	Id: 13741
@@ -98724,13 +98728,13 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" getitem 14539,10; ">
+	Script: <" getitem Shadow_Armor_S, 10; ">
 },
 {
 	Id: 13742
@@ -98742,13 +98746,13 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" getitem 14539,30; ">
+	Script: <" getitem Shadow_Armor_S, 30; ">
 },
 {
 	Id: 13743
@@ -98760,13 +98764,13 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" getitem 14540,5; ">
+	Script: <" getitem Holy_Armor_S, 5; ">
 },
 {
 	Id: 13744
@@ -98778,13 +98782,13 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" getitem 14540,10; ">
+	Script: <" getitem Holy_Armor_S, 10; ">
 },
 {
 	Id: 13745
@@ -98796,13 +98800,13 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" getitem 14540,30; ">
+	Script: <" getitem Holy_Armor_S, 30; ">
 },
 {
 	Id: 13746
@@ -109179,7 +109183,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 14597,10; ">
+	Script: <" getitem PhreeoniS, 10; ">
 },
 {
 	Id: 14315
@@ -109196,7 +109200,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 14598,10; ">
+	Script: <" getitem GhostringS, 10; ">
 },
 {
 	Id: 14316
@@ -109361,6 +109365,40 @@ item_db: (
 	Script: <" getitem Tyr's_Blessing,50; ">
 },
 {
+	Id: 14359
+	AegisName: "TaogunkaS_Box"
+	Name: "Tao Gunka Scroll Box"
+	Type: 18
+	Buy: 20
+	Trade: {
+		nodrop: true
+		notrade: true
+		nocart: true
+		noselltonpc: true
+		nomail: true
+		noauction: true
+		nogstorage: true
+	}
+	Script: <" getitem TaogunkaS, 10; ">
+},
+{
+	Id: 14360
+	AegisName: "MistressS_Box"
+	Name: "Mistress Scroll Box"
+	Type: 18
+	Buy: 20
+	Trade: {
+		nodrop: true
+		notrade: true
+		nocart: true
+		noselltonpc: true
+		nomail: true
+		noauction: true
+		nogstorage: true
+	}
+	Script: <" getitem MistressS, 10; ">
+},
+{
 	Id: 14361
 	AegisName: "Orc_HeroS_Box"
 	Name: "Orc Hero Scroll Box"
@@ -109369,13 +109407,13 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" getitem 14604,10; ">
+	Script: <" getitem Orc_HeroS, 10; ">
 },
 {
 	Id: 14362
@@ -109386,13 +109424,13 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" getitem 14605,10; ">
+	Script: <" getitem Ord_LoadS, 10; ">
 },
 {
 	Id: 14363
@@ -110499,15 +110537,15 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
 	Script: <"
 		specialeffect2 EF_CLOAKING;
-		sc_start4 SC_ARMOR_PROPERTY,1800000,1,Ele_Dark,1,0;
+		sc_start4 SC_ARMOR_PROPERTY, 1800000, 1, Ele_Dark, 1, 0;
 	">
 },
 {
@@ -110520,15 +110558,15 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
 	Script: <"
 		specialeffect2 EF_BENEDICTIO;
-		sc_start4 SC_ARMOR_PROPERTY,1800000,1,Ele_Holy,1,0;
+		sc_start4 SC_ARMOR_PROPERTY, 1800000, 1, Ele_Holy, 1, 0;
 	">
 },
 {
@@ -111638,13 +111676,13 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" sc_start SC_ITEMSCRIPT,180000,4121; ">
+	Script: <" sc_start SC_FOOD_BASICHIT, 180000, 100; ">
 },
 {
 	Id: 14598
@@ -111656,13 +111694,16 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" sc_start SC_ITEMSCRIPT,60000,4047; ">
+	Script: <"
+		specialeffect2 EF_LIGHTSPHERE;
+		sc_start4 SC_ARMOR_PROPERTY, 60000, 1, Ele_Neutral, 1, 0;
+	">
 },
 {
 	Id: 14599
@@ -111738,15 +111779,15 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
 	Script: <"
 		specialeffect2 EF_LIGHTSPHERE;
-		sc_start SC_ITEMSCRIPT,180000,4302;
+		sc_start4 SC_MVPCARD_TAOGUNKA, 1800000, 100, 50, 50, 0;
 	">
 },
 {
@@ -111759,15 +111800,15 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
 	Script: <"
 		specialeffect2 EF_SPELLBREAKER;
-		sc_start SC_ITEMSCRIPT,180000,4132;
+		sc_start SC_MVPCARD_MISTRESS, 180000, 25;
 	">
 },
 {
@@ -111780,13 +111821,13 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" sc_start SC_ITEMSCRIPT,60000,4143; ">
+	Script: <" sc_start SC_MVPCARD_ORCHERO, 180000, 100; ">
 },
 {
 	Id: 14605
@@ -111798,13 +111839,16 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		noselltonpc: true
 		nocart: true
-		nogstorage: true
+		noselltonpc: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" sc_start SC_ITEMSCRIPT,180000,4135; ">
+	Script: <"
+		specialeffect2 EF_LIGHTSPHERE;
+		sc_start SC_MVPCARD_ORCLORD, 180000, 30;
+	">
 },
 {
 	Id: 14606
diff --git a/db/sc_config.txt b/db/sc_config.txt
index 06b2bc617..b37afa877 100644
--- a/db/sc_config.txt
+++ b/db/sc_config.txt
@@ -424,6 +424,12 @@ SC_GEFFEN_MAGIC3, 2
 SC_OVERLAPEXPUP, 12
 SC_MORA_BUFF, 2
 
+// MVP Scrolls
+SC_MVPCARD_TAOGUNKA, 60
+SC_MVPCARD_MISTRESS, 60
+SC_MVPCARD_ORCHERO, 60
+SC_MVPCARD_ORCLORD, 60
+
 // Guild Auras should not be saved
 SC_LEADERSHIP,78
 SC_GLORYWOUNDS,78