refactor: add WeaponEntry/WeaponTable structs, use Weapon enum in match

Add WeaponEntry (0x1D0 bytes) and WeaponTable (header + 71 entries)
structs from wkJellyWorm RE data. DDGame.weapon_table is now typed
*mut WeaponTable, enabling array indexing instead of pointer math.

Use Weapon enum names in check_weapon_avail match arms instead of hex
literals. Fix hex-to-decimal conversion errors (0x37=55=NuclearTest,
not 0x37=37=NinjaRope). Rename fields to match actual weapons:
- weapon_36_disabled → donkey_disabled
- weapon_42_mode → invisibility_mode
- weapon_avail_threshold → double_turn_time_threshold
- weapon_index_offset → aquasheep_is_supersheep
- weapon_restriction_active → supersheep_restricted

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

crates/openwa-core/src/engine/ddgame.rs

@@ -9,6 +9,7 @@ use crate::display::palette::Palette;
 use crate::engine::ddgame_wrapper::DDGameWrapper;
 use crate::engine::game_info::GameInfo;
 use crate::engine::net_bridge::NetBridge;
+use crate::game::weapon::WeaponTable;
 use crate::input::keyboard::DDKeyboard;
 use crate::rebase::rb;
 // Re-export public GfxHandler functions so existing `engine::ddgame::*` imports keep working.
