fleethub-core 1.12.4 → 1.12.6

package/node/fleethub_core.js

@@ -1,10 +1,25 @@
 
 let imports = {};
 imports['__wbindgen_placeholder__'] = module.exports;
+imports['equipment-bonus'] = require('equipment-bonus');
 let wasm;
-const { createEquipmentBonuses } = require(`equipment-bonus`);
 const { TextDecoder, TextEncoder } = require(`util`);
 
+function addToExternrefTable0(obj) {
+    const idx = wasm.__externref_table_alloc();
+    wasm.__wbindgen_export_2.set(idx, obj);
+    return idx;
+}
+
+function handleError(f, args) {
+    try {
+        return f.apply(this, args);
+    } catch (e) {
+        const idx = addToExternrefTable0(e);
+        wasm.__wbindgen_exn_store(idx);
+    }
+}
+
 let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
 
 cachedTextDecoder.decode();
@@ -23,35 +38,6 @@ function getStringFromWasm0(ptr, len) {
     return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
 }
 
-const heap = new Array(128).fill(undefined);
-
-heap.push(undefined, null, true, false);
-
-let heap_next = heap.length;
-
-function addHeapObject(obj) {
-    if (heap_next === heap.length) heap.push(heap.length + 1);
-    const idx = heap_next;
-    heap_next = heap[idx];
-
-    heap[idx] = obj;
-    return idx;
-}
-
-function getObject(idx) { return heap[idx]; }
-
-function dropObject(idx) {
-    if (idx < 132) return;
-    heap[idx] = heap_next;
-    heap_next = idx;
-}
-
-function takeObject(idx) {
-    const ret = getObject(idx);
-    dropObject(idx);
-    return ret;
-}
-
 let WASM_VECTOR_LEN = 0;
 
 let cachedTextEncoder = new TextEncoder('utf-8');
@@ -108,10 +94,6 @@ function passStringToWasm0(arg, malloc, realloc) {
     return ptr;
 }
 
-function isLikeNone(x) {
-    return x === undefined || x === null;
-}
-
 let cachedDataViewMemory0 = null;
 
 function getDataViewMemory0() {
@@ -121,13 +103,18 @@ function getDataViewMemory0() {
     return cachedDataViewMemory0;
 }
 
+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(takeObject(mem.getUint32(i, true)));
+        result.push(wasm.__wbindgen_export_2.get(mem.getUint32(i, true)));
     }
+    wasm.__externref_drop_slice(ptr, len);
     return result;
 }
 
@@ -135,13 +122,13 @@ function _assertClass(instance, klass) {
     if (!(instance instanceof klass)) {
         throw new Error(`expected instance of ${klass.name}`);
     }
-    return instance.ptr;
 }
-/**
-*/
-module.exports.set_panic_hook = function() {
-    wasm.set_panic_hook();
-};
+
+function takeFromExternrefTable0(idx) {
+    const value = wasm.__wbindgen_export_2.get(idx);
+    wasm.__externref_table_dealloc(idx);
+    return value;
+}
 
 function getArrayU8FromWasm0(ptr, len) {
     ptr = ptr >>> 0;
@@ -164,11 +151,6 @@ function getUint16ArrayMemory0() {
     return cachedUint16ArrayMemory0;
 }
 
-function getArrayU16FromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return getUint16ArrayMemory0().subarray(ptr / 2, ptr / 2 + len);
-}
-
 function passArray16ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 2, 2) >>> 0;
     getUint16ArrayMemory0().set(arg, ptr / 2);
@@ -176,27 +158,27 @@ function passArray16ToWasm0(arg, malloc) {
     return ptr;
 }
 /**
-* @param {ShipConditions} value
-* @returns {ShipConditions}
-*/
+ * @param {ShipConditions} value
+ * @returns {ShipConditions}
+ */
 module.exports.parse_ship_conditions = function(value) {
-    const ret = wasm.parse_ship_conditions(addHeapObject(value));
-    return takeObject(ret);
+    const ret = wasm.parse_ship_conditions(value);
+    return ret;
 };
 
-function handleError(f, args) {
-    try {
-        return f.apply(this, args);
-    } catch (e) {
-        wasm.__wbindgen_exn_store(addHeapObject(e));
-    }
+module.exports.set_panic_hook = function() {
+    wasm.set_panic_hook();
+};
+
+function getArrayU16FromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return getUint16ArrayMemory0().subarray(ptr / 2, ptr / 2 + len);
 }
 
 const AirSquadronFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_airsquadron_free(ptr >>> 0, 1));
-/**
-*/
+
 class AirSquadron {
 
     static __wrap(ptr) {
@@ -219,62 +201,58 @@ class AirSquadron {
         wasm.__wbg_airsquadron_free(ptr, 0);
     }
     /**
-    * @returns {string}
-    */
+     * @returns {string}
+     */
     get id() {
         let deferred1_0;
         let deferred1_1;
         try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_airsquadron_id(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            deferred1_0 = r0;
-            deferred1_1 = r1;
-            return getStringFromWasm0(r0, r1);
+            const ret = wasm.__wbg_get_airsquadron_id(this.__wbg_ptr);
+            deferred1_0 = ret[0];
+            deferred1_1 = ret[1];
+            return getStringFromWasm0(ret[0], ret[1]);
         } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
             wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
         }
     }
     /**
-    * @param {string} arg0
-    */
+     * @param {string} arg0
+     */
     set id(arg0) {
         const ptr0 = passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_airsquadron_id(this.__wbg_ptr, ptr0, len0);
     }
     /**
-    * @returns {bigint}
-    */
+     * @returns {bigint}
+     */
     get hash() {
         const ret = wasm.__wbg_get_airsquadron_hash(this.__wbg_ptr);
         return BigInt.asUintN(64, ret);
     }
     /**
-    * @param {bigint} arg0
-    */
+     * @param {bigint} arg0
+     */
     set hash(arg0) {
         wasm.__wbg_set_airsquadron_hash(this.__wbg_ptr, arg0);
     }
     /**
-    * @returns {AirSquadronMode}
-    */
+     * @returns {AirSquadronMode}
+     */
     get mode() {
         const ret = wasm.__wbg_get_airsquadron_mode(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @param {AirSquadronMode} arg0
-    */
+     * @param {AirSquadronMode} arg0
+     */
     set mode(arg0) {
-        wasm.__wbg_set_airsquadron_mode(this.__wbg_ptr, addHeapObject(arg0));
+        wasm.__wbg_set_airsquadron_mode(this.__wbg_ptr, arg0);
     }
     /**
-    * @param {string} key
-    * @returns {Gear | undefined}
-    */
+     * @param {string} key
+     * @returns {Gear | undefined}
+     */
     get_gear(key) {
         const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
@@ -282,61 +260,45 @@ class AirSquadron {
         return ret === 0 ? undefined : Gear.__wrap(ret);
     }
     /**
-    * @param {number} index
-    * @returns {number}
-    */
+     * @param {number} index
+     * @returns {number}
+     */
     get_slot_size(index) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.airsquadron_get_slot_size(retptr, this.__wbg_ptr, index);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-            if (r2) {
-                throw takeObject(r1);
-            }
-            return r0;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
+        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}
-    */
+     * @param {number} index
+     * @returns {number}
+     */
     get_max_slot_size(index) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.airsquadron_get_max_slot_size(retptr, this.__wbg_ptr, index);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-            if (r2) {
-                throw takeObject(r1);
-            }
-            return r0;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
+        const ret = wasm.airsquadron_get_max_slot_size(this.__wbg_ptr, index);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
         }
+        return ret[0];
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     fighter_power() {
         const ret = wasm.airsquadron_fighter_power(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     interception_power() {
         const ret = wasm.airsquadron_interception_power(this.__wbg_ptr);
         return ret;
     }
     /**
-    * 行動半径
-    * @returns {number}
-    */
+     * 行動半径
+     * @returns {number}
+     */
     radius() {
         const ret = wasm.airsquadron_radius(this.__wbg_ptr);
         return ret;
@@ -347,8 +309,7 @@ module.exports.AirSquadron = AirSquadron;
 const AnalyzerFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_analyzer_free(ptr >>> 0, 1));
-/**
-*/
+
 class Analyzer {
 
     static __wrap(ptr) {
@@ -371,67 +332,59 @@ 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 {ShipAnalyzerConfig} config
+     * @param {Ship} left
+     * @param {Ship} right
+     * @param {boolean} attacker_is_left
+     * @returns {AttackAnalysis}
+     */
     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, addHeapObject(config), left.__wbg_ptr, right.__wbg_ptr, attacker_is_left);
-        return takeObject(ret);
+        const ret = wasm.analyzer_analyze_ship_attack(this.__wbg_ptr, config, left.__wbg_ptr, right.__wbg_ptr, attacker_is_left);
+        return ret;
     }
     /**
-    * @param {NodeAttackAnalyzerConfig} config
-    * @param {Comp} left_comp
-    * @param {Ship} left_ship
-    * @param {Comp} right_comp
-    * @param {Ship} right_ship
-    * @returns {NodeAttackAnalysis}
-    */
+     * @param {NodeAttackAnalyzerConfig} config
+     * @param {Comp} left_comp
+     * @param {Ship} left_ship
+     * @param {Comp} right_comp
+     * @param {Ship} right_ship
+     * @returns {NodeAttackAnalysis}
+     */
     analyze_node_attack(config, left_comp, left_ship, right_comp, right_ship) {
         _assertClass(left_comp, Comp);
         _assertClass(left_ship, Ship);
         _assertClass(right_comp, Comp);
         _assertClass(right_ship, Ship);
-        const ret = wasm.analyzer_analyze_node_attack(this.__wbg_ptr, addHeapObject(config), left_comp.__wbg_ptr, left_ship.__wbg_ptr, right_comp.__wbg_ptr, right_ship.__wbg_ptr);
-        return takeObject(ret);
+        const ret = wasm.analyzer_analyze_node_attack(this.__wbg_ptr, config, left_comp.__wbg_ptr, left_ship.__wbg_ptr, right_comp.__wbg_ptr, right_ship.__wbg_ptr);
+        return ret;
     }
     /**
-    * @param {Comp} comp
-    * @param {CompAnalyzerConfig} config
-    * @returns {CompAnalysis}
-    */
+     * @param {Comp} comp
+     * @param {CompAnalyzerConfig} config
+     * @returns {CompAnalysis}
+     */
     analyze_comp(comp, config) {
         _assertClass(comp, Comp);
-        const ret = wasm.analyzer_analyze_comp(this.__wbg_ptr, comp.__wbg_ptr, addHeapObject(config));
-        return takeObject(ret);
+        const ret = wasm.analyzer_analyze_comp(this.__wbg_ptr, comp.__wbg_ptr, config);
+        return ret;
     }
     /**
-    * @param {Comp} player_comp
-    * @param {Comp} enemy_comp
-    * @param {NodeAttackAnalyzerConfig} config
-    * @param {number} times
-    * @returns {SimulatorResult}
-    */
+     * @param {Comp} player_comp
+     * @param {Comp} enemy_comp
+     * @param {NodeAttackAnalyzerConfig} config
+     * @param {number} times
+     * @returns {SimulatorResult}
+     */
     simulate_support_shelling(player_comp, enemy_comp, config, times) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            _assertClass(player_comp, Comp);
-            _assertClass(enemy_comp, Comp);
-            wasm.analyzer_simulate_support_shelling(retptr, this.__wbg_ptr, player_comp.__wbg_ptr, enemy_comp.__wbg_ptr, addHeapObject(config), times);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-            if (r2) {
-                throw takeObject(r1);
-            }
-            return takeObject(r0);
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
+        _assertClass(player_comp, Comp);
+        _assertClass(enemy_comp, Comp);
+        const ret = wasm.analyzer_simulate_support_shelling(this.__wbg_ptr, player_comp.__wbg_ptr, enemy_comp.__wbg_ptr, config, times);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
         }
+        return takeFromExternrefTable0(ret[0]);
     }
 }
 module.exports.Analyzer = Analyzer;
@@ -439,8 +392,7 @@ module.exports.Analyzer = Analyzer;
 const CompFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_comp_free(ptr >>> 0, 1));
