Merge pull request #2658 from Kenpachi2k13/new_status_changes

Add new status changes and update related items

4 files changed, 342 insertions, 5 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 6f87b2d51..9b11a43e9 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -1417,6 +1417,13 @@ constants_db: {
 	SC_RESIST_PROPERTY_WIND:          667
 	SC_CLIENT_ONLY_EQUIP_ARROW:       668
 	SC_MADOGEAR:                      669
+	SC_POPECOOKIE:                    670
+	SC_VITALIZE_POTION:               671
+	SC_SKF_MATK:                      672
+	SC_SKF_ATK:                       673
+	SC_SKF_ASPD:                      674
+	SC_SKF_CAST:                      675
+	SC_ALMIGHTY:                      676
 
 	comment__: "Emotes"
 	e_gasp:         0
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index fa204f04b..74aeaa460 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -70971,6 +70971,18 @@ item_db: (
 	Buy: 10
 	Weight: 10
 	BuyingStore: true
+	Trade: {
+		nodrop: true
+		notrade: true
+		nocart: true
+		nomail: true
+		noauction: true
+		nogstorage: true
+	}
+	Script: <"
+		specialeffect(EF_STEAL, AREA, playerattached());
+		sc_start4(SC_POPECOOKIE, 1200000, 3, 3, 3, 0);
+	">
 },
 {
 	Id: 12380
@@ -71380,7 +71392,7 @@ item_db: (
 {
 	Id: 12404
 	AegisName: "Acti_Potion"
-	Name: "Acti Potion"
+	Name: "Activation Potion"
 	Type: "IT_USABLE"
 	Buy: 20
 	Weight: 10
@@ -71393,6 +71405,10 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
+	Script: <"
+		specialeffect(EF_STEAL, AREA, playerattached());
+		sc_start4(SC_VITALIZE_POTION, 120000, 2, 2, 10, 0);
+	">
 },
 {
 	Id: 12405
@@ -73162,6 +73178,90 @@ item_db: (
 	OnRentalEndScript: <" sc_end(SC_ALL_RIDING); ">
 },
 {
+	Id: 12666
+	AegisName: "Thai_Perfume_MATK"
+	Name: "Thai Perfume(MATK)"
+	Type: "IT_USABLE"
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		specialeffect(EF_MAGICALATTHIT, AREA, playerattached());
+		sc_start(SC_SKF_MATK, 600000, 24);
+	">
+},
+{
+	Id: 12667
+	AegisName: "Thai_Perfume_ATK"
+	Name: "Thai Perfume(ATK)"
+	Type: "IT_USABLE"
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		specialeffect(EF_MAGICALATTHIT, AREA, playerattached());
+		sc_start(SC_SKF_ATK, 600000, 24);
+	">
+},
+{
+	Id: 12668
+	AegisName: "Thai_Perfume_ASPD"
+	Name: "Thai Perfume(ASPD)"
+	Type: "IT_USABLE"
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		specialeffect(EF_MAGICALATTHIT, AREA, playerattached());
+		sc_start(SC_SKF_ASPD, 600000, 3);
+	">
+},
+{
+	Id: 12669
+	AegisName: "Thai_Perfume_CAST"
+	Name: "Thai Perfume(CAST)"
+	Type: "IT_USABLE"
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		specialeffect(EF_MAGICALATTHIT, AREA, playerattached());
+		sc_start(SC_SKF_CAST, 600000, 5);
+	">
+},
+{
 	Id: 12701
 	AegisName: "Old_Blue_Box_F"
 	Name: "Old Blue Box"
@@ -74233,6 +74333,33 @@ item_db: (
 	">
 },
 {
+	Id: 12883
+	AegisName: "Almighty"
+	Name: "Almighty"
+	Type: "IT_USABLE"
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		specialeffect(EF_BASH3D, AREA, playerattached());
+		sc_start(SC_FOOD_STR_CASH, 1800000, 10);
+		sc_start(SC_FOOD_VIT_CASH, 1800000, 10);
+		sc_start(SC_FOOD_AGI_CASH, 1800000, 10);
+		sc_start(SC_FOOD_INT_CASH, 1800000, 10);
+		sc_start(SC_FOOD_DEX_CASH, 1800000, 10);
+		sc_start(SC_FOOD_LUK_CASH, 1800000, 10);
+		sc_start2(SC_ALMIGHTY, 1800000, 30, 30);
+	">
+},
+{
 	Id: 12900
 	AegisName: "Battle_Manual_Box"
 	Name: "Battle Manual Box"
@@ -93997,6 +94124,24 @@ item_db: (
 },
 */
 {
+	Id: 16254
+	AegisName: "Energizing_Potion_Box"
+	Name: "Activation Potion Box"
+	Type: "IT_CASH"
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" getitem(Acti_Potion, 5); ">
+},
+{
 	Id: 16257
 	AegisName: "Buddah_Scroll"
 	Name: "Buddah Scroll"
@@ -94465,6 +94610,23 @@ item_db: (
 	Script: <" getitem(Clothing_Dye_Coupon2, 1); ">
 },
 {
+	Id: 17224
+	AegisName: "Almighty_Box"
+	Name: "Almighty Box"
+	Type: "IT_CASH"
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" getitem(Almighty, 10); ">
+},
+{
 	Id: 17336
 	AegisName: "Jeremy_Beauty_Coupon_Box"
 	Name: "Jeremy's Beauty Coupon Box"
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index dbe3531b0..cf2bd7da2 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -90584,6 +90584,18 @@ item_db: (
 	Buy: 10
 	Weight: 10
 	BuyingStore: true
+	Trade: {
+		nodrop: true
+		notrade: true
+		nocart: true
+		nomail: true
+		noauction: true
+		nogstorage: true
+	}
+	Script: <"
+		specialeffect(EF_STEAL, AREA, playerattached());
+		sc_start4(SC_POPECOOKIE, 1200000, 3, 3, 3, 0);
+	">
 },
 {
 	Id: 12380
@@ -91001,6 +91013,10 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
+	Script: <"
+		specialeffect(EF_STEAL, AREA, playerattached());
+		sc_start4(SC_VITALIZE_POTION, 120000, 2, 2, 10, 0);
+	">
 },
 {
 	Id: 12405
@@ -94088,33 +94104,85 @@ item_db: (
 	Id: 12666
 	AegisName: "Thai_Perfume_MATK"
 	Name: "Thai Perfume(MATK)"
-	Type: "IT_DELAYCONSUME"
+	Type: "IT_USABLE"
 	Buy: 20
 	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		specialeffect(EF_MAGICALATTHIT, AREA, playerattached());
+		sc_start(SC_SKF_MATK, 600000, 24);
+	">
 },
 {
 	Id: 12667
 	AegisName: "Thai_Perfume_ATK"
 	Name: "Thai Perfume(ATK)"
-	Type: "IT_DELAYCONSUME"
+	Type: "IT_USABLE"
 	Buy: 20
 	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		specialeffect(EF_MAGICALATTHIT, AREA, playerattached());
+		sc_start(SC_SKF_ATK, 600000, 24);
+	">
 },
 {
 	Id: 12668
 	AegisName: "Thai_Perfume_ASPD"
 	Name: "Thai Perfume(ASPD)"
-	Type: "IT_DELAYCONSUME"
+	Type: "IT_USABLE"
 	Buy: 20
 	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		specialeffect(EF_MAGICALATTHIT, AREA, playerattached());
+		sc_start(SC_SKF_ASPD, 600000, 3);
+	">
 },
 {
 	Id: 12669
 	AegisName: "Thai_Perfume_CAST"
 	Name: "Thai Perfume(CAST)"
-	Type: "IT_DELAYCONSUME"
+	Type: "IT_USABLE"
 	Buy: 20
 	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		specialeffect(EF_MAGICALATTHIT, AREA, playerattached());
+		sc_start(SC_SKF_CAST, 600000, 5);
+	">
 },
 {
 	Id: 12670
@@ -96029,6 +96097,33 @@ item_db: (
 	Script: <" autobonus "{ heal -3000,0; bonus2 bResEff,Eff_Blind,10000; }",10,0,0,SI_GVG_BLIND; ">
 },
 {
+	Id: 12883
+	AegisName: "Almighty"
+	Name: "Almighty"
+	Type: "IT_USABLE"
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		specialeffect(EF_BASH3D, AREA, playerattached());
+		sc_start(SC_FOOD_STR_CASH, 1800000, 10);
+		sc_start(SC_FOOD_VIT_CASH, 1800000, 10);
+		sc_start(SC_FOOD_AGI_CASH, 1800000, 10);
+		sc_start(SC_FOOD_INT_CASH, 1800000, 10);
+		sc_start(SC_FOOD_DEX_CASH, 1800000, 10);
+		sc_start(SC_FOOD_LUK_CASH, 1800000, 10);
+		sc_start2(SC_ALMIGHTY, 1800000, 30, 30);
+	">
+},
+{
 	Id: 12884
 	AegisName: "C_Center_Potion"
 	Name: "Infinite Concentration Potion"
@@ -127064,6 +127159,7 @@ item_db: (
 	Name: "Activation Potion Box"
 	Type: "IT_CASH"
 	Buy: 20
+	Weight: 10
 	Trade: {
 		nodrop: true
 		notrade: true
@@ -127073,6 +127169,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
+	Script: <" getitem(Acti_Potion, 5); ">
 },
 {
 	Id: 16257
@@ -130581,6 +130678,23 @@ item_db: (
 	Script: <" packageitem(); ">
 },
 {
+	Id: 17224
+	AegisName: "Almighty_Box"
+	Name: "Almighty Box"
+	Type: "IT_CASH"
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" getitem(Almighty, 10); ">
+},
+{
 	Id: 17226
 	AegisName: "C_Center_Potion_Box"
 	Name: "Infinite Concentration Potion Box"
diff --git a/db/sc_config.conf b/db/sc_config.conf
index 2520fc595..11f8579e5 100644
--- a/db/sc_config.conf
+++ b/db/sc_config.conf
@@ -3675,3 +3675,57 @@ SC_MADOGEAR: {
 	}
 	Icon: "SI_MADOGEAR"
 }
+SC_POPECOOKIE: {
+	Flags: {
+		NoDispelReset: true
+		NoClearanceReset: true
+		Buff: true
+	}
+	Icon: "SI_POPECOOKIE"
+}
+SC_VITALIZE_POTION: {
+	Flags: {
+		NoDispelReset: true
+	}
+	Icon: "SI_VITALIZE_POTION"
+}
+SC_SKF_MATK: {
+	Flags: {
+		NoDispelReset: true
+		NoClearanceReset: true
+		Buff: true
+	}
+	Icon: "SI_SKF_MATK"
+}
+SC_SKF_ATK: {
+	Flags: {
+		NoDispelReset: true
+		NoClearanceReset: true
+		Buff: true
+	}
+	Icon: "SI_SKF_ATK"
+}
+SC_SKF_ASPD: {
+	Flags: {
+		NoDispelReset: true
+		NoClearanceReset: true
+		Buff: true
+	}
+	Icon: "SI_SKF_ASPD"
+}
+SC_SKF_CAST: {
+	Flags: {
+		NoDispelReset: true
+		NoClearanceReset: true
+		Buff: true
+	}
+	Icon: "SI_SKF_CAST"
+}
+SC_ALMIGHTY: {
+	Flags: {
+		NoDeathReset: true
+		NoDispelReset: true
+		NoClearanceReset: true
+	}
+	Icon: "SI_ALMIGHTY"
+}