koishipro-core.js 1.0.10 → 1.1.0

package/dist/src/adapters/ocgcore-parsers.d.ts

@@ -1,6 +1,12 @@
-import { OcgcoreCardInfo, OcgcoreFieldInfo, OcgcoreRegistryDumpEntry } from '../types/ocgcore-results';
-export declare function parseCardQuery(raw: Uint8Array, length: number): OcgcoreCardInfo | null;
-export declare function parseFieldCardQuery(raw: Uint8Array, length: number): OcgcoreCardInfo[];
-export declare function parseFieldInfo(raw: Uint8Array): OcgcoreFieldInfo;
+import { CardQuery, YGOProMsgReloadField } from 'ygopro-msg-encode';
+interface RegistryDumpEntry {
+    key: string;
+    value: Uint8Array;
+    valueText?: string;
+}
+export declare function parseCardQuery(raw: Uint8Array, length: number): CardQuery | null;
+export declare function parseFieldCardQuery(raw: Uint8Array, length: number): CardQuery[];
+export declare function parseFieldInfo(raw: Uint8Array): YGOProMsgReloadField;
 export declare function parseRegistryKeys(raw: Uint8Array): string[];
-export declare function parseRegistryDump(raw: Uint8Array): OcgcoreRegistryDumpEntry[];
+export declare function parseRegistryDump(raw: Uint8Array): RegistryDumpEntry[];
+export {};

package/dist/src/ocgcore-duel.d.ts

@@ -27,5 +27,5 @@ export declare class OcgcoreDuel {
     getRegistryKeys(): OcgcoreRegistryKeysResult;
     clearRegistry(): void;
     dumpRegistry(): OcgcoreRegistryDumpResult;
-    loadRegistry(input: Uint8Array): void;
+    loadRegistry(input: Uint8Array | Record<string, string>): void;
 }

package/dist/src/structs/card-data.d.ts

