fleethub-core 1.12.11 → 1.12.12

package/pkg/fleethub_core_bg.js

@@ -121,15 +121,10 @@ function isLikeNone(x) {
     return x === undefined || x === null;
 }
 
-function getArrayJsValueFromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    const mem = getDataViewMemory0();
-    const result = [];
-    for (let i = ptr; i < ptr + 4 * len; i += 4) {
-        result.push(wasm.__wbindgen_export_2.get(mem.getUint32(i, true)));
-    }
-    wasm.__externref_drop_slice(ptr, len);
-    return result;
+function takeFromExternrefTable0(idx) {
+    const value = wasm.__wbindgen_export_2.get(idx);
+    wasm.__externref_table_dealloc(idx);
+    return value;
 }
 
 function _assertClass(instance, klass) {
@@ -138,12 +133,6 @@ function _assertClass(instance, klass) {
     }
 }
 
-function takeFromExternrefTable0(idx) {
-    const value = wasm.__wbindgen_export_2.get(idx);
-    wasm.__externref_table_dealloc(idx);
-    return value;
-}
-
 let cachedUint16ArrayMemory0 = null;
 
 function getUint16ArrayMemory0() {
@@ -153,11 +142,20 @@ function getUint16ArrayMemory0() {
     return cachedUint16ArrayMemory0;
 }
 
-function passArray16ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 2, 2) >>> 0;
-    getUint16ArrayMemory0().set(arg, ptr / 2);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
+function getArrayU16FromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return getUint16ArrayMemory0().subarray(ptr / 2, ptr / 2 + len);
+}
+
+function getArrayJsValueFromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    const mem = getDataViewMemory0();
+    const result = [];
+    for (let i = ptr; i < ptr + 4 * len; i += 4) {
+        result.push(wasm.__wbindgen_export_2.get(mem.getUint32(i, true)));
+    }
+    wasm.__externref_drop_slice(ptr, len);
+    return result;
 }
 
 function passArray8ToWasm0(arg, malloc) {
@@ -166,11 +164,6 @@ function passArray8ToWasm0(arg, malloc) {
     WASM_VECTOR_LEN = arg.length;
     return ptr;
 }
-
-function getArrayU16FromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return getUint16ArrayMemory0().subarray(ptr / 2, ptr / 2 + len);
-}
 /**
  * @param {ShipConditions} value
  * @returns {ShipConditions}
@@ -180,6 +173,13 @@ export function parse_ship_conditions(value) {
     return ret;
 }
 
+function passArray16ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 2, 2) >>> 0;
+    getUint16ArrayMemory0().set(arg, ptr / 2);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
 export function set_panic_hook() {
     wasm.set_panic_hook();
 }
@@ -209,6 +209,60 @@ export class AirSquadron {
         const ptr = this.__destroy_into_raw();
         wasm.__wbg_airsquadron_free(ptr, 0);
     }
+    /**
+     * @returns {number}
+     */
+    fighter_power() {
+        const ret = wasm.airsquadron_fighter_power(this.__wbg_ptr);
+        return ret;
+    }
+    /**
+     * @param {number} index
+     * @returns {number}
+     */
+    get_slot_size(index) {
+        const ret = wasm.airsquadron_get_slot_size(this.__wbg_ptr, index);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0];
+    }
+    /**
+     * @param {number} index
+     * @returns {number}
+     */
+    get_max_slot_size(index) {
+        const ret = wasm.airsquadron_get_max_slot_size(this.__wbg_ptr, index);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0];
+    }
+    /**
+     * @returns {number}
+     */
+    interception_power() {
+        const ret = wasm.airsquadron_interception_power(this.__wbg_ptr);
+        return ret;
+    }
+    /**
+     * 行動半径
+     * @returns {number}
+     */
+    radius() {
+        const ret = wasm.airsquadron_radius(this.__wbg_ptr);
+        return ret;
+    }
+    /**
+     * @param {string} key
+     * @returns {Gear | undefined}
+     */
+    get_gear(key) {
+        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.airsquadron_get_gear(this.__wbg_ptr, ptr0, len0);
+        return ret === 0 ? undefined : Gear.__wrap(ret);
+    }
     /**
      * @returns {string}
      */
@@ -258,60 +312,6 @@ export class AirSquadron {
     set mode(arg0) {
         wasm.__wbg_set_airsquadron_mode(this.__wbg_ptr, arg0);
     }
-    /**
-     * @param {string} key
-     * @returns {Gear | undefined}
-     */
-    get_gear(key) {
-        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.airsquadron_get_gear(this.__wbg_ptr, ptr0, len0);
-        return ret === 0 ? undefined : Gear.__wrap(ret);
-    }
-    /**
-     * @param {number} index
-     * @returns {number}
-     */
-    get_slot_size(index) {
-        const ret = wasm.airsquadron_get_slot_size(this.__wbg_ptr, index);
-        if (ret[2]) {
-            throw takeFromExternrefTable0(ret[1]);
-        }
-        return ret[0];
-    }
-    /**
-     * @param {number} index
-     * @returns {number}
-     */
-    get_max_slot_size(index) {
-        const ret = wasm.airsquadron_get_max_slot_size(this.__wbg_ptr, index);
-        if (ret[2]) {
-            throw takeFromExternrefTable0(ret[1]);
-        }
-        return ret[0];
-    }
-    /**
-     * @returns {number}
-     */
-    fighter_power() {
-        const ret = wasm.airsquadron_fighter_power(this.__wbg_ptr);
-        return ret;
-    }
-    /**
-     * @returns {number}
-     */
-    interception_power() {
-        const ret = wasm.airsquadron_interception_power(this.__wbg_ptr);
-        return ret;
-    }
-    /**
-     * 行動半径
-     * @returns {number}
-     */
-    radius() {
-        const ret = wasm.airsquadron_radius(this.__wbg_ptr);
-        return ret;
-    }
 }
 if (Symbol.dispose) AirSquadron.prototype[Symbol.dispose] = AirSquadron.prototype.free;
 
@@ -341,16 +341,13 @@ export class Analyzer {
         wasm.__wbg_analyzer_free(ptr, 0);
     }
     /**
-     * @param {ShipAnalyzerConfig} config
-     * @param {Ship} left
-     * @param {Ship} right
-     * @param {boolean} attacker_is_left
-     * @returns {AttackAnalysis}
+     * @param {Comp} comp
+     * @param {CompAnalyzerConfig} config
+     * @returns {CompAnalysis}
      */
