new: w3o, w3u, w3v, w3z stub, updates

Signed-off-by: Water <[email protected]>
WaterKnight · May 12, 2023 · f7aa35b · f7aa35b
1 parent ec30c32
commit f7aa35b
Show file tree

Hide file tree

Showing 14 changed files with 759 additions and 101 deletions.
diff --git a/w3-doo.ksy b/w3-doo.ksy
@@ -6,25 +6,25 @@ meta:
     - w3id
 seq:
   - id: file_id
-    type: u4
+    type: w3id
   - id: version
     type: u4
   - id: sub_version
     type: u4
-  - id: doodads_amount
+  - id: num_doodad
     type: u4
   - id: doodad
     type: doodad
     repeat: expr
-    repeat-expr: doodads_amount
+    repeat-expr: num_doodad
   - id: special_doodad_version
     type: u4
-  - id: special_doodads_amount
+  - id: num_special_doodad
     type: u4
   - id: special_doodad
     type: special_doodad
     repeat: expr
-    repeat-expr: special_doodads_amount
+    repeat-expr: num_special_doodad
 types:
   doodad:
     seq:
@@ -54,22 +54,22 @@ types:
         type: u1
       - id: random_item_set_ptr
         type: u4
-      - id: item_sets_amount
+      - id: num_item_set
         type: u4
       - id: item_set
         type: item_set
         repeat: expr
-        repeat-expr: item_sets_amount
+        repeat-expr: num_item_set
       - id: editor_id
         type: u4
   item_set:
     seq:
-      - id: items_amount
+      - id: num_item
         type: u4
       - id: item
         type: item
         repeat: expr
-        repeat-expr: items_amount
+        repeat-expr: num_item
   item:
     seq:
       - id: id

diff --git a/w3-dooUnits.ksy b/w3-dooUnits.ksy
@@ -11,12 +11,12 @@ seq:
     type: u4
   - id: sub_version
     type: u4
-  - id: units_amount
+  - id: num_unit
     type: u4
   - id: unit
     type: unit
     repeat: expr
-    repeat-expr: units_amount
+    repeat-expr: num_unit
 types:
   unit:
     seq:
@@ -54,12 +54,12 @@ types:
         type: u4
       - id: dropped_item_set_ptr
         type: u4
-      - id: dropped_item_sets_amount
+      - id: num_dropped_item_set
         type: u4
       - id: dropped_item_set
         type: item_set
         repeat: expr
-        repeat-expr: dropped_item_sets_amount
+        repeat-expr: num_dropped_item_set
       - id: resources_amount
         type: u4
       - id: target_aquisition
@@ -72,18 +72,18 @@ types:
         type: u4
       - id: hero_intelligence
         type: u4
-      - id: inventory_items_amount
+      - id: num_inventory_item
         type: u4
       - id: inventory_item
         type: inventory_item
         repeat: expr
-        repeat-expr: inventory_items_amount
-      - id: ability_mods_amount
+        repeat-expr: num_inventory_item
+      - id: num_ability_mod
         type: u4
       - id: ability_mod
         type: ability_mod
         repeat: expr
-        repeat-expr: ability_mods_amount
+        repeat-expr: num_ability_mod
       - id: random
         type: random
       - id: color
@@ -94,10 +94,12 @@ types:
         type: u4
   item_set:
     seq:
-      - id: items_amount
+      - id: num_item
         type: u4
       - id: item
         type: item
+        repeat: expr
+        repeat-expr: num_item
   item:
     seq:
       - id: id
@@ -122,7 +124,9 @@ types:
   random:
     seq:
       - id: random_type
-        type: u4
+        type: u2
+      - id: random_type_rest
+        type: u2
       - id: value
         type:
           switch-on: random_type
@@ -148,13 +152,13 @@ types:
         type: u4
   custom_group:
     seq:
-      - id: units_amount
+      - id: num_group_unit
         type: u4
-      - id: unit
+      - id: group_unit
         type: unit
         repeat: expr
-        repeat-expr: units_amount
-  unit:
+        repeat-expr: num_group_unit
+  group_unit:
     seq:
       - id: id
         type: w3id

diff --git a/w3-mmp.ksy b/w3-mmp.ksy
@@ -10,12 +10,12 @@ seq:
 types:
   icons_chunk:
     seq:
-      - id: icons_amount
+      - id: num_icon
         type: u4
       - id: icon
         type: icon
         repeat: expr
-        repeat-expr: icons_amount
+        repeat-expr: num_icon
   icon:
     seq:
       - id: icon_type

diff --git a/w3-w3a.ksy b/w3-w3a.ksy
@@ -15,30 +15,30 @@ seq:
 types:
   objects_chunk:
     seq:
-      - id: amount
+      - id: num_obj
         type: u4
       - id: obj
         type: obj
         repeat: expr
-        repeat-expr: amount
+        repeat-expr: num_obj
   obj:
     seq:
       - id: base_id
         type: w3id
       - id: new_id
         type: w3id
-      - id: unknown_amount
+      - id: num_unknown
         type: u4
       - id: unknown
         type: u4
         repeat: expr
-        repeat-expr: unknown_amount
-      - id: mods_amount
+        repeat-expr: num_unknown
+      - id: num_mod
         type: u4
       - id: mod
         type: mod
         repeat: expr
-        repeat-expr: mods_amount
+        repeat-expr: num_mod
   mod:
     seq:
       - id: mod_id

diff --git a/w3-w3c.ksy b/w3-w3c.ksy
@@ -7,12 +7,12 @@ meta:
 seq:
   - id: version
     type: u4
-  - id: cameras_amount
+  - id: num_camera
     type: u4
   - id: camera
     type: camera
     repeat: expr
-    repeat-expr: cameras_amount
+    repeat-expr: num_camera
 types:
   camera:
     seq:

diff --git a/w3-w3e.ksy b/w3-w3e.ksy
@@ -14,18 +14,18 @@ seq:
     enum: tileset
   - id: use_custom_tileset
     type: u4
-  - id: tiles_amount
+  - id: num_tile_id
     type: u4
   - id: tile_id
     type: w3id
     repeat: expr
-    repeat-expr: tiles_amount
-  - id: cliff_tiles_amount
+    repeat-expr: num_tile_id
+  - id: num_cliff_tile_id
     type: u4
   - id: cliff_tile_id
     type: w3id
     repeat: expr
-    repeat-expr: cliff_tiles_amount
+    repeat-expr: num_cliff_tile_id
   - id: map_width
     type: u4
   - id: map_height