@@ -1,7 +1,7 @@
-export declare const CardDataStruct: import("typed-struct").StructConstructor<{
+export declare class CardDataStruct {
     code: number;
     alias: number;
-    setcode: Uint16Array<ArrayBufferLike>;
+    setcode: Uint16Array;
     type: number;
     level: number;
     attribute: number;
@@ -11,4 +11,6 @@ export declare const CardDataStruct: import("typed-struct").StructConstructor<{
     lscale: number;
     rscale: number;
     linkMarker: number;
-}, "Structure">;
+    static fromBytes(data: Uint8Array): CardDataStruct;
+    toBytes(): Uint8Array;
+}

package/dist/src/types/card-data.d.ts

@@ -1,4 +1,3 @@
-import { CardDataStruct } from '../structs/card-data';
 export interface CardData {
     code: number;
     alias: number;
@@ -13,5 +12,4 @@ export interface CardData {
     rscale: number;
     linkMarker: number;
 }
-export type CardDataStructInstance = InstanceType<typeof CardDataStruct>;
-export type CardDataInput = CardData | CardDataStructInstance;
+export type CardDataInput = CardData;

package/dist/src/types/ocgcore-params.d.ts

@@ -5,15 +5,15 @@ export interface OcgcoreStartDuelOptions {
     flags?: Array<OcgcoreDuelOptionFlag | number>;
 }
 export interface OcgcoreSetPlayerInfoParams {
-    playerId: number;
+    player: number;
     lp: number;
-    startCount: number;
+    startHand: number;
     drawCount: number;
 }
 export interface OcgcoreNewCardParams {
     code: number;
     owner: number;
-    playerId: number;
+    player: number;
     location: number;
     sequence: number;
     position: number;
@@ -24,18 +24,18 @@ export interface OcgcoreNewTagCardParams {
     location: number;
 }
 export interface OcgcoreQueryCardParams {
-    playerId: number;
+    player: number;
     location: number;
     sequence: number;
     queryFlag: number;
     useCache?: number;
 }
 export interface OcgcoreQueryFieldCountParams {
-    playerId: number;
+    player: number;
     location: number;
 }
 export interface OcgcoreQueryFieldCardParams {
-    playerId: number;
+    player: number;
     location: number;
     queryFlag: number;
     useCache?: number;

package/dist/src/types/ocgcore-results.d.ts

@@ -1,88 +1,22 @@
+import type { YGOProMsgBase, CardQuery, YGOProMsgReloadField } from 'ygopro-msg-encode';
 export interface OcgcoreBinaryResult {
     length: number;
     raw: Uint8Array;
 }
-export interface OcgcoreCardLocationRef {
-    controller: number;
-    location: number;
-    sequence: number;
-}
-export interface OcgcoreCounterInfo {
-    type: number;
-    count: number;
-}
-export interface OcgcoreCardInfo {
-    flags: number;
-    empty: boolean;
-    code?: number;
-    position?: number;
-    alias?: number;
-    type?: number;
-    level?: number;
-    rank?: number;
-    attribute?: number;
-    race?: number;
-    attack?: number;
-    defense?: number;
-    baseAttack?: number;
-    baseDefense?: number;
-    reason?: number;
-    equipCard?: OcgcoreCardLocationRef;
-    targetCards?: OcgcoreCardLocationRef[];
-    overlayCards?: number[];
-    counters?: OcgcoreCounterInfo[];
-    owner?: number;
-    status?: number;
-    lscale?: number;
-    rscale?: number;
-    link?: number;
-    linkMarker?: number;
-}
 export interface OcgcoreCardQueryResult extends OcgcoreBinaryResult {
-    card: OcgcoreCardInfo | null;
+    card: CardQuery | null;
 }
 export interface OcgcoreFieldCardQueryResult extends OcgcoreBinaryResult {
-    cards: OcgcoreCardInfo[];
+    cards: CardQuery[];
 }
 export interface OcgcoreMessageResult extends OcgcoreBinaryResult {
 }
 export interface OcgcoreProcessResult extends OcgcoreBinaryResult {
     status: number;
-}
-export interface OcgcoreFieldInfoPlayerState {
-    lp: number;
-    mzone: Array<{
-        occupied: boolean;
-        position?: number;
-        xyzCount?: number;
-    }>;
-    szone: Array<{
-        occupied: boolean;
-        position?: number;
-    }>;
-    deckCount: number;
-    handCount: number;
-    graveCount: number;
-    removedCount: number;
-    extraCount: number;
-    extraPCount: number;
-}
-export interface OcgcoreFieldInfoChain {
-    code: number;
-    chainCard: OcgcoreCardLocationRef & {
-        subSequence: number;
-    };
-    trigger: OcgcoreCardLocationRef;
-    description: number;
-}
-export interface OcgcoreFieldInfo {
-    message: number;
-    duelRule: number;
-    players: [OcgcoreFieldInfoPlayerState, OcgcoreFieldInfoPlayerState];
-    chains: OcgcoreFieldInfoChain[];
+    message?: YGOProMsgBase;
 }
 export interface OcgcoreFieldInfoResult extends OcgcoreBinaryResult {
-    field: OcgcoreFieldInfo;
+    field: YGOProMsgReloadField;
 }
 export interface OcgcoreRegistryValueResult extends OcgcoreBinaryResult {
     value: Uint8Array;
@@ -91,11 +25,6 @@ export interface OcgcoreRegistryValueResult extends OcgcoreBinaryResult {
 export interface OcgcoreRegistryKeysResult extends OcgcoreBinaryResult {
     keys: string[];
 }
-export interface OcgcoreRegistryDumpEntry {
-    key: string;
-    value: Uint8Array;
-    valueText?: string;
-}
 export interface OcgcoreRegistryDumpResult extends OcgcoreBinaryResult {
-    entries: OcgcoreRegistryDumpEntry[];
+    dict: Record<string, string>;
 }

package/dist/vendor/libocgcore.shared.d.ts

@@ -11,21 +11,21 @@ export interface OcgcoreModule extends EmscriptenModule {
   _create_duel_v2(seedSequencePtr: number): number;
   _start_duel(duelPtr: number, options: number): void;
   _end_duel(duelPtr: number): void;
-  _set_player_info(duelPtr: number, playerId: number, lp: number, startCount: number, drawCount: number): void;
+  _set_player_info(duelPtr: number, player: number, lp: number, startHand: number, drawCount: number): void;
   _get_log_message(duelPtr: number, bufPtr: number): number;
   _get_message(duelPtr: number, bufPtr: number): number;
   _process(duelPtr: number): number;
-  _new_card(duelPtr: number, code: number, owner: number, playerId: number, location: number, sequence: number, position: number): void;
+  _new_card(duelPtr: number, code: number, owner: number, player: number, location: number, sequence: number, position: number): void;
   _new_tag_card(duelPtr: number, code: number, owner: number, location: number): void;
-  _query_card(duelPtr: number, playerId: number, location: number, sequence: number, queryFlag: number, bufPtr: number, useCache: number): number;
-  _query_field_count(duelPtr: number, playerId: number, location: number): number;
-  _query_field_card(duelPtr: number, playerId: number, location: number, queryFlag: number, bufPtr: number, useCache: number): number;
+  _query_card(duelPtr: number, player: number, location: number, sequence: number, queryFlag: number, bufPtr: number, useCache: number): number;
+  _query_field_count(duelPtr: number, player: number, location: number): number;
+  _query_field_card(duelPtr: number, player: number, location: number, queryFlag: number, bufPtr: number, useCache: number): number;
   _query_field_info(duelPtr: number, bufPtr: number): number;
   _set_responsei(duelPtr: number, value: number): void;
   _set_responseb(duelPtr: number, bufPtr: number): void;
   _preload_script(duelPtr: number, scriptNamePtr: number): void;
-  _get_registry_value(duelPtr: number, keyPtr: number, keyLen: number, outBufPtr: number): number;
-  _set_registry_value(duelPtr: number, keyPtr: number, keyLen: number, valuePtr: number, valueLen: number): void;
+  _get_registry_value(duelPtr: number, keyPtr: number, outBufPtr: number): number;
+  _set_registry_value(duelPtr: number, keyPtr: number, valuePtr: number): void;
   _get_registry_keys(duelPtr: number, bufPtr: number): number;
   _clear_registry(duelPtr: number): void;
   _dump_registry(duelPtr: number, bufPtr: number): number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishipro-core.js",
   "description": "WASM wrapper for YGOPro/ocgcore, designed for both Node and browser runtimes.",
-  "version": "1.0.10",
+  "version": "1.1.0",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -41,7 +41,7 @@
     "buffer": "^6.0.3",
     "jszip": "^3.10.1",
     "sql.js": "^1.13.0",
-    "typed-struct": "^1.3.0",
+    "ygopro-msg-encode": "^1.0.1",
     "ygopro-yrp-encode": "^1.0.1"
   },
   "jest": {