- {all.map((v, i) => {
+ {enemy.showSpecial.map((v, i) => {
return (
-
- {name[i]}：
+
+ {v[0]}：
-
+
);
})}
@@ -46,12 +47,9 @@ export function getSpecialHint(enemy: Enemy & DetailedEnemy) {
* @param enemy 怪物实例
*/
export function getDefDamage(
- enemy: DetailedEnemy,
+ enemy: ToShowEnemy,
addDef: number = 0,
- addAtk: number = 0,
- x?: number,
- y?: number,
- floorId?: FloorIds
+ addAtk: number = 0
) {
// todo: 删除 getDamageInfo
const ratio = core.status.thisMap.ratio;
@@ -63,29 +61,26 @@ export function getDefDamage(
const max = 100 - Math.floor(addDef / ratio);
for (let i = 0; i <= max; i++) {
- const dam = core.getDamageInfo(
- enemy.id,
+ const dam = enemy.enemy.calEnemyDamage(
{
- def: core.getStatus('def') + ratio * i + addDef,
- atk: core.getStatus('atk') + addAtk
+ atk: core.status.hero.atk + addAtk,
+ def: core.status.hero.def + addDef + i * ratio
},
- x,
- y,
- floorId
+ 'none'
);
if (res.length === 0) {
- origin = dam?.damage;
+ origin = dam[0].damage;
if (has(origin)) {
res.push([addDef + i * ratio, origin]);
last = origin;
}
continue;
}
- if (!has(dam)) continue;
- if (dam.damage === res.at(-1)?.[1]) continue;
- last = dam.damage;
- res.push([ratio * i + addDef, dam.damage]);
+ if (!isFinite(dam[0].damage)) continue;
+ if (dam[0].damage === res.at(-1)?.[1]) continue;
+ last = dam[0].damage;
+ res.push([ratio * i + addDef, dam[0].damage]);
}
return res;
@@ -96,12 +91,9 @@ export function getDefDamage(
* @param enemy 怪物实例
*/
export function getCriticalDamage(
- enemy: DetailedEnemy,
+ enemy: ToShowEnemy,
addAtk: number = 0,
- addDef: number = 0,
- x?: number,
- y?: number,
- floorId?: FloorIds
+ addDef: number = 0
): [number, number][] {
// todo: 删除 getDamageInfo
const ratio = core.status.thisMap.ratio;
@@ -113,29 +105,26 @@ export function getCriticalDamage(
const max = 100 - Math.floor(addAtk / ratio);
for (let i = 0; i <= max; i++) {
- const dam = core.getDamageInfo(
- enemy.id,
+ const dam = enemy.enemy.calEnemyDamage(
{
- atk: core.getStatus('atk') + ratio * i + addAtk,
- def: core.getStatus('def') + addDef
+ atk: core.status.hero.atk + addAtk + i * ratio,
+ def: core.status.hero.def + addDef
},
- x,
- y,
- floorId
+ 'none'
);
if (res.length === 0) {
- origin = dam?.damage;
+ origin = dam[0].damage;
if (has(origin)) {
res.push([addAtk + i * ratio, origin]);
last = origin;
}
continue;
}
- if (!has(dam)) continue;
- if (dam.damage === res.at(-1)?.[1]) continue;
- last = dam.damage;
- res.push([ratio * i + addAtk, dam.damage]);
+ if (!isFinite(dam[0].damage)) continue;
+ if (dam[0].damage === res.at(-1)?.[1]) continue;
+ last = dam[0].damage;
+ res.push([ratio * i + addAtk, dam[0].damage]);
}
return res;
diff --git a/src/types/enemy.d.ts b/src/types/enemy.d.ts
index 43629e7..3535b4c 100644
--- a/src/types/enemy.d.ts
+++ b/src/types/enemy.d.ts
@@ -390,14 +390,6 @@ interface Enemys extends EnemyData {
floorId?: FloorIds
): number;
- /**
- * 获得某张地图的敌人集合，用于手册绘制
- * @example core.getCurrentEnemys('MT0') // 主塔0层的敌人集合
- * @param floorId 地图id
- * @returns 敌人集合，按伤害升序排列，支持多朝向怪合并
- */
- getCurrentEnemys(floorId?: FloorIds): DetailedEnemy[];
-
/**
* 检查某些楼层是否还有漏打的（某种）敌人
* @example core.hasEnemyLeft('greenSlime', ['sample0', 'sample1']) // 样板0层和1层是否有漏打的绿头怪
diff --git a/src/types/plugin.d.ts b/src/types/plugin.d.ts
index 3b3d046..4b426cb 100644
--- a/src/types/plugin.d.ts
+++ b/src/types/plugin.d.ts
@@ -168,12 +168,6 @@ interface PluginUtils {
}
interface PluginUis {
- /** 怪物手册的怪物详细信息的初始位置 */
- bookDetailPos: number;
-
- /** 怪物手册详细信息展示的怪物 */
- bookDetailEnemy: DetailedEnemy;
-
/** 定点查看的界面，特殊属性还是临界 */
fixedDetailPanel: 'special' | 'critical';
diff --git a/src/ui/book.vue b/src/ui/book.vue
index 2c8fde2..be67333 100644
--- a/src/ui/book.vue
+++ b/src/ui/book.vue
@@ -15,7 +15,7 @@
v-model:now="scroll"
v-model:drag="drag"
>
-