Added missing fields for MovementBlock

gtker · Jul 15, 2024 · db051bf · db051bf
1 parent 255234c
commit db051bf
Show file tree

Hide file tree

Showing 15 changed files with 2,284 additions and 1,622 deletions.
diff --git a/intermediate_representation.json b/intermediate_representation.json
diff --git a/wow_message_parser/wowm/world/gameobject/smsg_update_object_3_3_5.wowm b/wow_message_parser/wowm/world/gameobject/smsg_update_object_3_3_5.wowm
@@ -25,45 +25,37 @@ flag UpdateFlag : u16 {
 
 flag SplineFlag : u32 {
     NONE = 0x00000000;
-    DONE = 0x00000001;
+    DONE = 0x00000100;
     /// vmangos: Affects elevation computation
-    FALLING = 0x00000002;
-    UNKNOWN3 = 0x00000004;
-    UNKNOWN4 = 0x00000008;
-    UNKNOWN5 = 0x00000010;
-    UNKNOWN6 = 0x00000020;
-    UNKNOWN7 = 0x00000040;
-    UNKNOWN8 = 0x00000080;
-    RUNMODE = 0x00000100;
-    /// vmangos: Smooth movement(Catmullrom interpolation mode), flying animation
-    FLYING = 0x00000200;
+    FALLING = 0x00000200;
     NO_SPLINE = 0x00000400;
     PARABOLIC = 0x00000800;
-    UNKNOWN13 = 0x00001000;
-    UNKNOWN14 = 0x00002000;
-    UNKNOWN15 = 0x00004000;
-    UNKNOWN16 = 0x00008000;
-    FINAL_POINT = 0x00010000;
-    FINAL_TARGET = 0x00020000;
-    FINAL_ANGLE = 0x00040000;
-    /// vmangos: exists, but unknown what it does
-    UNKNOWN19 = 0x00080000;
-    /// vmangos: Movement by cycled spline
-    CYCLIC = 0x00100000;
-    /// vmangos: Everytimes appears with cyclic flag in monster move packet, erases first spline vertex after first cycle done
-    ENTER_CYCLE = 0x00200000;
+    WALK_MODE = 0x00001000;
+    FLYING = 0x00002000;
+    ORIENTATION_FIXED = 0x00004000;
+    FINAL_POINT = 0x00008000;
+    FINAL_TARGET = 0x00010000;
+    FINAL_ANGLE = 0x00020000;
+    /// azerothcore: Used Catmullrom interpolation mode
+    CATMULLROM = 0x00040000;
+    /// azerothcore: Movement by cycled spline
+    CYCLIC = 0x00080000;
+    /// azerothcore: Everytimes appears with cyclic flag in monster move packet, erases first spline vertex after first cycle done
+    ENTER_CYCLE = 0x00100000;
+    /// azerothcore: Plays animation after some time passed
+    ANIMATION = 0x00200000;
     /// vmangos: Will never arrive
     FROZEN = 0x00400000;
-    UNKNOWN23 = 0x00800000;
-    UNKNOWN24 = 0x01000000;
+    TRANSPORT_ENTER = 0x00800000;
+    TRANSPORT_EXIT = 0x01000000;
     /// vmangos: exists, but unknown what it does
-    UNKNOWN25 = 0x02000000;
-    UNKNOWN26 = 0x04000000;
-    UNKNOWN27 = 0x08000000;
-    UNKNOWN28 = 0x10000000;
-    UNKNOWN29 = 0x20000000;
-    UNKNOWN30 = 0x40000000;
-    UNKNOWN31 = 0x80000000;
+    UNKNOWN7 = 0x02000000;
+    UNKNOWN8 = 0x04000000;
+    ORIENTATION_INVERSED = 0x08000000;
+    UNKNOWN10 = 0x10000000;
+    UNKNOWN11 = 0x20000000;
+    UNKNOWN12 = 0x40000000;
+    UNKNOWN13 = 0x80000000;
 }
 
 enum ObjectType : u8 {
@@ -137,14 +129,20 @@ struct MovementBlock {
             u32 time_passed;
             u32 duration;
             u32 id;
+            f32 duration_mod;
+            f32 duration_mod_next;
+            f32 vertical_acceleration;
+            f32 effect_start_time;
             u32 amount_of_nodes;
             Vector3d[amount_of_nodes] nodes;
+            u8 mode;
             Vector3d final_node;
         }
     }
     else if (update_flag & POSITION) {
         PackedGuid transport_guid;
         Vector3d position1;
+        Vector3d transport_offset;
         f32 orientation1;
         f32 corpse_orientation;
     }

diff --git a/wow_world_base/src/inner/wrath/object_type.rs b/wow_world_base/src/inner/wrath/object_type.rs
@@ -1,4 +1,4 @@
-/// Auto generated from the original `wowm` in file [`wow_message_parser/wowm/world/gameobject/smsg_update_object_3_3_5.wowm:69`](https://github.com/gtker/wow_messages/tree/main/wow_message_parser/wowm/world/gameobject/smsg_update_object_3_3_5.wowm#L69):
+/// Auto generated from the original `wowm` in file [`wow_message_parser/wowm/world/gameobject/smsg_update_object_3_3_5.wowm:61`](https://github.com/gtker/wow_messages/tree/main/wow_message_parser/wowm/world/gameobject/smsg_update_object_3_3_5.wowm#L61):
 /// ```text
 /// enum ObjectType : u8 {
 ///     OBJECT = 0;