From 017a9b80ee3a9d63f5ac3c956f496c009a16ba7c Mon Sep 17 00:00:00 2001
From: Image <image.emagi@gmail.com>
Date: Sun, 21 Mar 2021 08:13:20 -0400
Subject: [PATCH] Struct updates for merchants (red text description) and item
display options (scribed/need other spell scribed first)
---
server/ItemStructs.xml | 20 +++++++++++++-------
server/WorldStructs.xml | 6 ++----
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/server/ItemStructs.xml b/server/ItemStructs.xml
index 1fceabc22..57f6572d6 100644
--- a/server/ItemStructs.xml
+++ b/server/ItemStructs.xml
@@ -6572,8 +6572,9 @@
<Data ElementName="spell_info" Substruct="WS_SpellInfo" Size="1" />
<Data ElementName="scribed" Type="int8" Size="1" />
<Data ElementName="scribed_better_version" Type="int8" Size="1" IfVariableSet="scribed" />
+<Data ElementName="unknown_1188_2_MJ" Type="int8" Size="1" />
<Data ElementName="require_previous" Type="int8" Size="1" /> <!-- added on 4/26/19 -->
-<Data ElementName="unknown_1188_2_MJ" Type="int8" Size="2" />
+<Data ElementName="require_membership" Type="int8" Size="1" />
<Data ElementName="footer" Substruct="Substruct_ItemFooter" Size="1" />
</Struct>
<Struct Name="WS_ItemRecipeBook" ClientVersion="57048" OpcodeName="OP_ClientCmdMsg" OpcodeType="OP_EqExamineInfoCmd">
@@ -6775,8 +6776,9 @@
<Data ElementName="spell_info" Substruct="WS_SpellInfo" Size="1" />
<Data ElementName="scribed" Type="int8" Size="1" />
<Data ElementName="scribed_better_version" Type="int8" Size="1" IfVariableSet="scribed" />
+<Data ElementName="unknown_1188_2_MJ" Type="int8" Size="1" />
<Data ElementName="require_previous" Type="int8" Size="1" /> <!-- added on 4/26/19 -->
-<Data ElementName="unknown_1188_2_MJ" Type="int8" Size="2" />
+<Data ElementName="require_membership" Type="int8" Size="1" />
<Data ElementName="footer" Substruct="Substruct_ItemFooter" Size="1" />
</Struct>
<Struct Name="WS_ItemRecipeBook" ClientVersion="57107" OpcodeName="OP_ClientCmdMsg" OpcodeType="OP_EqExamineInfoCmd">
@@ -6977,8 +6979,9 @@
<Data ElementName="spell_info" Substruct="WS_SpellInfo" Size="1" />
<Data ElementName="scribed" Type="int8" Size="1" />
<Data ElementName="scribed_better_version" Type="int8" Size="1" IfVariableSet="scribed" />
+<Data ElementName="unknown_1188_2_MJ" Type="int8" Size="1" />
<Data ElementName="require_previous" Type="int8" Size="1" /> <!-- added on 4/26/19 -->
-<Data ElementName="unknown_1188_2_MJ" Type="int8" Size="2" />
+<Data ElementName="require_membership" Type="int8" Size="1" />
<Data ElementName="footer" Substruct="Substruct_ItemFooter" Size="1" />
</Struct>
<Struct Name="WS_ItemRecipeBook" ClientVersion="58571" OpcodeName="OP_ClientCmdMsg" OpcodeType="OP_EqExamineInfoCmd">
@@ -7179,8 +7182,9 @@
<Data ElementName="spell_info" Substruct="WS_SpellInfo" Size="1" />
<Data ElementName="scribed" Type="int8" Size="1" />
<Data ElementName="scribed_better_version" Type="int8" Size="1" IfVariableSet="scribed" />
+<Data ElementName="unknown_1188_2_MJ" Type="int8" Size="1" />
<Data ElementName="require_previous" Type="int8" Size="1" /> <!-- added on 4/26/19 -->
-<Data ElementName="unknown_1188_2_MJ" Type="int8" Size="2" />
+<Data ElementName="require_membership" Type="int8" Size="1" />
<Data ElementName="footer" Substruct="Substruct_ItemFooter" Size="1" />
</Struct>
<Struct Name="WS_ItemRecipeBook" ClientVersion="58617" OpcodeName="OP_ClientCmdMsg" OpcodeType="OP_EqExamineInfoCmd">
@@ -7382,8 +7386,9 @@
<Data ElementName="spell_info" Substruct="WS_SpellInfo" Size="1" />
<Data ElementName="scribed" Type="int8" Size="1" />
<Data ElementName="scribed_better_version" Type="int8" Size="1" IfVariableSet="scribed" />
+<Data ElementName="unknown_1188_2_MJ" Type="int8" Size="1" />
<Data ElementName="require_previous" Type="int8" Size="1" /> <!-- added on 4/26/19 -->
-<Data ElementName="unknown_1188_2_MJ" Type="int8" Size="2" />
+<Data ElementName="require_membership" Type="int8" Size="1" />
<Data ElementName="footer" Substruct="Substruct_ItemFooter" Size="1" />
</Struct>
<Struct Name="WS_ItemRecipeBook" ClientVersion="60024" OpcodeName="OP_ClientCmdMsg" OpcodeType="OP_EqExamineInfoCmd">
@@ -7585,8 +7590,9 @@
<Data ElementName="spell_info" Substruct="WS_SpellInfo" Size="1" />
<Data ElementName="scribed" Type="int8" Size="1" />
<Data ElementName="scribed_better_version" Type="int8" Size="1" IfVariableSet="scribed" />
+<Data ElementName="unknown_1188_2_MJ" Type="int8" Size="1" />
<Data ElementName="require_previous" Type="int8" Size="1" /> <!-- added on 4/26/19 -->
-<Data ElementName="unknown_1188_2_MJ" Type="int8" Size="2" />
+<Data ElementName="require_membership" Type="int8" Size="1" />
<Data ElementName="footer" Substruct="Substruct_ItemFooter" Size="1" />
</Struct>
<Struct Name="WS_ItemRecipeBook" ClientVersion="60055" OpcodeName="OP_ClientCmdMsg" OpcodeType="OP_EqExamineInfoCmd">
@@ -12033,4 +12039,4 @@
</Data>
<Data ElementName="footer" Substruct="Substruct_ItemFooter" Size="1" />
</Struct>
-</EQ2Emulator>
\ No newline at end of file
+</EQ2Emulator>
diff --git a/server/WorldStructs.xml b/server/WorldStructs.xml
index 348537edd..726131dba 100644
--- a/server/WorldStructs.xml
+++ b/server/WorldStructs.xml
@@ -9449,8 +9449,7 @@ to zero and treated like placeholders." />
<Data ElementName="token_id2" Type="sint32" Size =" 1" />
<Data ElementName="token_name" Type="EQ2_16Bit_String" Size =" 1" />
</Data>
- <Data ElementName="description" Type="EQ2_8Bit_String" Size="1" />
- <Data ElementName="unknown" Type="int8" Size="1" />
+ <Data ElementName="description" Type="EQ2_16Bit_String" Size="1" />
</Data>
<Data ElementName="type" Type="int32" />
<Data ElementName="unknown8" Type="int8" Size="43" />
@@ -9487,8 +9486,7 @@ to zero and treated like placeholders." />
<Data ElementName="token_id2" Type="sint32" Size =" 1" />
<Data ElementName="token_name" Type="EQ2_16Bit_String" Size =" 1" />
</Data>
- <Data ElementName="description" Type="EQ2_8Bit_String" Size="1" />
- <Data ElementName="unknown" Type="int8" Size="1" />
+ <Data ElementName="description" Type="EQ2_16Bit_String" Size="1" />
</Data>
<Data ElementName="type" Type="int32" />
<Data ElementName="unknown8a" Type="int16" Size="20" />