Updated Trade Restrictions

1 files changed, 156 insertions, 84 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 1b5c44d56..faf6f6d23 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -8188,7 +8188,6 @@ item_db: (
 		bonus3 bAutoSpell,NPC_DRAGONFEAR,1,30;
 	">
 },
-
 {
 	Id: 1298
 	AegisName: "Shiver_Katar"
@@ -15090,15 +15089,6 @@ item_db: (
 	WeaponLv: 3
 	EquipLv: 70
 	View: 10
-	Trade: {
-		nodrop: true
-		notrade: true
-		noselltonpc: true
-		nocart: true
-		nogstorage: true
-		nomail: true
-		noauction: true
-	}
 	Script: <"
 		bonus bMatkRate,15;
 		bonus bInt,4;
@@ -15120,16 +15110,6 @@ item_db: (
 	WeaponLv: 3
 	Refine: false
 	View: 10
-	Trade: {
-		nodrop: true
-		notrade: true
-		noselltonpc: true
-		nocart: true
-		nostorage: true
-		nogstorage: true
-		nomail: true
-		noauction: true
-	}
 	Script: <"
 		bonus bAtkEle,Ele_Holy;
 		bonus bMatkRate,15;
@@ -18243,8 +18223,8 @@ item_db: (
 	Buy: 20
 	Weight: 500
 	Atk: 150
-	Slots: 1
 	Range: 1
+	Slots: 1
 	Job: 0x00080000
 	Upper: 56
 	Gender: 1
@@ -19201,8 +19181,8 @@ item_db: (
 	Type: 4
 	Buy: 20
 	Atk: 100
-	Slots: 1
 	Range: 2
+	Slots: 1
 	Job: 0x00080000
 	Upper: 56
 	Loc: 2
@@ -19784,7 +19764,7 @@ item_db: (
 	Weight: 3000
 	Atk: 200
 	Matk: 280
-	Job: 0x810200
+	Job: 0x00810200
 	Loc: 34
 	WeaponLv: 4
 	EquipLv: 90
@@ -19823,7 +19803,6 @@ item_db: (
 		bonus bUnbreakableWeapon,0;
 	">
 },
-
 {
 	Id: 2022
 	AegisName: "Staff_Of_Geffen"
@@ -19880,7 +19859,7 @@ item_db: (
 	Atk: 30
 	Matk: 170
 	Slots: 1
-	Job: 0x810200
+	Job: 0x00810200
 	Upper: 56
 	Loc: 34
 	WeaponLv: 4
@@ -21485,9 +21464,9 @@ item_db: (
 	AegisName: "Mad_Bunny"
 	Name: "Mad Bunny"
 	Type: 5
-	Slots: 1
 	Weight: 100
 	Def: 40
+	Slots: 1
 	Loc: 32
 	EquipLv: 30
 	View: 1
@@ -29250,6 +29229,7 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
+		nostorage: true
 		nogstorage: true
 		nomail: true
 		noauction: true
@@ -31128,6 +31108,9 @@ item_db: (
 	Refine: false
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 	Script: <" bonus bUseSPrate,-5; ">
 },
@@ -31142,6 +31125,9 @@ item_db: (
 	Refine: false
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 	Script: <" bonus bInt,2; ">
 },
@@ -31157,6 +31143,9 @@ item_db: (
 	Refine: false
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 	Script: <"
 		bonus bStr,2;
@@ -31175,6 +31164,9 @@ item_db: (
 	Refine: false
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 	Script: <" autobonus "{ bonus bAspdRate,2; }",10,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; ">
 },
@@ -31191,6 +31183,9 @@ item_db: (
 	Refine: false
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 	Script: <"
 		bonus bAllStats,1;
@@ -32050,6 +32045,9 @@ item_db: (
 	Refine: false
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 	Script: <" bonus bInt,2; ">
 },
@@ -32065,6 +32063,9 @@ item_db: (
 	Refine: false
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 	Script: <"
 		bonus bDex,2;
@@ -32083,6 +32084,9 @@ item_db: (
 	Refine: false
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 	Script: <" autobonus "{ bonus bMaxHPrate,10; }",10,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; ">
 },
@@ -34080,22 +34084,6 @@ item_db: (
 	Refine: false
 },
 {
-	Id: 2986
-	AegisName: "Snake_Ring"
-	Name: "Snake Ring"
-	Type: 5
-	Buy: 20
-	Weight: 100
-	Def: 2
-	Slots: 1
-	Loc: 136
-	Refine: false
-	Script: <"
-		bonus bDex,3;
-		bonus bMdef,2;
-	">
-},
-{
 	Id: 2981
 	AegisName: "Brave_Ring"
 	Name: "Brave Ring"
@@ -34115,6 +34103,22 @@ item_db: (
 	}
 },
 {
+	Id: 2986
+	AegisName: "Snake_Ring"
+	Name: "Snake Ring"
+	Type: 5
+	Buy: 20
+	Weight: 100
+	Def: 2
+	Slots: 1
+	Loc: 136
+	Refine: false
+	Script: <"
+		bonus bDex,3;
+		bonus bMdef,2;
+	">
+},
+{
 	Id: 2987
 	AegisName: "Snake_Pendant"
 	Name: "Snake Pendant"
@@ -34193,15 +34197,6 @@ item_db: (
 	Weight: 200
 	Loc: 136
 	Refine: false
-	Trade: {
-		nodrop: true
-		notrade: true
-		noselltonpc: true
-		nocart: true
-		nogstorage: true
-		nomail: true
-		noauction: true
-	}
 	Script: <"
 		bonus bMaxHP,300;
 		bonus bMaxSP,30;
@@ -50544,6 +50539,9 @@ item_db: (
 	Trade: {
 		nodrop: true
 		noselltonpc: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 	Script: <"
 		bonus bDex,3;
@@ -50649,6 +50647,9 @@ item_db: (
 	View: 431
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 	Script: <"
 		bonus2 bSubEle,Ele_Fire,20;
@@ -51490,6 +51491,9 @@ item_db: (
 	View: 476
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 	Script: <"
 		bonus bMdef,3;
@@ -51509,6 +51513,9 @@ item_db: (
 	View: 477
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 	Script: <"
 		bonus bAllStats,2;
@@ -51528,6 +51535,9 @@ item_db: (
 	View: 478
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 	Script: <"
 		bonus bAspdRate,10;
@@ -51547,6 +51557,9 @@ item_db: (
 	View: 479
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 	Script: <" bonus bStr,3; ">
 },
@@ -51563,6 +51576,9 @@ item_db: (
 	View: 480
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 	Script: <"
 		bonus bUnbreakableHelm,0;
@@ -53184,6 +53200,9 @@ item_db: (
 	View: 479
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 	Script: <"
 		bonus bDex,3;
@@ -55717,15 +55736,6 @@ item_db: (
 	Loc: 256
 	EquipLv: 10
 	View: 101
-	Trade: {
-		nodrop: true
-		notrade: true
-		nocart: true
-		nostorage: true
-		nogstorage: true
-		nomail: true
-		noauction: true
-	}
 	Script: <"
 		bonus bHealPower2,5;
 		bonus2 bAddMonsterDropItem,610,10;
@@ -58310,8 +58320,8 @@ item_db: (
 	AegisName: "Birdcage_of_paradise"
 	Name: "Birdcage of paradise"
 	Type: 5
-	Weight: 800
 	Buy: 20
+	Weight: 800
 	Def: 6
 	Loc: 256
 	EquipLv: 40
@@ -58333,8 +58343,8 @@ item_db: (
 	AegisName: "Crow_Tengu_Mask"
 	Name: "Crow Tengu Mask"
 	Type: 5
-	Weight: 300
 	Buy: 20
+	Weight: 300
 	Loc: 512
 	EquipLv: 80
 	View: 1287
@@ -58365,7 +58375,7 @@ item_db: (
 		bonus bUnbreakableHelm,0;
 		bonus bMdef,5;
 		bonus2 bAddMonsterDropItem,644,30; /*Custom - JRO*/
-		/*+Mistcase card, when base Luk is 77 or more, Has change to drops 'Happy Box' when killing a monster.*/
+		/*+Mistcase card, when base Luk is 77 or more, Has change to drops \'Happy Box\' when killing a monster.*/
 	">
 },
 {
@@ -60180,6 +60190,7 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
+		nostorage: true
 		nogstorage: true
 		nomail: true
 		noauction: true
@@ -60281,6 +60292,7 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
+		nostorage: true
 		nogstorage: true
 		nomail: true
 		noauction: true
@@ -60297,6 +60309,7 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
+		nostorage: true
 		nogstorage: true
 		nomail: true
 		noauction: true
@@ -61574,6 +61587,9 @@ item_db: (
 	Trade: {
 		nodrop: true
 		noselltonpc: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 },
 {
@@ -67440,6 +67456,11 @@ item_db: (
 	Type: 3
 	Buy: 0
 	BuyingStore: true
+	Trade: {
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
 },
 {
 	Id: 7200
@@ -72525,6 +72546,8 @@ item_db: (
 	Weight: 10
 	Trade: {
 		noselltonpc: true
+		nomail: true
+		noauction: true
 	}
 },
 {
@@ -72536,6 +72559,8 @@ item_db: (
 	Weight: 10
 	Trade: {
 		noselltonpc: true
+		nomail: true
+		noauction: true
 	}
 },
 {
@@ -72547,6 +72572,8 @@ item_db: (
 	Weight: 10
 	Trade: {
 		noselltonpc: true
+		nomail: true
+		noauction: true
 	}
 },
 {
@@ -72558,6 +72585,8 @@ item_db: (
 	Weight: 10
 	Trade: {
 		noselltonpc: true
+		nomail: true
+		noauction: true
 	}
 },
 {
@@ -72569,6 +72598,8 @@ item_db: (
 	Weight: 10
 	Trade: {
 		noselltonpc: true
+		nomail: true
+		noauction: true
 	}
 },
 {
@@ -72580,6 +72611,8 @@ item_db: (
 	Weight: 10
 	Trade: {
 		noselltonpc: true
+		nomail: true
+		noauction: true
 	}
 },
 {
@@ -72591,6 +72624,8 @@ item_db: (
 	Weight: 10
 	Trade: {
 		noselltonpc: true
+		nomail: true
+		noauction: true
 	}
 },
 {
@@ -72602,6 +72637,8 @@ item_db: (
 	Weight: 10
 	Trade: {
 		noselltonpc: true
+		nomail: true
+		noauction: true
 	}
 },
 {
@@ -72613,6 +72650,8 @@ item_db: (
 	Weight: 10
 	Trade: {
 		noselltonpc: true
+		nomail: true
+		noauction: true
 	}
 },
 {
@@ -72624,6 +72663,8 @@ item_db: (
 	Weight: 10
 	Trade: {
 		noselltonpc: true
+		nomail: true
+		noauction: true
 	}
 },
 {
@@ -72635,6 +72676,8 @@ item_db: (
 	Weight: 10
 	Trade: {
 		noselltonpc: true
+		nomail: true
+		noauction: true
 	}
 },
 {
@@ -72646,6 +72689,8 @@ item_db: (
 	Weight: 10
 	Trade: {
 		noselltonpc: true
+		nomail: true
+		noauction: true
 	}
 },
 {
@@ -75140,6 +75185,9 @@ item_db: (
 	Buy: 0
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 },
 {
@@ -75150,6 +75198,9 @@ item_db: (
 	Buy: 0
 	Trade: {
 		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 },
 {
@@ -75727,6 +75778,10 @@ item_db: (
 	Buy: 20
 	Trade: {
 		nodrop: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
 	}
 },
 {
@@ -81848,7 +81903,6 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nostorage: true
 		nogstorage: true
 		nomail: true
 		noauction: true
@@ -85613,6 +85667,12 @@ item_db: (
 	Type: 0
 	Buy: 0
 	Weight: 50
+	Trade: {
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
 	Script: <" percentheal 3,3; ">
 },
 {
@@ -121834,8 +121894,8 @@ item_db: (
 	Weight: 10
 	Slots: 1
 	Loc: 769
-	View: 806
 	Refine: false
+	View: 806
 	Script: <"
 		bonus2 bResEff,Eff_Curse,10000;
 		bonus bMdef,5;
@@ -126082,6 +126142,15 @@ item_db: (
 	Slots: 1
 	Loc: 256
 	View: 1308
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
 	Script: <"
 		bonus bAllStats,3;
 		bonus2 bHPDrainRate,40,10+(getrefine()/3);
@@ -126099,6 +126168,15 @@ item_db: (
 	Slots: 1
 	Loc: 256
 	View: 1308
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
 	Script: <"
 		skill ALL_CATCRY, 1;
 		bonus bAllStats,3;
@@ -126114,6 +126192,11 @@ item_db: (
 	Weight: 200
 	Loc: 1
 	View: 720
+	Trade: {
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
 },
 {
 	Id: 19081
@@ -126175,15 +126258,6 @@ item_db: (
 	Loc: 512
 	Refine: false
 	View: 568
-	Trade: {
-		nodrop: true
-		notrade: true
-		noselltonpc: true
-		nocart: true
-		nogstorage: true
-		nomail: true
-		noauction: true
-	}
 	Script: <"
 		if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief||(BaseJob==Job_Taekwon&&Class!=Job_Soul_Linker)) {
 			bonus bAspd,1;
@@ -132972,16 +133046,6 @@ item_db: (
 	Type: 5
 	Loc: 4096
 	View: 1348
-	Trade: {
-		nodrop: true
-		notrade: true
-		noselltonpc: true
-		nocart: true
-		nostorage: true
-		nogstorage: true
-		nomail: true
-		noauction: true
-	}
 	Script: <"
 		if(BaseLevel<100) {
 			bonus bHit,30-(3*(BaseLevel/10));
@@ -133403,6 +133467,14 @@ item_db: (
 	Loc: 4
 	EquipLv: 125
 	Refine: false
+	Trade: {
+		nodrop: true
+		notrade: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
 	Script: <"
 		bonus bFlee,20;
 		bonus bVariableCastrate,-20;