Browse Source

Struct updates for merchants (red text description) and item display options (scribed/need other spell scribed first)

Image 3 years ago
parent
commit
017a9b80ee
2 changed files with 15 additions and 11 deletions
  1. 13 7
      server/ItemStructs.xml
  2. 2 4
      server/WorldStructs.xml

+ 13 - 7
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>
+</EQ2Emulator>

+ 2 - 4
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" />