-/**
-*/
+
 class Comp {
 
     static __wrap(ptr) {
@@ -463,44 +415,44 @@ class Comp {
         wasm.__wbg_comp_free(ptr, 0);
     }
     /**
-    * @returns {OrgType}
-    */
+     * @returns {OrgType}
+     */
     get org_type() {
         const ret = wasm.__wbg_get_comp_org_type(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get hq_level() {
         const ret = wasm.__wbg_get_comp_hq_level(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {Fleet}
-    */
+     * @returns {Fleet}
+     */
     get main() {
         const ret = wasm.__wbg_get_comp_main(this.__wbg_ptr);
         return Fleet.__wrap(ret);
     }
     /**
-    * @param {Fleet} arg0
-    */
+     * @param {Fleet} arg0
+     */
     set main(arg0) {
         _assertClass(arg0, Fleet);
         var ptr0 = arg0.__destroy_into_raw();
         wasm.__wbg_set_comp_main(this.__wbg_ptr, ptr0);
     }
     /**
-    * @returns {Fleet | undefined}
-    */
+     * @returns {Fleet | undefined}
+     */
     get escort() {
         const ret = wasm.__wbg_get_comp_escort(this.__wbg_ptr);
         return ret === 0 ? undefined : Fleet.__wrap(ret);
     }
     /**
-    * @param {Fleet | undefined} [arg0]
-    */
+     * @param {Fleet | null} [arg0]
+     */
     set escort(arg0) {
         let ptr0 = 0;
         if (!isLikeNone(arg0)) {
@@ -510,15 +462,15 @@ class Comp {
         wasm.__wbg_set_comp_escort(this.__wbg_ptr, ptr0);
     }
     /**
-    * @returns {Fleet | undefined}
-    */
+     * @returns {Fleet | undefined}
+     */
     get route_sup() {
         const ret = wasm.__wbg_get_comp_route_sup(this.__wbg_ptr);
         return ret === 0 ? undefined : Fleet.__wrap(ret);
     }
     /**
-    * @param {Fleet | undefined} [arg0]
-    */
+     * @param {Fleet | null} [arg0]
+     */
     set route_sup(arg0) {
         let ptr0 = 0;
         if (!isLikeNone(arg0)) {
@@ -528,15 +480,15 @@ class Comp {
         wasm.__wbg_set_comp_route_sup(this.__wbg_ptr, ptr0);
     }
     /**
-    * @returns {Fleet | undefined}
-    */
+     * @returns {Fleet | undefined}
+     */
     get boss_sup() {
         const ret = wasm.__wbg_get_comp_boss_sup(this.__wbg_ptr);
         return ret === 0 ? undefined : Fleet.__wrap(ret);
     }
     /**
-    * @param {Fleet | undefined} [arg0]
-    */
+     * @param {Fleet | null} [arg0]
+     */
     set boss_sup(arg0) {
         let ptr0 = 0;
         if (!isLikeNone(arg0)) {
@@ -546,37 +498,37 @@ class Comp {
         wasm.__wbg_set_comp_boss_sup(this.__wbg_ptr, ptr0);
     }
     /**
-    * @returns {Side}
-    */
+     * @returns {Side}
+     */
     side() {
         const ret = wasm.comp_side(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_combined() {
         const ret = wasm.comp_is_combined(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_player() {
         const ret = wasm.comp_is_player(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_enemy() {
         const ret = wasm.comp_is_enemy(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @param {string} id
-    * @returns {boolean}
-    */
+     * @param {string} id
+     * @returns {boolean}
+     */
     has_ship_eid(id) {
         const ptr0 = passStringToWasm0(id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
@@ -584,92 +536,71 @@ class Comp {
         return ret !== 0;
     }
     /**
-    * @returns {string | undefined}
-    */
+     * @returns {string | undefined}
+     */
     first_ship_id() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.comp_first_ship_id(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            let v1;
-            if (r0 !== 0) {
-                v1 = getStringFromWasm0(r0, r1).slice();
-                wasm.__wbindgen_free(r0, r1 * 1, 1);
-            }
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
+        const ret = wasm.comp_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 {boolean}
-    */
+     * @returns {boolean}
+     */
     has_route_sup() {
         const ret = wasm.comp_has_route_sup(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {CompMeta}
-    */
+     * @returns {CompMeta}
+     */
     meta() {
         const ret = wasm.comp_meta(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @param {FleetType} ft
-    * @returns {string | undefined}
-    */
+     * @param {FleetType} ft
+     * @returns {string | undefined}
+     */
     get_fleet_id(ft) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.comp_get_fleet_id(retptr, this.__wbg_ptr, addHeapObject(ft));
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            let v1;
-            if (r0 !== 0) {
-                v1 = getStringFromWasm0(r0, r1).slice();
-                wasm.__wbindgen_free(r0, r1 * 1, 1);
-            }
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
+        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}
-    */
+     * @param {FleetType} ft
+     * @param {ShipKey} key
+     * @returns {Ship | undefined}
+     */
     get_ship_with_clone(ft, key) {
-        const ret = wasm.comp_get_ship_with_clone(this.__wbg_ptr, addHeapObject(ft), addHeapObject(key));
+        const ret = wasm.comp_get_ship_with_clone(this.__wbg_ptr, ft, key);
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
-    * @param {FleetType} ft
-    * @param {ShipKey} key
-    * @returns {string | undefined}
-    */
+     * @param {FleetType} ft
+     * @param {ShipKey} key
+     * @returns {string | undefined}
+     */
     get_ship_entity_id(ft, key) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.comp_get_ship_entity_id(retptr, this.__wbg_ptr, addHeapObject(ft), addHeapObject(key));
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            let v1;
-            if (r0 !== 0) {
-                v1 = getStringFromWasm0(r0, r1).slice();
-                wasm.__wbindgen_free(r0, r1 * 1, 1);
-            }
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
+        const ret = wasm.comp_get_ship_entity_id(this.__wbg_ptr, ft, 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;
     }
     /**
-    * @param {string} id
-    * @returns {Ship | undefined}
-    */
+     * @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;
@@ -677,90 +608,69 @@ class Comp {
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
-    * @returns {Formation}
-    */
+     * @returns {Formation}
+     */
     default_formation() {
         const ret = wasm.comp_default_formation(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * 艦隊防空値
-    * @param {number} formation_mod
-    * @returns {number}
-    */
+     * 艦隊防空値
+     * @param {number} formation_mod
+     * @returns {number}
+     */
     adjusted_anti_air(formation_mod) {
         const ret = wasm.comp_adjusted_anti_air(this.__wbg_ptr, formation_mod);
         return ret;
     }
     /**
-    * 制空値
-    * @param {boolean} escort_participates
-    * @param {AirWaveType} air_type
-    * @returns {number | undefined}
-    */
+     * 制空値
+     * @param {boolean} escort_participates
+     * @param {AirWaveType} air_type
+     * @returns {number | undefined}
+     */
     fighter_power(escort_participates, air_type) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.comp_fighter_power(retptr, this.__wbg_ptr, escort_participates, addHeapObject(air_type));
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            return r0 === 0 ? undefined : r1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.comp_fighter_power(this.__wbg_ptr, escort_participates, air_type);
+        return ret === 0x100000001 ? undefined : ret;
     }
     /**
-    * マップ索敵
-    * @param {number} node_divaricated_factor
-    * @returns {number | undefined}
-    */
+     * マップ索敵
+     * @param {number} node_divaricated_factor
+     * @returns {number | undefined}
+     */
     elos(node_divaricated_factor) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.comp_elos(retptr, this.__wbg_ptr, node_divaricated_factor);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.comp_elos(this.__wbg_ptr, node_divaricated_factor);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-    * 輸送物資量(TP)
-    * @returns {number}
-    */
+     * 輸送物資量(TP)
+     * @returns {number}
+     */
     transport_point() {
         const ret = wasm.comp_transport_point(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @param {Ship} ship
-    * @param {Formation | undefined} [formation]
-    * @returns {ShipConditions}
-    */
+     * @param {Ship} ship
+     * @param {Formation | null} [formation]
+     * @returns {ShipConditions}
+     */
     get_ship_conditions(ship, formation) {
         _assertClass(ship, Ship);
-        const ret = wasm.comp_get_ship_conditions(this.__wbg_ptr, ship.__wbg_ptr, isLikeNone(formation) ? 0 : addHeapObject(formation));
-        return takeObject(ret);
+        const ret = wasm.comp_get_ship_conditions(this.__wbg_ptr, ship.__wbg_ptr, isLikeNone(formation) ? 0 : addToExternrefTable0(formation));
+        return ret;
     }
     /**
-    * @param {FleetType} fleet_type
-    * @returns {number | undefined}
-    */
+     * @param {FleetType} fleet_type
+     * @returns {number | undefined}
+     */
     fleet_los_mod(fleet_type) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.comp_fleet_los_mod(retptr, this.__wbg_ptr, addHeapObject(fleet_type));
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.comp_fleet_los_mod(this.__wbg_ptr, fleet_type);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     balloons() {
         const ret = wasm.comp_balloons(this.__wbg_ptr);
         return ret >>> 0;
@@ -771,8 +681,7 @@ module.exports.Comp = Comp;
 const FhCoreFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_fhcore_free(ptr >>> 0, 1));
-/**
-*/
+
 class FhCore {
 
     __destroy_into_raw() {
@@ -787,93 +696,85 @@ class FhCore {
         wasm.__wbg_fhcore_free(ptr, 0);
     }
     /**
-    * @param {MasterData} js_master
-    */
+     * @param {MasterData} js_master
+     */
     constructor(js_master) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.fhcore_new(retptr, addHeapObject(js_master));
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-            if (r2) {
-                throw takeObject(r1);
-            }
-            this.__wbg_ptr = r0 >>> 0;
-            FhCoreFinalization.register(this, this.__wbg_ptr, this);
-            return this;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
+        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;
     }
     /**
-    * @param {GearState | undefined} [input]
-    * @returns {Gear | undefined}
-    */
+     * @param {GearState | null} [input]
+     * @returns {Gear | undefined}
+     */
     create_gear(input) {
-        const ret = wasm.fhcore_create_gear(this.__wbg_ptr, isLikeNone(input) ? 0 : addHeapObject(input));
+        const ret = wasm.fhcore_create_gear(this.__wbg_ptr, isLikeNone(input) ? 0 : addToExternrefTable0(input));
         return ret === 0 ? undefined : Gear.__wrap(ret);
     }
     /**
-    * @param {ShipState | undefined} [input]
-    * @returns {Ship | undefined}
-    */
+     * @param {ShipState | null} [input]
+     * @returns {Ship | undefined}
+     */
     create_ship(input) {
-        const ret = wasm.fhcore_create_ship(this.__wbg_ptr, isLikeNone(input) ? 0 : addHeapObject(input));
+        const ret = wasm.fhcore_create_ship(this.__wbg_ptr, isLikeNone(input) ? 0 : addToExternrefTable0(input));
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
-    * @param {AirSquadronState | undefined} [input]
-    * @returns {AirSquadron}
-    */
+     * @param {AirSquadronState | null} [input]
+     * @returns {AirSquadron}
+     */
     create_air_squadron(input) {
-        const ret = wasm.fhcore_create_air_squadron(this.__wbg_ptr, isLikeNone(input) ? 0 : addHeapObject(input));
+        const ret = wasm.fhcore_create_air_squadron(this.__wbg_ptr, isLikeNone(input) ? 0 : addToExternrefTable0(input));
         return AirSquadron.__wrap(ret);
     }
     /**
-    * @param {FleetState | undefined} [input]
-    * @returns {Fleet}
-    */
+     * @param {FleetState | null} [input]
+     * @returns {Fleet}
+     */
     create_fleet(input) {
-        const ret = wasm.fhcore_create_fleet(this.__wbg_ptr, isLikeNone(input) ? 0 : addHeapObject(input));
+        const ret = wasm.fhcore_create_fleet(this.__wbg_ptr, isLikeNone(input) ? 0 : addToExternrefTable0(input));
         return Fleet.__wrap(ret);
     }
     /**
-    * @param {OrgState | undefined} [input]
-    * @returns {Org | undefined}
-    */
+     * @param {OrgState | null} [input]
+     * @returns {Org | undefined}
+     */
     create_org(input) {
-        const ret = wasm.fhcore_create_org(this.__wbg_ptr, isLikeNone(input) ? 0 : addHeapObject(input));
+        const ret = wasm.fhcore_create_org(this.__wbg_ptr, isLikeNone(input) ? 0 : addToExternrefTable0(input));
         return ret === 0 ? undefined : Org.__wrap(ret);
     }
     /**
-    * @param {number} ship_id
-    * @returns {ShipState | undefined}
-    */
+     * @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 takeObject(ret);
+        return ret;
     }
     /**
-    * @param {number} ship_id
-    * @returns {Ship | undefined}
-    */
+     * @param {number} ship_id
+     * @returns {Ship | undefined}
+     */
     create_ship_by_id(ship_id) {
         const ret = wasm.fhcore_create_ship_by_id(this.__wbg_ptr, ship_id);
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
-    * @returns {Ship[]}
-    */
+     * @returns {Ship[]}
+     */
     create_all_ships() {
         const ret = wasm.fhcore_create_all_ships(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @param {Uint16Array} main
-    * @param {Uint16Array | undefined} [escort]
-    * @returns {Comp}
-    */
+     * @param {Uint16Array} main
+     * @param {Uint16Array | null} [escort]
+     * @returns {Comp}
+     */
     create_comp_by_map_enemy(main, escort) {
         const ptr0 = passArray16ToWasm0(main, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
@@ -883,15 +784,15 @@ class FhCore {
         return Comp.__wrap(ret);
     }
     /**
-    * @returns {Ship}
-    */
+     * @returns {Ship}
+     */
     create_default_ship() {
         const ret = wasm.fhcore_create_default_ship(this.__wbg_ptr);
         return Ship.__wrap(ret);
     }
     /**
-    * @returns {Analyzer}
-    */
+     * @returns {Analyzer}
+     */
     create_analyzer() {
         const ret = wasm.fhcore_create_analyzer(this.__wbg_ptr);
         return Analyzer.__wrap(ret);
@@ -902,8 +803,7 @@ module.exports.FhCore = FhCore;
 const FleetFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_fleet_free(ptr >>> 0, 1));
-/**
-*/
+
 class Fleet {
 
     static __wrap(ptr) {
@@ -926,134 +826,102 @@ class Fleet {
         wasm.__wbg_fleet_free(ptr, 0);
     }
     /**
-    * @returns {string}
-    */
+     * @returns {string}
+     */
     get id() {
         let deferred1_0;
         let deferred1_1;
         try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_fleet_id(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            deferred1_0 = r0;
-            deferred1_1 = r1;
-            return getStringFromWasm0(r0, r1);
+            const ret = wasm.__wbg_get_fleet_id(this.__wbg_ptr);
+            deferred1_0 = ret[0];
+            deferred1_1 = ret[1];
+            return getStringFromWasm0(ret[0], ret[1]);
         } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
             wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
         }
     }
     /**
-    * @param {string} arg0
-    */
+     * @param {string} arg0
+     */
     set id(arg0) {
         const ptr0 = passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_fleet_id(this.__wbg_ptr, ptr0, len0);
     }
     /**
-    * @returns {bigint}
-    */
+     * @returns {bigint}
+     */
     get hash() {
         const ret = wasm.__wbg_get_fleet_hash(this.__wbg_ptr);
         return BigInt.asUintN(64, ret);
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get len() {
         const ret = wasm.__wbg_get_fleet_len(this.__wbg_ptr);
         return ret >>> 0;
     }
     /**
-    * @returns {FleetMeta}
-    */
+     * @returns {FleetMeta}
+     */
     meta() {
         const ret = wasm.fleet_meta(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {(string)[]}
-    */
+     * @returns {string[]}
+     */
     ship_keys() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.fleet_ship_keys(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var v1 = getArrayJsValueFromWasm0(r0, r1).slice();
-            wasm.__wbindgen_free(r0, r1 * 4, 4);
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        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;
     }
     /**
-    * @returns {(string)[]}
-    */
+     * @returns {string[]}
+     */
     ship_ids() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.fleet_ship_ids(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var v1 = getArrayJsValueFromWasm0(r0, r1).slice();
-            wasm.__wbindgen_free(r0, r1 * 4, 4);
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        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;
     }
     /**
-    * @returns {(string)[]}
-    */
+     * @returns {string[]}
+     */
     get_gear_ids_by_improvable() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.fleet_get_gear_ids_by_improvable(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var v1 = getArrayJsValueFromWasm0(r0, r1).slice();
-            wasm.__wbindgen_free(r0, r1 * 4, 4);
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        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)[]}
-    */
+     * @returns {string[]}
+     */
     get_gear_ids_by_proficiency() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.fleet_get_gear_ids_by_proficiency(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var v1 = getArrayJsValueFromWasm0(r0, r1).slice();
-            wasm.__wbindgen_free(r0, r1 * 4, 4);
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        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;
     }
     /**
-    * @param {string} id
-    * @param {DamageState} state
-    * @returns {number | undefined}
-    */
+     * @param {string} id
+     * @param {DamageState} state
+     * @returns {number | undefined}
+     */
     get_damage_bound(id, state) {
         const ptr0 = passStringToWasm0(id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.fleet_get_damage_bound(this.__wbg_ptr, ptr0, len0, addHeapObject(state));
+        const ret = wasm.fleet_get_damage_bound(this.__wbg_ptr, ptr0, len0, state);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @param {string} id
-    * @param {number} rate
-    * @param {boolean} ceil
-    * @returns {number | undefined}
-    */
+     * @param {string} id
+     * @param {number} rate
+     * @param {boolean} ceil
+     * @returns {number | undefined}
+     */
     get_remaining_fuel(id, rate, ceil) {
         const ptr0 = passStringToWasm0(id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
@@ -1061,11 +929,11 @@ class Fleet {
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @param {string} id
-    * @param {number} rate
-    * @param {boolean} ceil
-    * @returns {number | undefined}
-    */
+     * @param {string} id
+     * @param {number} rate
+     * @param {boolean} ceil
+     * @returns {number | undefined}
+     */
     get_remaining_ammo(id, rate, ceil) {
         const ptr0 = passStringToWasm0(id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
@@ -1073,108 +941,71 @@ class Fleet {
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     count_ships() {
         const ret = wasm.fleet_count_ships(this.__wbg_ptr);
         return ret >>> 0;
     }
     /**
-    * @param {ShipKey} key
-    * @returns {Ship | undefined}
-    */
+     * @param {ShipKey} key
+     * @returns {Ship | undefined}
+     */
     get_ship(key) {
-        const ret = wasm.fleet_get_ship(this.__wbg_ptr, addHeapObject(key));
+        const ret = wasm.fleet_get_ship(this.__wbg_ptr, key);
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get fleet_los_mod() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.fleet_fleet_los_mod(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.fleet_fleet_los_mod(this.__wbg_ptr);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-    * @param {AirWaveType} air_type
-    * @returns {number | undefined}
-    */
+     * @param {AirWaveType} air_type
+     * @returns {number | undefined}
+     */
     fighter_power(air_type) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.fleet_fighter_power(retptr, this.__wbg_ptr, addHeapObject(air_type));
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            return r0 === 0 ? undefined : r1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.fleet_fighter_power(this.__wbg_ptr, air_type);
+        return ret === 0x100000001 ? undefined : ret;
     }
     /**
-    * マップ索敵
-    * @param {number} hq_level
-    * @param {number} node_divaricated_factor
-    * @returns {number | undefined}
-    */
+     * マップ索敵
+     * @param {number} hq_level
+     * @param {number} node_divaricated_factor
+     * @returns {number | undefined}
+     */
     elos(hq_level, node_divaricated_factor) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.fleet_elos(retptr, this.__wbg_ptr, hq_level, node_divaricated_factor);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.fleet_elos(this.__wbg_ptr, hq_level, node_divaricated_factor);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-    * 航空索敵スコア
-    * @returns {number | undefined}
-    */
+     * 航空索敵スコア
+     * @returns {number | undefined}
+     */
     aviation_detection_score() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.fleet_aviation_detection_score(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.fleet_aviation_detection_score(this.__wbg_ptr);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-    * 遠征ボーナス
-    * @returns {number}
-    */
+     * 遠征ボーナス
+     * @returns {number}
+     */
     expedition_bonus() {
         const ret = wasm.fleet_expedition_bonus(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @param {string} key
-    * @returns {number | undefined}
-    */
+     * @param {string} key
+     * @returns {number | undefined}
+     */
     sum_ship_stat_by(key) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-            const len0 = WASM_VECTOR_LEN;
-            wasm.fleet_sum_ship_stat_by(retptr, this.__wbg_ptr, ptr0, len0);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        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];
     }
-    /**
-    */
     reset_battle_state() {
         wasm.fleet_reset_battle_state(this.__wbg_ptr);
     }
@@ -1184,8 +1015,7 @@ module.exports.Fleet = Fleet;
 const GearFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_gear_free(ptr >>> 0, 1));
-/**
-*/
+
 class Gear {
 
     static __wrap(ptr) {
@@ -1208,479 +1038,464 @@ class Gear {
         wasm.__wbg_gear_free(ptr, 0);
     }
     /**
-    * @returns {string}
-    */
+     * @returns {string}
+     */
     get id() {
         let deferred1_0;
         let deferred1_1;
         try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_gear_id(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            deferred1_0 = r0;
-            deferred1_1 = r1;
-            return getStringFromWasm0(r0, r1);
+            const ret = wasm.__wbg_get_gear_id(this.__wbg_ptr);
+            deferred1_0 = ret[0];
+            deferred1_1 = ret[1];
+            return getStringFromWasm0(ret[0], ret[1]);
         } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
             wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
         }
     }
     /**
-    * @param {string} arg0
-    */
+     * @param {string} arg0
+     */
     set id(arg0) {
         const ptr0 = passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_gear_id(this.__wbg_ptr, ptr0, len0);
     }
     /**
-    * @returns {bigint}
-    */
+     * @returns {bigint}
+     */
     get hash() {
         const ret = wasm.__wbg_get_gear_hash(this.__wbg_ptr);
         return BigInt.asUintN(64, ret);
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get gear_id() {
         const ret = wasm.__wbg_get_gear_gear_id(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get stars() {
         const ret = wasm.__wbg_get_gear_stars(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get exp() {
         const ret = wasm.__wbg_get_gear_exp(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get default_exp() {
         const ret = wasm.__wbg_get_gear_default_exp(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {string}
-    */
+     * @returns {string}
+     */
     get name() {
         let deferred1_0;
         let deferred1_1;
         try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_gear_name(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            deferred1_0 = r0;
-            deferred1_1 = r1;
-            return getStringFromWasm0(r0, r1);
+            const ret = wasm.__wbg_get_gear_name(this.__wbg_ptr);
+            deferred1_0 = ret[0];
+            deferred1_1 = ret[1];
+            return getStringFromWasm0(ret[0], ret[1]);
         } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
             wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
         }
     }
     /**
-    * @param {string} arg0
-    */
+     * @param {string} arg0
+     */
     set name(arg0) {
         const ptr0 = passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_gear_name(this.__wbg_ptr, ptr0, len0);
     }
     /**
-    * @returns {Uint8Array}
-    */
+     * @returns {Uint8Array}
+     */
     get types() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_gear_types(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var v1 = getArrayU8FromWasm0(r0, r1).slice();
-            wasm.__wbindgen_free(r0, r1 * 1, 1);
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.__wbg_get_gear_types(this.__wbg_ptr);
+        var v1 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
+        return v1;
     }
     /**
-    * @param {Uint8Array} arg0
-    */
+     * @param {Uint8Array} arg0
+     */
     set types(arg0) {
         const ptr0 = passArray8ToWasm0(arg0, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_gear_types(this.__wbg_ptr, ptr0, len0);
     }
     /**
-    * @returns {GearType}
-    */
+     * @returns {GearType}
+     */
     get gear_type() {
         const ret = wasm.__wbg_get_gear_gear_type(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get max_hp() {
         const ret = wasm.__wbg_get_gear_max_hp(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get firepower() {
         const ret = wasm.__wbg_get_gear_firepower(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get armor() {
         const ret = wasm.__wbg_get_gear_armor(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get torpedo() {
         const ret = wasm.__wbg_get_gear_torpedo(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get anti_air() {
         const ret = wasm.__wbg_get_gear_anti_air(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get speed() {
         const ret = wasm.__wbg_get_gear_speed(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get bombing() {
         const ret = wasm.__wbg_get_gear_bombing(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get asw() {
         const ret = wasm.__wbg_get_gear_asw(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get los() {
         const ret = wasm.__wbg_get_gear_los(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get luck() {
         const ret = wasm.__wbg_get_gear_luck(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get accuracy() {
         const ret = wasm.__wbg_get_gear_accuracy(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get evasion() {
         const ret = wasm.__wbg_get_gear_evasion(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get range() {
         const ret = wasm.__wbg_get_gear_range(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get radius() {
         const ret = wasm.__wbg_get_gear_radius(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get cost() {
         const ret = wasm.__wbg_get_gear_cost(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     get improvable() {
         const ret = wasm.__wbg_get_gear_improvable(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get ship_anti_air_resist() {
         const ret = wasm.__wbg_get_gear_ship_anti_air_resist(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get fleet_anti_air_resist() {
         const ret = wasm.__wbg_get_gear_fleet_anti_air_resist(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {Gear}
-    */
+     * @returns {Gear}
+     */
     static default() {
         const ret = wasm.gear_default();
         return Gear.__wrap(ret);
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get gear_type_id() {
         const ret = wasm.gear_gear_type_id(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get special_type() {
         const ret = wasm.gear_special_type(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get icon_id() {
         const ret = wasm.gear_icon_id(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @param {GearAttr} attr
-    * @returns {boolean}
-    */
+     * @param {GearAttr} attr
+     * @returns {boolean}
+     */
     has_attr(attr) {
-        const ret = wasm.gear_has_attr(this.__wbg_ptr, addHeapObject(attr));
+        const ret = wasm.gear_has_attr(this.__wbg_ptr, attr);
         return ret !== 0;
     }
     /**
-    * @returns {GearCategory}
-    */
+     * @returns {GearCategory}
+     */
     category() {
         const ret = wasm.gear_category(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get ace() {
         const ret = wasm.gear_ace(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get anti_bomber() {
         const ret = wasm.gear_anti_bomber(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get interception() {
         const ret = wasm.gear_interception(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_high_angle_mount() {
         const ret = wasm.gear_is_high_angle_mount(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_carrier_shelling_plane() {
         const ret = wasm.gear_is_carrier_shelling_plane(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_hayabusa_20th_squadron() {
         const ret = wasm.gear_is_hayabusa_20th_squadron(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     has_proficiency() {
         const ret = wasm.gear_has_proficiency(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     max_exp_eq_120() {
         const ret = wasm.gear_max_exp_eq_120(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @param {number} slot_size
-    * @returns {number}
-    */
+     * @param {number} slot_size
+     * @returns {number}
+     */
     calc_fighter_power(slot_size) {
         const ret = wasm.gear_calc_fighter_power(this.__wbg_ptr, slot_size);
         return ret;
     }
     /**
-    * @param {number} slot_size
-    * @returns {number}
-    */
+     * @param {number} slot_size
+     * @returns {number}
+     */
     calc_interception_power(slot_size) {
         const ret = wasm.gear_calc_interception_power(this.__wbg_ptr, slot_size);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     fleet_anti_air_mod() {
         const ret = wasm.gear_fleet_anti_air_mod(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @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}
-    */
+     * @param {number} slot_size
+     * @returns {number}
+     */
     calc_contact_trigger_factor(slot_size) {
         const ret = wasm.gear_calc_contact_trigger_factor(this.__wbg_ptr, slot_size);
         return ret;
     }
     /**
-    * @param {AirStateRank} rank
-    * @returns {number}
-    */
+     * @param {AirStateRank} rank
+     * @returns {number}
+     */
     contact_selection_rate(rank) {
-        const ret = wasm.gear_contact_selection_rate(this.__wbg_ptr, addHeapObject(rank));
+        const ret = wasm.gear_contact_selection_rate(this.__wbg_ptr, rank);
         return ret;
     }
     /**
-    * @param {number} level
-    * @returns {number}
-    */
+     * @param {number} level
+     * @returns {number}
+     */
     night_contact_rate(level) {
         const ret = wasm.gear_night_contact_rate(this.__wbg_ptr, level);
         return ret;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_night_attacker() {
         const ret = wasm.gear_is_night_attacker(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_night_fighter() {
         const ret = wasm.gear_is_night_fighter(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_night_plane() {
         const ret = wasm.gear_is_night_plane(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @param {number} slot_size
-    * @param {boolean} anti_inst
-    * @returns {number}
-    */
+     * @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}
-    */
+     * @returns {number}
+     */
     elos() {
         const ret = wasm.gear_elos(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_abyssal() {
         const ret = wasm.gear_is_abyssal(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_abyssal_cuttlefish_torpedo() {
         const ret = wasm.gear_is_abyssal_cuttlefish_torpedo(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_abyssal_patrolling_attack_hawk() {
         const ret = wasm.gear_is_abyssal_patrolling_attack_hawk(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     expedition_bonus() {
         const ret = wasm.gear_expedition_bonus(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     can_be_deployed_to_land_base() {
         const ret = wasm.gear_can_be_deployed_to_land_base(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_balloon() {
         const ret = wasm.gear_is_balloon(this.__wbg_ptr);
         return ret !== 0;
@@ -1691,8 +1506,7 @@ module.exports.Gear = Gear;
 const OrgFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_org_free(ptr >>> 0, 1));
-/**
-*/
+
 class Org {
 
     static __wrap(ptr) {
@@ -1715,212 +1529,169 @@ class Org {
         wasm.__wbg_org_free(ptr, 0);
     }
     /**
-    * @returns {string}
-    */
+     * @returns {string}
+     */
     get id() {
         let deferred1_0;
         let deferred1_1;
         try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_org_id(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            deferred1_0 = r0;
-            deferred1_1 = r1;
-            return getStringFromWasm0(r0, r1);
+            const ret = wasm.__wbg_get_org_id(this.__wbg_ptr);
+            deferred1_0 = ret[0];
+            deferred1_1 = ret[1];
+            return getStringFromWasm0(ret[0], ret[1]);
         } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
             wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
         }
     }
     /**
-    * @param {string} arg0
-    */
+     * @param {string} arg0
+     */
     set id(arg0) {
         const ptr0 = passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_org_id(this.__wbg_ptr, ptr0, len0);
     }
     /**
-    * @returns {bigint}
-    */
+     * @returns {bigint}
+     */
     get hash() {
-        const ret = wasm.__wbg_get_gear_hash(this.__wbg_ptr);
+        const ret = wasm.__wbg_get_org_hash(this.__wbg_ptr);
         return BigInt.asUintN(64, ret);
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get hq_level() {
         const ret = wasm.__wbg_get_org_hq_level(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {OrgType}
-    */
+     * @returns {OrgType}
+     */
     get org_type() {
         const ret = wasm.__wbg_get_org_org_type(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {FleetKey}
-    */
+     * @returns {FleetKey}
+     */
     get sortie() {
         const ret = wasm.__wbg_get_org_sortie(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {FleetKey | undefined}
-    */
+     * @returns {FleetKey | undefined}
+     */
     get route_sup() {
         const ret = wasm.__wbg_get_org_route_sup(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {FleetKey | undefined}
-    */
+     * @returns {FleetKey | undefined}
+     */
     get boss_sup() {
         const ret = wasm.__wbg_get_org_boss_sup(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {string | undefined}
-    */
+     * @returns {string | undefined}
+     */
     first_ship_id() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.org_first_ship_id(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            let v1;
-            if (r0 !== 0) {
-                v1 = getStringFromWasm0(r0, r1).slice();
-                wasm.__wbindgen_free(r0, r1 * 1, 1);
-            }
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
+        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;
     }
     /**
-    * @param {FleetKey} fleet_key
-    * @param {ShipKey} ship_key
-    * @returns {number | undefined}
-    */
+     * @param {FleetKey} fleet_key
+     * @param {ShipKey} ship_key
+     * @returns {number | undefined}
+     */
     get_ship_mid(fleet_key, ship_key) {
-        const ret = wasm.org_get_ship_mid(this.__wbg_ptr, addHeapObject(fleet_key), addHeapObject(ship_key));
+        const ret = wasm.org_get_ship_mid(this.__wbg_ptr, fleet_key, ship_key);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @param {FleetKey} fleet_key
-    * @param {ShipKey} ship_key
-    * @returns {string | undefined}
-    */
+     * @param {FleetKey} fleet_key
+     * @param {ShipKey} ship_key
+     * @returns {string | undefined}
+     */
     get_ship_eid(fleet_key, ship_key) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.org_get_ship_eid(retptr, this.__wbg_ptr, addHeapObject(fleet_key), addHeapObject(ship_key));
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            let v1;
-            if (r0 !== 0) {
-                v1 = getStringFromWasm0(r0, r1).slice();
-                wasm.__wbindgen_free(r0, r1 * 1, 1);
-            }
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
+        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;
     }
     /**
-    * @param {FleetKey} key
-    * @returns {string}
-    */
+     * @param {FleetKey} key
+     * @returns {string}
+     */
     get_fleet_id(key) {
         let deferred1_0;
         let deferred1_1;
         try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.org_get_fleet_id(retptr, this.__wbg_ptr, addHeapObject(key));
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            deferred1_0 = r0;
-            deferred1_1 = r1;
-            return getStringFromWasm0(r0, r1);
+            const ret = wasm.org_get_fleet_id(this.__wbg_ptr, key);
+            deferred1_0 = ret[0];
+            deferred1_1 = ret[1];
+            return getStringFromWasm0(ret[0], ret[1]);
         } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
             wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
         }
     }
     /**
-    * @returns {(string)[]}
-    */
+     * @returns {string[]}
+     */
     air_squadron_ids() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.org_air_squadron_ids(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var v1 = getArrayJsValueFromWasm0(r0, r1).slice();
-            wasm.__wbindgen_free(r0, r1 * 4, 4);
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        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 {Uint16Array}
-    */
+     * @returns {Uint16Array}
+     */
     main_ship_ids() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.org_main_ship_ids(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var v1 = getArrayU16FromWasm0(r0, r1).slice();
-            wasm.__wbindgen_free(r0, r1 * 2, 2);
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        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;
     }
     /**
-    * @returns {Uint16Array}
-    */
+     * @returns {Uint16Array}
+     */
     escort_ship_ids() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.org_escort_ship_ids(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var v1 = getArrayU16FromWasm0(r0, r1).slice();
-            wasm.__wbindgen_free(r0, r1 * 2, 2);
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        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;
     }
     /**
-    * @param {FleetKey} key
-    * @returns {Fleet}
-    */
+     * @param {FleetKey} key
+     * @returns {Fleet}
+     */
     clone_fleet(key) {
-        const ret = wasm.org_clone_fleet(this.__wbg_ptr, addHeapObject(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}
-    */
+     * @param {FleetKey} fleet_key
+     * @param {ShipKey} ship_key
+     * @returns {Ship | undefined}
+     */
     clone_ship(fleet_key, ship_key) {
-        const ret = wasm.org_clone_ship(this.__wbg_ptr, addHeapObject(fleet_key), addHeapObject(ship_key));
+        const ret = wasm.org_clone_ship(this.__wbg_ptr, fleet_key, ship_key);
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
-    * @param {string} id
-    * @returns {Ship | undefined}
-    */
+     * @param {string} id
+     * @returns {Ship | undefined}
+     */
     get_ship_by_id(id) {
         const ptr0 = passStringToWasm0(id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
@@ -1928,160 +1699,131 @@ class Org {
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
-    * @param {FleetKey} key
-    * @returns {(string)[]}
-    */
+     * @param {FleetKey} key
+     * @returns {string[]}
+     */
     ship_keys(key) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.org_ship_keys(retptr, this.__wbg_ptr, addHeapObject(key));
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var v1 = getArrayJsValueFromWasm0(r0, r1).slice();
-            wasm.__wbindgen_free(r0, r1 * 4, 4);
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        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;
     }
     /**
-    * @returns {Comp}
-    */
+     * @returns {Comp}
+     */
     create_comp() {
         const ret = wasm.org_create_comp(this.__wbg_ptr);
         return Comp.__wrap(ret);
     }
     /**
-    * @param {FleetKey} key
-    * @returns {Comp}
-    */
+     * @param {FleetKey} key
+     * @returns {Comp}
+     */
     create_comp_by_key(key) {
-        const ret = wasm.org_create_comp_by_key(this.__wbg_ptr, addHeapObject(key));
+        const ret = wasm.org_create_comp_by_key(this.__wbg_ptr, key);
         return Comp.__wrap(ret);
     }
     /**
-    * @param {string} key
-    * @returns {AirSquadron}
-    */
+     * @param {string} key
+     * @returns {AirSquadron}
+     */
     get_air_squadron(key) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-            const len0 = WASM_VECTOR_LEN;
-            wasm.org_get_air_squadron(retptr, this.__wbg_ptr, ptr0, len0);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-            if (r2) {
-                throw takeObject(r1);
-            }
-            return AirSquadron.__wrap(r0);
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
+        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]);
     }
     /**
-    * @returns {(string)[]}
-    */
+     * @returns {string[]}
+     */
     get_air_squadron_gear_ids_by_improvable() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.org_get_air_squadron_gear_ids_by_improvable(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var v1 = getArrayJsValueFromWasm0(r0, r1).slice();
-            wasm.__wbindgen_free(r0, r1 * 4, 4);
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.org_get_air_squadron_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)[]}
-    */
+     * @returns {string[]}
+     */
     get_air_squadron_gear_ids_by_proficiency() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.org_get_air_squadron_gear_ids_by_proficiency(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var v1 = getArrayJsValueFromWasm0(r0, r1).slice();
-            wasm.__wbindgen_free(r0, r1 * 4, 4);
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.org_get_air_squadron_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;
     }
     /**
-    * @returns {Side}
-    */
+     * @returns {Side}
+     */
     side() {
         const ret = wasm.org_side(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_player() {
         const ret = wasm.org_is_player(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_enemy() {
         const ret = wasm.org_is_enemy(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_single() {
         const ret = wasm.org_is_single(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_combined() {
         const ret = wasm.org_is_combined(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * 防空時の基地制空値
-    * @returns {number}
-    */
+     * 防空時の基地制空値
+     * @returns {number}
+     */
     interception_power() {
         const ret = wasm.org_interception_power(this.__wbg_ptr);
         return ret;
     }
     /**
-    * 高高度迎撃時の基地制空値
-    * @returns {number}
-    */
+     * 高高度迎撃時の基地制空値
+     * @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}
-    */
+     * @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 takeObject(ret);
+        return ret;
     }
     /**
-    * @param {FleetKey} key
-    * @returns {FleetType | undefined}
-    */
+     * @param {FleetKey} key
+     * @returns {FleetType | undefined}
+     */
     get_fleet_type(key) {
-        const ret = wasm.org_get_fleet_type(this.__wbg_ptr, addHeapObject(key));
-        return takeObject(ret);
+        const ret = wasm.org_get_fleet_type(this.__wbg_ptr, key);
+        return ret;
     }
 }
 module.exports.Org = Org;
@@ -2089,8 +1831,7 @@ module.exports.Org = Org;
 const ShipFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_ship_free(ptr >>> 0, 1));
-/**
-*/
+
 class Ship {
 
     static __wrap(ptr) {
@@ -2113,217 +1854,236 @@ class Ship {
         wasm.__wbg_ship_free(ptr, 0);
     }
     /**
-    * @returns {string}
-    */
+     * @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];
+    }
+    /**
+     * フィット砲補正
+     * @param {boolean} is_night
+     * @returns {number}
+     */
+    gunfit_accuracy(is_night) {
+        const ret = wasm.ship_gunfit_accuracy(this.__wbg_ptr, is_night);
+        return ret;
+    }
+    /**
+     * @returns {string}
+     */
     get id() {
         let deferred1_0;
         let deferred1_1;
         try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_ship_id(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            deferred1_0 = r0;
-            deferred1_1 = r1;
-            return getStringFromWasm0(r0, r1);
+            const ret = wasm.__wbg_get_ship_id(this.__wbg_ptr);
+            deferred1_0 = ret[0];
+            deferred1_1 = ret[1];
+            return getStringFromWasm0(ret[0], ret[1]);
         } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
             wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
         }
     }
     /**
-    * @param {string} arg0
-    */
+     * @param {string} arg0
+     */
     set id(arg0) {
         const ptr0 = passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_ship_id(this.__wbg_ptr, ptr0, len0);
     }
     /**
-    * @returns {bigint}
-    */
+     * @returns {bigint}
+     */
     get hash() {
         const ret = wasm.__wbg_get_ship_hash(this.__wbg_ptr);
         return BigInt.asUintN(64, ret);
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get ship_id() {
         const ret = wasm.__wbg_get_ship_ship_id(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get level() {
         const ret = wasm.__wbg_get_ship_level(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get current_hp() {
         const ret = wasm.__wbg_get_ship_current_hp(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get morale() {
         const ret = wasm.__wbg_get_ship_morale(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get ammo() {
         const ret = wasm.__wbg_get_ship_ammo(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get fuel() {
         const ret = wasm.__wbg_get_ship_fuel(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {ShipType}
-    */
+     * @returns {ShipType}
+     */
     get ship_type() {
         const ret = wasm.__wbg_get_ship_ship_type(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get ctype() {
         const ret = wasm.__wbg_get_ship_ctype(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {SlotSizeVec}
-    */
+     * @returns {SlotSizeVec}
+     */
     get slots() {
         const ret = wasm.__wbg_get_ship_slots(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @param {SlotSizeVec} arg0
-    */
+     * @param {SlotSizeVec} arg0
+     */
     set slots(arg0) {
-        wasm.__wbg_set_ship_slots(this.__wbg_ptr, addHeapObject(arg0));
+        wasm.__wbg_set_ship_slots(this.__wbg_ptr, arg0);
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get naked_firepower() {
         const ret = wasm.ship_naked_firepower(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get naked_torpedo() {
         const ret = wasm.ship_naked_torpedo(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get naked_armor() {
         const ret = wasm.ship_naked_armor(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get naked_anti_air() {
         const ret = wasm.ship_naked_anti_air(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get naked_evasion() {
         const ret = wasm.ship_naked_evasion(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get naked_asw() {
         const ret = wasm.ship_naked_asw(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get naked_los() {
         const ret = wasm.ship_naked_los(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get firepower() {
         const ret = wasm.ship_firepower(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get torpedo() {
         const ret = wasm.ship_torpedo(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get armor() {
         const ret = wasm.ship_armor(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get anti_air() {
         const ret = wasm.ship_anti_air(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get evasion() {
         const ret = wasm.ship_evasion(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get asw() {
         const ret = wasm.ship_asw(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get los() {
         const ret = wasm.ship_los(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {Ship}
-    */
+     * @returns {Ship}
+     */
     static default() {
         const ret = wasm.ship_default();
         return Ship.__wrap(ret);
     }
     /**
-    * @param {string} id
-    * @returns {boolean}
-    */
+     * @param {string} id
+     * @returns {boolean}
+     */
     eq_id(id) {
         const ptr0 = passStringToWasm0(id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
@@ -2331,155 +2091,140 @@ class Ship {
         return ret !== 0;
     }
     /**
-    * @returns {ShipState}
-    */
+     * @returns {ShipState}
+     */
     state() {
         const ret = wasm.ship_state(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {CustomPowerModifiers}
-    */
+     * @returns {CustomPowerModifiers}
+     */
     custom_power_mods() {
         const ret = wasm.ship_custom_power_mods(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {ShipMeta}
-    */
+     * @returns {ShipMeta}
+     */
     meta() {
         const ret = wasm.ship_meta(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {string}
-    */
+     * @returns {string}
+     */
     get name() {
         let deferred1_0;
         let deferred1_1;
         try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.ship_name(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            deferred1_0 = r0;
-            deferred1_1 = r1;
-            return getStringFromWasm0(r0, r1);
+            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_add_to_stack_pointer(16);
             wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
         }
     }
     /**
-    * @returns {string}
-    */
+     * @returns {string}
+     */
     get yomi() {
         let deferred1_0;
         let deferred1_1;
         try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.ship_yomi(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            deferred1_0 = r0;
-            deferred1_1 = r1;
-            return getStringFromWasm0(r0, r1);
+            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_add_to_stack_pointer(16);
             wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
         }
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get stype() {
         const ret = wasm.ship_stype(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get sort_id() {
         const ret = wasm.ship_sort_id(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get remodel_rank() {
         const ret = wasm.ship_remodel_rank(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get slotnum() {
         const ret = wasm.ship_slotnum(this.__wbg_ptr);
         return ret >>> 0;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get next_id() {
         const ret = wasm.ship_next_id(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     get useful() {
         const ret = wasm.ship_useful(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {DamageState}
-    */
+     * @returns {DamageState}
+     */
     damage_state() {
         const ret = wasm.ship_damage_state(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {MoraleState}
-    */
+     * @returns {MoraleState}
+     */
     morale_state() {
         const ret = wasm.ship_morale_state(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {ShipCategory}
-    */
+     * @returns {ShipCategory}
+     */
     category() {
         const ret = wasm.ship_category(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @param {ShipAttr} attr
-    * @returns {boolean}
-    */
+     * @param {ShipAttr} attr
+     * @returns {boolean}
+     */
     has_attr(attr) {
-        const ret = wasm.ship_has_attr(this.__wbg_ptr, addHeapObject(attr));
+        const ret = wasm.ship_has_attr(this.__wbg_ptr, attr);
         return ret !== 0;
     }
     /**
-    * @returns {(string)[]}
-    */
+     * @returns {string[]}
+     */
     gear_keys() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.ship_gear_keys(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var v1 = getArrayJsValueFromWasm0(r0, r1).slice();
-            wasm.__wbindgen_free(r0, r1 * 4, 4);
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        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}
-    */
+     * @param {string} key
+     * @returns {Gear | undefined}
+     */
     get_gear(key) {
         const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
@@ -2487,35 +2232,35 @@ class Ship {
         return ret === 0 ? undefined : Gear.__wrap(ret);
     }
     /**
-    * @param {DamageState} state
-    * @returns {number | undefined}
-    */
+     * @param {DamageState} state
+     * @returns {number | undefined}
+     */
     get_damage_bound(state) {
-        const ret = wasm.ship_get_damage_bound(this.__wbg_ptr, addHeapObject(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}
-    */
+     * @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}
-    */
+     * @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}
-    */
+     * @param {string} key
+     * @returns {boolean}
+     */
     has_unknown_stat(key) {
         const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
@@ -2523,9 +2268,9 @@ class Ship {
         return ret !== 0;
     }
     /**
-    * @param {string} key
-    * @returns {number | undefined}
-    */
+     * @param {string} key
+     * @returns {number | undefined}
+     */
     get_naked_stat(key) {
         const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
@@ -2533,9 +2278,9 @@ class Ship {
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @param {string} key
-    * @returns {number | undefined}
-    */
+     * @param {string} key
+     * @returns {number | undefined}
+     */
     get_stat_interval_left(key) {
         const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
@@ -2543,9 +2288,9 @@ class Ship {
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @param {string} key
-    * @returns {number | undefined}
-    */
+     * @param {string} key
+     * @returns {number | undefined}
+     */
     get_stat_interval_right(key) {
         const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
@@ -2553,9 +2298,9 @@ class Ship {
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @param {string} key
-    * @returns {number}
-    */
+     * @param {string} key
+     * @returns {number}
+     */
     get_gear_stat(key) {
         const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
@@ -2563,9 +2308,9 @@ class Ship {
         return ret;
     }
     /**
-    * @param {string} key
-    * @returns {number}
-    */
+     * @param {string} key
+     * @returns {number}
+     */
     get_ebonus(key) {
         const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
@@ -2573,9 +2318,9 @@ class Ship {
         return ret;
     }
     /**
-    * @param {string} key
-    * @returns {number | undefined}
-    */
+     * @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;
@@ -2583,31 +2328,31 @@ class Ship {
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_abyssal() {
         const ret = wasm.ship_is_abyssal(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_submarine() {
         const ret = wasm.ship_is_submarine(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_amagiri() {
         const ret = wasm.ship_is_amagiri(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @param {Gear} gear
-    * @param {string} key
-    * @returns {boolean}
-    */
+     * @param {Gear} gear
+     * @param {string} key
+     * @returns {boolean}
+     */
     can_equip(gear, key) {
         _assertClass(gear, Gear);
         const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -2616,373 +2361,251 @@ class Ship {
         return ret !== 0;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get max_hp() {
         const ret = wasm.ship_max_hp(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get max_ammo() {
         const ret = wasm.ship_max_ammo(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get max_fuel() {
         const ret = wasm.ship_max_fuel(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get naked_range() {
         const ret = wasm.ship_naked_range(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get naked_speed() {
         const ret = wasm.ship_naked_speed(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get luck() {
         const ret = wasm.ship_luck(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     get range() {
         const ret = wasm.ship_range(this.__wbg_ptr);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get speed() {
         const ret = wasm.ship_speed(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get accuracy() {
         const ret = wasm.ship_accuracy(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     get innate_torpedo_accuracy() {
         const ret = wasm.ship_innate_torpedo_accuracy(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_installation() {
         const ret = wasm.ship_is_installation(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_pt_imp() {
         const ret = wasm.ship_is_pt_imp(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @returns {SpecialEnemyType}
-    */
+     * @returns {SpecialEnemyType}
+     */
     special_enemy_type() {
         const ret = wasm.ship_special_enemy_type(this.__wbg_ptr);
-        return takeObject(ret);
+        return ret;
     }
     /**
-    * @returns {boolean}
-    */
+     * @returns {boolean}
+     */
     is_attackable_by_torpedo() {
         const ret = wasm.ship_is_attackable_by_torpedo(this.__wbg_ptr);
         return ret !== 0;
     }
     /**
-    * @param {number} index
-    * @returns {number | undefined}
-    */
+     * @param {number} index
+     * @returns {number | undefined}
+     */
     get_slot_size(index) {
         const ret = wasm.ship_get_slot_size(this.__wbg_ptr, index);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @param {number} index
-    * @returns {number | undefined}
-    */
+     * @param {number} index
+     * @returns {number | undefined}
+     */
     get_max_slot_size(index) {
         const ret = wasm.ship_get_max_slot_size(this.__wbg_ptr, index);
         return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     remaining_ammo_mod() {
         const ret = wasm.ship_remaining_ammo_mod(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     remaining_fuel_mod() {
         const ret = wasm.ship_remaining_fuel_mod(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @param {AirWaveType} air_type
-    * @returns {number | undefined}
-    */
+     * @param {AirWaveType} air_type
+     * @returns {number | undefined}
+     */
     fighter_power(air_type) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.ship_fighter_power(retptr, this.__wbg_ptr, addHeapObject(air_type));
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            return r0 === 0 ? undefined : r1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.ship_fighter_power(this.__wbg_ptr, air_type);
+        return ret === 0x100000001 ? undefined : ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     fleet_los_factor() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.ship_fleet_los_factor(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.ship_fleet_los_factor(this.__wbg_ptr);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-    * 加重対空
-    * @param {Side} side
-    * @returns {number | undefined}
-    */
+     * 加重対空
+     * @param {Side} side
+     * @returns {number | undefined}
+     */
     ship_adjusted_anti_air(side) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.ship_ship_adjusted_anti_air(retptr, this.__wbg_ptr, addHeapObject(side));
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.ship_ship_adjusted_anti_air(this.__wbg_ptr, side);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-    * 艦隊対空補正
-    * @returns {number}
-    */
+     * 艦隊対空補正
+     * @returns {number}
+     */
     fleet_anti_air_mod() {
         const ret = wasm.ship_fleet_anti_air_mod(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     cruiser_fit_bonus() {
         const ret = wasm.ship_cruiser_fit_bonus(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     basic_accuracy_term() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.ship_basic_accuracy_term(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.ship_basic_accuracy_term(this.__wbg_ptr);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-    * @returns {number | undefined}
-    */
+     * @returns {number | undefined}
+     */
     basic_evasion_term() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.ship_basic_evasion_term(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.ship_basic_evasion_term(this.__wbg_ptr);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-    * @param {number} formation_mod
-    * @param {number} postcap_additive
-    * @param {number} postcap_multiplicative
-    * @returns {number | undefined}
-    */
+     * @param {number} formation_mod
+     * @param {number} postcap_additive
+     * @param {number} postcap_multiplicative
+     * @returns {number | undefined}
+     */
     evasion_term(formation_mod, postcap_additive, postcap_multiplicative) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.ship_evasion_term(retptr, this.__wbg_ptr, formation_mod, postcap_additive, postcap_multiplicative);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.ship_evasion_term(this.__wbg_ptr, formation_mod, postcap_additive, postcap_multiplicative);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-    * @param {number} armor_penetration
-    * @returns {number | undefined}
-    */
+     * @param {number} armor_penetration
+     * @returns {number | undefined}
+     */
     basic_defense_power(armor_penetration) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.ship_basic_defense_power(retptr, this.__wbg_ptr, armor_penetration);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.ship_basic_defense_power(this.__wbg_ptr, armor_penetration);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-    * @returns {number}
-    */
+     * @returns {number}
+     */
     transport_point() {
         const ret = wasm.ship_transport_point(this.__wbg_ptr);
         return ret;
     }
     /**
-    * @param {number} node_divaricated_factor
-    * @returns {number | undefined}
-    */
+     * @param {number} node_divaricated_factor
+     * @returns {number | undefined}
+     */
     elos(node_divaricated_factor) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.ship_elos(retptr, this.__wbg_ptr, node_divaricated_factor);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.ship_elos(this.__wbg_ptr, node_divaricated_factor);
+        return ret[0] === 0 ? undefined : ret[1];
     }
     /**
-    * 確殺攻撃力
-    * @returns {number | undefined}
-    */
+     * 確殺攻撃力
+     * @returns {number | undefined}
+     */
     ohko_power() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.ship_ohko_power(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
-    }
-    /**
-    * @returns {number | undefined}
-    */
-    state_day_gunfit_accuracy() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.ship_state_day_gunfit_accuracy(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
-    }
-    /**
-    * @returns {number | undefined}
-    */
-    state_night_gunfit_accuracy() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.ship_state_night_gunfit_accuracy(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
-    }
-    /**
-    * フィット砲補正
-    * @param {boolean} is_night
-    * @returns {number}
-    */
-    gunfit_accuracy(is_night) {
-        const ret = wasm.ship_gunfit_accuracy(this.__wbg_ptr, is_night);
-        return ret;
+        const ret = wasm.ship_ohko_power(this.__wbg_ptr);
+        return ret[0] === 0 ? undefined : ret[1];
     }
 }
 module.exports.Ship = Ship;
 
-module.exports.__wbindgen_string_new = function(arg0, arg1) {
-    const ret = getStringFromWasm0(arg0, arg1);
-    return addHeapObject(ret);
-};
-
-module.exports.__wbindgen_object_drop_ref = function(arg0) {
-    takeObject(arg0);
-};
-
-module.exports.__wbg_ship_new = function(arg0) {
-    const ret = Ship.__wrap(arg0);
-    return addHeapObject(ret);
-};
-
-module.exports.__wbindgen_object_clone_ref = function(arg0) {
-    const ret = getObject(arg0);
-    return addHeapObject(ret);
-};
-
-module.exports.__wbg_createEquipmentBonuses_031a77b32ed94c4c = function(arg0, arg1) {
-    const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
-    return addHeapObject(ret);
+module.exports.__wbg_buffer_609cc3eee51ed158 = function(arg0) {
+    const ret = arg0.buffer;
+    return ret;
 };
 
-module.exports.__wbindgen_is_undefined = function(arg0) {
-    const ret = getObject(arg0) === undefined;
+module.exports.__wbg_call_672a4d21634d4a24 = function() { return handleError(function (arg0, arg1) {
+    const ret = arg0.call(arg1);
     return ret;
-};
+}, arguments) };
 
-module.exports.__wbg_new_abda76e883ba8a5f = function() {
-    const ret = new Error();
-    return addHeapObject(ret);
-};
+module.exports.__wbg_call_7cccdd69e0791ae2 = function() { return handleError(function (arg0, arg1, arg2) {
+    const ret = arg0.call(arg1, arg2);
+    return ret;
+}, arguments) };
 
-module.exports.__wbg_stack_658279fe44541cf6 = function(arg0, arg1) {
-    const ret = getObject(arg1).stack;
-    const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len1 = WASM_VECTOR_LEN;
-    getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
-    getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
+module.exports.__wbg_crypto_ed58b8e10a292839 = function(arg0) {
+    const ret = arg0.crypto;
+    return ret;
 };
 
-module.exports.__wbg_error_f851667af71bcfc6 = function(arg0, arg1) {
+module.exports.__wbg_error_7534b8e9a36f1ab4 = function(arg0, arg1) {
     let deferred0_0;
     let deferred0_1;
     try {
@@ -2994,162 +2617,181 @@ module.exports.__wbg_error_f851667af71bcfc6 = function(arg0, arg1) {
     }
 };
 
-module.exports.__wbg_crypto_1d1f22824a6a080c = function(arg0) {
-    const ret = getObject(arg0).crypto;
-    return addHeapObject(ret);
+module.exports.__wbg_getRandomValues_bcb4912f16000dc4 = function() { return handleError(function (arg0, arg1) {
+    arg0.getRandomValues(arg1);
+}, arguments) };
+
+module.exports.__wbg_msCrypto_0a36e2ec3a343d26 = function(arg0) {
+    const ret = arg0.msCrypto;
+    return ret;
 };
 
-module.exports.__wbindgen_is_object = function(arg0) {
-    const val = getObject(arg0);
-    const ret = typeof(val) === 'object' && val !== null;
+module.exports.__wbg_new_78feb108b6472713 = function() {
+    const ret = new Array();
+    return ret;
+};
+
+module.exports.__wbg_new_8a6f238a6ece86ea = function() {
+    const ret = new Error();
     return ret;
 };
 
-module.exports.__wbg_process_4a72847cc503995b = function(arg0) {
-    const ret = getObject(arg0).process;
-    return addHeapObject(ret);
+module.exports.__wbg_new_a12002a7f91c75be = function(arg0) {
+    const ret = new Uint8Array(arg0);
+    return ret;
 };
 
-module.exports.__wbg_versions_f686565e586dd935 = function(arg0) {
-    const ret = getObject(arg0).versions;
-    return addHeapObject(ret);
+module.exports.__wbg_newnoargs_105ed471475aaf50 = function(arg0, arg1) {
+    const ret = new Function(getStringFromWasm0(arg0, arg1));
+    return ret;
 };
 
-module.exports.__wbg_node_104a2ff8d6ea03a2 = function(arg0) {
-    const ret = getObject(arg0).node;
-    return addHeapObject(ret);
+module.exports.__wbg_newwithbyteoffsetandlength_d97e637ebe145a9a = function(arg0, arg1, arg2) {
+    const ret = new Uint8Array(arg0, arg1 >>> 0, arg2 >>> 0);
+    return ret;
 };
 
-module.exports.__wbindgen_is_string = function(arg0) {
-    const ret = typeof(getObject(arg0)) === 'string';
+module.exports.__wbg_newwithlength_a381634e90c276d4 = function(arg0) {
+    const ret = new Uint8Array(arg0 >>> 0);
     return ret;
 };
 
-module.exports.__wbg_require_cca90b1a94a0255b = function() { return handleError(function () {
-    const ret = module.require;
-    return addHeapObject(ret);
+module.exports.__wbg_node_02999533c4ea02e3 = function(arg0) {
+    const ret = arg0.node;
+    return ret;
+};
+
+module.exports.__wbg_parse_def2e24ef1252aff = function() { return handleError(function (arg0, arg1) {
+    const ret = JSON.parse(getStringFromWasm0(arg0, arg1));
+    return ret;
 }, arguments) };
 
-module.exports.__wbindgen_is_function = function(arg0) {
-    const ret = typeof(getObject(arg0)) === 'function';
+module.exports.__wbg_process_5c1d670bc53614b8 = function(arg0) {
+    const ret = arg0.process;
     return ret;
 };
 
-module.exports.__wbg_msCrypto_eb05e62b530a1508 = function(arg0) {
-    const ret = getObject(arg0).msCrypto;
-    return addHeapObject(ret);
+module.exports.__wbg_push_737cfc8c1432c2c6 = function(arg0, arg1) {
+    const ret = arg0.push(arg1);
+    return ret;
 };
 
-module.exports.__wbg_randomFillSync_5c9c955aa56b6049 = function() { return handleError(function (arg0, arg1) {
-    getObject(arg0).randomFillSync(takeObject(arg1));
+module.exports.__wbg_randomFillSync_ab2cfe79ebbf2740 = function() { return handleError(function (arg0, arg1) {
+    arg0.randomFillSync(arg1);
 }, arguments) };
 
-module.exports.__wbg_getRandomValues_3aa56aa6edec874c = function() { return handleError(function (arg0, arg1) {
-    getObject(arg0).getRandomValues(getObject(arg1));
+module.exports.__wbg_require_79b1e9274cde3c87 = function() { return handleError(function () {
+    const ret = module.require;
+    return ret;
 }, arguments) };
 
-module.exports.__wbg_new_a220cf903aa02ca2 = function() {
-    const ret = new Array();
-    return addHeapObject(ret);
+module.exports.__wbg_set_65595bdd868b3009 = function(arg0, arg1, arg2) {
+    arg0.set(arg1, arg2 >>> 0);
 };
 
-module.exports.__wbg_newnoargs_76313bd6ff35d0f2 = function(arg0, arg1) {
-    const ret = new Function(getStringFromWasm0(arg0, arg1));
-    return addHeapObject(ret);
+module.exports.__wbg_ship_new = function(arg0) {
+    const ret = Ship.__wrap(arg0);
+    return ret;
 };
 
-module.exports.__wbg_call_1084a111329e68ce = function() { return handleError(function (arg0, arg1) {
-    const ret = getObject(arg0).call(getObject(arg1));
-    return addHeapObject(ret);
-}, arguments) };
-
-module.exports.__wbindgen_string_get = function(arg0, arg1) {
-    const obj = getObject(arg1);
-    const ret = typeof(obj) === 'string' ? obj : undefined;
-    var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    var len1 = WASM_VECTOR_LEN;
+module.exports.__wbg_stack_0ed75d68575b0f3c = function(arg0, arg1) {
+    const ret = arg1.stack;
+    const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len1 = WASM_VECTOR_LEN;
     getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
     getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
 };
 
-module.exports.__wbg_self_3093d5d1f7bcb682 = function() { return handleError(function () {
-    const ret = self.self;
-    return addHeapObject(ret);
-}, arguments) };
+module.exports.__wbg_static_accessor_GLOBAL_88a902d13a557d07 = function() {
+    const ret = typeof global === 'undefined' ? null : global;
+    return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
+};
 
-module.exports.__wbg_window_3bcfc4d31bc012f8 = function() { return handleError(function () {
-    const ret = window.window;
-    return addHeapObject(ret);
-}, arguments) };
+module.exports.__wbg_static_accessor_GLOBAL_THIS_56578be7e9f832b0 = function() {
+    const ret = typeof globalThis === 'undefined' ? null : globalThis;
+    return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
+};
 
-module.exports.__wbg_globalThis_86b222e13bdf32ed = function() { return handleError(function () {
-    const ret = globalThis.globalThis;
-    return addHeapObject(ret);
-}, arguments) };
+module.exports.__wbg_static_accessor_SELF_37c5d418e4bf5819 = function() {
+    const ret = typeof self === 'undefined' ? null : self;
+    return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
+};
 
-module.exports.__wbg_global_e5a3fe56f8be9485 = function() { return handleError(function () {
-    const ret = global.global;
-    return addHeapObject(ret);
+module.exports.__wbg_static_accessor_WINDOW_5de37043a91a9c40 = function() {
+    const ret = typeof window === 'undefined' ? null : window;
+    return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
+};
+
+module.exports.__wbg_stringify_f7ed6987935b4a24 = function() { return handleError(function (arg0) {
+    const ret = JSON.stringify(arg0);
+    return ret;
 }, arguments) };
 
-module.exports.__wbg_push_37c89022f34c01ca = function(arg0, arg1) {
-    const ret = getObject(arg0).push(getObject(arg1));
+module.exports.__wbg_subarray_aa9065fa9dc5df96 = function(arg0, arg1, arg2) {
+    const ret = arg0.subarray(arg1 >>> 0, arg2 >>> 0);
     return ret;
 };
 
-module.exports.__wbg_call_89af060b4e1523f2 = function() { return handleError(function (arg0, arg1, arg2) {
-    const ret = getObject(arg0).call(getObject(arg1), getObject(arg2));
-    return addHeapObject(ret);
-}, arguments) };
+module.exports.__wbg_versions_c71aa1626a93e0a1 = function(arg0) {
+    const ret = arg0.versions;
+    return ret;
+};
 
-module.exports.__wbg_buffer_b7b08af79b0b0974 = function(arg0) {
-    const ret = getObject(arg0).buffer;
-    return addHeapObject(ret);
+module.exports.__wbindgen_init_externref_table = function() {
+    const table = wasm.__wbindgen_export_2;
+    const offset = table.grow(4);
+    table.set(0, undefined);
+    table.set(offset + 0, undefined);
+    table.set(offset + 1, null);
+    table.set(offset + 2, true);
+    table.set(offset + 3, false);
+    ;
 };
 
-module.exports.__wbg_newwithbyteoffsetandlength_8a2cb9ca96b27ec9 = function(arg0, arg1, arg2) {
-    const ret = new Uint8Array(getObject(arg0), arg1 >>> 0, arg2 >>> 0);
-    return addHeapObject(ret);
+module.exports.__wbindgen_is_function = function(arg0) {
+    const ret = typeof(arg0) === 'function';
+    return ret;
 };
 
-module.exports.__wbg_new_ea1883e1e5e86686 = function(arg0) {
-    const ret = new Uint8Array(getObject(arg0));
-    return addHeapObject(ret);
+module.exports.__wbindgen_is_object = function(arg0) {
+    const val = arg0;
+    const ret = typeof(val) === 'object' && val !== null;
+    return ret;
 };
 
-module.exports.__wbg_set_d1e79e2388520f18 = function(arg0, arg1, arg2) {
-    getObject(arg0).set(getObject(arg1), arg2 >>> 0);
+module.exports.__wbindgen_is_string = function(arg0) {
+    const ret = typeof(arg0) === 'string';
+    return ret;
 };
 
-module.exports.__wbg_newwithlength_ec548f448387c968 = function(arg0) {
-    const ret = new Uint8Array(arg0 >>> 0);
-    return addHeapObject(ret);
+module.exports.__wbindgen_is_undefined = function(arg0) {
+    const ret = arg0 === undefined;
+    return ret;
 };
 
-module.exports.__wbg_subarray_7c2e3576afe181d1 = function(arg0, arg1, arg2) {
-    const ret = getObject(arg0).subarray(arg1 >>> 0, arg2 >>> 0);
-    return addHeapObject(ret);
+module.exports.__wbindgen_memory = function() {
+    const ret = wasm.memory;
+    return ret;
 };
 
-module.exports.__wbg_parse_52202f117ec9ecfa = function() { return handleError(function (arg0, arg1) {
-    const ret = JSON.parse(getStringFromWasm0(arg0, arg1));
-    return addHeapObject(ret);
-}, arguments) };
+module.exports.__wbindgen_string_get = function(arg0, arg1) {
+    const obj = arg1;
+    const ret = typeof(obj) === 'string' ? obj : undefined;
+    var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    var len1 = WASM_VECTOR_LEN;
+    getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
+    getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
+};
 
-module.exports.__wbg_stringify_bbf45426c92a6bf5 = function() { return handleError(function (arg0) {
-    const ret = JSON.stringify(getObject(arg0));
-    return addHeapObject(ret);
-}, arguments) };
+module.exports.__wbindgen_string_new = function(arg0, arg1) {
+    const ret = getStringFromWasm0(arg0, arg1);
+    return ret;
+};
 
 module.exports.__wbindgen_throw = function(arg0, arg1) {
     throw new Error(getStringFromWasm0(arg0, arg1));
 };
 
-module.exports.__wbindgen_memory = function() {
-    const ret = wasm.memory;
-    return addHeapObject(ret);
-};
-
 const path = require('path').join(__dirname, 'fleethub_core_bg.wasm');
 const bytes = require('fs').readFileSync(path);
 
@@ -3158,3 +2800,5 @@ const wasmInstance = new WebAssembly.Instance(wasmModule, imports);
 wasm = wasmInstance.exports;
 module.exports.__wasm = wasm;
 
+wasm.__wbindgen_start();
+