ItemDB Updates:

 - Fixes http://herc.ws/board/tracker/issue-7330-halohalo/ where Item 'Halohalo' will not stack together w/ other Status Foods.
 - Change the Status Food Behavior based on Aegis: (NOTE: ID# 12202, 12203, 12204, 12205, 12206, 12207 and 12247)
   • Removed when the player dies.
   • Update its HP/SP percentheal based on Aegis script.
 - Follow up https://github.com/HerculesWS/Hercules/commit/e511dcf5940cee7a6e43744543a5ca96bc23cf84#commitcomment-14500629. Thanks to AnnieRuru.
 - Follow up https://github.com/HerculesWS/Hercules/commit/d9ad1cc97be0a90b3ef2f653ae2d2cdd77dddd83#commitcomment-14502822. Thanks also to AnnieRuru.
 - Change the sequence of our current Trade Restriction based on kRO's itemmoveinfov5.txt

2 files changed, 82 insertions, 64 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 2fde6314b..abb7b5a2e 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -37,13 +37,13 @@ item_db: (
 		override: GroupID             (int, defaults to 100)
 		nodrop: true/false            (boolean, defaults to false)
 		notrade: true/false           (boolean, defaults to false)
-		partneroverride: true/false   (boolean, defaults to false)
-		noselltonpc: true/false       (boolean, defaults to false)
-		nocart: true/false            (boolean, defaults to false)
 		nostorage: true/false         (boolean, defaults to false)
-		nogstorage: true/false        (boolean, defaults to false)
+		nocart: true/false            (boolean, defaults to false)
+		noselltonpc: true/false       (boolean, defaults to false)
 		nomail: true/false            (boolean, defaults to false)
-		noauction: true/false         (boolean, defaults to false)
+		noauction: true/false         (boolean, defaults to false)		
+		nogstorage: true/false        (boolean, defaults to false)
+		partneroverride: true/false   (boolean, defaults to false)
 	}
 	Nouse: {                      (defaults to no restrictions)
 		override: GroupID             (int, defaults to 100)
@@ -64054,7 +64054,9 @@ item_db: (
 	Buy: 20
 	Weight: 200
 },
-//  Cash Shop Usable Items
+
+// Cash Shop Usable Items
+// ===================================================================
 {
 	Id: 12202
 	AegisName: "Str_Dish10_"
@@ -64065,15 +64067,15 @@ 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_FOOD_STR_CASH,1800000,10;
-		percentheal 15,5;
+		sc_start SC_FOOD_STR,1800000,10;
+		percentheal 20,10;
 	">
 },
 {
@@ -64086,14 +64088,14 @@ 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_FOOD_AGI_CASH,1800000,10;
+		sc_start SC_FOOD_AGI,1800000,10;
 		percentheal 15,5;
 	">
 },
@@ -64107,15 +64109,15 @@ 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_FOOD_INT_CASH,1800000,10;
-		percentheal 15,5;
+		sc_start SC_FOOD_INT,1800000,10;
+		percentheal 10,20;
 	">
 },
 {
@@ -64128,15 +64130,15 @@ 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_FOOD_DEX_CASH,1800000,10;
-		percentheal 15,5;
+		sc_start SC_FOOD_DEX,1800000,10;
+		percentheal 10,10;
 	">
 },
 {
@@ -64149,15 +64151,15 @@ 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_FOOD_LUK_CASH,1800000,10;
-		percentheal 15,5;
+		sc_start SC_FOOD_LUK,1800000,10;
+		percentheal 14,8;
 	">
 },
 {
@@ -64170,15 +64172,15 @@ 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_FOOD_VIT_CASH,1800000,10;
-		percentheal 15,5;
+		sc_start SC_FOOD_VIT,1800000,10;
+		percentheal 25,0;
 	">
 },
 {
@@ -64773,7 +64775,14 @@ item_db: (
 	Buy: 2
 	Weight: 100
 	EquipLv: 20
-	Script: <" sc_start SC_INCALLSTATUS,600000,3; ">
+	Script: <"
+		sc_start SC_FOOD_STR,600000,3;
+		sc_start SC_FOOD_AGI,600000,3;
+		sc_start SC_FOOD_VIT,600000,3;
+		sc_start SC_FOOD_INT,600000,3;
+		sc_start SC_FOOD_DEX,600000,3;
+		sc_start SC_FOOD_LUK,600000,3;
+	">
 },
 {
 	Id: 12248
@@ -64801,7 +64810,7 @@ item_db: (
 	Weight: 10
 	Script: <"
 		sc_start SC_FOOD_STR,3600000,10;
-		percentheal 20,20;
+		percentheal 20,10;
 	">
 },
 {
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index a0d839190..94a1fbe9a 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -37,13 +37,13 @@ item_db: (
 		override: GroupID             (int, defaults to 100)
 		nodrop: true/false            (boolean, defaults to false)
 		notrade: true/false           (boolean, defaults to false)
-		partneroverride: true/false   (boolean, defaults to false)
-		noselltonpc: true/false       (boolean, defaults to false)
-		nocart: true/false            (boolean, defaults to false)
 		nostorage: true/false         (boolean, defaults to false)
-		nogstorage: true/false        (boolean, defaults to false)
+		nocart: true/false            (boolean, defaults to false)
+		noselltonpc: true/false       (boolean, defaults to false)
 		nomail: true/false            (boolean, defaults to false)
-		noauction: true/false         (boolean, defaults to false)
+		noauction: true/false         (boolean, defaults to false)		
+		nogstorage: true/false        (boolean, defaults to false)
+		partneroverride: true/false   (boolean, defaults to false)
 	}
 	Nouse: {                      (defaults to no restrictions)
 		override: GroupID             (int, defaults to 100)
@@ -41824,7 +41824,7 @@ item_db: (
 	Loc: 769
 	Script: <"
 		bonus bVit,3;
-		/* When received magical attack, give 100% chance to stun the attacker. */
+		bonus3 bAddEffWhenHit,Eff_Stun,10000,BF_MAGIC; /* NOTE: Works only on monsters, going to test further in Official servers if also works on players. [Frost] */
 	">
 },
 {
@@ -78939,7 +78939,9 @@ item_db: (
 	Buy: 20
 	Weight: 200
 },
-//  Cash Shop Usable Items
+
+// Cash Shop Usable Items
+// ===================================================================
 {
 	Id: 12202
 	AegisName: "Str_Dish10_"
@@ -78950,15 +78952,15 @@ 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_FOOD_STR_CASH,1800000,10;
-		percentheal 15,5;
+		sc_start SC_FOOD_STR,1800000,10;
+		percentheal 20,10;
 	">
 },
 {
@@ -78971,14 +78973,14 @@ 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_FOOD_AGI_CASH,1800000,10;
+		sc_start SC_FOOD_AGI,1800000,10;
 		percentheal 15,5;
 	">
 },
@@ -78992,15 +78994,15 @@ 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_FOOD_INT_CASH,1800000,10;
-		percentheal 15,5;
+		sc_start SC_FOOD_INT,1800000,10;
+		percentheal 10,20;
 	">
 },
 {
@@ -79013,15 +79015,15 @@ 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_FOOD_DEX_CASH,1800000,10;
-		percentheal 15,5;
+		sc_start SC_FOOD_DEX,1800000,10;
+		percentheal 10,10;
 	">
 },
 {
@@ -79034,15 +79036,15 @@ 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_FOOD_LUK_CASH,1800000,10;
-		percentheal 15,5;
+		sc_start SC_FOOD_LUK,1800000,10;
+		percentheal 14,8;
 	">
 },
 {
@@ -79055,15 +79057,15 @@ 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_FOOD_VIT_CASH,1800000,10;
-		percentheal 15,5;
+		sc_start SC_FOOD_VIT,1800000,10;
+		percentheal 25,0;
 	">
 },
 {
@@ -79670,7 +79672,14 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 100
-	Script: <" sc_start SC_INCALLSTATUS,600000,3; ">
+	Script: <"
+		sc_start SC_FOOD_STR,600000,3;
+		sc_start SC_FOOD_AGI,600000,3;
+		sc_start SC_FOOD_VIT,600000,3;
+		sc_start SC_FOOD_INT,600000,3;
+		sc_start SC_FOOD_DEX,600000,3;
+		sc_start SC_FOOD_LUK,600000,3;
+	">
 },
 {
 	Id: 12248
@@ -79698,7 +79707,7 @@ item_db: (
 	Weight: 10
 	Script: <"
 		sc_start SC_FOOD_STR,3600000,10;
-		percentheal 20,20;
+		percentheal 20,10;
 	">
 },
 {
@@ -86862,7 +86871,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		//itemskill AL_TELEPORT,1; /* NOTE: Temporary disabled, this item must not be removed from inventory when used. */
+		warp strcharinfo(3),0,0; /* NOTE: Temporary script until we get the correct information. */
 	">
 },
 {