@@ -96,8 +97,8 @@ pub struct DDGame {
     pub arrow_collision_regions: [*mut u8; 32],
     /// 0x50C: Coordinate list — dynamic array of packed (x,y) terrain coords.
     pub coord_list: *mut CoordList,
-    /// 0x510: Weapon table pointer
-    pub weapon_table: *mut u8,
+    /// 0x510: Weapon table pointer (0x10 header + 71 × WeaponEntry).
+    pub weapon_table: *mut WeaponTable,
     /// 0x514: Unknown pointer (populated at runtime)
     pub _unknown_514: *mut u8,
     /// 0x518: Unknown pointer (populated at runtime)
@@ -281,9 +282,9 @@ pub struct DDGame {
 
     /// 0x7D84-0x7E24: Unknown
     pub _unknown_7d84: [u8; 0x7E25 - 0x7D84],
-    /// 0x7E25: Weapon restriction active flag (byte).
-    /// When nonzero, specific weapons (0x19 area) are disabled.
-    pub weapon_restriction_active: u8,
+    /// 0x7E25: SuperSheep/AquaSheep restriction active flag (byte).
+    /// When nonzero, the SuperSheep/AquaSheep weapon check is applied.
+    pub supersheep_restricted: u8,
     /// 0x7E26-0x7E2D: Unknown
     pub _unknown_7e26: [u8; 0x7E2E - 0x7E26],
     /// 0x7E2E: Version flag byte 1 (set by InitVersionFlags).

crates/openwa-core/src/engine/game_info.rs

@@ -29,9 +29,9 @@ pub struct GameInfo {
 
     /// 0xD77C-0xD931: Unknown
     pub _unknown_d77c: [u8; 0xD932 - 0xD77C],
-    /// 0xD932: Weapon availability threshold (u16). For weapon 0x45:
-    /// if game_version > 0xD1 and this > 0x7FFF, weapon is disabled.
-    pub weapon_avail_threshold: u16,
+    /// 0xD932: DoubleTurnTime availability threshold (u16).
+    /// If game_version > 0xD1 and this > 0x7FFF, DoubleTurnTime is disabled.
+    pub double_turn_time_threshold: u16,
     /// 0xD934-0xD93B: Unknown
     pub _unknown_d934: [u8; 0xD93C - 0xD934],
     /// 0xD93C: Super weapon allowed flag. If 0, super weapons are
@@ -49,12 +49,12 @@ pub struct GameInfo {
 
     /// 0xD947-0xD94B: Unknown
     pub _unknown_d947: [u8; 0xD94C - 0xD947],
-    /// 0xD94C: Weapon 0x36 (Indian Nuclear Test) disable flag.
-    pub weapon_36_disabled: u8,
+    /// 0xD94C: Donkey (weapon 0x36) disable flag.
+    pub donkey_disabled: u8,
     /// 0xD94D-0xD955: Unknown
     pub _unknown_d94d: [u8; 0xD956 - 0xD94D],
-    /// 0xD956: Weapon index offset flag. Affects weapon 0x19 availability check.
-    pub weapon_index_offset: u8,
+    /// 0xD956: When set, the AquaSheep slot is treated as SuperSheep instead.
+    pub aquasheep_is_supersheep: u8,
     /// 0xD957-0xD958: Unknown
     pub _unknown_d957: [u8; 0xD959 - 0xD957],
     /// 0xD959: Version-gated weapon restriction. If nonzero and game_version > 0x29,
@@ -97,9 +97,9 @@ pub struct GameInfo {
 
     /// 0xDAFA-0xDB07: Unknown
     pub _unknown_dafa: [u8; 0xDB08 - 0xDAFA],
-    /// 0xDB08: Weapon 0x42 mode flag (u32). Controls team-count vs network_ecx
-    /// check for weapon availability.
-    pub weapon_42_mode: u32,
+    /// 0xDB08: Invisibility (weapon 0x42) mode flag (u32). Controls team-count
+    /// vs network_ecx check for availability.
+    pub invisibility_mode: u32,
     /// 0xDB0C-0xDB1B: Unknown
     pub _unknown_db0c: [u8; 0xDB1C - 0xDB0C],
     /// 0xDB1C: Replay map sub-type (first DWORD of first payload).

crates/openwa-core/src/engine/game_state_init.rs

@@ -4,7 +4,6 @@
 //! InitGameState itself is Rust or the original WA code.
 
 use crate::engine::ddgame::DDGame;
-use crate::log::log_line;
 use crate::wa_alloc::wa_malloc;
 
 /// Pure Rust implementation of SpriteGfxTable__Init (0x541620).
@@ -350,20 +349,25 @@ pub unsafe fn check_weapon_avail(ddgame: *mut DDGame, weapon_index: u32) -> i32
     let game_version = (*gi).game_version;
     let num_teams = (*gi).num_teams;
 
+    use crate::game::weapon::Weapon;
+
     // Step 1: Special per-weapon disabling rules
     match weapon_index {
-        10 | 0x37 | 0x38 => {
+        w if w == Weapon::Earthquake as u32
+            || w == Weapon::NuclearTest as u32
+            || w == Weapon::Armageddon as u32 =>
+        {
             if (*gi).net_config_2 != 0 && (*gi).net_weapon_exception == 0 {
                 return 0;
             }
         }
-        0x36 => {
-            if (*gi).weapon_36_disabled != 0 {
+        w if w == Weapon::Donkey as u32 => {
+            if (*gi).donkey_disabled != 0 {
                 return 0;
             }
         }
-        0x42 => {
-            if (*gi).weapon_42_mode == 0 {
+        w if w == Weapon::Invisibility as u32 => {
+            if (*gi).invisibility_mode == 0 {
                 if (*ddgame).network_ecx == 0 {
                     return 0;
                 }
@@ -371,9 +375,9 @@ pub unsafe fn check_weapon_avail(ddgame: *mut DDGame, weapon_index: u32) -> i32
                 return 0;
             }
         }
-        0x45 => {
+        w if w == Weapon::DoubleTurnTime as u32 => {
             if game_version > 0xD1 {
-                if (*gi).weapon_avail_threshold > 0x7FFF {
+                if (*gi).double_turn_time_threshold > 0x7FFF {
                     return 0;
                 }
             }
@@ -381,11 +385,11 @@ pub unsafe fn check_weapon_avail(ddgame: *mut DDGame, weapon_index: u32) -> i32
         _ => {}
     }
 
-    // Step 2: Branch on weapon table entry + level_width_raw
-    let weapon_table = (*ddgame).weapon_table as *const u8;
-    let weapon_entry = *(weapon_table.add(0x10 + (weapon_index as usize) * 0x1D0) as *const i32);
+    // Step 2: Branch on weapon name pointer (non-null = weapon defined).
+    let weapon_table = (*ddgame).weapon_table;
+    let name_ptr = (*weapon_table).entries[weapon_index as usize].name1;
 
-    if (*ddgame).level_width_raw == 0 || weapon_entry != 0 {
+    if (*ddgame).level_width_raw == 0 || !name_ptr.is_null() {
         // Main path: check super weapon flag
         let super_result = is_super_weapon(weapon_index, (*ddgame).version_flag_3);
         if super_result != 0 && (*gi).super_weapon_allowed == 0 {
@@ -393,13 +397,14 @@ pub unsafe fn check_weapon_avail(ddgame: *mut DDGame, weapon_index: u32) -> i32
             return (game_version < 0x2A) as i32 - 1;
         }
 
-        if (*ddgame).weapon_restriction_active == 0 {
+        if (*ddgame).supersheep_restricted == 0 {
             return 1;
         }
 
-        // Check if weapon_index == (0x19 - (weapon_index_offset != 0))
-        let offset = ((*gi).weapon_index_offset != 0) as u32;
-        if weapon_index != 0x19 - offset {
+        // AquaSheep (25) or SuperSheep (24) depending on weapon_index_offset
+        let restricted_id = Weapon::AquaSheep as u32
+            - ((*gi).aquasheep_is_supersheep != 0) as u32;
+        if weapon_index != restricted_id {
             return 1;
         }
 

crates/openwa-core/src/game/mod.rs

@@ -14,4 +14,4 @@ pub use scheme::{
     SCHEME_PAYLOAD_V2, SCHEME_PAYLOAD_V3, SCHEME_WEAPON_ORDER, WEAPONS_TOTAL_COUNT,
     WEAPONS_V1_COUNT, WEAPONS_V1_OFFSET, WEAPONS_V2_COUNT, WEAPONS_V2_OFFSET, WEAPON_ENTRY_SIZE,
 };
-pub use weapon::Weapon;
+pub use weapon::{Weapon, WeaponEntry, WeaponTable};

crates/openwa-core/src/game/weapon.rs

@@ -1,3 +1,5 @@
+use core::ffi::c_char;
+
 /// Weapon types. Contiguous range 0-70.
 ///
 /// Source: wkJellyWorm Constants.h
@@ -92,3 +94,45 @@ impl TryFrom<u32> for Weapon {
         }
     }
 }
+
+// ============================================================
+// WeaponEntry — per-weapon data in the weapon table (0x1D0 bytes)
+// ============================================================
+
+/// Per-weapon data entry in the weapon table (0x1D0 = 464 bytes).
+///
+/// 71 standard entries (indices 0..70), matching the `Weapon` enum.
+/// Source: wkJellyWorm/src/CustomWeapons.h (WeaponStruct).
+///
+/// Only 3 fields are confirmed; the rest is opaque. wkJellyWorm copies
+/// entire entries via memcpy when creating custom weapons.
+#[repr(C)]
+pub struct WeaponEntry {
+    /// +0x00: Pointer to primary weapon name string.
+    /// Non-null means the weapon is defined/available.
+    pub name1: *const c_char,
+    /// +0x04: Pointer to secondary weapon name string.
+    pub name2: *const c_char,
+    /// +0x08: Weapon panel row index (0..12).
+    pub panel_row: i32,
+    /// +0x0C: Unknown.
+    pub _unknown_0c: i32,
+    /// +0x10-0x1CF: Unknown fields (113 × i32).
+    pub _unknown_10: [u8; 0x1D0 - 0x10],
+}
+const _: () = assert!(core::mem::size_of::<WeaponEntry>() == 0x1D0);
+
+/// Weapon table header (0x10 = 16 bytes before the first entry).
+///
+/// The table is allocated by `InitWeaponTable` (0x53CAB0) and stored
+/// at DDGame+0x510. Layout: 16-byte header + 71 × WeaponEntry.
+#[repr(C)]
+pub struct WeaponTable {
+    /// +0x00-0x0F: Header (purpose unknown).
+    pub _header: [u8; 0x10],
+    /// +0x10: Weapon entries array (71 standard weapons).
+    pub entries: [WeaponEntry; 71],
+}
+const _: () = assert!(
+    core::mem::size_of::<WeaponTable>() == 0x10 + 71 * 0x1D0
+);