fleethub-core 1.12.19 → 1.12.20

package/pkg/fleethub_core_bg.js

@@ -1,3 +1,6 @@
+import { createEquipmentBonuses } from 'equipment-bonus';
+
+
 export class AirSquadron {
     static __wrap(ptr) {
         const obj = Object.create(AirSquadron.prototype);
@@ -61,6 +64,16 @@ export class AirSquadron {
         const ret = wasm.airsquadron_interception_power(this.__wbg_ptr);
         return ret;
     }
+    /**
+     * @returns {AirSquadronMode}
+     */
+    get mode() {
+        const ret = wasm.airsquadron_mode(this.__wbg_ptr);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
+    }
     /**
      * 行動半径
      * @returns {number}
@@ -69,6 +82,15 @@ export class AirSquadron {
         const ret = wasm.airsquadron_radius(this.__wbg_ptr);
         return ret;
     }
+    /**
+     * @param {AirSquadronMode} mode
+     */
+    set mode(mode) {
+        const ret = wasm.airsquadron_set_mode(this.__wbg_ptr, mode);
+        if (ret[1]) {
+            throw takeFromExternrefTable0(ret[0]);
+        }
+    }
     /**
      * @returns {bigint}
      */
@@ -91,13 +113,6 @@ export class AirSquadron {
             wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
         }
     }
-    /**
-     * @returns {AirSquadronMode}
-     */
-    get mode() {
-        const ret = wasm.__wbg_get_airsquadron_mode(this.__wbg_ptr);
-        return ret;
-    }
     /**
      * @param {bigint} arg0
      */
@@ -112,12 +127,6 @@ export class AirSquadron {
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_airsquadron_id(this.__wbg_ptr, ptr0, len0);
     }
-    /**
-     * @param {AirSquadronMode} arg0
-     */
-    set mode(arg0) {
-        wasm.__wbg_set_airsquadron_mode(this.__wbg_ptr, arg0);
-    }
 }
 if (Symbol.dispose) AirSquadron.prototype[Symbol.dispose] = AirSquadron.prototype.free;
 
