Update GX Poison items

4 files changed, 97 insertions, 44 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index c3a4c8e94..cfa7cb7d1 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -74747,11 +74747,15 @@ item_db: (
 	Name: "Paralyze"
 	Type: 0
 	Buy: 2
-	Weight: 100
+	Weight: 20
+	Job: {
+		Assassin: true
+	}
+	Upper: 8
 	BuyingStore: true
 	Script: <"
 		specialeffect2 EF_ENCHANTPOISON;
-		sc_start SC_PARALYSE,300000,0,10,SCFLAG_FIXEDTICK;
+		sc_start SC_PARALYSE, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
 {
@@ -74760,11 +74764,15 @@ item_db: (
 	Name: "Leech End"
 	Type: 0
 	Buy: 2
-	Weight: 100
+	Weight: 20
+	Job: {
+		Assassin: true
+	}
+	Upper: 8
 	BuyingStore: true
 	Script: <"
 		specialeffect2 EF_ENCHANTPOISON;
-		sc_start SC_LEECHESEND,300000,0,10,SCFLAG_FIXEDTICK;
+		sc_start SC_LEECHESEND, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
 {
@@ -74773,11 +74781,15 @@ item_db: (
 	Name: "Oblivion Curse"
 	Type: 0
 	Buy: 2
-	Weight: 100
+	Weight: 20
+	Job: {
+		Assassin: true
+	}
+	Upper: 8
 	BuyingStore: true
 	Script: <"
 		specialeffect2 EF_ENCHANTPOISON;
-		sc_start SC_OBLIVIONCURSE,300000,0,10,SCFLAG_FIXEDTICK;
+		sc_start SC_OBLIVIONCURSE, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
 {
@@ -74786,11 +74798,15 @@ item_db: (
 	Name: "Disheart"
 	Type: 0
 	Buy: 2
-	Weight: 100
+	Weight: 20
+	Job: {
+		Assassin: true
+	}
+	Upper: 8
 	BuyingStore: true
 	Script: <"
 		specialeffect2 EF_ENCHANTPOISON;
-		sc_start SC_DEATHHURT,300000,0,10,SCFLAG_FIXEDTICK;
+		sc_start SC_DEATHHURT, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
 {
@@ -74799,11 +74815,15 @@ item_db: (
 	Name: "Toxin"
 	Type: 0
 	Buy: 2
-	Weight: 100
+	Weight: 20
+	Job: {
+		Assassin: true
+	}
+	Upper: 8
 	BuyingStore: true
 	Script: <"
 		specialeffect2 EF_ENCHANTPOISON;
-		sc_start SC_TOXIN,300000,0,10,SCFLAG_FIXEDTICK;
+		sc_start SC_TOXIN, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
 {
@@ -74812,11 +74832,15 @@ item_db: (
 	Name: "Pyrexia"
 	Type: 0
 	Buy: 2
-	Weight: 100
+	Weight: 20
+	Job: {
+		Assassin: true
+	}
+	Upper: 8
 	BuyingStore: true
 	Script: <"
 		specialeffect2 EF_ENCHANTPOISON;
-		sc_start SC_PYREXIA,300000,0,10,SCFLAG_FIXEDTICK;
+		sc_start SC_PYREXIA, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
 {
@@ -74825,11 +74849,16 @@ item_db: (
 	Name: "Magic Mushroom"
 	Type: 0
 	Buy: 2
-	Weight: 100
+	Weight: 20
+	BuyingStore: true
+	Job: {
+		Assassin: true
+	}
+	Upper: 8
 	BuyingStore: true
 	Script: <"
 		specialeffect2 EF_ENCHANTPOISON;
-		sc_start SC_MAGICMUSHROOM,300000,0,10,SCFLAG_FIXEDTICK;
+		sc_start SC_MAGICMUSHROOM, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
 {
@@ -74838,11 +74867,15 @@ item_db: (
 	Name: "Venom Bleed"
 	Type: 0
 	Buy: 2
-	Weight: 100
+	Weight: 20
+	Job: {
+		Assassin: true
+	}
+	Upper: 8
 	BuyingStore: true
 	Script: <"
 		specialeffect2 EF_ENCHANTPOISON;
-		sc_start SC_VENOMBLEED,15000,0,10,SCFLAG_FIXEDTICK;
+		sc_start SC_VENOMBLEED, 15000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
 
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 7ebad4434..d1f416b08 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -94159,10 +94159,14 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 20
+	Job: {
+		Assassin: true
+	}
+	Upper: 56
 	BuyingStore: true
 	Script: <"
 		specialeffect2 EF_ENCHANTPOISON;
-		sc_start SC_PARALYSE,300000,0,10,SCFLAG_FIXEDTICK;
+		sc_start SC_PARALYSE, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
 {
@@ -94172,10 +94176,14 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 20
+	Job: {
+		Assassin: true
+	}
+	Upper: 56
 	BuyingStore: true
 	Script: <"
 		specialeffect2 EF_ENCHANTPOISON;
-		sc_start SC_LEECHESEND,300000,0,10,SCFLAG_FIXEDTICK;
+		sc_start SC_LEECHESEND, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
 {
@@ -94185,10 +94193,14 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 20
+	Job: {
+		Assassin: true
+	}
+	Upper: 56
 	BuyingStore: true
 	Script: <"
 		specialeffect2 EF_ENCHANTPOISON;
-		sc_start SC_OBLIVIONCURSE,300000,0,10,SCFLAG_FIXEDTICK;
+		sc_start SC_OBLIVIONCURSE, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
 {
@@ -94198,10 +94210,14 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 20
+	Job: {
+		Assassin: true
+	}
+	Upper: 56
 	BuyingStore: true
 	Script: <"
 		specialeffect2 EF_ENCHANTPOISON;
-		sc_start SC_DEATHHURT,300000,0,10,SCFLAG_FIXEDTICK;
+		sc_start SC_DEATHHURT, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
 {
@@ -94211,10 +94227,14 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 20
+	Job: {
+		Assassin: true
+	}
+	Upper: 56
 	BuyingStore: true
 	Script: <"
 		specialeffect2 EF_ENCHANTPOISON;
-		sc_start SC_TOXIN,300000,0,10,SCFLAG_FIXEDTICK;
+		sc_start SC_TOXIN, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
 {
@@ -94224,10 +94244,14 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 20
+	Job: {
+		Assassin: true
+	}
+	Upper: 56
 	BuyingStore: true
 	Script: <"
 		specialeffect2 EF_ENCHANTPOISON;
-		sc_start SC_PYREXIA,300000,0,10,SCFLAG_FIXEDTICK;
+		sc_start SC_PYREXIA, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
 {
@@ -94237,10 +94261,14 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 20
+	Job: {
+		Assassin: true
+	}
+	Upper: 56
 	BuyingStore: true
 	Script: <"
 		specialeffect2 EF_ENCHANTPOISON;
-		sc_start SC_MAGICMUSHROOM,300000,0,10,SCFLAG_FIXEDTICK;
+		sc_start SC_MAGICMUSHROOM, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
 {
@@ -94250,10 +94278,14 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 20
+	Job: {
+		Assassin: true
+	}
+	Upper: 56
 	BuyingStore: true
 	Script: <"
 		specialeffect2 EF_ENCHANTPOISON;
-		sc_start SC_VENOMBLEED,15000,0,10,SCFLAG_FIXEDTICK;
+		sc_start SC_VENOMBLEED, 15000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
 
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index ac2382d90..138a783ae 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -147,6 +147,14 @@ enum item_itemid {
 	ITEMID_BLACK_THING           = 12435,
 	ITEMID_BOARDING_HALTER       = 12622,
 	ITEMID_NOBLE_NAMEPLATE       = 12705,
+	ITEMID_POISON_PARALYSIS      = 12717,
+	ITEMID_POISON_LEECH          = 12718,
+	ITEMID_POISON_OBLIVION       = 12719,
+	ITEMID_POISON_CONTAMINATION  = 12720,
+	ITEMID_POISON_NUMB           = 12721,
+	ITEMID_POISON_FEVER          = 12722,
+	ITEMID_POISON_LAUGHING       = 12723,
+	ITEMID_POISON_FATIGUE        = 12724,
 	ITEMID_NAUTHIZ               = 12725,
 	ITEMID_RAIDO                 = 12726,
 	ITEMID_BERKANA               = 12727,
@@ -272,20 +280,6 @@ enum cash_food_item_list {
 };
 
 /**
- * GC Poison
- */
-enum poison_item_list {
-	ITEMID_POISON_PARALYSIS       = 12717,
-	ITEMID_POISON_LEECH,         // 12718
-	ITEMID_POISON_OBLIVION,      // 12719
-	ITEMID_POISON_CONTAMINATION, // 12720
-	ITEMID_POISON_NUMB,          // 12721
-	ITEMID_POISON_FEVER,         // 12722
-	ITEMID_POISON_LAUGHING,      // 12723
-	ITEMID_POISON_FATIGUE,       // 12724
-};
-
-/**
  * Geneticist
  */
 enum geneticist_item_list {
diff --git a/src/map/pc.c b/src/map/pc.c
index 4b1a586a8..991018012 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4917,12 +4917,6 @@ int pc_isUseitem(struct map_session_data *sd,int n)
 	if( nameid >= ITEMID_BOW_MERCENARY_SCROLL1 && nameid <= ITEMID_SPEARMERCENARY_SCROLL10 && sd->md != NULL ) // Mercenary Scrolls
 		return 0;
 
-	/**
-	 * Only GCross may use poisons
-	 **/
-	else if (itemdb_is_poison(nameid) && (sd->job & MAPID_THIRDMASK) != MAPID_GUILLOTINE_CROSS)
-		return 0;
-
 	if( item->package || item->group ) {
 		if (pc_is90overweight(sd)) {
 			clif->msgtable(sd, MSG_ITEM_CANT_OBTAIN_WEIGHT);