From 828b080559c173d1916243e87705ad6364a5865d Mon Sep 17 00:00:00 2001
From: Devn00b <cronikus@gmail.com>
Date: Wed, 20 Jul 2022 00:26:34 -0700
Subject: [PATCH] Added ability to search 'Tradeskill' items from the broker
---
EQ2/source/WorldServer/Items/Items.cpp | 2 +-
EQ2/source/WorldServer/Items/Items.h | 1 +
EQ2/source/WorldServer/Items/ItemsDB.cpp | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/EQ2/source/WorldServer/Items/Items.cpp b/EQ2/source/WorldServer/Items/Items.cpp
index 4237d7575..959840cbc 100644
--- a/EQ2/source/WorldServer/Items/Items.cpp
+++ b/EQ2/source/WorldServer/Items/Items.cpp
@@ -310,7 +310,7 @@ vector<Item*>* MasterItemList::GetItems(string name, int64 itype, int64 ltype, i
break;
}
case ITEM_BROKER_TYPE_TRADESKILL:{
- if(item->IsTradeskill())
+ if(item->crafted == 1)
should_add = true;
break;
}
diff --git a/EQ2/source/WorldServer/Items/Items.h b/EQ2/source/WorldServer/Items/Items.h
index 6081a4f19..c1e128262 100644
--- a/EQ2/source/WorldServer/Items/Items.h
+++ b/EQ2/source/WorldServer/Items/Items.h
@@ -949,6 +949,7 @@ public:
std::time_t created;
std::map<int32, bool> grouped_char_ids;
ItemEffectType effect_type;
+ int8 crafted;
void AddEffect(string effect, int8 percentage, int8 subbulletflag);
void AddBookPage(int8 page, string page_text,int8 valign, int8 halign);
diff --git a/EQ2/source/WorldServer/Items/ItemsDB.cpp b/EQ2/source/WorldServer/Items/ItemsDB.cpp
index e49f17bb7..479002511 100644
--- a/EQ2/source/WorldServer/Items/ItemsDB.cpp
+++ b/EQ2/source/WorldServer/Items/ItemsDB.cpp
@@ -174,7 +174,6 @@ void WorldDatabase::LoadDataFromRow(DatabaseResult* result, Item* item)
item->generic_info.display_charges = result->GetInt8Str("display_charges");
item->generic_info.tradeskill_default_level = result->GetInt16Str("tradeskill_default_level");
-
item->generic_info.adventure_classes = result->GetInt64Str("adventure_classes");
item->generic_info.tradeskill_classes = result->GetInt64Str("tradeskill_classes");
@@ -222,6 +221,8 @@ void WorldDatabase::LoadDataFromRow(DatabaseResult* result, Item* item)
strcpy(item->generic_info.required_by_quest_name,"");
item->generic_info.transmuted_material = result->GetInt8Str("transmuted_material");
+
+ item->crafted = result->GetInt8Str("crafted");
}
int32 WorldDatabase::LoadSkillItems()