From 6f59f290d03774c697b0d3b6520d642b58141fe9 Mon Sep 17 00:00:00 2001
From: Jedzkie <jedzkie13@rocketmail.com>
Date: Tue, 18 Apr 2017 17:13:26 +0800
Subject: Update Rune Knight Runes & Ores

---
 src/map/itemdb.h | 28 ++++++++++------------------
 src/map/pc.c     |  5 -----
 2 files changed, 10 insertions(+), 23 deletions(-)

(limited to 'src')

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
@@ -4917,11 +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 Rune Knights may use runes
-	 **/
-	if (itemdb_is_rune(nameid) && (sd->job & MAPID_THIRDMASK) != MAPID_RUNE_KNIGHT)
-		return 0;
 	/**
 	 * Only GCross may use poisons
 	 **/
-- 
cgit v1.2.3-70-g09d2