-    analyze_ship_attack(config, left, right, attacker_is_left) {
-        _assertClass(left, Ship);
-        _assertClass(right, Ship);
-        const ret = wasm.analyzer_analyze_ship_attack(this.__wbg_ptr, config, left.__wbg_ptr, right.__wbg_ptr, attacker_is_left);
+    analyze_comp(comp, config) {
+        _assertClass(comp, Comp);
+        const ret = wasm.analyzer_analyze_comp(this.__wbg_ptr, comp.__wbg_ptr, config);
         return ret;
     }
     /**
@@ -370,13 +367,16 @@ export class Analyzer {
         return ret;
     }
     /**
-     * @param {Comp} comp
-     * @param {CompAnalyzerConfig} config
-     * @returns {CompAnalysis}
+     * @param {ShipAnalyzerConfig} config
+     * @param {Ship} left
+     * @param {Ship} right
+     * @param {boolean} attacker_is_left
+     * @returns {AttackAnalysis}
      */
-    analyze_comp(comp, config) {
-        _assertClass(comp, Comp);
-        const ret = wasm.analyzer_analyze_comp(this.__wbg_ptr, comp.__wbg_ptr, config);
+    analyze_ship_attack(config, left, right, attacker_is_left) {
+        _assertClass(left, Ship);
+        _assertClass(right, Ship);
+        const ret = wasm.analyzer_analyze_ship_attack(this.__wbg_ptr, config, left.__wbg_ptr, right.__wbg_ptr, attacker_is_left);
         return ret;
     }
     /**
@@ -506,13 +506,6 @@ export class Comp {
         }
         wasm.__wbg_set_comp_boss_sup(this.__wbg_ptr, ptr0);
     }
-    /**
-     * @returns {Side}
-     */
-    side() {
-        const ret = wasm.comp_side(this.__wbg_ptr);
-        return ret;
-    }
     /**
      * @returns {boolean}
      */
@@ -521,18 +514,17 @@ export class Comp {
         return ret !== 0;
     }
     /**
-     * @returns {boolean}
-     */
-    is_player() {
-        const ret = wasm.comp_is_player(this.__wbg_ptr);
-        return ret !== 0;
-    }
-    /**
-     * @returns {boolean}
+     * @param {FleetType} ft
+     * @returns {string | undefined}
      */
-    is_enemy() {
-        const ret = wasm.comp_is_enemy(this.__wbg_ptr);
-        return ret !== 0;
+    get_fleet_id(ft) {
+        const ret = wasm.comp_get_fleet_id(this.__wbg_ptr, ft);
+        let v1;
+        if (ret[0] !== 0) {
+            v1 = getStringFromWasm0(ret[0], ret[1]).slice();
+            wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
+        }
+        return v1;
     }
     /**
      * @param {string} id
@@ -544,6 +536,16 @@ export class Comp {
         const ret = wasm.comp_has_ship_eid(this.__wbg_ptr, ptr0, len0);
         return ret !== 0;
     }
+    /**
+     * 制空値
+     * @param {boolean} escort_participates
+     * @param {AirWaveType} air_type
+     * @returns {number | undefined}
+     */
+    fighter_power(escort_participates, air_type) {
+        const ret = wasm.comp_fighter_power(this.__wbg_ptr, escort_participates, air_type);
+        return ret === 0x100000001 ? undefined : ret;
+    }
     /**
      * @returns {string | undefined}
      */
@@ -556,6 +558,14 @@ export class Comp {
         }
         return v1;
     }
+    /**
+     * @param {FleetType} fleet_type
+     * @returns {number | undefined}
+     */
+    fleet_los_mod(fleet_type) {
+        const ret = wasm.comp_fleet_los_mod(this.__wbg_ptr, fleet_type);
+        return ret[0] === 0 ? undefined : ret[1];
+    }
     /**
      * @returns {boolean}
      */
@@ -564,33 +574,28 @@ export class Comp {
         return ret !== 0;
     }
     /**
-     * @returns {CompMeta}
+     * 輸送物資量(TP)
+     * @returns {number}
      */
-    meta() {
-        const ret = wasm.comp_meta(this.__wbg_ptr);
+    transport_point() {
+        const ret = wasm.comp_transport_point(this.__wbg_ptr);
         return ret;
     }
     /**
-     * @param {FleetType} ft
-     * @returns {string | undefined}
+     * 艦隊防空値
+     * @param {number} formation_mod
+     * @returns {number}
      */
-    get_fleet_id(ft) {
-        const ret = wasm.comp_get_fleet_id(this.__wbg_ptr, ft);
-        let v1;
-        if (ret[0] !== 0) {
-            v1 = getStringFromWasm0(ret[0], ret[1]).slice();
-            wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
-        }
-        return v1;
-    }
-    /**
-     * @param {FleetType} ft
-     * @param {ShipKey} key
-     * @returns {Ship | undefined}
+    adjusted_anti_air(formation_mod) {
+        const ret = wasm.comp_adjusted_anti_air(this.__wbg_ptr, formation_mod);
+        return ret;
+    }
+    /**
+     * @returns {Formation}
      */
-    get_ship_with_clone(ft, key) {
-        const ret = wasm.comp_get_ship_with_clone(this.__wbg_ptr, ft, key);
-        return ret === 0 ? undefined : Ship.__wrap(ret);
+    default_formation() {
+        const ret = wasm.comp_default_formation(this.__wbg_ptr);
+        return ret;
     }
     /**
      * @param {FleetType} ft
@@ -607,40 +612,33 @@ export class Comp {
         return v1;
     }
     /**
-     * @param {string} id
-     * @returns {Ship | undefined}
-     */
-    get_ship_by_eid_with_clone(id) {
-        const ptr0 = passStringToWasm0(id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.comp_get_ship_by_eid_with_clone(this.__wbg_ptr, ptr0, len0);
-        return ret === 0 ? undefined : Ship.__wrap(ret);
-    }
-    /**
-     * @returns {Formation}
+     * @param {Ship} ship
+     * @param {Formation | null} [formation]
+     * @returns {ShipConditions}
      */
-    default_formation() {
-        const ret = wasm.comp_default_formation(this.__wbg_ptr);
+    get_ship_conditions(ship, formation) {
+        _assertClass(ship, Ship);
+        const ret = wasm.comp_get_ship_conditions(this.__wbg_ptr, ship.__wbg_ptr, isLikeNone(formation) ? 0 : addToExternrefTable0(formation));
         return ret;
     }
     /**
-     * 艦隊防空値
-     * @param {number} formation_mod
-     * @returns {number}
+     * @param {FleetType} ft
+     * @param {ShipKey} key
+     * @returns {Ship | undefined}
      */
-    adjusted_anti_air(formation_mod) {
-        const ret = wasm.comp_adjusted_anti_air(this.__wbg_ptr, formation_mod);
-        return ret;
+    get_ship_with_clone(ft, key) {
+        const ret = wasm.comp_get_ship_with_clone(this.__wbg_ptr, ft, key);
+        return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
-     * 制空値
-     * @param {boolean} escort_participates
-     * @param {AirWaveType} air_type
-     * @returns {number | undefined}
+     * @param {string} id
+     * @returns {Ship | undefined}
      */
-    fighter_power(escort_participates, air_type) {
-        const ret = wasm.comp_fighter_power(this.__wbg_ptr, escort_participates, air_type);
-        return ret === 0x100000001 ? undefined : ret;
+    get_ship_by_eid_with_clone(id) {
+        const ptr0 = passStringToWasm0(id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.comp_get_ship_by_eid_with_clone(this.__wbg_ptr, ptr0, len0);
+        return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
      * マップ索敵
@@ -652,31 +650,19 @@ export class Comp {
         return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-     * 輸送物資量(TP)
-     * @returns {number}
+     * @returns {CompMeta}
      */
-    transport_point() {
-        const ret = wasm.comp_transport_point(this.__wbg_ptr);
+    meta() {
+        const ret = wasm.comp_meta(this.__wbg_ptr);
         return ret;
     }
     /**
-     * @param {Ship} ship
-     * @param {Formation | null} [formation]
-     * @returns {ShipConditions}
+     * @returns {Side}
      */
-    get_ship_conditions(ship, formation) {
-        _assertClass(ship, Ship);
-        const ret = wasm.comp_get_ship_conditions(this.__wbg_ptr, ship.__wbg_ptr, isLikeNone(formation) ? 0 : addToExternrefTable0(formation));
+    side() {
+        const ret = wasm.comp_side(this.__wbg_ptr);
         return ret;
     }
-    /**
-     * @param {FleetType} fleet_type
-     * @returns {number | undefined}
-     */
-    fleet_los_mod(fleet_type) {
-        const ret = wasm.comp_fleet_los_mod(this.__wbg_ptr, fleet_type);
-        return ret[0] === 0 ? undefined : ret[1];
-    }
     /**
      * @returns {number}
      */
@@ -684,6 +670,20 @@ export class Comp {
         const ret = wasm.comp_balloons(this.__wbg_ptr);
         return ret >>> 0;
     }
+    /**
+     * @returns {boolean}
+     */
+    is_enemy() {
+        const ret = wasm.comp_is_enemy(this.__wbg_ptr);
+        return ret !== 0;
+    }
+    /**
+     * @returns {boolean}
+     */
+    is_player() {
+        const ret = wasm.comp_is_player(this.__wbg_ptr);
+        return ret !== 0;
+    }
 }
 if (Symbol.dispose) Comp.prototype[Symbol.dispose] = Comp.prototype.free;
 
@@ -705,16 +705,12 @@ export class FhCore {
         wasm.__wbg_fhcore_free(ptr, 0);
     }
     /**
-     * @param {MasterData} js_master
+     * @param {OrgState | null} [input]
+     * @returns {Org | undefined}
      */
-    constructor(js_master) {
-        const ret = wasm.fhcore_new(js_master);
-        if (ret[2]) {
-            throw takeFromExternrefTable0(ret[1]);
-        }
-        this.__wbg_ptr = ret[0] >>> 0;
-        FhCoreFinalization.register(this, this.__wbg_ptr, this);
-        return this;
+    create_org(input) {
+        const ret = wasm.fhcore_create_org(this.__wbg_ptr, isLikeNone(input) ? 0 : addToExternrefTable0(input));
+        return ret === 0 ? undefined : Org.__wrap(ret);
     }
     /**
      * @param {GearState | null} [input]
@@ -732,14 +728,6 @@ export class FhCore {
         const ret = wasm.fhcore_create_ship(this.__wbg_ptr, isLikeNone(input) ? 0 : addToExternrefTable0(input));
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
-    /**
-     * @param {AirSquadronState | null} [input]
-     * @returns {AirSquadron}
-     */
-    create_air_squadron(input) {
-        const ret = wasm.fhcore_create_air_squadron(this.__wbg_ptr, isLikeNone(input) ? 0 : addToExternrefTable0(input));
-        return AirSquadron.__wrap(ret);
-    }
     /**
      * @param {FleetState | null} [input]
      * @returns {Fleet}
@@ -749,19 +737,17 @@ export class FhCore {
         return Fleet.__wrap(ret);
     }
     /**
-     * @param {OrgState | null} [input]
-     * @returns {Org | undefined}
+     * @returns {Analyzer}
      */
-    create_org(input) {
-        const ret = wasm.fhcore_create_org(this.__wbg_ptr, isLikeNone(input) ? 0 : addToExternrefTable0(input));
-        return ret === 0 ? undefined : Org.__wrap(ret);
+    create_analyzer() {
+        const ret = wasm.fhcore_create_analyzer(this.__wbg_ptr);
+        return Analyzer.__wrap(ret);
     }
     /**
-     * @param {number} ship_id
-     * @returns {ShipState | undefined}
+     * @returns {Ship[]}
      */
-    create_ship_state_by_id(ship_id) {
-        const ret = wasm.fhcore_create_ship_state_by_id(this.__wbg_ptr, ship_id);
+    create_all_ships() {
+        const ret = wasm.fhcore_create_all_ships(this.__wbg_ptr);
         return ret;
     }
     /**
@@ -773,10 +759,26 @@ export class FhCore {
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
-     * @returns {Ship[]}
+     * @param {AirSquadronState | null} [input]
+     * @returns {AirSquadron}
      */
-    create_all_ships() {
-        const ret = wasm.fhcore_create_all_ships(this.__wbg_ptr);
+    create_air_squadron(input) {
+        const ret = wasm.fhcore_create_air_squadron(this.__wbg_ptr, isLikeNone(input) ? 0 : addToExternrefTable0(input));
+        return AirSquadron.__wrap(ret);
+    }
+    /**
+     * @returns {Ship}
+     */
+    create_default_ship() {
+        const ret = wasm.fhcore_create_default_ship(this.__wbg_ptr);
+        return Ship.__wrap(ret);
+    }
+    /**
+     * @param {number} ship_id
+     * @returns {ShipState | undefined}
+     */
+    create_ship_state_by_id(ship_id) {
+        const ret = wasm.fhcore_create_ship_state_by_id(this.__wbg_ptr, ship_id);
         return ret;
     }
     /**
@@ -793,18 +795,16 @@ export class FhCore {
         return Comp.__wrap(ret);
     }
     /**
-     * @returns {Ship}
-     */
-    create_default_ship() {
-        const ret = wasm.fhcore_create_default_ship(this.__wbg_ptr);
-        return Ship.__wrap(ret);
-    }
-    /**
-     * @returns {Analyzer}
+     * @param {MasterData} js_master
      */
-    create_analyzer() {
-        const ret = wasm.fhcore_create_analyzer(this.__wbg_ptr);
-        return Analyzer.__wrap(ret);
+    constructor(js_master) {
+        const ret = wasm.fhcore_new(js_master);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        this.__wbg_ptr = ret[0] >>> 0;
+        FhCoreFinalization.register(this, this.__wbg_ptr, this);
+        return this;
     }
 }
 if (Symbol.dispose) FhCore.prototype[Symbol.dispose] = FhCore.prototype.free;
@@ -872,47 +872,34 @@ export class Fleet {
         return ret >>> 0;
     }
     /**
-     * @returns {FleetMeta}
-     */
-    meta() {
-        const ret = wasm.fleet_meta(this.__wbg_ptr);
-        return ret;
-    }
-    /**
-     * @returns {string[]}
+     * @returns {number}
      */
-    ship_keys() {
-        const ret = wasm.fleet_ship_keys(this.__wbg_ptr);
-        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
-        wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
-        return v1;
+    count_ships() {
+        const ret = wasm.fleet_count_ships(this.__wbg_ptr);
+        return ret >>> 0;
     }
     /**
-     * @returns {string[]}
+     * @param {AirWaveType} air_type
+     * @returns {number | undefined}
      */
-    ship_ids() {
-        const ret = wasm.fleet_ship_ids(this.__wbg_ptr);
-        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
-        wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
-        return v1;
+    fighter_power(air_type) {
+        const ret = wasm.fleet_fighter_power(this.__wbg_ptr, air_type);
+        return ret === 0x100000001 ? undefined : ret;
     }
     /**
-     * @returns {string[]}
+     * @returns {number | undefined}
      */
-    get_gear_ids_by_improvable() {
-        const ret = wasm.fleet_get_gear_ids_by_improvable(this.__wbg_ptr);
-        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
-        wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
-        return v1;
+    get fleet_los_mod() {
+        const ret = wasm.fleet_fleet_los_mod(this.__wbg_ptr);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-     * @returns {string[]}
+     * 遠征ボーナス
+     * @returns {number}
      */
-    get_gear_ids_by_proficiency() {
-        const ret = wasm.fleet_get_gear_ids_by_proficiency(this.__wbg_ptr);
-        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
-        wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
-        return v1;
+    expedition_bonus() {
+        const ret = wasm.fleet_expedition_bonus(this.__wbg_ptr);
+        return ret;
     }
     /**
      * @param {string} id
@@ -925,16 +912,26 @@ export class Fleet {
         const ret = wasm.fleet_get_damage_bound(this.__wbg_ptr, ptr0, len0, state);
         return ret === 0xFFFFFF ? undefined : ret;
     }
+    /**
+     * @param {string} key
+     * @returns {number | undefined}
+     */
+    sum_ship_stat_by(key) {
+        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.fleet_sum_ship_stat_by(this.__wbg_ptr, ptr0, len0);
+        return ret[0] === 0 ? undefined : ret[1];
+    }
     /**
      * @param {string} id
      * @param {number} rate
      * @param {boolean} ceil
      * @returns {number | undefined}
      */
-    get_remaining_fuel(id, rate, ceil) {
+    get_remaining_ammo(id, rate, ceil) {
         const ptr0 = passStringToWasm0(id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.fleet_get_remaining_fuel(this.__wbg_ptr, ptr0, len0, rate, ceil);
+        const ret = wasm.fleet_get_remaining_ammo(this.__wbg_ptr, ptr0, len0, rate, ceil);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
@@ -943,41 +940,40 @@ export class Fleet {
      * @param {boolean} ceil
      * @returns {number | undefined}
      */
-    get_remaining_ammo(id, rate, ceil) {
+    get_remaining_fuel(id, rate, ceil) {
         const ptr0 = passStringToWasm0(id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.fleet_get_remaining_ammo(this.__wbg_ptr, ptr0, len0, rate, ceil);
+        const ret = wasm.fleet_get_remaining_fuel(this.__wbg_ptr, ptr0, len0, rate, ceil);
         return ret === 0xFFFFFF ? undefined : ret;
     }
-    /**
-     * @returns {number}
-     */
-    count_ships() {
-        const ret = wasm.fleet_count_ships(this.__wbg_ptr);
-        return ret >>> 0;
-    }
-    /**
-     * @param {ShipKey} key
-     * @returns {Ship | undefined}
-     */
-    get_ship(key) {
-        const ret = wasm.fleet_get_ship(this.__wbg_ptr, key);
-        return ret === 0 ? undefined : Ship.__wrap(ret);
+    reset_battle_state() {
+        wasm.fleet_reset_battle_state(this.__wbg_ptr);
     }
     /**
+     * 航空索敵スコア
      * @returns {number | undefined}
      */
-    get fleet_los_mod() {
-        const ret = wasm.fleet_fleet_los_mod(this.__wbg_ptr);
+    aviation_detection_score() {
+        const ret = wasm.fleet_aviation_detection_score(this.__wbg_ptr);
         return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-     * @param {AirWaveType} air_type
-     * @returns {number | undefined}
+     * @returns {string[]}
      */
-    fighter_power(air_type) {
-        const ret = wasm.fleet_fighter_power(this.__wbg_ptr, air_type);
-        return ret === 0x100000001 ? undefined : ret;
+    get_gear_ids_by_improvable() {
+        const ret = wasm.fleet_get_gear_ids_by_improvable(this.__wbg_ptr);
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
+        return v1;
+    }
+    /**
+     * @returns {string[]}
+     */
+    get_gear_ids_by_proficiency() {
+        const ret = wasm.fleet_get_gear_ids_by_proficiency(this.__wbg_ptr);
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
+        return v1;
     }
     /**
      * マップ索敵
@@ -990,33 +986,37 @@ export class Fleet {
         return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-     * 航空索敵スコア
-     * @returns {number | undefined}
+     * @returns {FleetMeta}
      */
-    aviation_detection_score() {
-        const ret = wasm.fleet_aviation_detection_score(this.__wbg_ptr);
-        return ret[0] === 0 ? undefined : ret[1];
+    meta() {
+        const ret = wasm.fleet_meta(this.__wbg_ptr);
+        return ret;
     }
     /**
-     * 遠征ボーナス
-     * @returns {number}
+     * @param {ShipKey} key
+     * @returns {Ship | undefined}
      */
-    expedition_bonus() {
-        const ret = wasm.fleet_expedition_bonus(this.__wbg_ptr);
-        return ret;
+    get_ship(key) {
+        const ret = wasm.fleet_get_ship(this.__wbg_ptr, key);
+        return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
-     * @param {string} key
-     * @returns {number | undefined}
+     * @returns {string[]}
      */
-    sum_ship_stat_by(key) {
-        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.fleet_sum_ship_stat_by(this.__wbg_ptr, ptr0, len0);
-        return ret[0] === 0 ? undefined : ret[1];
+    ship_ids() {
+        const ret = wasm.fleet_ship_ids(this.__wbg_ptr);
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
+        return v1;
     }
-    reset_battle_state() {
-        wasm.fleet_reset_battle_state(this.__wbg_ptr);
+    /**
+     * @returns {string[]}
+     */
+    ship_keys() {
+        const ret = wasm.fleet_ship_keys(this.__wbg_ptr);
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
+        return v1;
     }
 }
 if (Symbol.dispose) Fleet.prototype[Symbol.dispose] = Fleet.prototype.free;
@@ -1278,118 +1278,111 @@ export class Gear {
         return ret;
     }
     /**
-     * @returns {Gear}
-     */
-    static default() {
-        const ret = wasm.gear_default();
-        return Gear.__wrap(ret);
-    }
-    /**
-     * @returns {number}
-     */
-    get gear_type_id() {
-        const ret = wasm.gear_gear_type_id(this.__wbg_ptr);
-        return ret;
-    }
-    /**
-     * @returns {number}
-     */
-    get special_type() {
-        const ret = wasm.gear_special_type(this.__wbg_ptr);
-        return ret;
-    }
-    /**
-     * @returns {number}
+     * @returns {boolean}
      */
-    get icon_id() {
-        const ret = wasm.gear_icon_id(this.__wbg_ptr);
-        return ret;
+    is_abyssal() {
+        const ret = wasm.gear_is_abyssal(this.__wbg_ptr);
+        return ret !== 0;
     }
     /**
-     * @param {GearAttr} attr
      * @returns {boolean}
      */
-    has_attr(attr) {
-        const ret = wasm.gear_has_attr(this.__wbg_ptr, attr);
+    is_balloon() {
+        const ret = wasm.gear_is_balloon(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-     * @returns {GearCategory}
+     * @returns {number}
      */
-    category() {
-        const ret = wasm.gear_category(this.__wbg_ptr);
+    get anti_bomber() {
+        const ret = wasm.gear_anti_bomber(this.__wbg_ptr);
         return ret;
     }
     /**
      * @returns {number}
      */
-    get ace() {
-        const ret = wasm.gear_ace(this.__wbg_ptr);
+    get gear_type_id() {
+        const ret = wasm.gear_gear_type_id(this.__wbg_ptr);
         return ret;
     }
     /**
      * @returns {number}
      */
-    get anti_bomber() {
-        const ret = wasm.gear_anti_bomber(this.__wbg_ptr);
+    get interception() {
+        const ret = wasm.gear_interception(this.__wbg_ptr);
         return ret;
     }
     /**
      * @returns {number}
      */
-    get interception() {
-        const ret = wasm.gear_interception(this.__wbg_ptr);
+    get special_type() {
+        const ret = wasm.gear_special_type(this.__wbg_ptr);
         return ret;
     }
     /**
      * @returns {boolean}
      */
-    is_high_angle_mount() {
-        const ret = wasm.gear_is_high_angle_mount(this.__wbg_ptr);
+    is_night_plane() {
+        const ret = wasm.gear_is_night_plane(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
      * @returns {boolean}
      */
-    is_carrier_shelling_plane() {
-        const ret = wasm.gear_is_carrier_shelling_plane(this.__wbg_ptr);
+    max_exp_eq_120() {
+        const ret = wasm.gear_max_exp_eq_120(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
      * @returns {boolean}
      */
-    is_hayabusa_20th_squadron() {
-        const ret = wasm.gear_is_hayabusa_20th_squadron(this.__wbg_ptr);
+    has_proficiency() {
+        const ret = wasm.gear_can_be_deployed_to_land_base(this.__wbg_ptr);
         return ret !== 0;
     }
+    /**
+     * @returns {number}
+     */
+    expedition_bonus() {
+        const ret = wasm.gear_expedition_bonus(this.__wbg_ptr);
+        return ret;
+    }
     /**
      * @returns {boolean}
      */
-    has_proficiency() {
-        const ret = wasm.gear_can_be_deployed_to_land_base(this.__wbg_ptr);
+    is_night_fighter() {
+        const ret = wasm.gear_is_night_fighter(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
      * @returns {boolean}
      */
-    max_exp_eq_120() {
-        const ret = wasm.gear_max_exp_eq_120(this.__wbg_ptr);
+    is_night_attacker() {
+        const ret = wasm.gear_is_night_attacker(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
      * @param {number} slot_size
+     * @param {boolean} anti_inst
      * @returns {number}
      */
-    calc_fighter_power(slot_size) {
-        const ret = wasm.gear_calc_fighter_power(this.__wbg_ptr, slot_size);
+    night_plane_power(slot_size, anti_inst) {
+        const ret = wasm.gear_night_plane_power(this.__wbg_ptr, slot_size, anti_inst);
+        return ret;
+    }
+    /**
+     * @returns {number}
+     */
+    ship_anti_air_mod() {
+        const ret = wasm.gear_ship_anti_air_mod(this.__wbg_ptr);
         return ret;
     }
     /**
      * @param {number} slot_size
      * @returns {number}
      */
-    calc_interception_power(slot_size) {
-        const ret = wasm.gear_calc_interception_power(this.__wbg_ptr, slot_size);
+    calc_fighter_power(slot_size) {
+        const ret = wasm.gear_calc_fighter_power(this.__wbg_ptr, slot_size);
         return ret;
     }
     /**
@@ -1400,19 +1393,19 @@ export class Gear {
         return ret;
     }
     /**
+     * @param {number} level
      * @returns {number}
      */
-    ship_anti_air_mod() {
-        const ret = wasm.gear_ship_anti_air_mod(this.__wbg_ptr);
+    night_contact_rate(level) {
+        const ret = wasm.gear_night_contact_rate(this.__wbg_ptr, level);
         return ret;
     }
     /**
-     * @param {number} slot_size
-     * @returns {number}
+     * @returns {boolean}
      */
-    calc_contact_trigger_factor(slot_size) {
-        const ret = wasm.gear_calc_contact_trigger_factor(this.__wbg_ptr, slot_size);
-        return ret;
+    is_high_angle_mount() {
+        const ret = wasm.gear_is_high_angle_mount(this.__wbg_ptr);
+        return ret !== 0;
     }
     /**
      * @param {AirStateRank} rank
@@ -1423,55 +1416,40 @@ export class Gear {
         return ret;
     }
     /**
-     * @param {number} level
+     * @param {number} slot_size
      * @returns {number}
      */
-    night_contact_rate(level) {
-        const ret = wasm.gear_night_contact_rate(this.__wbg_ptr, level);
+    calc_interception_power(slot_size) {
+        const ret = wasm.gear_calc_interception_power(this.__wbg_ptr, slot_size);
         return ret;
     }
     /**
      * @returns {boolean}
      */
-    is_night_attacker() {
-        const ret = wasm.gear_is_night_attacker(this.__wbg_ptr);
-        return ret !== 0;
-    }
-    /**
-     * @returns {boolean}
-     */
-    is_night_fighter() {
-        const ret = wasm.gear_is_night_fighter(this.__wbg_ptr);
+    is_carrier_shelling_plane() {
+        const ret = wasm.gear_is_carrier_shelling_plane(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
      * @returns {boolean}
      */
-    is_night_plane() {
-        const ret = wasm.gear_is_night_plane(this.__wbg_ptr);
+    is_hayabusa_20th_squadron() {
+        const ret = wasm.gear_is_hayabusa_20th_squadron(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
      * @param {number} slot_size
-     * @param {boolean} anti_inst
-     * @returns {number}
-     */
-    night_plane_power(slot_size, anti_inst) {
-        const ret = wasm.gear_night_plane_power(this.__wbg_ptr, slot_size, anti_inst);
-        return ret;
-    }
-    /**
      * @returns {number}
      */
-    elos() {
-        const ret = wasm.gear_elos(this.__wbg_ptr);
+    calc_contact_trigger_factor(slot_size) {
+        const ret = wasm.gear_calc_contact_trigger_factor(this.__wbg_ptr, slot_size);
         return ret;
     }
     /**
      * @returns {boolean}
      */
-    is_abyssal() {
-        const ret = wasm.gear_is_abyssal(this.__wbg_ptr);
+    can_be_deployed_to_land_base() {
+        const ret = wasm.gear_can_be_deployed_to_land_base(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
@@ -1491,22 +1469,44 @@ export class Gear {
     /**
      * @returns {number}
      */
-    expedition_bonus() {
-        const ret = wasm.gear_expedition_bonus(this.__wbg_ptr);
+    get ace() {
+        const ret = wasm.gear_ace(this.__wbg_ptr);
         return ret;
     }
     /**
-     * @returns {boolean}
+     * @returns {number}
      */
-    can_be_deployed_to_land_base() {
-        const ret = wasm.gear_can_be_deployed_to_land_base(this.__wbg_ptr);
-        return ret !== 0;
+    elos() {
+        const ret = wasm.gear_elos(this.__wbg_ptr);
+        return ret;
+    }
+    /**
+     * @returns {Gear}
+     */
+    static default() {
+        const ret = wasm.gear_default();
+        return Gear.__wrap(ret);
+    }
+    /**
+     * @returns {number}
+     */
+    get icon_id() {
+        const ret = wasm.gear_icon_id(this.__wbg_ptr);
+        return ret;
+    }
+    /**
+     * @returns {GearCategory}
+     */
+    category() {
+        const ret = wasm.gear_category(this.__wbg_ptr);
+        return ret;
     }
     /**
+     * @param {GearAttr} attr
      * @returns {boolean}
      */
-    is_balloon() {
-        const ret = wasm.gear_is_balloon(this.__wbg_ptr);
+    has_attr(attr) {
+        const ret = wasm.gear_has_attr(this.__wbg_ptr, attr);
         return ret !== 0;
     }
 }
@@ -1603,39 +1603,35 @@ export class Org {
         return ret;
     }
     /**
-     * @returns {string | undefined}
+     * @param {FleetKey} fleet_key
+     * @param {ShipKey} ship_key
+     * @returns {Ship | undefined}
      */
-    first_ship_id() {
-        const ret = wasm.org_first_ship_id(this.__wbg_ptr);
-        let v1;
-        if (ret[0] !== 0) {
-            v1 = getStringFromWasm0(ret[0], ret[1]).slice();
-            wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
-        }
-        return v1;
+    clone_ship(fleet_key, ship_key) {
+        const ret = wasm.org_clone_ship(this.__wbg_ptr, fleet_key, ship_key);
+        return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
-     * @param {FleetKey} fleet_key
-     * @param {ShipKey} ship_key
-     * @returns {number | undefined}
+     * @param {FleetKey} key
+     * @returns {Fleet}
      */
-    get_ship_mid(fleet_key, ship_key) {
-        const ret = wasm.org_get_ship_mid(this.__wbg_ptr, fleet_key, ship_key);
-        return ret === 0xFFFFFF ? undefined : ret;
+    clone_fleet(key) {
+        const ret = wasm.org_clone_fleet(this.__wbg_ptr, key);
+        return Fleet.__wrap(ret);
     }
     /**
-     * @param {FleetKey} fleet_key
-     * @param {ShipKey} ship_key
-     * @returns {string | undefined}
+     * @returns {Comp}
      */
-    get_ship_eid(fleet_key, ship_key) {
-        const ret = wasm.org_get_ship_eid(this.__wbg_ptr, fleet_key, ship_key);
-        let v1;
-        if (ret[0] !== 0) {
-            v1 = getStringFromWasm0(ret[0], ret[1]).slice();
-            wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
-        }
-        return v1;
+    create_comp() {
+        const ret = wasm.org_create_comp(this.__wbg_ptr);
+        return Comp.__wrap(ret);
+    }
+    /**
+     * @returns {boolean}
+     */
+    is_combined() {
+        const ret = wasm.org_is_combined(this.__wbg_ptr);
+        return ret !== 0;
     }
     /**
      * @param {FleetKey} key
@@ -1654,48 +1650,56 @@ export class Org {
         }
     }
     /**
-     * @returns {string[]}
+     * @param {FleetKey} fleet_key
+     * @param {ShipKey} ship_key
+     * @returns {string | undefined}
      */
-    air_squadron_ids() {
-        const ret = wasm.org_air_squadron_ids(this.__wbg_ptr);
-        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
-        wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
+    get_ship_eid(fleet_key, ship_key) {
+        const ret = wasm.org_get_ship_eid(this.__wbg_ptr, fleet_key, ship_key);
+        let v1;
+        if (ret[0] !== 0) {
+            v1 = getStringFromWasm0(ret[0], ret[1]).slice();
+            wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
+        }
         return v1;
     }
     /**
-     * @returns {Uint16Array}
+     * @param {FleetKey} fleet_key
+     * @param {ShipKey} ship_key
+     * @returns {number | undefined}
      */
-    main_ship_ids() {
-        const ret = wasm.org_main_ship_ids(this.__wbg_ptr);
-        var v1 = getArrayU16FromWasm0(ret[0], ret[1]).slice();
-        wasm.__wbindgen_free(ret[0], ret[1] * 2, 2);
+    get_ship_mid(fleet_key, ship_key) {
+        const ret = wasm.org_get_ship_mid(this.__wbg_ptr, fleet_key, ship_key);
+        return ret === 0xFFFFFF ? undefined : ret;
+    }
+    /**
+     * @returns {string | undefined}
+     */
+    first_ship_id() {
+        const ret = wasm.org_first_ship_id(this.__wbg_ptr);
+        let v1;
+        if (ret[0] !== 0) {
+            v1 = getStringFromWasm0(ret[0], ret[1]).slice();
+            wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
+        }
         return v1;
     }
     /**
      * @returns {Uint16Array}
      */
-    escort_ship_ids() {
-        const ret = wasm.org_escort_ship_ids(this.__wbg_ptr);
+    main_ship_ids() {
+        const ret = wasm.org_main_ship_ids(this.__wbg_ptr);
         var v1 = getArrayU16FromWasm0(ret[0], ret[1]).slice();
         wasm.__wbindgen_free(ret[0], ret[1] * 2, 2);
         return v1;
     }
     /**
      * @param {FleetKey} key
-     * @returns {Fleet}
-     */
-    clone_fleet(key) {
-        const ret = wasm.org_clone_fleet(this.__wbg_ptr, key);
-        return Fleet.__wrap(ret);
-    }
-    /**
-     * @param {FleetKey} fleet_key
-     * @param {ShipKey} ship_key
-     * @returns {Ship | undefined}
+     * @returns {FleetType | undefined}
      */
-    clone_ship(fleet_key, ship_key) {
-        const ret = wasm.org_clone_ship(this.__wbg_ptr, fleet_key, ship_key);
-        return ret === 0 ? undefined : Ship.__wrap(ret);
+    get_fleet_type(key) {
+        const ret = wasm.org_get_fleet_type(this.__wbg_ptr, key);
+        return ret;
     }
     /**
      * @param {string} id
@@ -1708,21 +1712,35 @@ export class Org {
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
-     * @param {FleetKey} key
+     * @returns {Uint16Array}
+     */
+    escort_ship_ids() {
+        const ret = wasm.org_escort_ship_ids(this.__wbg_ptr);
+        var v1 = getArrayU16FromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free(ret[0], ret[1] * 2, 2);
+        return v1;
+    }
+    /**
      * @returns {string[]}
      */
-    ship_keys(key) {
-        const ret = wasm.org_ship_keys(this.__wbg_ptr, key);
+    air_squadron_ids() {
+        const ret = wasm.org_air_squadron_ids(this.__wbg_ptr);
         var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
         wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
         return v1;
     }
     /**
-     * @returns {Comp}
+     * @param {string} key
+     * @returns {AirSquadron}
      */
-    create_comp() {
-        const ret = wasm.org_create_comp(this.__wbg_ptr);
-        return Comp.__wrap(ret);
+    get_air_squadron(key) {
+        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.org_get_air_squadron(this.__wbg_ptr, ptr0, len0);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return AirSquadron.__wrap(ret[0]);
     }
     /**
      * @param {FleetKey} key
@@ -1733,17 +1751,32 @@ export class Org {
         return Comp.__wrap(ret);
     }
     /**
-     * @param {string} key
-     * @returns {AirSquadron}
+     * 防空時の基地制空値
+     * @returns {number}
      */
-    get_air_squadron(key) {
-        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    interception_power() {
+        const ret = wasm.org_interception_power(this.__wbg_ptr);
+        return ret;
+    }
+    /**
+     * @param {string} id
+     * @param {number} x
+     * @param {number} y
+     * @returns {MoveShipPayload | undefined}
+     */
+    create_move_ship_payload(id, x, y) {
+        const ptr0 = passStringToWasm0(id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.org_get_air_squadron(this.__wbg_ptr, ptr0, len0);
-        if (ret[2]) {
-            throw takeFromExternrefTable0(ret[1]);
-        }
-        return AirSquadron.__wrap(ret[0]);
+        const ret = wasm.org_create_move_ship_payload(this.__wbg_ptr, ptr0, len0, x, y);
+        return ret;
+    }
+    /**
+     * 高高度迎撃時の基地制空値
+     * @returns {number}
+     */
+    high_altitude_interception_power() {
+        const ret = wasm.org_high_altitude_interception_power(this.__wbg_ptr);
+        return ret;
     }
     /**
      * @returns {string[]}
@@ -1770,13 +1803,6 @@ export class Org {
         const ret = wasm.org_side(this.__wbg_ptr);
         return ret;
     }
-    /**
-     * @returns {boolean}
-     */
-    is_player() {
-        const ret = wasm.org_is_player(this.__wbg_ptr);
-        return ret !== 0;
-    }
     /**
      * @returns {boolean}
      */
@@ -1787,52 +1813,26 @@ export class Org {
     /**
      * @returns {boolean}
      */
-    is_single() {
-        const ret = wasm.org_is_single(this.__wbg_ptr);
+    is_player() {
+        const ret = wasm.org_is_player(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
      * @returns {boolean}
      */
-    is_combined() {
-        const ret = wasm.org_is_combined(this.__wbg_ptr);
+    is_single() {
+        const ret = wasm.org_is_single(this.__wbg_ptr);
         return ret !== 0;
     }
-    /**
-     * 防空時の基地制空値
-     * @returns {number}
-     */
-    interception_power() {
-        const ret = wasm.org_interception_power(this.__wbg_ptr);
-        return ret;
-    }
-    /**
-     * 高高度迎撃時の基地制空値
-     * @returns {number}
-     */
-    high_altitude_interception_power() {
-        const ret = wasm.org_high_altitude_interception_power(this.__wbg_ptr);
-        return ret;
-    }
-    /**
-     * @param {string} id
-     * @param {number} x
-     * @param {number} y
-     * @returns {MoveShipPayload | undefined}
-     */
-    create_move_ship_payload(id, x, y) {
-        const ptr0 = passStringToWasm0(id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.org_create_move_ship_payload(this.__wbg_ptr, ptr0, len0, x, y);
-        return ret;
-    }
     /**
      * @param {FleetKey} key
-     * @returns {FleetType | undefined}
+     * @returns {string[]}
      */
-    get_fleet_type(key) {
-        const ret = wasm.org_get_fleet_type(this.__wbg_ptr, key);
-        return ret;
+    ship_keys(key) {
+        const ret = wasm.org_ship_keys(this.__wbg_ptr, key);
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
+        return v1;
     }
 }
 if (Symbol.dispose) Org.prototype[Symbol.dispose] = Org.prototype.free;
@@ -1862,6 +1862,29 @@ export class Ship {
         const ptr = this.__destroy_into_raw();
         wasm.__wbg_ship_free(ptr, 0);
     }
+    /**
+     * フィット砲補正
+     * @param {boolean} is_night
+     * @returns {number}
+     */
+    gunfit_accuracy(is_night) {
+        const ret = wasm.ship_gunfit_accuracy(this.__wbg_ptr, is_night);
+        return ret;
+    }
+    /**
+     * @returns {number | undefined}
+     */
+    state_day_gunfit_accuracy() {
+        const ret = wasm.ship_state_day_gunfit_accuracy(this.__wbg_ptr);
+        return ret[0] === 0 ? undefined : ret[1];
+    }
+    /**
+     * @returns {number | undefined}
+     */
+    state_night_gunfit_accuracy() {
+        const ret = wasm.ship_state_night_gunfit_accuracy(this.__wbg_ptr);
+        return ret[0] === 0 ? undefined : ret[1];
+    }
     /**
      * @returns {string}
      */
@@ -1962,18 +1985,36 @@ export class Ship {
         wasm.__wbg_set_ship_slots(this.__wbg_ptr, arg0);
     }
     /**
-     * @returns {number | undefined}
+     * @param {string} key
+     * @returns {number}
      */
-    get naked_firepower() {
-        const ret = wasm.ship_naked_firepower(this.__wbg_ptr);
-        return ret === 0xFFFFFF ? undefined : ret;
+    get_ebonus(key) {
+        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.ship_get_ebonus(this.__wbg_ptr, ptr0, len0);
+        return ret;
     }
     /**
-     * @returns {number | undefined}
+     * @returns {boolean}
      */
-    get naked_torpedo() {
-        const ret = wasm.ship_naked_torpedo(this.__wbg_ptr);
-        return ret === 0xFFFFFF ? undefined : ret;
+    is_abyssal() {
+        const ret = wasm.ship_is_abyssal(this.__wbg_ptr);
+        return ret !== 0;
+    }
+    /**
+     * @returns {boolean}
+     */
+    is_amagiri() {
+        const ret = wasm.ship_is_amagiri(this.__wbg_ptr);
+        return ret !== 0;
+    }
+    /**
+     * 確殺攻撃力
+     * @returns {number | undefined}
+     */
+    ohko_power() {
+        const ret = wasm.ship_ohko_power(this.__wbg_ptr);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
      * @returns {number | undefined}
@@ -1985,102 +2026,173 @@ export class Ship {
     /**
      * @returns {number | undefined}
      */
-    get naked_anti_air() {
-        const ret = wasm.ship_naked_anti_air(this.__wbg_ptr);
+    get naked_range() {
+        const ret = wasm.ship_naked_range(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
+     * @returns {number}
+     */
+    get naked_speed() {
+        const ret = wasm.ship_naked_speed(this.__wbg_ptr);
+        return ret;
+    }
+    /**
+     * @returns {DamageState}
+     */
+    damage_state() {
+        const ret = wasm.ship_damage_state(this.__wbg_ptr);
+        return ret;
+    }
+    /**
+     * @param {number} formation_mod
+     * @param {number} postcap_additive
+     * @param {number} postcap_multiplicative
      * @returns {number | undefined}
      */
-    get naked_evasion() {
-        const ret = wasm.ship_naked_evasion(this.__wbg_ptr);
-        return ret === 0xFFFFFF ? undefined : ret;
+    evasion_term(formation_mod, postcap_additive, postcap_multiplicative) {
+        const ret = wasm.ship_evasion_term(this.__wbg_ptr, formation_mod, postcap_additive, postcap_multiplicative);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
+     * @param {string} key
      * @returns {number | undefined}
      */
-    get naked_asw() {
-        const ret = wasm.ship_naked_asw(this.__wbg_ptr);
+    get_stat_mod(key) {
+        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.ship_get_stat_mod(this.__wbg_ptr, ptr0, len0);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
+     * @returns {boolean}
+     */
+    is_submarine() {
+        const ret = wasm.ship_is_submarine(this.__wbg_ptr);
+        return ret !== 0;
+    }
+    /**
+     * @returns {MoraleState}
+     */
+    morale_state() {
+        const ret = wasm.ship_morale_state(this.__wbg_ptr);
+        return ret;
+    }
+    /**
+     * @returns {number}
+     */
+    get remodel_rank() {
+        const ret = wasm.ship_remodel_rank(this.__wbg_ptr);
+        return ret;
+    }
+    /**
+     * @param {AirWaveType} air_type
      * @returns {number | undefined}
      */
-    get naked_los() {
-        const ret = wasm.ship_naked_los(this.__wbg_ptr);
-        return ret === 0xFFFFFF ? undefined : ret;
+    fighter_power(air_type) {
+        const ret = wasm.ship_fighter_power(this.__wbg_ptr, air_type);
+        return ret === 0x100000001 ? undefined : ret;
+    }
+    /**
+     * @param {string} key
+     * @returns {number}
+     */
+    get_gear_stat(key) {
+        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.ship_get_gear_stat(this.__wbg_ptr, ptr0, len0);
+        return ret;
     }
     /**
+     * @param {number} index
      * @returns {number | undefined}
      */
-    get firepower() {
-        const ret = wasm.ship_firepower(this.__wbg_ptr);
+    get_slot_size(index) {
+        const ret = wasm.ship_get_slot_size(this.__wbg_ptr, index);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
      * @returns {number | undefined}
      */
-    get torpedo() {
-        const ret = wasm.ship_torpedo(this.__wbg_ptr);
+    get naked_evasion() {
+        const ret = wasm.ship_naked_evasion(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
      * @returns {number | undefined}
      */
-    get armor() {
-        const ret = wasm.ship_armor(this.__wbg_ptr);
+    get naked_torpedo() {
+        const ret = wasm.ship_naked_torpedo(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
+     * @param {string} key
      * @returns {number | undefined}
      */
-    get anti_air() {
-        const ret = wasm.ship_anti_air(this.__wbg_ptr);
+    get_naked_stat(key) {
+        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.ship_get_naked_stat(this.__wbg_ptr, ptr0, len0);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
      * @returns {number | undefined}
      */
-    get evasion() {
-        const ret = wasm.ship_evasion(this.__wbg_ptr);
+    get naked_anti_air() {
+        const ret = wasm.ship_naked_anti_air(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
+    /**
+     * @returns {boolean}
+     */
+    is_installation() {
+        const ret = wasm.ship_is_installation(this.__wbg_ptr);
+        return ret !== 0;
+    }
     /**
      * @returns {number | undefined}
      */
-    get asw() {
-        const ret = wasm.ship_asw(this.__wbg_ptr);
+    get naked_firepower() {
+        const ret = wasm.ship_naked_firepower(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
+    /**
+     * @returns {number}
+     */
+    transport_point() {
+        const ret = wasm.ship_transport_point(this.__wbg_ptr);
+        return ret;
+    }
     /**
      * @returns {number | undefined}
      */
-    get los() {
-        const ret = wasm.ship_los(this.__wbg_ptr);
-        return ret === 0xFFFFFF ? undefined : ret;
+    fleet_los_factor() {
+        const ret = wasm.ship_fleet_los_factor(this.__wbg_ptr);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-     * @returns {Ship}
+     * @param {DamageState} state
+     * @returns {number | undefined}
      */
-    static default() {
-        const ret = wasm.ship_default();
-        return Ship.__wrap(ret);
+    get_damage_bound(state) {
+        const ret = wasm.ship_get_damage_bound(this.__wbg_ptr, state);
+        return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-     * @param {string} id
+     * @param {string} key
      * @returns {boolean}
      */
-    eq_id(id) {
-        const ptr0 = passStringToWasm0(id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    has_unknown_stat(key) {
+        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.ship_eq_id(this.__wbg_ptr, ptr0, len0);
+        const ret = wasm.ship_has_unknown_stat(this.__wbg_ptr, ptr0, len0);
         return ret !== 0;
     }
     /**
-     * @returns {ShipState}
+     * @returns {number}
      */
-    state() {
-        const ret = wasm.ship_state(this.__wbg_ptr);
+    cruiser_fit_bonus() {
+        const ret = wasm.ship_cruiser_fit_bonus(this.__wbg_ptr);
         return ret;
     }
     /**
@@ -2091,187 +2203,100 @@ export class Ship {
         return ret;
     }
     /**
-     * @returns {ShipMeta}
-     */
-    meta() {
-        const ret = wasm.ship_meta(this.__wbg_ptr);
-        return ret;
-    }
-    /**
-     * @returns {string}
+     * @param {number} index
+     * @returns {number | undefined}
      */
-    get name() {
-        let deferred1_0;
-        let deferred1_1;
-        try {
-            const ret = wasm.ship_name(this.__wbg_ptr);
-            deferred1_0 = ret[0];
-            deferred1_1 = ret[1];
-            return getStringFromWasm0(ret[0], ret[1]);
-        } finally {
-            wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
-        }
+    get_max_slot_size(index) {
+        const ret = wasm.ship_get_max_slot_size(this.__wbg_ptr, index);
+        return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-     * @returns {string}
+     * @returns {number | undefined}
      */
-    get yomi() {
-        let deferred1_0;
-        let deferred1_1;
-        try {
-            const ret = wasm.ship_yomi(this.__wbg_ptr);
-            deferred1_0 = ret[0];
-            deferred1_1 = ret[1];
-            return getStringFromWasm0(ret[0], ret[1]);
-        } finally {
-            wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
-        }
+    basic_evasion_term() {
+        const ret = wasm.ship_basic_evasion_term(this.__wbg_ptr);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
+     * 艦隊対空補正
      * @returns {number}
      */
-    get stype() {
-        const ret = wasm.ship_stype(this.__wbg_ptr);
+    fleet_anti_air_mod() {
+        const ret = wasm.ship_fleet_anti_air_mod(this.__wbg_ptr);
         return ret;
     }
     /**
+     * @param {number} rate
+     * @param {boolean} ceil
      * @returns {number}
      */
-    get sort_id() {
-        const ret = wasm.ship_sort_id(this.__wbg_ptr);
+    get_remaining_ammo(rate, ceil) {
+        const ret = wasm.ship_get_remaining_ammo(this.__wbg_ptr, rate, ceil);
         return ret;
     }
     /**
+     * @param {number} rate
+     * @param {boolean} ceil
      * @returns {number}
      */
-    get remodel_rank() {
-        const ret = wasm.ship_remodel_rank(this.__wbg_ptr);
+    get_remaining_fuel(rate, ceil) {
+        const ret = wasm.ship_get_remaining_fuel(this.__wbg_ptr, rate, ceil);
         return ret;
     }
     /**
      * @returns {number}
      */
-    get slotnum() {
-        const ret = wasm.ship_slotnum(this.__wbg_ptr);
-        return ret >>> 0;
+    remaining_ammo_mod() {
+        const ret = wasm.ship_remaining_ammo_mod(this.__wbg_ptr);
+        return ret;
     }
     /**
      * @returns {number}
      */
-    get next_id() {
-        const ret = wasm.ship_next_id(this.__wbg_ptr);
+    remaining_fuel_mod() {
+        const ret = wasm.ship_remaining_fuel_mod(this.__wbg_ptr);
         return ret;
     }
     /**
-     * @returns {boolean}
+     * @returns {SpecialEnemyType}
      */
-    get useful() {
-        const ret = wasm.ship_useful(this.__wbg_ptr);
-        return ret !== 0;
+    special_enemy_type() {
+        const ret = wasm.ship_special_enemy_type(this.__wbg_ptr);
+        return ret;
     }
     /**
-     * @returns {DamageState}
+     * @returns {number | undefined}
      */
-    damage_state() {
-        const ret = wasm.ship_damage_state(this.__wbg_ptr);
-        return ret;
+    basic_accuracy_term() {
+        const ret = wasm.ship_basic_accuracy_term(this.__wbg_ptr);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-     * @returns {MoraleState}
+     * @param {number} armor_penetration
+     * @returns {number | undefined}
      */
-    morale_state() {
-        const ret = wasm.ship_morale_state(this.__wbg_ptr);
-        return ret;
-    }
-    /**
-     * @returns {ShipCategory}
-     */
-    category() {
-        const ret = wasm.ship_category(this.__wbg_ptr);
-        return ret;
-    }
-    /**
-     * @param {ShipAttr} attr
-     * @returns {boolean}
-     */
-    has_attr(attr) {
-        const ret = wasm.ship_has_attr(this.__wbg_ptr, attr);
-        return ret !== 0;
-    }
-    /**
-     * @returns {string[]}
-     */
-    gear_keys() {
-        const ret = wasm.ship_gear_keys(this.__wbg_ptr);
-        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
-        wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
-        return v1;
-    }
-    /**
-     * @param {string} key
-     * @returns {Gear | undefined}
-     */
-    get_gear(key) {
-        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.ship_get_gear(this.__wbg_ptr, ptr0, len0);
-        return ret === 0 ? undefined : Gear.__wrap(ret);
-    }
-    /**
-     * @param {DamageState} state
-     * @returns {number | undefined}
-     */
-    get_damage_bound(state) {
-        const ret = wasm.ship_get_damage_bound(this.__wbg_ptr, state);
-        return ret === 0xFFFFFF ? undefined : ret;
-    }
-    /**
-     * @param {number} rate
-     * @param {boolean} ceil
-     * @returns {number}
-     */
-    get_remaining_fuel(rate, ceil) {
-        const ret = wasm.ship_get_remaining_fuel(this.__wbg_ptr, rate, ceil);
-        return ret;
-    }
-    /**
-     * @param {number} rate
-     * @param {boolean} ceil
-     * @returns {number}
-     */
-    get_remaining_ammo(rate, ceil) {
-        const ret = wasm.ship_get_remaining_ammo(this.__wbg_ptr, rate, ceil);
-        return ret;
-    }
-    /**
-     * @param {string} key
-     * @returns {boolean}
-     */
-    has_unknown_stat(key) {
-        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.ship_has_unknown_stat(this.__wbg_ptr, ptr0, len0);
-        return ret !== 0;
+    basic_defense_power(armor_penetration) {
+        const ret = wasm.ship_basic_defense_power(this.__wbg_ptr, armor_penetration);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
      * @param {string} key
      * @returns {number | undefined}
      */
-    get_naked_stat(key) {
+    get_stat_interval_left(key) {
         const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.ship_get_naked_stat(this.__wbg_ptr, ptr0, len0);
+        const ret = wasm.ship_get_stat_interval_left(this.__wbg_ptr, ptr0, len0);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-     * @param {string} key
+     * 加重対空
+     * @param {Side} side
      * @returns {number | undefined}
      */
-    get_stat_interval_left(key) {
-        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.ship_get_stat_interval_left(this.__wbg_ptr, ptr0, len0);
-        return ret === 0xFFFFFF ? undefined : ret;
+    ship_adjusted_anti_air(side) {
+        const ret = wasm.ship_ship_adjusted_anti_air(this.__wbg_ptr, side);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
      * @param {string} key
@@ -2284,109 +2309,101 @@ export class Ship {
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-     * @param {string} key
      * @returns {number}
      */
-    get_gear_stat(key) {
-        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.ship_get_gear_stat(this.__wbg_ptr, ptr0, len0);
-        return ret;
-    }
-    /**
-     * @param {string} key
-     * @returns {number}
-     */
-    get_ebonus(key) {
-        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.ship_get_ebonus(this.__wbg_ptr, ptr0, len0);
+    get innate_torpedo_accuracy() {
+        const ret = wasm.ship_innate_torpedo_accuracy(this.__wbg_ptr);
         return ret;
     }
-    /**
-     * @param {string} key
-     * @returns {number | undefined}
-     */
-    get_stat_mod(key) {
-        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.ship_get_stat_mod(this.__wbg_ptr, ptr0, len0);
-        return ret === 0xFFFFFF ? undefined : ret;
-    }
     /**
      * @returns {boolean}
      */
-    is_abyssal() {
-        const ret = wasm.ship_is_abyssal(this.__wbg_ptr);
+    is_attackable_by_torpedo() {
+        const ret = wasm.ship_is_attackable_by_torpedo(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-     * @returns {boolean}
+     * @returns {number | undefined}
      */
-    is_submarine() {
-        const ret = wasm.ship_is_submarine(this.__wbg_ptr);
-        return ret !== 0;
+    get asw() {
+        const ret = wasm.ship_asw(this.__wbg_ptr);
+        return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-     * @returns {boolean}
+     * @returns {number | undefined}
      */
-    is_amagiri() {
-        const ret = wasm.ship_is_amagiri(this.__wbg_ptr);
-        return ret !== 0;
+    get los() {
+        const ret = wasm.ship_los(this.__wbg_ptr);
+        return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-     * @param {Gear} gear
-     * @param {string} key
-     * @returns {boolean}
+     * @param {number} node_divaricated_factor
+     * @returns {number | undefined}
      */
-    can_equip(gear, key) {
-        _assertClass(gear, Gear);
-        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.ship_can_equip(this.__wbg_ptr, gear.__wbg_ptr, ptr0, len0);
-        return ret !== 0;
+    elos(node_divaricated_factor) {
+        const ret = wasm.ship_elos(this.__wbg_ptr, node_divaricated_factor);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
      * @returns {number | undefined}
      */
-    get max_hp() {
-        const ret = wasm.ship_max_hp(this.__wbg_ptr);
+    get luck() {
+        const ret = wasm.ship_luck(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-     * @returns {number}
+     * @returns {ShipMeta}
      */
-    get max_ammo() {
-        const ret = wasm.ship_max_ammo(this.__wbg_ptr);
+    meta() {
+        const ret = wasm.ship_meta(this.__wbg_ptr);
         return ret;
     }
     /**
-     * @returns {number}
+     * @returns {string}
      */
-    get max_fuel() {
-        const ret = wasm.ship_max_fuel(this.__wbg_ptr);
-        return ret;
+    get name() {
+        let deferred1_0;
+        let deferred1_1;
+        try {
+            const ret = wasm.ship_name(this.__wbg_ptr);
+            deferred1_0 = ret[0];
+            deferred1_1 = ret[1];
+            return getStringFromWasm0(ret[0], ret[1]);
+        } finally {
+            wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
+        }
     }
     /**
-     * @returns {number | undefined}
+     * @returns {string}
      */
-    get naked_range() {
-        const ret = wasm.ship_naked_range(this.__wbg_ptr);
-        return ret === 0xFFFFFF ? undefined : ret;
+    get yomi() {
+        let deferred1_0;
+        let deferred1_1;
+        try {
+            const ret = wasm.ship_yomi(this.__wbg_ptr);
+            deferred1_0 = ret[0];
+            deferred1_1 = ret[1];
+            return getStringFromWasm0(ret[0], ret[1]);
+        } finally {
+            wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
+        }
     }
     /**
-     * @returns {number}
+     * @returns {number | undefined}
      */
-    get naked_speed() {
-        const ret = wasm.ship_naked_speed(this.__wbg_ptr);
-        return ret;
+    get armor() {
+        const ret = wasm.ship_armor(this.__wbg_ptr);
+        return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-     * @returns {number | undefined}
+     * @param {string} id
+     * @returns {boolean}
      */
-    get luck() {
-        const ret = wasm.ship_luck(this.__wbg_ptr);
-        return ret === 0xFFFFFF ? undefined : ret;
+    eq_id(id) {
+        const ptr0 = passStringToWasm0(id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.ship_eq_id(this.__wbg_ptr, ptr0, len0);
+        return ret !== 0;
     }
     /**
      * @returns {number | undefined}
@@ -2403,193 +2420,176 @@ export class Ship {
         return ret;
     }
     /**
-     * @returns {number}
+     * @returns {ShipState}
      */
-    get accuracy() {
-        const ret = wasm.ship_accuracy(this.__wbg_ptr);
+    state() {
+        const ret = wasm.ship_state(this.__wbg_ptr);
         return ret;
     }
     /**
      * @returns {number}
      */
-    get innate_torpedo_accuracy() {
-        const ret = wasm.ship_innate_torpedo_accuracy(this.__wbg_ptr);
+    get stype() {
+        const ret = wasm.ship_stype(this.__wbg_ptr);
         return ret;
     }
     /**
-     * @returns {boolean}
+     * @returns {number | undefined}
      */
-    is_installation() {
-        const ret = wasm.ship_is_installation(this.__wbg_ptr);
-        return ret !== 0;
+    get max_hp() {
+        const ret = wasm.ship_max_hp(this.__wbg_ptr);
+        return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
      * @returns {boolean}
      */
-    is_pt_imp() {
-        const ret = wasm.ship_is_pt_imp(this.__wbg_ptr);
+    get useful() {
+        const ret = wasm.ship_useful(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-     * @returns {SpecialEnemyType}
-     */
-    special_enemy_type() {
-        const ret = wasm.ship_special_enemy_type(this.__wbg_ptr);
-        return ret;
-    }
-    /**
-     * @returns {boolean}
+     * @returns {Ship}
      */
-    is_attackable_by_torpedo() {
-        const ret = wasm.ship_is_attackable_by_torpedo(this.__wbg_ptr);
-        return ret !== 0;
+    static default() {
+        const ret = wasm.ship_default();
+        return Ship.__wrap(ret);
     }
     /**
-     * @param {number} index
      * @returns {number | undefined}
      */
-    get_slot_size(index) {
-        const ret = wasm.ship_get_slot_size(this.__wbg_ptr, index);
+    get evasion() {
+        const ret = wasm.ship_evasion(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-     * @param {number} index
-     * @returns {number | undefined}
+     * @returns {number}
      */
-    get_max_slot_size(index) {
-        const ret = wasm.ship_get_max_slot_size(this.__wbg_ptr, index);
-        return ret === 0xFFFFFF ? undefined : ret;
+    get next_id() {
+        const ret = wasm.ship_next_id(this.__wbg_ptr);
+        return ret;
     }
     /**
      * @returns {number}
      */
-    remaining_ammo_mod() {
-        const ret = wasm.ship_remaining_ammo_mod(this.__wbg_ptr);
-        return ret;
+    get slotnum() {
+        const ret = wasm.ship_slotnum(this.__wbg_ptr);
+        return ret >>> 0;
     }
     /**
      * @returns {number}
      */
-    remaining_fuel_mod() {
-        const ret = wasm.ship_remaining_fuel_mod(this.__wbg_ptr);
+    get sort_id() {
+        const ret = wasm.ship_sort_id(this.__wbg_ptr);
         return ret;
     }
     /**
-     * @param {AirWaveType} air_type
      * @returns {number | undefined}
      */
-    fighter_power(air_type) {
-        const ret = wasm.ship_fighter_power(this.__wbg_ptr, air_type);
-        return ret === 0x100000001 ? undefined : ret;
+    get torpedo() {
+        const ret = wasm.ship_torpedo(this.__wbg_ptr);
+        return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-     * @returns {number | undefined}
+     * @returns {number}
      */
-    fleet_los_factor() {
-        const ret = wasm.ship_fleet_los_factor(this.__wbg_ptr);
-        return ret[0] === 0 ? undefined : ret[1];
+    get accuracy() {
+        const ret = wasm.ship_accuracy(this.__wbg_ptr);
+        return ret;
     }
     /**
-     * 加重対空
-     * @param {Side} side
      * @returns {number | undefined}
      */
-    ship_adjusted_anti_air(side) {
-        const ret = wasm.ship_ship_adjusted_anti_air(this.__wbg_ptr, side);
-        return ret[0] === 0 ? undefined : ret[1];
-    }
-    /**
-     * 艦隊対空補正
-     * @returns {number}
-     */
-    fleet_anti_air_mod() {
-        const ret = wasm.ship_fleet_anti_air_mod(this.__wbg_ptr);
-        return ret;
+    get anti_air() {
+        const ret = wasm.ship_anti_air(this.__wbg_ptr);
+        return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-     * @returns {number}
+     * @returns {ShipCategory}
      */
-    cruiser_fit_bonus() {
-        const ret = wasm.ship_cruiser_fit_bonus(this.__wbg_ptr);
+    category() {
+        const ret = wasm.ship_category(this.__wbg_ptr);
         return ret;
     }
     /**
-     * @returns {number | undefined}
+     * @param {string} key
+     * @returns {Gear | undefined}
      */
-    basic_accuracy_term() {
-        const ret = wasm.ship_basic_accuracy_term(this.__wbg_ptr);
-        return ret[0] === 0 ? undefined : ret[1];
+    get_gear(key) {
+        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.ship_get_gear(this.__wbg_ptr, ptr0, len0);
+        return ret === 0 ? undefined : Gear.__wrap(ret);
     }
     /**
-     * @returns {number | undefined}
+     * @param {ShipAttr} attr
+     * @returns {boolean}
      */
-    basic_evasion_term() {
-        const ret = wasm.ship_basic_evasion_term(this.__wbg_ptr);
-        return ret[0] === 0 ? undefined : ret[1];
+    has_attr(attr) {
+        const ret = wasm.ship_has_attr(this.__wbg_ptr, attr);
+        return ret !== 0;
     }
     /**
-     * @param {number} formation_mod
-     * @param {number} postcap_additive
-     * @param {number} postcap_multiplicative
-     * @returns {number | undefined}
+     * @returns {number}
      */
-    evasion_term(formation_mod, postcap_additive, postcap_multiplicative) {
-        const ret = wasm.ship_evasion_term(this.__wbg_ptr, formation_mod, postcap_additive, postcap_multiplicative);
-        return ret[0] === 0 ? undefined : ret[1];
+    get max_ammo() {
+        const ret = wasm.ship_max_ammo(this.__wbg_ptr);
+        return ret;
     }
     /**
-     * @param {number} armor_penetration
-     * @returns {number | undefined}
+     * @returns {number}
      */
-    basic_defense_power(armor_penetration) {
-        const ret = wasm.ship_basic_defense_power(this.__wbg_ptr, armor_penetration);
-        return ret[0] === 0 ? undefined : ret[1];
+    get max_fuel() {
+        const ret = wasm.ship_max_fuel(this.__wbg_ptr);
+        return ret;
     }
     /**
-     * @returns {number}
+     * @param {Gear} gear
+     * @param {string} key
+     * @returns {boolean}
      */
-    transport_point() {
-        const ret = wasm.ship_transport_point(this.__wbg_ptr);
-        return ret;
+    can_equip(gear, key) {
+        _assertClass(gear, Gear);
+        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.ship_can_equip(this.__wbg_ptr, gear.__wbg_ptr, ptr0, len0);
+        return ret !== 0;
     }
     /**
-     * @param {number} node_divaricated_factor
      * @returns {number | undefined}
      */
-    elos(node_divaricated_factor) {
-        const ret = wasm.ship_elos(this.__wbg_ptr, node_divaricated_factor);
-        return ret[0] === 0 ? undefined : ret[1];
+    get firepower() {
+        const ret = wasm.ship_firepower(this.__wbg_ptr);
+        return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-     * 確殺攻撃力
-     * @returns {number | undefined}
+     * @returns {string[]}
      */
-    ohko_power() {
-        const ret = wasm.ship_ohko_power(this.__wbg_ptr);
-        return ret[0] === 0 ? undefined : ret[1];
+    gear_keys() {
+        const ret = wasm.ship_gear_keys(this.__wbg_ptr);
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
+        return v1;
     }
     /**
-     * @returns {number | undefined}
+     * @returns {boolean}
      */
-    state_day_gunfit_accuracy() {
-        const ret = wasm.ship_state_day_gunfit_accuracy(this.__wbg_ptr);
-        return ret[0] === 0 ? undefined : ret[1];
+    is_pt_imp() {
+        const ret = wasm.ship_is_pt_imp(this.__wbg_ptr);
+        return ret !== 0;
     }
     /**
      * @returns {number | undefined}
      */
-    state_night_gunfit_accuracy() {
-        const ret = wasm.ship_state_night_gunfit_accuracy(this.__wbg_ptr);
-        return ret[0] === 0 ? undefined : ret[1];
+    get naked_asw() {
+        const ret = wasm.ship_naked_asw(this.__wbg_ptr);
+        return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-     * フィット砲補正
-     * @param {boolean} is_night
-     * @returns {number}
+     * @returns {number | undefined}
      */
-    gunfit_accuracy(is_night) {
-        const ret = wasm.ship_gunfit_accuracy(this.__wbg_ptr, is_night);
-        return ret;
+    get naked_los() {
+        const ret = wasm.ship_naked_los(this.__wbg_ptr);
+        return ret === 0xFFFFFF ? undefined : ret;
     }
 }
 if (Symbol.dispose) Ship.prototype[Symbol.dispose] = Ship.prototype.free;