重写战斗

src/types/enemy.d.ts

@@ -26,7 +26,10 @@ type PartialNumbericEnemyProperty =
     | 'courage'
     | 'charge'
     | 'paleShield'
-    | 'iceHalo';
+    | 'iceHalo'
+    | 'day'
+    | 'night'
+    | 'melt';
 
 type BooleanEnemyProperty =
     | 'zoneSquare'
@@ -314,10 +317,10 @@ interface Enemys extends EnemyData {
      * @returns true表示可以打败，false表示无法打败
      */
     canBattle(
-        enemy: EnemyIds | Enemy,
-        x?: number,
-        y?: number,
-        floorId?: FloorIds
+        x: number,
+        y: number,
+        floorId?: FloorIds,
+        dir?: Dir | 'none' | (Dir | 'none')[]
     ): boolean;
 
     /**

src/types/event.d.ts

@@ -109,10 +109,10 @@ interface Events extends EventData {
      * @param callback 回调函数
      */
     battle(
-        id: AllIdsOf<'enemys' | 'enemy48'>,
-        x?: number,
-        y?: number,
-        force?: boolean,
+        x: number,
+        y: number,
+        dir: Dir | 'none',
+        force: boolean = false,
         callback?: () => void
     ): void;
 
@@ -758,6 +758,8 @@ interface Events extends EventData {
      * @param itemId 道具id，其中敌人手册、传送器和飞行器会被特殊处理
      */
     tryUseItem(itemId: ItemIdOf<'tools' | 'constants'>): void;
+
+    _sys_battle(data: Block, callback?: () => void): void;
 }
 
 declare const events: new () => Events;

src/types/function.d.ts

@@ -161,18 +161,6 @@ interface EventData {
      */
     flyTo(toId: FloorIds, callback?: () => void): boolean;
 
-    /**
-     * 与怪物战斗前
-     * @param enemyId 打败的怪物
-     * @param x 怪物横坐标
-     * @param y 怪物纵坐标
-     */
-    beforeBattle(
-        enemyId: AllIdsOf<'enemys' | 'enemy48'>,
-        x?: number,
-        y?: number
-    ): void;
-
     /**
      * 与怪物战斗后
      * @param enemyId 打败的怪物

src/types/plugin.d.ts

@@ -462,8 +462,6 @@ interface Skill {
     effect: string[];
 }
 
-interface DamageEnemy {}
-
 type Forward<T> = {
     [K in keyof T as T[K] extends Function
         ? K extends `_${string}`

src/types/status.d.ts

@@ -963,8 +963,8 @@ interface HeroStatus {
      * 勇士学习的特技
      */
     special: {
-        num: [];
-        last: [];
+        num: number[];
+        last: number[];
         [k: string]: any;
     };