diff --git a/images/icon-skills.png b/images/icon-skills.png index 087b9c3c..3eb74ca1 100644 Binary files a/images/icon-skills.png and b/images/icon-skills.png differ diff --git a/images/project file/icon-skills.fw.png b/images/project file/icon-skills.fw.png index 9ea2d284..be3a8d47 100644 Binary files a/images/project file/icon-skills.fw.png and b/images/project file/icon-skills.fw.png differ diff --git a/languages/en.js b/languages/en.js index 2d4ef5f7..74c96603 100644 --- a/languages/en.js +++ b/languages/en.js @@ -82,7 +82,7 @@ rate_multiply_drop: tp`${'icon'}Drop rate`, rate_multiply_coin: tp`${'icon'}Coins`, rate_multiply_exp: tp`${'icon'}Rank EXP`, - reduce_damage: tp`${'condition'}Reduces${'attrs'} damage taken by ${'value'}`, + reduce_damage: tp`${'condition'}${'icon'}Reduces${'attrs'} damage taken by ${'value'}`, power_up: tp`${'condition'}${'targets'}${'value'}${'reduceDamage'}${'addCombo'}${'followAttack'}`, power_up_targets: tp`${'attrs'}${'types'}'s `, henshin: tp`Transforms into ${'card'}`, diff --git a/languages/icon-en.css b/languages/icon-en.css index 28356902..f9f44016 100644 --- a/languages/icon-en.css +++ b/languages/icon-en.css @@ -27,6 +27,10 @@ { background-position-x: -20px; } -.icon-skill[data-icon-type="mass-attack"] { +.icon-skill[data-icon-type="mass-attack"], +.icon-skill[data-icon-type="reduce-damage"], +.icon-skill[data-icon-type="damage-absorb"], +.icon-skill[data-icon-type="damage-void"] +{ background-position-x: calc(-36px * 1); } \ No newline at end of file diff --git a/script-skill-parser.js b/script-skill-parser.js index 0f274537..30a08ea0 100644 --- a/script-skill-parser.js +++ b/script-skill-parser.js @@ -1130,7 +1130,7 @@ const parsers = { [150](_, mul) { return powerUp(null, null, p.mul({ atk: mul }), c.exact('match-length', 5, 'enhanced')); }, [151](mul1, mul2, percent) { return [ - powerUp(null, null, p.scaleCross([{ single: true, attr: Attributes.Heart, atk: mul1, rcv: mul2 }]), null, v.percent(percent)), + powerUp(null, null, p.scaleCross([{ single: true, attr: [Attributes.Heart], atk: mul1 || 100, rcv: mul2 || 100 }]), null, v.percent(percent)), ]; }, [152](attrs, count) { return setOrbState(flags(attrs), 'locked', {count: v.constant(count)}); }, @@ -1155,15 +1155,6 @@ const parsers = { { single: false, attr: [attr2], atk: mul2 }, { single: false, attr: [attr3], atk: mul3 } ].filter(cross => cross.atk); - - /*if (crosses.length >= 2 && crosses.every(cross => cross.atk === crosses[0].atk)) { - //所有值一样 - crosses.reduce((pre,cur)=>{ - pre.attr = pre.attr.concat(cur.attr); - return pre - }); - crosses = [crosses[0]]; - }*/ return powerUp(null, null, p.scaleCross(crosses)); }, [158](len, attrs, types, atk, hp, rcv) { @@ -1328,7 +1319,7 @@ const parsers = { ]; }, [209](combo) { - return powerUp(null, null, p.scaleCross([{ single: true, attr: Attributes.Heart, atk: 100, rcv: 100}]), null, null, [addCombo(combo)]); + return powerUp(null, null, p.scaleCross([{ single: true, attr: [Attributes.Heart], atk: 100, rcv: 100}]), null, null, [addCombo(combo)]); }, [210](attrs, _, combo) { return powerUp(null, null, p.scaleCross([{ single: false, attr: flags(attrs), atk: 100, rcv: 100}]), null, null, [addCombo(combo)]);