@@ -146,7 +155,10 @@ export class Analyzer {
     analyze_comp(comp, config) {
         _assertClass(comp, Comp);
         const ret = wasm.analyzer_analyze_comp(this.__wbg_ptr, comp.__wbg_ptr, config);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @param {NodeAttackAnalyzerConfig} config
@@ -163,7 +175,10 @@ export class Analyzer {
         _assertClass(right_comp, Comp);
         _assertClass(right_ship, Ship);
         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, isLikeNone(density_detail) ? 0 : addToExternrefTable0(density_detail));
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @param {ShipAnalyzerConfig} config
@@ -176,7 +191,10 @@ export class Analyzer {
         _assertClass(left, Ship);
         _assertClass(right, Ship);
         const ret = wasm.analyzer_analyze_ship_attack(this.__wbg_ptr, config, left.__wbg_ptr, right.__wbg_ptr, attacker_is_left);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @param {Comp} player_comp
@@ -235,7 +253,10 @@ export class Comp {
      */
     default_formation() {
         const ret = wasm.comp_default_formation(this.__wbg_ptr);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * マップ索敵
@@ -254,7 +275,10 @@ export class Comp {
      */
     fighter_power(escort_participates, air_type) {
         const ret = wasm.comp_fighter_power(this.__wbg_ptr, escort_participates, air_type);
-        return ret === Number.MAX_SAFE_INTEGER ? undefined : ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0] === Number.MAX_SAFE_INTEGER ? undefined : ret[0];
     }
     /**
      * @returns {string | undefined}
@@ -263,7 +287,7 @@ export class Comp {
         const ret = wasm.comp_first_ship_id(this.__wbg_ptr);
         let v1;
         if (ret[0] !== 0) {
-            v1 = getStringFromWasm0(ret[0], ret[1]).slice();
+            v1 = getStringFromWasm0(ret[0], ret[1]);
             wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
         }
         return v1;
@@ -274,6 +298,9 @@ export class Comp {
      */
     fleet_los_mod(fleet_type) {
         const ret = wasm.comp_fleet_los_mod(this.__wbg_ptr, fleet_type);
+        if (ret[3]) {
+            throw takeFromExternrefTable0(ret[2]);
+        }
         return ret[0] === 0 ? undefined : ret[1];
     }
     /**
@@ -282,9 +309,12 @@ export class Comp {
      */
     get_fleet_id(ft) {
         const ret = wasm.comp_get_fleet_id(this.__wbg_ptr, ft);
+        if (ret[3]) {
+            throw takeFromExternrefTable0(ret[2]);
+        }
         let v1;
         if (ret[0] !== 0) {
-            v1 = getStringFromWasm0(ret[0], ret[1]).slice();
+            v1 = getStringFromWasm0(ret[0], ret[1]);
             wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
         }
         return v1;
@@ -307,7 +337,10 @@ export class Comp {
     get_ship_conditions(ship, formation) {
         _assertClass(ship, Ship);
         const ret = wasm.comp_get_ship_conditions(this.__wbg_ptr, ship.__wbg_ptr, isLikeNone(formation) ? 0 : addToExternrefTable0(formation));
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @param {FleetType} ft
@@ -316,9 +349,12 @@ export class Comp {
      */
     get_ship_entity_id(ft, key) {
         const ret = wasm.comp_get_ship_entity_id(this.__wbg_ptr, ft, key);
+        if (ret[3]) {
+            throw takeFromExternrefTable0(ret[2]);
+        }
         let v1;
         if (ret[0] !== 0) {
-            v1 = getStringFromWasm0(ret[0], ret[1]).slice();
+            v1 = getStringFromWasm0(ret[0], ret[1]);
             wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
         }
         return v1;
@@ -330,7 +366,10 @@ export class Comp {
      */
     get_ship_with_clone(ft, key) {
         const ret = wasm.comp_get_ship_with_clone(this.__wbg_ptr, ft, key);
-        return ret === 0 ? undefined : Ship.__wrap(ret);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0] === 0 ? undefined : Ship.__wrap(ret[0]);
     }
     /**
      * @returns {boolean}
@@ -375,14 +414,30 @@ export class Comp {
      */
     meta() {
         const ret = wasm.comp_meta(this.__wbg_ptr);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
+    }
+    /**
+     * @returns {OrgType}
+     */
+    get org_type() {
+        const ret = wasm.comp_org_type(this.__wbg_ptr);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @returns {Side}
      */
     side() {
         const ret = wasm.comp_side(this.__wbg_ptr);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * 輸送物資量(TP)
@@ -420,13 +475,6 @@ export class Comp {
         const ret = wasm.__wbg_get_comp_main(this.__wbg_ptr);
         return Fleet.__wrap(ret);
     }
-    /**
-     * @returns {OrgType}
-     */
-    get org_type() {
-        const ret = wasm.__wbg_get_comp_org_type(this.__wbg_ptr);
-        return ret;
-    }
     /**
      * @returns {Fleet | undefined}
      */
@@ -495,7 +543,10 @@ export class FhCore {
      */
     create_air_squadron(input) {
         const ret = wasm.fhcore_create_air_squadron(this.__wbg_ptr, isLikeNone(input) ? 0 : addToExternrefTable0(input));
-        return AirSquadron.__wrap(ret);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return AirSquadron.__wrap(ret[0]);
     }
     /**
      * @returns {Ship[]}
@@ -537,7 +588,10 @@ export class FhCore {
      */
     create_fleet(input) {
         const ret = wasm.fhcore_create_fleet(this.__wbg_ptr, isLikeNone(input) ? 0 : addToExternrefTable0(input));
-        return Fleet.__wrap(ret);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return Fleet.__wrap(ret[0]);
     }
     /**
      * @param {GearState | null} [input]
@@ -545,7 +599,10 @@ export class FhCore {
      */
     create_gear(input) {
         const ret = wasm.fhcore_create_gear(this.__wbg_ptr, isLikeNone(input) ? 0 : addToExternrefTable0(input));
-        return ret === 0 ? undefined : Gear.__wrap(ret);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0] === 0 ? undefined : Gear.__wrap(ret[0]);
     }
     /**
      * @param {OrgState | null} [input]
@@ -553,7 +610,10 @@ export class FhCore {
      */
     create_org(input) {
         const ret = wasm.fhcore_create_org(this.__wbg_ptr, isLikeNone(input) ? 0 : addToExternrefTable0(input));
-        return ret === 0 ? undefined : Org.__wrap(ret);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0] === 0 ? undefined : Org.__wrap(ret[0]);
     }
     /**
      * @param {ShipState | null} [input]
@@ -561,7 +621,10 @@ export class FhCore {
      */
     create_ship(input) {
         const ret = wasm.fhcore_create_ship(this.__wbg_ptr, isLikeNone(input) ? 0 : addToExternrefTable0(input));
-        return ret === 0 ? undefined : Ship.__wrap(ret);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0] === 0 ? undefined : Ship.__wrap(ret[0]);
     }
     /**
      * @param {number} ship_id
@@ -577,7 +640,10 @@ export class FhCore {
      */
     create_ship_state_by_id(ship_id) {
         const ret = wasm.fhcore_create_ship_state_by_id(this.__wbg_ptr, ship_id);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @param {MasterData} js_master
@@ -650,7 +716,10 @@ export class Fleet {
      */
     fighter_power(air_type) {
         const ret = wasm.fleet_fighter_power(this.__wbg_ptr, air_type);
-        return ret === Number.MAX_SAFE_INTEGER ? undefined : ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0] === Number.MAX_SAFE_INTEGER ? undefined : ret[0];
     }
     /**
      * @returns {number | undefined}
@@ -668,14 +737,17 @@ export class Fleet {
         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, state);
-        return ret === 0xFFFFFF ? undefined : ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0] === 0xFFFFFF ? undefined : ret[0];
     }
     /**
      * @returns {string[]}
      */
     get_gear_ids_by_improvable() {
         const ret = wasm.fleet_get_gear_ids_by_improvable(this.__wbg_ptr);
-        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]);
         wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
         return v1;
     }
@@ -684,7 +756,7 @@ export class Fleet {
      */
     get_gear_ids_by_proficiency() {
         const ret = wasm.fleet_get_gear_ids_by_proficiency(this.__wbg_ptr);
-        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]);
         wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
         return v1;
     }
@@ -718,14 +790,20 @@ export class Fleet {
      */
     get_ship(key) {
         const ret = wasm.fleet_get_ship(this.__wbg_ptr, key);
-        return ret === 0 ? undefined : Ship.__wrap(ret);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0] === 0 ? undefined : Ship.__wrap(ret[0]);
     }
     /**
      * @returns {FleetMeta}
      */
     meta() {
         const ret = wasm.fleet_meta(this.__wbg_ptr);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     reset_battle_state() {
         wasm.fleet_reset_battle_state(this.__wbg_ptr);
@@ -735,7 +813,7 @@ export class Fleet {
      */
     ship_ids() {
         const ret = wasm.fleet_ship_ids(this.__wbg_ptr);
-        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]);
         wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
         return v1;
     }
@@ -744,7 +822,7 @@ export class Fleet {
      */
     ship_keys() {
         const ret = wasm.fleet_ship_keys(this.__wbg_ptr);
-        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]);
         wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
         return v1;
     }
@@ -865,7 +943,10 @@ export class Gear {
      */
     category() {
         const ret = wasm.gear_category(this.__wbg_ptr);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @param {AirStateRank} rank
@@ -873,7 +954,10 @@ export class Gear {
      */
     contact_selection_rate(rank) {
         const ret = wasm.gear_contact_selection_rate(this.__wbg_ptr, rank);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0];
     }
     /**
      * @returns {Gear}
@@ -910,13 +994,26 @@ export class Gear {
         const ret = wasm.gear_gear_type_id(this.__wbg_ptr);
         return ret;
     }
+    /**
+     * @returns {GearType}
+     */
+    get gear_type() {
+        const ret = wasm.gear_gear_type_js(this.__wbg_ptr);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
+    }
     /**
      * @param {GearAttr} attr
      * @returns {boolean}
      */
     has_attr(attr) {
         const ret = wasm.gear_has_attr(this.__wbg_ptr, attr);
-        return ret !== 0;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0] !== 0;
     }
     /**
      * @returns {boolean}
@@ -1138,13 +1235,6 @@ export class Gear {
         const ret = wasm.__wbg_get_gear_gear_id(this.__wbg_ptr);
         return ret;
     }
-    /**
-     * @returns {GearType}
-     */
-    get gear_type() {
-        const ret = wasm.__wbg_get_gear_gear_type(this.__wbg_ptr);
-        return ret;
-    }
     /**
      * @returns {bigint}
      */
@@ -1305,13 +1395,6 @@ export class Org {
         const ptr = this.__destroy_into_raw();
         wasm.__wbg_org_free(ptr, 0);
     }
-    /**
-     * @returns {FleetKey | undefined}
-     */
-    get boss_sup() {
-        const ret = wasm.__wbg_get_org_boss_sup(this.__wbg_ptr);
-        return ret;
-    }
     /**
      * @returns {bigint}
      */
@@ -1341,43 +1424,35 @@ export class Org {
             wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
         }
     }
-    /**
-     * @returns {OrgType}
-     */
-    get org_type() {
-        const ret = wasm.__wbg_get_org_org_type(this.__wbg_ptr);
-        return ret;
-    }
-    /**
-     * @returns {FleetKey | undefined}
-     */
-    get route_sup() {
-        const ret = wasm.__wbg_get_org_route_sup(this.__wbg_ptr);
-        return ret;
-    }
-    /**
-     * @returns {FleetKey}
-     */
-    get sortie() {
-        const ret = wasm.__wbg_get_org_sortie(this.__wbg_ptr);
-        return ret;
-    }
     /**
      * @returns {string[]}
      */
     air_squadron_ids() {
         const ret = wasm.org_air_squadron_ids(this.__wbg_ptr);
-        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]);
         wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
         return v1;
     }
+    /**
+     * @returns {FleetKey | undefined}
+     */
+    get boss_sup() {
+        const ret = wasm.org_boss_sup(this.__wbg_ptr);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
+    }
     /**
      * @param {FleetKey} key
      * @returns {Fleet}
      */
     clone_fleet(key) {
         const ret = wasm.org_clone_fleet(this.__wbg_ptr, key);
-        return Fleet.__wrap(ret);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return Fleet.__wrap(ret[0]);
     }
     /**
      * @param {FleetKey} fleet_key
@@ -1386,7 +1461,10 @@ export class Org {
      */
     clone_ship(fleet_key, ship_key) {
         const ret = wasm.org_clone_ship(this.__wbg_ptr, fleet_key, ship_key);
-        return ret === 0 ? undefined : Ship.__wrap(ret);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0] === 0 ? undefined : Ship.__wrap(ret[0]);
     }
     /**
      * @returns {Comp}
@@ -1401,7 +1479,10 @@ export class Org {
      */
     create_comp_by_key(key) {
         const ret = wasm.org_create_comp_by_key(this.__wbg_ptr, key);
-        return Comp.__wrap(ret);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return Comp.__wrap(ret[0]);
     }
     /**
      * @param {string} id
@@ -1413,7 +1494,10 @@ export class Org {
         const ptr0 = passStringToWasm0(id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
         const ret = wasm.org_create_move_ship_payload(this.__wbg_ptr, ptr0, len0, x, y);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @returns {Uint16Array}
@@ -1431,7 +1515,7 @@ export class Org {
         const ret = wasm.org_first_ship_id(this.__wbg_ptr);
         let v1;
         if (ret[0] !== 0) {
-            v1 = getStringFromWasm0(ret[0], ret[1]).slice();
+            v1 = getStringFromWasm0(ret[0], ret[1]);
             wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
         }
         return v1;
@@ -1454,7 +1538,7 @@ export class Org {
      */
     get_air_squadron_gear_ids_by_improvable() {
         const ret = wasm.org_get_air_squadron_gear_ids_by_improvable(this.__wbg_ptr);
-        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]);
         wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
         return v1;
     }
@@ -1463,7 +1547,7 @@ export class Org {
      */
     get_air_squadron_gear_ids_by_proficiency() {
         const ret = wasm.org_get_air_squadron_gear_ids_by_proficiency(this.__wbg_ptr);
-        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]);
         wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
         return v1;
     }
@@ -1472,15 +1556,21 @@ export class Org {
      * @returns {string}
      */
     get_fleet_id(key) {
-        let deferred1_0;
-        let deferred1_1;
+        let deferred2_0;
+        let deferred2_1;
         try {
             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]);
+            var ptr1 = ret[0];
+            var len1 = ret[1];
+            if (ret[3]) {
+                ptr1 = 0; len1 = 0;
+                throw takeFromExternrefTable0(ret[2]);
+            }
+            deferred2_0 = ptr1;
+            deferred2_1 = len1;
+            return getStringFromWasm0(ptr1, len1);
         } finally {
-            wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
+            wasm.__wbindgen_free(deferred2_0, deferred2_1, 1);
         }
     }
     /**
@@ -1489,7 +1579,10 @@ export class Org {
      */
     get_fleet_type(key) {
         const ret = wasm.org_get_fleet_type(this.__wbg_ptr, key);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @param {string} id
@@ -1508,9 +1601,12 @@ export class Org {
      */
     get_ship_eid(fleet_key, ship_key) {
         const ret = wasm.org_get_ship_eid(this.__wbg_ptr, fleet_key, ship_key);
+        if (ret[3]) {
+            throw takeFromExternrefTable0(ret[2]);
+        }
         let v1;
         if (ret[0] !== 0) {
-            v1 = getStringFromWasm0(ret[0], ret[1]).slice();
+            v1 = getStringFromWasm0(ret[0], ret[1]);
             wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
         }
         return v1;
@@ -1522,7 +1618,10 @@ export class Org {
      */
     get_ship_mid(fleet_key, ship_key) {
         const ret = wasm.org_get_ship_mid(this.__wbg_ptr, fleet_key, ship_key);
-        return ret === 0xFFFFFF ? undefined : ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0] === 0xFFFFFF ? undefined : ret[0];
     }
     /**
      * 高高度迎撃時の基地制空値
@@ -1577,13 +1676,36 @@ export class Org {
         wasm.__wbindgen_free(ret[0], ret[1] * 2, 2);
         return v1;
     }
+    /**
+     * @returns {OrgType}
+     */
+    get org_type() {
+        const ret = wasm.org_org_type(this.__wbg_ptr);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
+    }
+    /**
+     * @returns {FleetKey | undefined}
+     */
+    get route_sup() {
+        const ret = wasm.org_route_sup(this.__wbg_ptr);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
+    }
     /**
      * @param {FleetKey} key
      * @returns {string[]}
      */
     ship_keys(key) {
         const ret = wasm.org_ship_keys(this.__wbg_ptr, key);
-        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        if (ret[3]) {
+            throw takeFromExternrefTable0(ret[2]);
+        }
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]);
         wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
         return v1;
     }
@@ -1592,7 +1714,20 @@ export class Org {
      */
     side() {
         const ret = wasm.org_side(this.__wbg_ptr);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
+    }
+    /**
+     * @returns {FleetKey}
+     */
+    get sortie() {
+        const ret = wasm.org_sortie(this.__wbg_ptr);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @param {string} arg0
@@ -1693,20 +1828,6 @@ export class Ship {
         const ret = wasm.__wbg_get_ship_ship_id(this.__wbg_ptr);
         return ret;
     }
-    /**
-     * @returns {ShipType}
-     */
-    get ship_type() {
-        const ret = wasm.__wbg_get_ship_ship_type(this.__wbg_ptr);
-        return ret;
-    }
-    /**
-     * @returns {SlotSizeVec}
-     */
-    get slots() {
-        const ret = wasm.__wbg_get_ship_slots(this.__wbg_ptr);
-        return ret;
-    }
     /**
      * @param {string} arg0
      */
@@ -1715,12 +1836,6 @@ export class Ship {
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_ship_id(this.__wbg_ptr, ptr0, len0);
     }
-    /**
-     * @param {SlotSizeVec} arg0
-     */
-    set slots(arg0) {
-        wasm.__wbg_set_ship_slots(this.__wbg_ptr, arg0);
-    }
     /**
      * @returns {number}
      */
@@ -1788,7 +1903,10 @@ export class Ship {
      */
     category() {
         const ret = wasm.ship_category(this.__wbg_ptr);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @returns {number}
@@ -1802,14 +1920,20 @@ export class Ship {
      */
     custom_power_mods() {
         const ret = wasm.ship_custom_power_mods(this.__wbg_ptr);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @returns {DamageState}
      */
     damage_state() {
         const ret = wasm.ship_damage_state(this.__wbg_ptr);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @returns {Ship}
@@ -1859,7 +1983,10 @@ export class Ship {
      */
     fighter_power(air_type) {
         const ret = wasm.ship_fighter_power(this.__wbg_ptr, air_type);
-        return ret === Number.MAX_SAFE_INTEGER ? undefined : ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0] === Number.MAX_SAFE_INTEGER ? undefined : ret[0];
     }
     /**
      * @returns {number | undefined}
@@ -1888,7 +2015,7 @@ export class Ship {
      */
     gear_keys() {
         const ret = wasm.ship_gear_keys(this.__wbg_ptr);
-        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]);
         wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
         return v1;
     }
@@ -1898,7 +2025,10 @@ export class Ship {
      */
     get_damage_bound(state) {
         const ret = wasm.ship_get_damage_bound(this.__wbg_ptr, state);
-        return ret === 0xFFFFFF ? undefined : ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0] === 0xFFFFFF ? undefined : ret[0];
     }
     /**
      * @param {string} key
@@ -2019,7 +2149,10 @@ export class Ship {
      */
     has_attr(attr) {
         const ret = wasm.ship_has_attr(this.__wbg_ptr, attr);
-        return ret !== 0;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return ret[0] !== 0;
     }
     /**
      * @param {string} key
@@ -2120,14 +2253,20 @@ export class Ship {
      */
     meta() {
         const ret = wasm.ship_meta(this.__wbg_ptr);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @returns {MoraleState}
      */
     morale_state() {
         const ret = wasm.ship_morale_state(this.__wbg_ptr);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @returns {number | undefined}
@@ -2250,6 +2389,15 @@ export class Ship {
         const ret = wasm.ship_remodel_rank(this.__wbg_ptr);
         return ret;
     }
+    /**
+     * @param {SlotSizeVec} slots
+     */
+    set slots(slots) {
+        const ret = wasm.ship_set_slots_js(this.__wbg_ptr, slots);
+        if (ret[1]) {
+            throw takeFromExternrefTable0(ret[0]);
+        }
+    }
     /**
      * 加重対空
      * @param {Side} side
@@ -2257,8 +2405,21 @@ export class Ship {
      */
     ship_adjusted_anti_air(side) {
         const ret = wasm.ship_ship_adjusted_anti_air(this.__wbg_ptr, side);
+        if (ret[3]) {
+            throw takeFromExternrefTable0(ret[2]);
+        }
         return ret[0] === 0 ? undefined : ret[1];
     }
+    /**
+     * @returns {ShipType}
+     */
+    get ship_type() {
+        const ret = wasm.ship_ship_type_js(this.__wbg_ptr);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
+    }
     /**
      * @returns {number}
      */
@@ -2266,6 +2427,16 @@ export class Ship {
         const ret = wasm.ship_slotnum(this.__wbg_ptr);
         return ret >>> 0;
     }
+    /**
+     * @returns {SlotSizeVec}
+     */
+    get slots() {
+        const ret = wasm.ship_slots_js(this.__wbg_ptr);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
+    }
     /**
      * @returns {number}
      */
@@ -2278,7 +2449,10 @@ export class Ship {
      */
     special_enemy_type() {
         const ret = wasm.ship_special_enemy_type(this.__wbg_ptr);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @returns {number}
@@ -2292,7 +2466,10 @@ export class Ship {
      */
     state() {
         const ret = wasm.ship_state(this.__wbg_ptr);
-        return ret;
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * @returns {number | undefined}
@@ -2360,30 +2537,31 @@ if (Symbol.dispose) Ship.prototype[Symbol.dispose] = Ship.prototype.free;
  */
 export function parse_ship_conditions(value) {
     const ret = wasm.parse_ship_conditions(value);
-    return ret;
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return takeFromExternrefTable0(ret[0]);
 }
 
 export function set_panic_hook() {
     wasm.set_panic_hook();
 }
-export function __wbg___wbindgen_is_function_1ff95bcc5517c252(arg0) {
-    const ret = typeof(arg0) === 'function';
-    return ret;
-}
-export function __wbg___wbindgen_is_object_a27215656b807791(arg0) {
-    const val = arg0;
-    const ret = typeof(val) === 'object' && val !== null;
+export function __wbg_Error_30c8987f7c2ed4e2(arg0, arg1) {
+    const ret = Error(getStringFromWasm0(arg0, arg1));
     return ret;
 }
-export function __wbg___wbindgen_is_string_ea5e6cc2e4141dfe(arg0) {
-    const ret = typeof(arg0) === 'string';
-    return ret;
+export function __wbg___wbindgen_debug_string_4687d8d8c2017d52(arg0, arg1) {
+    const ret = debugString(arg1);
+    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);
 }
-export function __wbg___wbindgen_is_undefined_c05833b95a3cf397(arg0) {
+export function __wbg___wbindgen_is_undefined_8865fb403f8fe9d8(arg0) {
     const ret = arg0 === undefined;
     return ret;
 }
-export function __wbg___wbindgen_string_get_b0ca35b86a603356(arg0, arg1) {
+export function __wbg___wbindgen_string_get_0380ccaa2f57f0d9(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);
@@ -2391,18 +2569,14 @@ export function __wbg___wbindgen_string_get_b0ca35b86a603356(arg0, arg1) {
     getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
     getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
 }
-export function __wbg___wbindgen_throw_344f42d3211c4765(arg0, arg1) {
+export function __wbg___wbindgen_throw_41e9ee4f547fc59a(arg0, arg1) {
     throw new Error(getStringFromWasm0(arg0, arg1));
 }
-export function __wbg_call_a6e5c5dce5018821() { return handleError(function (arg0, arg1, arg2) {
-    const ret = arg0.call(arg1, arg2);
+export function __wbg_createEquipmentBonuses_a2c75928d6e342a7() { return handleError(function (arg0, arg1) {
+    const ret = createEquipmentBonuses(arg0, arg1);
     return ret;
 }, arguments); }
-export function __wbg_crypto_38df2bab126b63dc(arg0) {
-    const ret = arg0.crypto;
-    return ret;
-}
-export function __wbg_error_a6fa202b58aa1cd3(arg0, arg1) {
+export function __wbg_error_757e9472f8410341(arg0, arg1) {
     let deferred0_0;
     let deferred0_1;
     try {
@@ -2413,55 +2587,25 @@ export function __wbg_error_a6fa202b58aa1cd3(arg0, arg1) {
         wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
     }
 }
-export function __wbg_getRandomValues_c44a50d8cfdaebeb() { return handleError(function (arg0, arg1) {
-    arg0.getRandomValues(arg1);
+export function __wbg_getRandomValues_436a51d0629d84e1() { return handleError(function (arg0, arg1) {
+    globalThis.crypto.getRandomValues(getArrayU8FromWasm0(arg0, arg1));
 }, arguments); }
-export function __wbg_length_1f0964f4a5e2c6d8(arg0) {
-    const ret = arg0.length;
-    return ret;
-}
-export function __wbg_msCrypto_bd5a034af96bcba6(arg0) {
-    const ret = arg0.msCrypto;
-    return ret;
-}
 export function __wbg_new_227d7c05414eb861() {
     const ret = new Error();
     return ret;
 }
-export function __wbg_new_32b398fb48b6d94a() {
+export function __wbg_new_ee2291f50781bf1d() {
     const ret = new Array();
     return ret;
 }
-export function __wbg_new_with_length_e6785c33c8e4cce8(arg0) {
-    const ret = new Uint8Array(arg0 >>> 0);
-    return ret;
-}
-export function __wbg_node_84ea875411254db1(arg0) {
-    const ret = arg0.node;
-    return ret;
-}
-export function __wbg_parse_1c0d8a8656d7e016() { return handleError(function (arg0, arg1) {
+export function __wbg_parse_0fc53dead14b3b42() { return handleError(function (arg0, arg1) {
     const ret = JSON.parse(getStringFromWasm0(arg0, arg1));
     return ret;
 }, arguments); }
-export function __wbg_process_44c7a14e11e9f69e(arg0) {
-    const ret = arg0.process;
-    return ret;
-}
-export function __wbg_prototypesetcall_4770620bbe4688a0(arg0, arg1, arg2) {
-    Uint8Array.prototype.set.call(getArrayU8FromWasm0(arg0, arg1), arg2);
-}
-export function __wbg_push_d2ae3af0c1217ae6(arg0, arg1) {
+export function __wbg_push_2baf45db356cf468(arg0, arg1) {
     const ret = arg0.push(arg1);
     return ret;
 }
-export function __wbg_randomFillSync_6c25eac9869eb53c() { return handleError(function (arg0, arg1) {
-    arg0.randomFillSync(arg1);
-}, arguments); }
-export function __wbg_require_b4edbdcf3e2a1ef0() { return handleError(function () {
-    const ret = module.require;
-    return ret;
-}, arguments); }
 export function __wbg_ship_new(arg0) {
     const ret = Ship.__wrap(arg0);
     return ret;
@@ -2473,40 +2617,11 @@ export function __wbg_stack_3b0d974bbf31e44f(arg0, arg1) {
     getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
     getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
 }
-export function __wbg_static_accessor_GLOBAL_4ef717fb391d88b7() {
-    const ret = typeof global === 'undefined' ? null : global;
-    return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
-}
-export function __wbg_static_accessor_GLOBAL_THIS_8d1badc68b5a74f4() {
-    const ret = typeof globalThis === 'undefined' ? null : globalThis;
-    return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
-}
-export function __wbg_static_accessor_SELF_146583524fe1469b() {
-    const ret = typeof self === 'undefined' ? null : self;
-    return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
-}
-export function __wbg_static_accessor_WINDOW_f2829a2234d7819e() {
-    const ret = typeof window === 'undefined' ? null : window;
-    return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
-}
-export function __wbg_stringify_b54333f60f1e4dad() { return handleError(function (arg0) {
+export function __wbg_stringify_52ff602c1cc4fbb6() { return handleError(function (arg0) {
     const ret = JSON.stringify(arg0);
     return ret;
 }, arguments); }
-export function __wbg_subarray_3ed232c8a6baee09(arg0, arg1, arg2) {
-    const ret = arg0.subarray(arg1 >>> 0, arg2 >>> 0);
-    return ret;
-}
-export function __wbg_versions_276b2795b1c6a219(arg0) {
-    const ret = arg0.versions;
-    return ret;
-}
-export function __wbindgen_cast_0000000000000001(arg0, arg1) {
-    // Cast intrinsic for `Ref(Slice(U8)) -> NamedExternref("Uint8Array")`.
-    const ret = getArrayU8FromWasm0(arg0, arg1);
-    return ret;
-}
-export function __wbindgen_cast_0000000000000002(arg0, arg1) {
+export function __wbindgen_generic_0000000000000001(arg0, arg1) {
     // Cast intrinsic for `Ref(String) -> Externref`.
     const ret = getStringFromWasm0(arg0, arg1);
     return ret;
@@ -2557,6 +2672,71 @@ function _assertClass(instance, klass) {
     }
 }
 
+function debugString(val) {
+    // primitive types
+    const type = typeof val;
+    if (type == 'number' || type == 'boolean' || val == null) {
+        return  `${val}`;
+    }
+    if (type == 'string') {
+        return `"${val}"`;
+    }
+    if (type == 'symbol') {
+        const description = val.description;
+        if (description == null) {
+            return 'Symbol';
+        } else {
+            return `Symbol(${description})`;
+        }
+    }
+    if (type == 'function') {
+        const name = val.name;
+        if (typeof name == 'string' && name.length > 0) {
+            return `Function(${name})`;
+        } else {
+            return 'Function';
+        }
+    }
+    // objects
+    if (Array.isArray(val)) {
+        const length = val.length;
+        let debug = '[';
+        if (length > 0) {
+            debug += debugString(val[0]);
+        }
+        for(let i = 1; i < length; i++) {
+            debug += ', ' + debugString(val[i]);
+        }
+        debug += ']';
+        return debug;
+    }
+    // Test for built-in
+    const builtInMatches = /\[object ([^\]]+)\]/.exec(toString.call(val));
+    let className;
+    if (builtInMatches && builtInMatches.length > 1) {
+        className = builtInMatches[1];
+    } else {
+        // Failed to match the standard '[object ClassName]'
+        return toString.call(val);
+    }
+    if (className == 'Object') {
+        // we're a user defined class or Object
+        // JSON.stringify avoids problems with cycles, and is generally much
+        // easier than looping through ownProperties of `val`.
+        try {
+            return 'Object(' + JSON.stringify(val) + ')';
+        } catch (_) {
+            return 'Object';
+        }
+    }
+    // errors
+    if (val instanceof Error) {
+        return `${val.name}: ${val.message}\n${val.stack}`;
+    }
+    // TODO we could test for more things here, like `Set`s and `Map`s.
+    return className;
+}
+
 function getArrayJsValueFromWasm0(ptr, len) {
     ptr = ptr >>> 0;
     const mem = getDataViewMemory0();