Update Rune Knight Runes & Ores

4 files changed, 113 insertions, 78 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index dbcfe61e7..c3a4c8e94 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -74854,6 +74854,9 @@ item_db: (
 	Type: 11
 	Buy: 100
 	Weight: 100
+	Job: {
+		Knight: true
+	}
 	Upper: 8
 	Delay: 120000
 	Trade: {
@@ -74869,7 +74872,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_REFRESH,1; ">
+	Script: <" itemskill RK_REFRESH, 1; ">
 },
 {
 	Id: 12726
@@ -74878,6 +74881,9 @@ item_db: (
 	Type: 11
 	Buy: 100
 	Weight: 100
+	Job: {
+		Knight: true
+	}
 	Upper: 8
 	Delay: 30000
 	Trade: {
@@ -74893,7 +74899,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_CRUSHSTRIKE,1; ">
+	Script: <" itemskill RK_CRUSHSTRIKE, 1; ">
 },
 {
 	Id: 12727
@@ -74902,6 +74908,9 @@ item_db: (
 	Type: 11
 	Buy: 100
 	Weight: 100
+	Job: {
+		Knight: true
+	}
 	Upper: 8
 	Delay: 60000
 	Trade: {
@@ -74917,7 +74926,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_MILLENNIUMSHIELD,1; ">
+	Script: <" itemskill RK_MILLENNIUMSHIELD, 1; ">
 },
 {
 	Id: 12728
@@ -74926,6 +74935,9 @@ item_db: (
 	Type: 11
 	Buy: 100
 	Weight: 100
+	Job: {
+		Knight: true
+	}
 	Upper: 8
 	Trade: {
 		nodrop: true
@@ -74940,7 +74952,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_VITALITYACTIVATION,1; ">
+	Script: <" itemskill RK_VITALITYACTIVATION, 1; ">
 },
 {
 	Id: 12729
@@ -74949,6 +74961,9 @@ item_db: (
 	Type: 11
 	Buy: 100
 	Weight: 100
+	Job: {
+		Knight: true
+	}
 	Upper: 8
 	Trade: {
 		nodrop: true
@@ -74963,7 +74978,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_FIGHTINGSPIRIT,1; ">
+	Script: <" itemskill RK_FIGHTINGSPIRIT, 1; ">
 },
 {
 	Id: 12730
@@ -74972,6 +74987,9 @@ item_db: (
 	Type: 11
 	Buy: 100
 	Weight: 100
+	Job: {
+		Knight: true
+	}
 	Upper: 8
 	Trade: {
 		nodrop: true
@@ -74986,7 +75004,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_ABUNDANCE,1; ">
+	Script: <" itemskill RK_ABUNDANCE, 1; ">
 },
 {
 	Id: 12731
@@ -74995,6 +75013,9 @@ item_db: (
 	Type: 11
 	Buy: 100
 	Weight: 100
+	Job: {
+		Knight: true
+	}
 	Upper: 8
 	Trade: {
 		nodrop: true
@@ -75009,7 +75030,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_GIANTGROWTH,1; ">
+	Script: <" itemskill RK_GIANTGROWTH, 1; ">
 },
 {
 	Id: 12732
@@ -75018,6 +75039,9 @@ item_db: (
 	Type: 11
 	Buy: 100
 	Weight: 100
+	Job: {
+		Knight: true
+	}
 	Upper: 8
 	Delay: 1000
 	Trade: {
@@ -75033,7 +75057,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_STORMBLAST,1; ">
+	Script: <" itemskill RK_STORMBLAST, 1; ">
 },
 {
 	Id: 12733
@@ -75042,6 +75066,9 @@ item_db: (
 	Type: 11
 	Buy: 100
 	Weight: 100
+	Job: {
+		Knight: true
+	}
 	Upper: 8
 	Trade: {
 		nodrop: true
@@ -75056,9 +75083,10 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_STONEHARDSKIN,1; ">
+	Script: <" itemskill RK_STONEHARDSKIN, 1; ">
 },
-//  Rune Knight Rune Ores
+
+//==  Rune Knight Rune Ores =============================
 {
 	Id: 12734
 	AegisName: "Runstone_Quality"
@@ -75066,10 +75094,6 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 100
-	Job: {
-		Knight: true
-	}
-	Upper: 8
 	BuyingStore: true
 	Script: <" makerune 5; ">
 },
@@ -75080,10 +75104,6 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 100
-	Job: {
-		Knight: true
-	}
-	Upper: 8
 	BuyingStore: true
 	Script: <" makerune 11; ">
 },
@@ -75094,10 +75114,6 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 100
-	Job: {
-		Knight: true
-	}
-	Upper: 8
 	BuyingStore: true
 	Script: <" makerune 14; ">
 },
@@ -75108,10 +75124,6 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 100
-	Job: {
-		Knight: true
-	}
-	Upper: 8
 	BuyingStore: true
 	Script: <" makerune 2; ">
 },
@@ -75122,10 +75134,6 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 100
-	Job: {
-		Knight: true
-	}
-	Upper: 8
 	BuyingStore: true
 	Script: <" makerune 8; ">
 },
@@ -96082,7 +96090,20 @@ item_db: (
 	Type: 11
 	Buy: 2
 	Weight: 100
+	Job: {
+		Knight: true
+	}
+	Upper: 8
 	Delay: 60000
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
 	Stack: [20, 1]
 	Script: <" itemskill RK_LUXANIMA,1; ">
 },
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 74740e693..7ebad4434 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -94265,6 +94265,10 @@ item_db: (
 	Type: 11
 	Buy: 2
 	Weight: 100
+	Job: {
+		Knight: true
+	}
+	Upper: 56
 	Delay: 120000
 	Trade: {
 		nodrop: true
@@ -94279,7 +94283,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_REFRESH,1; ">
+	Script: <" itemskill RK_REFRESH, 1; ">
 },
 {
 	Id: 12726
@@ -94288,6 +94292,10 @@ item_db: (
 	Type: 11
 	Buy: 2
 	Weight: 100
+	Job: {
+		Knight: true
+	}
+	Upper: 56
 	Delay: 30000
 	Trade: {
 		nodrop: true
@@ -94302,7 +94310,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_CRUSHSTRIKE,1; ">
+	Script: <" itemskill RK_CRUSHSTRIKE, 1; ">
 },
 {
 	Id: 12727
@@ -94311,6 +94319,10 @@ item_db: (
 	Type: 11
 	Buy: 2
 	Weight: 100
+	Job: {
+		Knight: true
+	}
+	Upper: 56
 	Delay: 60000
 	Trade: {
 		nodrop: true
@@ -94325,7 +94337,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_MILLENNIUMSHIELD,1; ">
+	Script: <" itemskill RK_MILLENNIUMSHIELD, 1; ">
 },
 {
 	Id: 12728
@@ -94334,6 +94346,10 @@ item_db: (
 	Type: 11
 	Buy: 2
 	Weight: 100
+	Job: {
+		Knight: true
+	}
+	Upper: 56
 	Trade: {
 		nodrop: true
 		notrade: true
@@ -94347,7 +94363,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_VITALITYACTIVATION,1; ">
+	Script: <" itemskill RK_VITALITYACTIVATION, 1; ">
 },
 {
 	Id: 12729
@@ -94356,6 +94372,10 @@ item_db: (
 	Type: 11
 	Buy: 2
 	Weight: 100
+	Job: {
+		Knight: true
+	}
+	Upper: 56
 	Trade: {
 		nodrop: true
 		notrade: true
@@ -94369,7 +94389,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_FIGHTINGSPIRIT,1; ">
+	Script: <" itemskill RK_FIGHTINGSPIRIT, 1; ">
 },
 {
 	Id: 12730
@@ -94378,6 +94398,10 @@ item_db: (
 	Type: 11
 	Buy: 2
 	Weight: 100
+	Job: {
+		Knight: true
+	}
+	Upper: 56
 	Trade: {
 		nodrop: true
 		notrade: true
@@ -94391,7 +94415,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_ABUNDANCE,1; ">
+	Script: <" itemskill RK_ABUNDANCE, 1; ">
 },
 {
 	Id: 12731
@@ -94400,6 +94424,10 @@ item_db: (
 	Type: 11
 	Buy: 2
 	Weight: 100
+	Job: {
+		Knight: true
+	}
+	Upper: 56
 	Trade: {
 		nodrop: true
 		notrade: true
@@ -94413,7 +94441,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_GIANTGROWTH,1; ">
+	Script: <" itemskill RK_GIANTGROWTH, 1; ">
 },
 {
 	Id: 12732
@@ -94422,6 +94450,10 @@ item_db: (
 	Type: 11
 	Buy: 2
 	Weight: 100
+	Job: {
+		Knight: true
+	}
+	Upper: 56
 	Delay: 1000
 	Trade: {
 		nodrop: true
@@ -94436,7 +94468,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_STORMBLAST,1; ">
+	Script: <" itemskill RK_STORMBLAST, 1; ">
 },
 {
 	Id: 12733
@@ -94445,6 +94477,10 @@ item_db: (
 	Type: 11
 	Buy: 2
 	Weight: 100
+	Job: {
+		Knight: true
+	}
+	Upper: 56
 	Trade: {
 		nodrop: true
 		notrade: true
@@ -94458,8 +94494,10 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_STONEHARDSKIN,1; ">
+	Script: <" itemskill RK_STONEHARDSKIN, 1; ">
 },
+
+//==  Rune Knight Rune Ores =============================
 {
 	Id: 12734
 	AegisName: "Runstone_Quality"
@@ -94467,9 +94505,6 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 100
-	Job: {
-		Knight: true
-	}
 	BuyingStore: true
 	Script: <" makerune 5; ">
 },
@@ -94480,9 +94515,6 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 100
-	Job: {
-		Knight: true
-	}
 	BuyingStore: true
 	Script: <" makerune 11; ">
 },
@@ -94493,9 +94525,6 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 100
-	Job: {
-		Knight: true
-	}
 	BuyingStore: true
 	Script: <" makerune 14; ">
 },
@@ -94506,9 +94535,6 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 100
-	Job: {
-		Knight: true
-	}
 	BuyingStore: true
 	Script: <" makerune 2; ">
 },
@@ -94519,9 +94545,6 @@ item_db: (
 	Type: 0
 	Buy: 2
 	Weight: 100
-	Job: {
-		Knight: true
-	}
 	BuyingStore: true
 	Script: <" makerune 8; ">
 },
@@ -146821,6 +146844,10 @@ item_db: (
 	Type: 11
 	Buy: 2
 	Weight: 100
+	Job: {
+		Knight: true
+	}
+	Upper: 56
 	Delay: 60000
 	Trade: {
 		nodrop: true
@@ -146832,7 +146859,7 @@ item_db: (
 		noauction: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_LUXANIMA,1; ">
+	Script: <" itemskill RK_LUXANIMA, 1; ">
 },
 {
 	Id: 22669
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 618111d2a..ac2382d90 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -147,6 +147,15 @@ enum item_itemid {
 	ITEMID_BLACK_THING           = 12435,
 	ITEMID_BOARDING_HALTER       = 12622,
 	ITEMID_NOBLE_NAMEPLATE       = 12705,
+	ITEMID_NAUTHIZ               = 12725,
+	ITEMID_RAIDO                 = 12726,
+	ITEMID_BERKANA               = 12727,
+	ITEMID_ISA                   = 12728,
+	ITEMID_OTHILA                = 12729,
+	ITEMID_URUZ                  = 12730,
+	ITEMID_THURISAZ              = 12731,
+	ITEMID_WYRD                  = 12732,
+	ITEMID_HAGALAZ               = 12733,
 	ITEMID_DUN_TELE_SCROLL1      = 14527,
 	ITEMID_BATTLE_MANUAL25       = 14532,
 	ITEMID_BATTLE_MANUAL100      = 14533,
@@ -161,6 +170,7 @@ enum item_itemid {
 	ITEMID_PILEBUNCKER_S         = 16030,
 	ITEMID_PILEBUNCKER_P         = 16031,
 	ITEMID_PILEBUNCKER_T         = 16032,
+	ITEMID_LUX_ANIMA             = 22540,
 };
 
 enum cards_item_list {
@@ -275,23 +285,6 @@ enum poison_item_list {
 	ITEMID_POISON_FATIGUE,       // 12724
 };
 
-
-/**
- * Rune Knight
- **/
-enum rune_item_list {
-	ITEMID_NAUTHIZ    = 12725,
-	ITEMID_RAIDO,    // 12726
-	ITEMID_BERKANA,  // 12727
-	ITEMID_ISA,      // 12728
-	ITEMID_OTHILA,   // 12729
-	ITEMID_URUZ,     // 12730
-	ITEMID_THURISAZ, // 12731
-	ITEMID_WYRD,     // 12732
-	ITEMID_HAGALAZ,  // 12733
-	ITEMID_LUX_ANIMA  = 22540,
-};
-
 /**
  * Geneticist
  */
@@ -566,7 +559,6 @@ struct item_data {
 #define itemdb_canrefine(n)   (!itemdb->search(n)->flag.no_refine)
 #define itemdb_allowoption(n) (!itemdb->search(n)->flag.no_options)
 
-#define itemdb_is_rune(n)        (((n) >= ITEMID_NAUTHIZ && (n) <= ITEMID_HAGALAZ) || (n) == ITEMID_LUX_ANIMA)
 #define itemdb_is_element(n)     ((n) >= ITEMID_SCARLET_PTS && (n) <= ITEMID_LIME_GREEN_PTS)
 #define itemdb_is_spellbook(n)   ((n) >= ITEMID_MAGIC_BOOK_FB && (n) <= ITEMID_MAGIC_BOOK_DL)
 #define itemdb_is_poison(n)      ((n) >= ITEMID_POISON_PARALYSIS && (n) <= ITEMID_POISON_FATIGUE)
diff --git a/src/map/pc.c b/src/map/pc.c
index 0dde3cd9e..4b1a586a8 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4918,11 +4918,6 @@ int pc_isUseitem(struct map_session_data *sd,int n)
 		return 0;
 
 	/**
-	 * Only Rune Knights may use runes
-	 **/
-	if (itemdb_is_rune(nameid) && (sd->job & MAPID_THIRDMASK) != MAPID_RUNE_KNIGHT)
-		return 0;
-	/**
 	 * Only GCross may use poisons
 	 **/
 	else if (itemdb_is_poison(nameid) && (sd->job & MAPID_THIRDMASK) != MAPID_GUILLOTINE_CROSS)