[08] Reload item enchants and random props

crates/wow-database/src/statements/character.rs

@@ -1877,7 +1877,8 @@ impl StatementDef for CharStatements {
             Self::SEL_MAX_GUID => "SELECT MAX(guid) FROM characters",
             Self::SEL_CHAR_EQUIPMENT => {
                 "SELECT ci.slot, ii.itemEntry, ci.item, ii.count, ii.durability, ii.context, \
-                 ii.flags, ii.playedTime, ir.paidMoney, ir.paidExtendedCost \
+                 ii.flags, ii.playedTime, ii.enchantments, ii.randomPropertiesId, \
+                 ii.randomPropertiesSeed, ir.paidMoney, ir.paidExtendedCost \
                  FROM character_inventory ci \
                  JOIN item_instance ii ON ci.item = ii.guid \
                  LEFT JOIN item_refund_instance ir \
@@ -3106,7 +3107,8 @@ impl StatementDef for CharStatements {
             }
             Self::SEL_CHAR_BAG_CONTENTS => {
                 "SELECT bag_ci.slot, ci.slot, ii.itemEntry, ci.item, ii.count, ii.durability, ii.context, \
-                 ii.flags, ii.playedTime, ir.paidMoney, ir.paidExtendedCost \
+                 ii.flags, ii.playedTime, ii.enchantments, ii.randomPropertiesId, \
+                 ii.randomPropertiesSeed, ir.paidMoney, ir.paidExtendedCost \
                  FROM character_inventory ci \
                  JOIN character_inventory bag_ci \
                    ON bag_ci.guid = ci.guid AND bag_ci.item = ci.bag \
@@ -6014,6 +6016,21 @@ mod tests {
                 .count(),
             1
         );
+        assert!(
+            CharStatements::SEL_CHAR_EQUIPMENT
+                .sql()
+                .contains("ii.enchantments")
+        );
+        assert!(
+            CharStatements::SEL_CHAR_EQUIPMENT
+                .sql()
+                .contains("ii.randomPropertiesId")
+        );
+        assert!(
+            CharStatements::SEL_CHAR_EQUIPMENT
+                .sql()
+                .contains("ii.randomPropertiesSeed")
+        );
         assert_eq!(
             CharStatements::INS_ITEM_INSTANCE_WITH_RANDOM_CONTEXT
                 .sql()
@@ -6061,6 +6078,21 @@ mod tests {
                 .count(),
             1
         );
+        assert!(
+            CharStatements::SEL_CHAR_BAG_CONTENTS
+                .sql()
+                .contains("ii.enchantments")
+        );
+        assert!(
+            CharStatements::SEL_CHAR_BAG_CONTENTS
+                .sql()
+                .contains("ii.randomPropertiesId")
+        );
+        assert!(
+            CharStatements::SEL_CHAR_BAG_CONTENTS
+                .sql()
+                .contains("ii.randomPropertiesSeed")
+        );
         assert_eq!(
             CharStatements::DEL_ITEM_REFUND_INSTANCE
                 .sql()

crates/wow-packet/src/packets/update.rs

@@ -1369,6 +1369,7 @@ pub struct ItemCreateData {
     pub max_durability: u32,
     pub random_properties_seed: i32,
     pub random_properties_id: i32,
+    pub enchantments: [ItemEnchantmentValuesUpdate; 13],
     pub context: u8,
     /// Non-zero for `Bag` objects. C++ writes those as TYPEID_CONTAINER
     /// and appends `ContainerData::WriteCreate` after `ItemData::WriteCreate`.
@@ -5317,13 +5318,13 @@ fn write_item_create_block(
     // DynamicFlags
     val_buf.write_uint32(data.dynamic_flags);
 
-    // 13 x ItemEnchantment (all zeros)
-    for _ in 0..13 {
-        val_buf.write_int32(0); // ID
-        val_buf.write_int32(0); // Duration
-        val_buf.write_int16(0); // Charges
-        val_buf.write_uint8(0); // Field_A
-        val_buf.write_uint8(0); // Field_B
+    // 13 x ItemEnchantment
+    for enchantment in data.enchantments {
+        val_buf.write_int32(enchantment.id);
+        val_buf.write_uint32(enchantment.duration);
+        val_buf.write_int16(enchantment.charges);
+        val_buf.write_uint8(enchantment.field_a);
+        val_buf.write_uint8(enchantment.field_b);
     }
 
     // PropertySeed, RandomPropertiesID
@@ -9546,6 +9547,16 @@ mod tests {
                 max_durability: 20,
                 random_properties_seed: 456,
                 random_properties_id: -77,
+                enchantments: {
+                    let mut enchantments = [ItemEnchantmentValuesUpdate::default(); 13];
+                    enchantments[0] = ItemEnchantmentValuesUpdate {
+                        id: 2673,
+                        duration: 0,
+                        charges: 0,
+                        ..Default::default()
+                    };
+                    enchantments
+                },
                 context: 2,
                 container_slots: 0,
                 container_item_guids: [ObjectGuid::EMPTY; 36],
@@ -9577,6 +9588,11 @@ mod tests {
                 .any(|window| window == (-77i32).to_le_bytes())
         );
         assert!(bytes.windows(4).any(|window| window == 2i32.to_le_bytes()));
+        assert!(
+            bytes
+                .windows(4)
+                .any(|window| window == 2673i32.to_le_bytes())
+        );
     }
 
     #[test]
@@ -9599,6 +9615,7 @@ mod tests {
                 max_durability: 0,
                 random_properties_seed: 0,
                 random_properties_id: 0,
+                enchantments: [ItemEnchantmentValuesUpdate::default(); 13],
                 context: 0,
                 container_slots: 16,
                 container_item_guids,