fleethub-core 1.8.7 → 1.8.10

package/node/fleethub_core.js

@@ -83,20 +83,6 @@ function getInt32Memory0() {
     return cachedInt32Memory0;
 }
 
-let heap_next = heap.length;
-
-function dropObject(idx) {
-    if (idx < 36) return;
-    heap[idx] = heap_next;
-    heap_next = idx;
-}
-
-function takeObject(idx) {
-    const ret = getObject(idx);
-    dropObject(idx);
-    return ret;
-}
-
 let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
 
 cachedTextDecoder.decode();
@@ -105,6 +91,8 @@ function getStringFromWasm0(ptr, len) {
     return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
 }
 
+let heap_next = heap.length;
+
 function addHeapObject(obj) {
     if (heap_next === heap.length) heap.push(heap.length + 1);
     const idx = heap_next;
@@ -113,15 +101,33 @@ function addHeapObject(obj) {
     heap[idx] = obj;
     return idx;
 }
+
+function dropObject(idx) {
+    if (idx < 36) return;
+    heap[idx] = heap_next;
+    heap_next = idx;
+}
+
+function takeObject(idx) {
+    const ret = getObject(idx);
+    dropObject(idx);
+    return ret;
+}
 /**
-* @param {ShipConditions} value
-* @returns {ShipConditions}
 */
-module.exports.parse_ship_conditions = function(value) {
-    const ret = wasm.parse_ship_conditions(addHeapObject(value));
-    return takeObject(ret);
+module.exports.set_panic_hook = function() {
+    wasm.set_panic_hook();
 };
 
+let cachedFloat64Memory0 = new Float64Array();
+
+function getFloat64Memory0() {
+    if (cachedFloat64Memory0.byteLength === 0) {
+        cachedFloat64Memory0 = new Float64Array(wasm.memory.buffer);
+    }
+    return cachedFloat64Memory0;
+}
+
 function isLikeNone(x) {
     return x === undefined || x === null;
 }
@@ -146,33 +152,6 @@ const u32CvtShim = new Uint32Array(2);
 
 const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
 
-function _assertClass(instance, klass) {
-    if (!(instance instanceof klass)) {
-        throw new Error(`expected instance of ${klass.name}`);
-    }
-    return instance.ptr;
-}
-
-let cachedFloat64Memory0 = new Float64Array();
-
-function getFloat64Memory0() {
-    if (cachedFloat64Memory0.byteLength === 0) {
-        cachedFloat64Memory0 = new Float64Array(wasm.memory.buffer);
-    }
-    return cachedFloat64Memory0;
-}
-
-function getArrayU8FromWasm0(ptr, len) {
-    return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
-}
-
-function passArray8ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 1);
-    getUint8Memory0().set(arg, ptr / 1);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
-
 let cachedUint32Memory0 = new Uint32Array();
 
 function getUint32Memory0() {
@@ -195,12 +174,33 @@ function getArrayJsValueFromWasm0(ptr, len) {
 function getArrayU16FromWasm0(ptr, len) {
     return getUint16Memory0().subarray(ptr / 2, ptr / 2 + len);
 }
+
+function _assertClass(instance, klass) {
+    if (!(instance instanceof klass)) {
+        throw new Error(`expected instance of ${klass.name}`);
+    }
+    return instance.ptr;
+}
 /**
+* @param {ShipConditions} value
+* @returns {ShipConditions}
 */
-module.exports.set_panic_hook = function() {
-    wasm.set_panic_hook();
+module.exports.parse_ship_conditions = function(value) {
+    const ret = wasm.parse_ship_conditions(addHeapObject(value));
+    return takeObject(ret);
 };
 
+function getArrayU8FromWasm0(ptr, len) {
+    return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
+}
+
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1);
+    getUint8Memory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
 function handleError(f, args) {
     try {
         return f.apply(this, args);
@@ -630,34 +630,30 @@ class Comp {
     }
     /**
     * @param {FleetType} ft
-    * @param {string} key
+    * @param {ShipKey} key
     * @returns {Ship | undefined}
     */
     get_ship_with_clone(ft, key) {
-        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.comp_get_ship_with_clone(this.ptr, addHeapObject(ft), ptr0, len0);
+        const ret = wasm.comp_get_ship_with_clone(this.ptr, addHeapObject(ft), addHeapObject(key));
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
     * @param {FleetType} ft
-    * @param {string} key
+    * @param {ShipKey} key
     * @returns {string | undefined}
     */
     get_ship_entity_id(ft, 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.comp_get_ship_entity_id(retptr, this.ptr, addHeapObject(ft), ptr0, len0);
+            wasm.comp_get_ship_entity_id(retptr, this.ptr, addHeapObject(ft), addHeapObject(key));
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
-            let v1;
+            let v0;
             if (r0 !== 0) {
-                v1 = getStringFromWasm0(r0, r1).slice();
+                v0 = getStringFromWasm0(r0, r1).slice();
                 wasm.__wbindgen_free(r0, r1 * 1);
             }
-            return v1;
+            return v0;
         } finally {
             wasm.__wbindgen_add_to_stack_pointer(16);
         }
@@ -739,6 +735,21 @@ class Comp {
         const ret = wasm.comp_get_ship_conditions(this.ptr, ship.ptr, isLikeNone(formation) ? 0 : addHeapObject(formation));
         return takeObject(ret);
     }
+    /**
+    * @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.ptr, addHeapObject(fleet_type));
+            var r0 = getInt32Memory0()[retptr / 4 + 0];
+            var r2 = getFloat64Memory0()[retptr / 8 + 1];
+            return r0 === 0 ? undefined : r2;
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+        }
+    }
 }
 module.exports.Comp = Comp;
 
@@ -1052,13 +1063,11 @@ class Fleet {
         return ret >>> 0;
     }
     /**
-    * @param {string} key
+    * @param {ShipKey} key
     * @returns {Ship | undefined}
     */
     get_ship(key) {
-        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.fleet_get_ship(this.ptr, ptr0, len0);
+        const ret = wasm.fleet_get_ship(this.ptr, addHeapObject(key));
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
@@ -1207,7 +1216,7 @@ class Gear {
     get hash() {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_gear_hash(retptr, this.ptr);
+            wasm.__wbg_get_airsquadron_hash(retptr, this.ptr);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             u32CvtShim[0] = r0;
@@ -1647,233 +1656,6 @@ class Gear {
 }
 module.exports.Gear = Gear;
 
-const IBonusesFinalization = new FinalizationRegistry(ptr => wasm.__wbg_ibonuses_free(ptr));
-/**
-*/
-class IBonuses {
-
-    __destroy_into_raw() {
-        const ptr = this.ptr;
-        this.ptr = 0;
-        IBonusesFinalization.unregister(this);
-        return ptr;
-    }
-
-    free() {
-        const ptr = this.__destroy_into_raw();
-        wasm.__wbg_ibonuses_free(ptr);
-    }
-    /**
-    * @returns {number}
-    */
-    get shelling_power() {
-        const ret = wasm.__wbg_get_ibonuses_shelling_power(this.ptr);
-        return ret;
-    }
-    /**
-    * @param {number} arg0
-    */
-    set shelling_power(arg0) {
-        wasm.__wbg_set_ibonuses_shelling_power(this.ptr, arg0);
-    }
-    /**
-    * @returns {number}
-    */
-    get carrier_shelling_power() {
-        const ret = wasm.__wbg_get_ibonuses_carrier_shelling_power(this.ptr);
-        return ret;
-    }
-    /**
-    * @param {number} arg0
-    */
-    set carrier_shelling_power(arg0) {
-        wasm.__wbg_set_ibonuses_carrier_shelling_power(this.ptr, arg0);
-    }
-    /**
-    * @returns {number}
-    */
-    get shelling_accuracy() {
-        const ret = wasm.__wbg_get_ibonuses_shelling_accuracy(this.ptr);
-        return ret;
-    }
-    /**
-    * @param {number} arg0
-    */
-    set shelling_accuracy(arg0) {
-        wasm.__wbg_set_ibonuses_shelling_accuracy(this.ptr, arg0);
-    }
-    /**
-    * @returns {number}
-    */
-    get torpedo_power() {
-        const ret = wasm.__wbg_get_ibonuses_torpedo_power(this.ptr);
-        return ret;
-    }
-    /**
-    * @param {number} arg0
-    */
-    set torpedo_power(arg0) {
-        wasm.__wbg_set_ibonuses_torpedo_power(this.ptr, arg0);
-    }
-    /**
-    * @returns {number}
-    */
-    get torpedo_accuracy() {
-        const ret = wasm.__wbg_get_ibonuses_torpedo_accuracy(this.ptr);
-        return ret;
-    }
-    /**
-    * @param {number} arg0
-    */
-    set torpedo_accuracy(arg0) {
-        wasm.__wbg_set_ibonuses_torpedo_accuracy(this.ptr, arg0);
-    }
-    /**
-    * @returns {number}
-    */
-    get torpedo_evasion() {
-        const ret = wasm.__wbg_get_ibonuses_torpedo_evasion(this.ptr);
-        return ret;
-    }
-    /**
-    * @param {number} arg0
-    */
-    set torpedo_evasion(arg0) {
-        wasm.__wbg_set_ibonuses_torpedo_evasion(this.ptr, arg0);
-    }
-    /**
-    * @returns {number}
-    */
-    get asw_power() {
-        const ret = wasm.__wbg_get_ibonuses_asw_power(this.ptr);
-        return ret;
-    }
-    /**
-    * @param {number} arg0
-    */
-    set asw_power(arg0) {
-        wasm.__wbg_set_ibonuses_asw_power(this.ptr, arg0);
-    }
-    /**
-    * @returns {number}
-    */
-    get asw_accuracy() {
-        const ret = wasm.__wbg_get_ibonuses_asw_accuracy(this.ptr);
-        return ret;
-    }
-    /**
-    * @param {number} arg0
-    */
-    set asw_accuracy(arg0) {
-        wasm.__wbg_set_ibonuses_asw_accuracy(this.ptr, arg0);
-    }
-    /**
-    * @returns {number}
-    */
-    get night_power() {
-        const ret = wasm.__wbg_get_ibonuses_night_power(this.ptr);
-        return ret;
-    }
-    /**
-    * @param {number} arg0
-    */
-    set night_power(arg0) {
-        wasm.__wbg_set_ibonuses_night_power(this.ptr, arg0);
-    }
-    /**
-    * @returns {number}
-    */
-    get night_accuracy() {
-        const ret = wasm.__wbg_get_ibonuses_night_accuracy(this.ptr);
-        return ret;
-    }
-    /**
-    * @param {number} arg0
-    */
-    set night_accuracy(arg0) {
-        wasm.__wbg_set_ibonuses_night_accuracy(this.ptr, arg0);
-    }
-    /**
-    * @returns {number}
-    */
-    get defense_power() {
-        const ret = wasm.__wbg_get_ibonuses_defense_power(this.ptr);
-        return ret;
-    }
-    /**
-    * @param {number} arg0
-    */
-    set defense_power(arg0) {
-        wasm.__wbg_set_ibonuses_defense_power(this.ptr, arg0);
-    }
-    /**
-    * @returns {number}
-    */
-    get contact_selection() {
-        const ret = wasm.__wbg_get_ibonuses_contact_selection(this.ptr);
-        return ret;
-    }
-    /**
-    * @param {number} arg0
-    */
-    set contact_selection(arg0) {
-        wasm.__wbg_set_ibonuses_contact_selection(this.ptr, arg0);
-    }
-    /**
-    * @returns {number}
-    */
-    get fighter_power() {
-        const ret = wasm.__wbg_get_ibonuses_fighter_power(this.ptr);
-        return ret;
-    }
-    /**
-    * @param {number} arg0
-    */
-    set fighter_power(arg0) {
-        wasm.__wbg_set_ibonuses_fighter_power(this.ptr, arg0);
-    }
-    /**
-    * @returns {number}
-    */
-    get ship_anti_air() {
-        const ret = wasm.__wbg_get_ibonuses_ship_anti_air(this.ptr);
-        return ret;
-    }
-    /**
-    * @param {number} arg0
-    */
-    set ship_anti_air(arg0) {
-        wasm.__wbg_set_ibonuses_ship_anti_air(this.ptr, arg0);
-    }
-    /**
-    * @returns {number}
-    */
-    get fleet_anti_air() {
-        const ret = wasm.__wbg_get_ibonuses_fleet_anti_air(this.ptr);
-        return ret;
-    }
-    /**
-    * @param {number} arg0
-    */
-    set fleet_anti_air(arg0) {
-        wasm.__wbg_set_ibonuses_fleet_anti_air(this.ptr, arg0);
-    }
-    /**
-    * @returns {number}
-    */
-    get elos() {
-        const ret = wasm.__wbg_get_ibonuses_elos(this.ptr);
-        return ret;
-    }
-    /**
-    * @param {number} arg0
-    */
-    set elos(arg0) {
-        wasm.__wbg_set_ibonuses_elos(this.ptr, arg0);
-    }
-}
-module.exports.IBonuses = IBonuses;
-
 const OrgFinalization = new FinalizationRegistry(ptr => wasm.__wbg_org_free(ptr));
 /**
 */
@@ -1952,35 +1734,33 @@ class Org {
         return takeObject(ret);
     }
     /**
-    * @returns {string}
+    * @returns {FleetKey}
     */
     get sortie() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_org_sortie(retptr, this.ptr);
-            var r0 = getInt32Memory0()[retptr / 4 + 0];
-            var r1 = getInt32Memory0()[retptr / 4 + 1];
-            return getStringFromWasm0(r0, r1);
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-            wasm.__wbindgen_free(r0, r1);
-        }
+        const ret = wasm.__wbg_get_org_sortie(this.ptr);
+        return takeObject(ret);
     }
     /**
-    * @param {string} arg0
+    * @returns {FleetKey | undefined}
     */
-    set sortie(arg0) {
-        const ptr0 = passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        wasm.__wbg_set_org_sortie(this.ptr, ptr0, len0);
+    get route_sup() {
+        const ret = wasm.__wbg_get_org_route_sup(this.ptr);
+        return takeObject(ret);
+    }
+    /**
+    * @returns {FleetKey | undefined}
+    */
+    get boss_sup() {
+        const ret = wasm.__wbg_get_org_boss_sup(this.ptr);
+        return takeObject(ret);
     }
     /**
     * @returns {string | undefined}
     */
-    get route_sup() {
+    first_ship_id() {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_org_route_sup(retptr, this.ptr);
+            wasm.org_first_ship_id(retptr, this.ptr);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             let v0;
@@ -1994,20 +1774,23 @@ class Org {
         }
     }
     /**
-    * @param {string | undefined} arg0
+    * @param {FleetKey} fleet_key
+    * @param {ShipKey} ship_key
+    * @returns {number | undefined}
     */
-    set route_sup(arg0) {
-        var ptr0 = isLikeNone(arg0) ? 0 : passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        var len0 = WASM_VECTOR_LEN;
-        wasm.__wbg_set_org_route_sup(this.ptr, ptr0, len0);
+    get_ship_mid(fleet_key, ship_key) {
+        const ret = wasm.org_get_ship_mid(this.ptr, addHeapObject(fleet_key), addHeapObject(ship_key));
+        return ret === 0xFFFFFF ? undefined : ret;
     }
     /**
+    * @param {FleetKey} fleet_key
+    * @param {ShipKey} ship_key
     * @returns {string | undefined}
     */
-    get boss_sup() {
+    get_ship_eid(fleet_key, ship_key) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_org_boss_sup(retptr, this.ptr);
+            wasm.org_get_ship_eid(retptr, this.ptr, addHeapObject(fleet_key), addHeapObject(ship_key));
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             let v0;
@@ -2021,42 +1804,19 @@ class Org {
         }
     }
     /**
-    * @param {string | undefined} arg0
-    */
-    set boss_sup(arg0) {
-        var ptr0 = isLikeNone(arg0) ? 0 : passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        var len0 = WASM_VECTOR_LEN;
-        wasm.__wbg_set_org_boss_sup(this.ptr, ptr0, len0);
-    }
-    /**
-    * @param {Role} role
-    * @returns {number}
-    */
-    fleet_len(role) {
-        const ret = wasm.org_fleet_len(this.ptr, addHeapObject(role));
-        return ret >>> 0;
-    }
-    /**
-    * @param {Role} role
-    * @param {string} key
-    * @returns {string | undefined}
+    * @param {FleetKey} key
+    * @returns {string}
     */
-    get_ship_entity_id(role, key) {
+    get_fleet_id(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_ship_entity_id(retptr, this.ptr, addHeapObject(role), ptr0, len0);
+            wasm.org_get_fleet_id(retptr, this.ptr, addHeapObject(key));
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
-            let v1;
-            if (r0 !== 0) {
-                v1 = getStringFromWasm0(r0, r1).slice();
-                wasm.__wbindgen_free(r0, r1 * 1);
-            }
-            return v1;
+            return getStringFromWasm0(r0, r1);
         } finally {
             wasm.__wbindgen_add_to_stack_pointer(16);
+            wasm.__wbindgen_free(r0, r1);
         }
     }
     /**
@@ -2076,21 +1836,6 @@ class Org {
         }
     }
     /**
-    * @param {Role} role
-    * @returns {number | undefined}
-    */
-    fleet_los_mod(role) {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.org_fleet_los_mod(retptr, this.ptr, addHeapObject(role));
-            var r0 = getInt32Memory0()[retptr / 4 + 0];
-            var r2 = getFloat64Memory0()[retptr / 8 + 1];
-            return r0 === 0 ? undefined : r2;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
-    }
-    /**
     * @returns {Uint16Array}
     */
     main_ship_ids() {
@@ -2123,24 +1868,20 @@ class Org {
         }
     }
     /**
-    * @param {string} key
+    * @param {FleetKey} key
     * @returns {Fleet}
     */
     clone_fleet(key) {
-        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.org_clone_fleet(this.ptr, ptr0, len0);
+        const ret = wasm.org_clone_fleet(this.ptr, addHeapObject(key));
         return Fleet.__wrap(ret);
     }
     /**
-    * @param {Role} role
-    * @param {string} key
+    * @param {FleetKey} fleet_key
+    * @param {ShipKey} ship_key
     * @returns {Ship | undefined}
     */
-    get_ship(role, key) {
-        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.org_get_ship(this.ptr, addHeapObject(role), ptr0, len0);
+    clone_ship(fleet_key, ship_key) {
+        const ret = wasm.org_clone_ship(this.ptr, addHeapObject(fleet_key), addHeapObject(ship_key));
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
@@ -2154,19 +1895,20 @@ class Org {
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
-    * @param {Role} role
-    * @returns {string}
+    * @param {FleetKey} key
+    * @returns {(string)[]}
     */
-    get_fleet_id_by_role(role) {
+    ship_keys(key) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.org_get_fleet_id_by_role(retptr, this.ptr, addHeapObject(role));
+            wasm.org_ship_keys(retptr, this.ptr, addHeapObject(key));
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
-            return getStringFromWasm0(r0, r1);
+            var v0 = getArrayJsValueFromWasm0(r0, r1).slice();
+            wasm.__wbindgen_free(r0, r1 * 4);
+            return v0;
         } finally {
             wasm.__wbindgen_add_to_stack_pointer(16);
-            wasm.__wbindgen_free(r0, r1);
         }
     }
     /**
@@ -2177,13 +1919,11 @@ class Org {
         return Comp.__wrap(ret);
     }
     /**
-    * @param {string} key
+    * @param {FleetKey} key
     * @returns {Comp}
     */
     create_comp_by_key(key) {
-        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.org_create_comp_by_key(this.ptr, ptr0, len0);
+        const ret = wasm.org_create_comp_by_key(this.ptr, addHeapObject(key));
         return Comp.__wrap(ret);
     }
     /**
@@ -2291,11 +2031,24 @@ class Org {
         return ret;
     }
     /**
-    * @returns {Org}
+    * @param {string} id
+    * @param {number} x
+    * @param {number} y
+    * @returns {MoveShipPayload | undefined}
     */
-    static default() {
-        const ret = wasm.org_default();
-        return Org.__wrap(ret);
+    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.ptr, ptr0, len0, x, y);
+        return takeObject(ret);
+    }
+    /**
+    * @param {FleetKey} key
+    * @returns {FleetType | undefined}
+    */
+    get_fleet_type(key) {
+        const ret = wasm.org_get_fleet_type(this.ptr, addHeapObject(key));
+        return takeObject(ret);
     }
 }
 module.exports.Org = Org;
@@ -2324,6 +2077,43 @@ class Ship {
         wasm.__wbg_ship_free(ptr);
     }
     /**
+    * @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.ptr);
+            var r0 = getInt32Memory0()[retptr / 4 + 0];
+            var r2 = getFloat64Memory0()[retptr / 8 + 1];
+            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.ptr);
+            var r0 = getInt32Memory0()[retptr / 4 + 0];
+            var r2 = getFloat64Memory0()[retptr / 8 + 1];
+            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.ptr, is_night);
+        return ret;
+    }
+    /**
     * @returns {string}
     */
     get id() {
@@ -3079,43 +2869,6 @@ class Ship {
             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.ptr);
-            var r0 = getInt32Memory0()[retptr / 4 + 0];
-            var r2 = getFloat64Memory0()[retptr / 8 + 1];
-            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.ptr);
-            var r0 = getInt32Memory0()[retptr / 4 + 0];
-            var r2 = getFloat64Memory0()[retptr / 8 + 1];
-            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.ptr, is_night);
-        return ret;
-    }
 }
 module.exports.Ship = Ship;
 
@@ -3128,16 +2881,16 @@ module.exports.__wbindgen_json_serialize = function(arg0, arg1) {
     getInt32Memory0()[arg0 / 4 + 0] = ptr0;
 };
 
-module.exports.__wbindgen_object_drop_ref = function(arg0) {
-    takeObject(arg0);
-};
-
 module.exports.__wbindgen_string_new = function(arg0, arg1) {
     const ret = getStringFromWasm0(arg0, arg1);
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_createEquipmentBonuses_970b62943e7f3a74 = function(arg0, arg1) {
+module.exports.__wbindgen_object_drop_ref = function(arg0) {
+    takeObject(arg0);
+};
+
+module.exports.__wbg_createEquipmentBonuses_5c51b37ac8d29697 = function(arg0, arg1) {
     const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };