新增柏妮思伤害计算等

2025-12-16 21:27:47 +00:00 · 2025-01-14 21:42:23 +08:00 · 2025-01-14 21:42:23 +08:00 · b51acca73e
commit b51acca73e
parent 6573f1d600
19 changed files with 1053 additions and 164 deletions
--- a/model/damage/character/11号/calc.js
+++ b/model/damage/character/11号/calc.js
@ -1,5 +1,11 @@
 /** @type {import('../../BuffManager.ts').BuffManager['buffs']} */
 export const buffs = [
+  {
+    name: '2影',
+    type: '增伤',
+    value: 0.03 * 12,
+    range: ['AP', 'CC', 'CF']
+  },
  {
    name: '6影',
    type: '无视抗性',
@ -7,12 +13,6 @@ export const buffs = [
    element: 'Fire',
    range: ['AQ']
  },
-  {
-    name: '2影',
-    type: '增伤',
-    value: 0.03 * 12,
-    range: ['AP', 'CC', 'CF']
-  },
  {
    name: '核心被动：热浪',
    type: '增伤',
@ -29,6 +29,7 @@ export const buffs = [

 /** @type {import('../../Calculator.ts').Calculator['skills']} */
 export const skills = [
+  { name: '灼烧', type: '灼烧' },
  { name: '普攻：火力镇压四段', type: 'AQ4' },
  { name: '闪避反击：逆火', type: 'CF' },
  { name: '强化特殊技：盛燃烈火', type: 'EQ' },
--- a/model/damage/character/安东/calc.js
+++ b/model/damage/character/安东/calc.js
@ -1,16 +1,16 @@
 /** @type {import('../../BuffManager.ts').BuffManager['buffs']} */
 export const buffs = [
+  {
+    name: '4影',
+    type: '暴击率',
+    value: 0.1
+  },
  {
    name: '6影',
    type: '增伤',
    value: 0.04 * 6,
    range: ['AQ', 'CFQ']
  },
-  {
-    name: '4影',
-    type: '暴击率',
-    value: 0.1
-  },
  {
    name: '核心被动：兄弟齐心',
    type: '增伤',
@ -27,6 +27,7 @@ export const buffs = [

 /** @type {import('../../Calculator.ts').Calculator['skills']} */
 export const skills = [
+  { name: '感电每次', type: '感电' },
  { name: '普攻二段（爆发）', type: 'AQ2' },
  { name: '闪避反击：过载钻击（爆发）', type: 'CFQ' },
  { name: '特殊技：爆发钻击（爆发）', type: 'EPQ' },
--- a/model/damage/character/悠真/calc.js
+++ b/model/damage/character/悠真/calc.js
@ -1,16 +1,16 @@
 /** @type {import('../../BuffManager.ts').BuffManager['buffs']} */
 export const buffs = [
-  {
-    name: '6影',
-    type: '无视抗性',
-    value: 0.15
-  },
  {
    name: '2影',
    type: '增伤',
    value: 0.5,
    range: ['CCQ']
  },
+  {
+    name: '6影',
+    type: '无视抗性',
+    value: 0.15
+  },
  {
    name: '核心被动：破晓',
    type: '暴击率',
@ -33,6 +33,7 @@ export const buffs = [

 /** @type {import('../../Calculator.ts').Calculator['skills']} */
 export const skills = [
+  { name: '感电每次', type: '感电' },
  { name: '普攻：穿云五段', type: 'AP5' },
  { name: '普攻：落羽', type: 'AX' },
  { name: '冲刺攻击：飞弦·斩', type: 'CCQ3' },
--- a/model/damage/character/星见雅/calc.js
+++ b/model/damage/character/星见雅/calc.js
@ -9,20 +9,12 @@
 //   /** 注册buff */
 //   // 影画加成
 //   buffM.new({
-//     name: '6影',
-//     type: '增伤',
-//     isForever: true,
-//     value: 0.30,
+//     name: '1影',
+//     type: '无视防御',
+//     value: 0.36,
 //     range: ['AX']
 //   })
 //   buffM.new({
-//     name: '4影',
-//     type: '增伤',
-//     isForever: true,
-//     value: 0.30,
-//     range: ['TP']
-//   })
-//   buffM.new({
 //     name: '2影',
 //     type: '增伤',
 //     isForever: true,
@ -36,9 +28,17 @@
 //     value: 0.15
 //   })
 //   buffM.new({
-//     name: '1影',
-//     type: '无视防御',
-//     value: 0.36,
+//     name: '4影',
+//     type: '增伤',
+//     isForever: true,
+//     value: 0.30,
+//     range: ['TP']
+//   })
+//   buffM.new({
+//     name: '6影',
+//     type: '增伤',
+//     isForever: true,
+//     value: 0.30,
 //     range: ['AX']
 //   })
 //   // 额外能力加成
@ -93,19 +93,11 @@
 /** @type {import('../../BuffManager.ts').BuffManager['buffs']} */
 export const buffs = [
  {
-    name: '6影',
-    type: '增伤',
-    isForever: true,
-    value: 0.30,
+    name: '1影',
+    type: '无视防御',
+    value: 0.36,
    range: ['AX']
  },
-  {
-    name: '4影',
-    type: '增伤',
-    isForever: true,
-    value: 0.30,
-    range: ['TP']
-  },
  {
    name: '2影',
    type: '暴击率',
@ -120,9 +112,17 @@ export const buffs = [
    range: ['AP', 'CF']
  },
  {
-    name: '1影',
-    type: '无视防御',
-    value: 0.36,
+    name: '4影',
+    type: '增伤',
+    isForever: true,
+    value: 0.30,
+    range: ['TP']
+  },
+  {
+    name: '6影',
+    type: '增伤',
+    isForever: true,
+    value: 0.30,
    range: ['AX']
  },
  {
--- a/model/damage/character/朱鸢/calc.js
+++ b/model/damage/character/朱鸢/calc.js
@ -1,11 +1,5 @@
 /** @type {import('../../BuffManager.ts').BuffManager['buffs']} */
 export const buffs = [
-  {
-    name: '4影',
-    type: '无视抗性',
-    value: 0.25,
-    range: ['AQ', 'CCQ']
-  },
  {
    name: '2影',
    type: '增伤',
@ -13,6 +7,12 @@ export const buffs = [
    element: 'Ether',
    range: ['AQ', 'CCQ']
  },
+  {
+    name: '4影',
+    type: '无视抗性',
+    value: 0.25,
+    range: ['AQ', 'CCQ']
+  },
  {
    name: '核心被动：特种弹药',
    type: '增伤',
@ -28,6 +28,7 @@ export const buffs = [

 /** @type {import('../../Calculator.ts').Calculator['skills']} */
 export const skills = [
+  { name: '侵蚀每次', type: '侵蚀' },
  { name: '普攻三段（以太）', type: 'AQY3' },
  { name: '冲刺攻击：火力压制', type: 'CCQ' },
  {
--- a/model/damage/character/柏妮思/calc.js
+++ b/model/damage/character/柏妮思/calc.js
@ -0,0 +1,102 @@
+/** @type {import('../../BuffManager.ts').BuffManager['buffs']} */
+export const buffs = [
+  {
+    name: '1影',
+    type: '倍率',
+    value: 1,
+    range: ['TY', 'YY']
+  },
+  {
+    name: '2影',
+    type: '穿透率',
+    value: 0.2
+  },
+  {
+    name: '4影',
+    type: '暴击率',
+    value: 0.3,
+    range: ['EQ', 'L']
+  },
+  {
+    name: '6影',
+    type: '无视抗性',
+    value: 0.25,
+    element: 'Fire',
+    range: ['TY', 'YY', '灼烧']
+  },
+  {
+    name: '核心被动：燃油特调',
+    type: '增伤',
+    value: ({ calc }) => Math.min(30, Math.floor(calc.get_AnomalyProficiency() / 10)) * 0.01,
+    isForever: true,
+    range: ['TY', 'YY']
+  },
+  {
+    name: '额外能力：星火燎原',
+    type: '异常持续时间',
+    value: 3,
+    range: ['灼烧']
+  }
+]
+
+/** @type {import('../../Calculator.ts').Calculator['skills']} */
+export const skills = [
+  { name: '灼烧', type: '灼烧' },
+  { name: '紊乱', type: '紊乱' },
+  {
+    name: '核心被动：余烬',
+    type: 'TY',
+    redirect: 'L'
+  },
+  // { name: '普攻：炽焰直调式五段', type: 'AP5' },
+  { name: '长按普攻0', type: 'AX0', isHide: true },
+  {
+    name: '长按普攻',
+    type: 'AX',
+    after: ({ damage }) => damage.add('AX0')
+  },
+  { name: '闪避反击：摇荡闪', type: 'CF' },
+  { name: '强化E：火焰冲击', type: 'EQP0' },
+  {
+    name: '强化E：持续喷射秒伤',
+    type: 'EQP',
+    after: ({ damage }) => damage.x(0.5)
+  },
+  { name: '强化E双份：火焰冲击', type: 'EQS0' },
+  {
+    name: '强化E双份：持续喷射秒伤',
+    type: 'EQS',
+    after: ({ damage }) => damage.x(0.5)
+  },
+  { name: '连携技：燃油熔焰', type: 'RL' },
+  { name: '终结技：纵享盛焰', type: 'RZ' }
+]
+
+/**
+ * @param {import('../../BuffManager.ts').BuffManager} buffM
+ * @param {import('../../Calculator.ts').Calculator} calc
+ * @param {import('../../../avatar.js').ZZZAvatarInfo} avatar
+ */
+export function calc(buffM, calc, avatar) {
+  if (avatar.rank >= 6) {
+    calc.new({
+      name: '6影强化E双份额外余烬秒伤',
+      type: 'YY',
+      fixedMultiplier: 1.2
+    })
+    calc.new({
+      name: '6影强化E双份额外灼烧',
+      type: 'Y灼烧',
+      dmg: (calc) => {
+        const dmg = calc.calc_skill({
+          name: '灼烧每段',
+          element: 'Fire',
+          type: '灼烧',
+          after: ({ damage }) => damage.x(18)
+        })
+        dmg.skill.name = '6影强化E双份额外灼烧'
+        return dmg
+      }
+    })
+  }
+}
--- a/model/damage/character/柏妮思/data.json
+++ b/model/damage/character/柏妮思/data.json
@ -0,0 +1,37 @@
+{
+  "skill": {
+    "AP5": [
+      0.963,1.051,1.139,1.227,1.315,1.403,1.491,1.579,1.667,1.755,1.843,1.931,2.019,2.107,2.195,2.283
+    ],
+    "AX0": [
+      1.254,1.368,1.482,1.596,1.71,1.824,1.938,2.052,2.166,2.28,2.394,2.508,2.622,2.736,2.85,2.964
+    ],
+    "AX": [
+      2.328,2.54,2.752,2.964,3.176,3.388,3.6,3.812,4.024,4.236,4.448,4.66,4.872,5.084,5.296,5.508
+    ],
+    "CF": [
+      2.197,2.397,2.597,2.797,2.997,3.197,3.397,3.597,3.797,3.997,4.197,4.397,4.597,4.797,4.997,5.197
+    ],
+    "EQP0": [
+      0.967,1.055,1.143,1.231,1.319,1.407,1.495,1.583,1.671,1.759,1.847,1.935,2.023,2.111,2.199,2.287
+    ],
+    "EQP": [
+      5.438,5.933,6.428,6.923,7.418,7.913,8.408,8.903,9.398,9.893,10.388,10.883,11.378,11.873,12.368,12.863
+    ],
+    "EQS0": [
+      2.871,3.132,3.393,3.654,3.915,4.176,4.437,4.698,4.959,5.22,5.481,5.742,6.003,6.264,6.525,6.786
+    ],
+    "EQS": [
+      9.581,10.452,11.323,12.194,13.065,13.936,14.807,15.678,16.549,17.42,18.291,19.162,20.033,20.904,21.775,22.646
+    ],
+    "RL": [
+      6.809,7.428,8.047,8.666,9.285,9.904,10.523,11.142,11.761,12.38,12.999,13.618,14.237,14.856,15.475,16.094
+    ],
+    "RZ": [
+      20.122,21.952,23.782,25.612,27.442,29.272,31.102,32.932,34.762,36.592,38.422,40.252,42.082,43.912,45.742,47.572
+    ],
+    "TY": [
+      1.75,2.05,2.35,2.62,2.9,3.2,3.5
+    ]
+  }
+}
--- a/model/damage/character/模板/calc.js
+++ b/model/damage/character/模板/calc.js
@ -7,13 +7,7 @@ export function calc(buffM, calc, avatar) {
  /** 注册buff */
  // 影画加成
  buffM.new({
-    name: '6影',
-    type: ,
-    value: 0,
-    range: ['']
-  })
-  buffM.new({
-    name: '4影',
+    name: '1影',
    type: ,
    value: 0,
    range: ['']
@ -25,7 +19,13 @@ export function calc(buffM, calc, avatar) {
    range: ['']
  })
  buffM.new({
-    name: '1影',
+    name: '4影',
+    type: ,
+    value: 0,
+    range: ['']
+  })
+  buffM.new({
+    name: '6影',
    type: ,
    value: 0,
    range: ['']
@ -65,13 +65,7 @@ export function calc(buffM, calc, avatar) {
 /** @type {import('../../BuffManager.ts').BuffManager['buffs']} */
 export const buffs = [
  {
-    name: '6影',
-    type: ,
-    value: 0,
-    range: ['']
-  },
-  {
-    name: '4影',
+    name: '1影',
    type: ,
    value: 0,
    range: ['']
@ -83,7 +77,13 @@ export const buffs = [
    range: ['']
  },
  {
-    name: '1影',
+    name: '4影',
+    type: ,
+    value: 0,
+    range: ['']
+  },
+  {
+    name: '6影',
    type: ,
    value: 0,
    range: ['']
--- a/model/damage/character/猫又/calc.js
+++ b/model/damage/character/猫又/calc.js
@ -1,9 +1,10 @@
 /** @type {import('../../BuffManager.ts').BuffManager['buffs']} */
 export const buffs = [
  {
-    name: '6影',
-    type: '暴击伤害',
-    value: 0.18 * 3
+    name: '1影',
+    type: '无视抗性',
+    value: 0.16,
+    element: 'Physical'
  },
  {
    name: '4影',
@ -11,10 +12,9 @@ export const buffs = [
    value: 0.07 * 2
  },
  {
-    name: '1影',
-    type: '无视抗性',
-    value: 0.16,
-    element: 'Physical'
+    name: '6影',
+    type: '暴击伤害',
+    value: 0.18 * 3
  },
  {
    name: '核心被动：猫步诡影',
--- a/model/damage/character/艾莲/calc.js
+++ b/model/damage/character/艾莲/calc.js
@ -1,5 +1,17 @@
 /** @type {import('../../BuffManager.ts').BuffManager['buffs']} */
 export const buffs = [
+  {
+    name: '1影',
+    type: '暴击率',
+    value: 0.2 * 6
+  },
+  {
+    name: '2影',
+    type: '暴击伤害',
+    value: 0.6,
+    range: ['EQ']
+  },
+
  {
    name: '6影',
    type: '穿透率',
@ -11,17 +23,6 @@ export const buffs = [
    value: 2.5,
    range: ['CCXX']
  },
-  {
-    name: '2影',
-    type: '暴击伤害',
-    value: 0.6,
-    range: ['EQ']
-  },
-  {
-    name: '1影',
-    type: '暴击率',
-    value: 0.2 * 6
-  },
  {
    name: '核心被动：凌牙厉齿',
    type: '暴击伤害',
--- a/model/damage/character/青衣/calc.js
+++ b/model/damage/character/青衣/calc.js
@ -1,5 +1,15 @@
 /** @type {import('../../BuffManager.ts').BuffManager['buffs']} */
 export const buffs = [
+  {
+    name: '1影',
+    type: '无视防御',
+    value: 0.15
+  },
+  {
+    name: '1影',
+    type: '暴击率',
+    value: 0.2
+  },
  {
    name: '6影',
    type: '暴击伤害',
@ -12,16 +22,6 @@ export const buffs = [
    type: '无视抗性',
    value: 0.2
  },
-  {
-    name: '1影',
-    type: '无视防御',
-    value: 0.15
-  },
-  {
-    name: '1影',
-    type: '暴击率',
-    value: 0.2
-  },
  {
    name: '额外能力：阳关三叠',
    type: '攻击力',
@ -45,6 +45,7 @@ export const buffs = [

 /** @type {import('../../Calculator.ts').Calculator['skills']} */
 export const skills = [
+  { name: '感电每次', type: '感电' },
  { name: '普攻：醉花月云转', type: 'AQ' },
  { name: '闪避反击：意不尽', type: 'CF' },
  { name: '强化特殊技：月上海棠', type: 'EQ' },