From 6b8a9f3482b97eb02f6c33a10a2b62f872c3f155 Mon Sep 17 00:00:00 2001 From: wormtql <584130248@qq.com> Date: Tue, 2 Mar 2021 20:09:05 +0800 Subject: [PATCH] feat(data): add Hutao fix lots of bugs add Hutao --- dist/attribute/attribute.d.ts | 1 + dist/index.js | 72 +-- dist/numerics/character/data/fire/hutao.d.ts | 3 + .../weapon/data/sword2/jilidajian.d.ts | 3 +- package-lock.json | 417 +++++++----------- package.json | 4 +- scripts/test.js | 2 +- src/attribute/attribute.ts | 8 + src/numerics/character/data/fire/hutao.ts | 14 + .../weapon/data/book/chenshizhisuo.ts | 4 +- src/numerics/weapon/data/book/modaoxulun.ts | 10 +- .../weapon/data/book/sifengyuandian.ts | 10 +- .../weapon/data/book/wanguozhuhaitupu.ts | 10 +- src/numerics/weapon/data/bow/ganglungong.ts | 6 - .../weapon/data/bow/shensheshouzhishi.ts | 10 +- src/numerics/weapon/data/bow/tangong.ts | 8 +- src/numerics/weapon/data/bow/yayugong.ts | 10 +- .../weapon/data/stick/guanhongzhishuo.ts | 4 +- .../weapon/data/stick/heiyingqiang.ts | 9 + src/numerics/weapon/data/stick/hepuyuan.ts | 10 +- .../weapon/data/stick/juedouzhiqiang.ts | 10 +- .../weapon/data/stick/qianyanchangqiang.ts | 6 +- .../weapon/data/stick/tiankongzhiji.ts | 6 +- .../weapon/data/stick/xialimiechen.ts | 10 +- .../weapon/data/sword/feitianyujian.ts | 6 - .../weapon/data/sword/limingshenjian.ts | 6 +- .../weapon/data/sword/tiankongzhiren.ts | 2 +- .../weapon/data/sword/xialilongyin.ts | 6 - .../weapon/data/sword/zhuofengzhiren.ts | 8 + src/numerics/weapon/data/sword2/chigujian.ts | 6 - src/numerics/weapon/data/sword2/jilidajian.ts | 2 +- .../weapon/data/sword2/qianyangujian.ts | 6 +- .../weapon/data/sword2/tieyingkuojian.ts | 6 - .../weapon/data/sword2/wugongzhijian.ts | 7 + 34 files changed, 326 insertions(+), 376 deletions(-) create mode 100644 dist/numerics/character/data/fire/hutao.d.ts create mode 100644 src/numerics/character/data/fire/hutao.ts diff --git a/dist/attribute/attribute.d.ts b/dist/attribute/attribute.d.ts index 64e85c1..5fea039 100644 --- a/dist/attribute/attribute.d.ts +++ b/dist/attribute/attribute.d.ts @@ -48,4 +48,5 @@ export default class Attribute { attack(): number; life(): number; defend(): number; + crit(value: number): void; } diff --git a/dist/index.js b/dist/index.js index f149b56..eaad642 100644 --- a/dist/index.js +++ b/dist/index.js @@ -431,7 +431,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nclass Attribute {\r\n constructor() {\r\n this.cureEffect = 0; // 治疗效果 \r\n this.curedEffect = 0; // 被治疗效果\r\n this.lifeBasic = 0; // 基础生命值\r\n this.lifeStatic = 0; // 固定增加生命值\r\n this.lifePercentage = 0; // %增加生命值\r\n this.attackBasic = 0; // 基础攻击力\r\n this.attackStatic = 0; // 固定攻击力\r\n this.attackPercentage = 0; // %增加攻击力\r\n this.defendBasic = 0; // 基础防御力\r\n this.defendStatic = 0; // 固定防御力\r\n this.defendPercentage = 0; // %增加防御力\r\n this.critical = 0.05; // 普通攻击暴击率\r\n this.bCritical = 0.05; // 重击暴击率\r\n this.eCritical = 0.05; // 元素战技暴击率\r\n this.qCritical = 0.05; // 元素爆发暴击率\r\n this.airCritical = 0.05; // 下落攻击暴击率\r\n this.criticalDamage = 0.5; // 暴击伤害\r\n this.thunderRes = 0; // 雷元素抗性\r\n this.fireRes = 0; //\r\n this.waterRes = 0; //\r\n this.iceRes = 0; //\r\n this.windRes = 0; //\r\n this.rockRes = 0; //\r\n this.elementalMastery = 0; // 元素精通\r\n this.recharge = 1; // 元素充能效率\r\n this.thunderBonus = 0; // 雷元素伤害加成\r\n this.fireBonus = 0; //\r\n this.waterBonus = 0; //\r\n this.iceBonus = 0; //\r\n this.windBonus = 0; //\r\n this.rockBonus = 0; //\r\n this.physicalBonus = 0; // 物理伤害加成\r\n this.elementalBonus = 0; // 元素伤害加成\r\n this.aBonus = 0; // 普通攻击伤害加成\r\n this.bBonus = 0; // 重击伤害加成\r\n this.eBonus = 0; // 元素战技伤害加成\r\n this.qBonus = 0; // 元素爆发伤害加成\r\n this.airBonus = 0; // 下落攻击伤害加成\r\n this.bonus = 0; // 伤害加成\r\n this.thunderTime = 0; // 雷元素附着持续时间\r\n this.fireTime = 0; //\r\n this.waterTime = 0; //\r\n this.iceTime = 0; //\r\n this.windTime = 0; //\r\n this.rockTime = 0; //\r\n this.shield = 0; // 护盾强效\r\n }\r\n attack() {\r\n return this.attackBasic + this.attackPercentage + this.attackStatic;\r\n }\r\n life() {\r\n return this.lifeBasic + this.lifePercentage + this.lifeStatic;\r\n }\r\n defend() {\r\n return this.defendBasic + this.defendPercentage + this.defendStatic;\r\n }\r\n}\r\nexports.default = Attribute;\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/attribute/attribute.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nclass Attribute {\r\n constructor() {\r\n this.cureEffect = 0; // 治疗效果 \r\n this.curedEffect = 0; // 被治疗效果\r\n this.lifeBasic = 0; // 基础生命值\r\n this.lifeStatic = 0; // 固定增加生命值\r\n this.lifePercentage = 0; // %增加生命值\r\n this.attackBasic = 0; // 基础攻击力\r\n this.attackStatic = 0; // 固定攻击力\r\n this.attackPercentage = 0; // %增加攻击力\r\n this.defendBasic = 0; // 基础防御力\r\n this.defendStatic = 0; // 固定防御力\r\n this.defendPercentage = 0; // %增加防御力\r\n this.critical = 0.05; // 普通攻击暴击率\r\n this.bCritical = 0.05; // 重击暴击率\r\n this.eCritical = 0.05; // 元素战技暴击率\r\n this.qCritical = 0.05; // 元素爆发暴击率\r\n this.airCritical = 0.05; // 下落攻击暴击率\r\n this.criticalDamage = 0.5; // 暴击伤害\r\n this.thunderRes = 0; // 雷元素抗性\r\n this.fireRes = 0; //\r\n this.waterRes = 0; //\r\n this.iceRes = 0; //\r\n this.windRes = 0; //\r\n this.rockRes = 0; //\r\n this.elementalMastery = 0; // 元素精通\r\n this.recharge = 1; // 元素充能效率\r\n this.thunderBonus = 0; // 雷元素伤害加成\r\n this.fireBonus = 0; //\r\n this.waterBonus = 0; //\r\n this.iceBonus = 0; //\r\n this.windBonus = 0; //\r\n this.rockBonus = 0; //\r\n this.physicalBonus = 0; // 物理伤害加成\r\n this.elementalBonus = 0; // 元素伤害加成\r\n this.aBonus = 0; // 普通攻击伤害加成\r\n this.bBonus = 0; // 重击伤害加成\r\n this.eBonus = 0; // 元素战技伤害加成\r\n this.qBonus = 0; // 元素爆发伤害加成\r\n this.airBonus = 0; // 下落攻击伤害加成\r\n this.bonus = 0; // 伤害加成\r\n this.thunderTime = 0; // 雷元素附着持续时间\r\n this.fireTime = 0; //\r\n this.waterTime = 0; //\r\n this.iceTime = 0; //\r\n this.windTime = 0; //\r\n this.rockTime = 0; //\r\n this.shield = 0; // 护盾强效\r\n }\r\n attack() {\r\n return this.attackBasic + this.attackPercentage + this.attackStatic;\r\n }\r\n life() {\r\n return this.lifeBasic + this.lifePercentage + this.lifeStatic;\r\n }\r\n defend() {\r\n return this.defendBasic + this.defendPercentage + this.defendStatic;\r\n }\r\n crit(value) {\r\n this.critical += value;\r\n this.bCritical += value;\r\n this.eCritical += value;\r\n this.qCritical += value;\r\n this.airCritical += value;\r\n }\r\n}\r\nexports.default = Attribute;\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/attribute/attribute.ts?"); /***/ }), @@ -512,6 +512,17 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ }), +/***/ "./src/numerics/character/data/fire/hutao.ts": +/*!***************************************************!*\ + !*** ./src/numerics/character/data/fire/hutao.ts ***! + \***************************************************/ +/***/ ((__unused_webpack_module, exports) => { + +"use strict"; +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"hutao\", \"胡桃\"],\r\n life: [1211, 3141, 4179, 6253, 6990, 8042, 9026, 10089, 10826, 11899, 12637, 13721, 14459, 15552],\r\n attack: [8, 21, 29, 43, 48, 55, 62, 69, 74, 81, 86, 94, 99, 106],\r\n defend: [68, 177, 235, 352, 394, 453, 508, 568, 610, 670, 712, 773, 815, 876],\r\n secondary: {\r\n name: \"criticalDamage\",\r\n family: \"cd384\",\r\n },\r\n weapon: 3 /* Stick */,\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/character/data/fire/hutao.ts?"); + +/***/ }), + /***/ "./src/numerics/character/data/fire/keli.ts": /*!**************************************************!*\ !*** ./src/numerics/character/data/fire/keli.ts ***! @@ -1036,7 +1047,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"chenshizhisuo\", \"尘世之锁\", \"memoryofdust\"],\r\n baseAtkFamily: \"atk46\",\r\n secondary: {\r\n name: \"attackPercentage\",\r\n family: \"atk108\"\r\n },\r\n effect: function (attribute) {\r\n let that = this;\r\n let value = 0.01 * that.refine + 0.03;\r\n attribute.attackPercentage += attribute.attackBasic * value * 2.5;\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/book/chenshizhisuo.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"chenshizhisuo\", \"尘世之锁\", \"memoryofdust\"],\r\n baseAtkFamily: \"atk46\",\r\n secondary: {\r\n name: \"attackPercentage\",\r\n family: \"atk108\"\r\n },\r\n effect: function (attribute) {\r\n let that = this;\r\n let value = 0.05 * that.refine + 0.15;\r\n attribute.shield += value;\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/book/chenshizhisuo.ts?"); /***/ }), @@ -1113,7 +1124,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"modaoxulun\", \"魔导绪论\", \"magicguide\"],\r\n baseAtkFamily: \"atk38\",\r\n secondary: {\r\n name: \"elementalMastery\",\r\n family: \"em41\",\r\n },\r\n effect: function (attribute) {\r\n let that = this;\r\n let value = that.refine * 0.03 + 0.09;\r\n attribute.bonus += value;\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/book/modaoxulun.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"modaoxulun\", \"魔导绪论\", \"magicguide\"],\r\n baseAtkFamily: \"atk38\",\r\n secondary: {\r\n name: \"elementalMastery\",\r\n family: \"em41\",\r\n },\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/book/modaoxulun.ts?"); /***/ }), @@ -1146,7 +1157,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"sifengyuandian\", \"四风原典\", \"lostprayertothesacredwinds\"],\r\n baseAtkFamily: \"atk46\",\r\n secondary: {\r\n name: \"critical\",\r\n family: \"cr72\",\r\n },\r\n effect: function (attribute) {\r\n let that = this;\r\n let value = that.refine * 0.02 + 0.06;\r\n attribute.elementalBonus += value * 4;\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/book/sifengyuandian.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"sifengyuandian\", \"四风原典\", \"lostprayertothesacredwinds\"],\r\n baseAtkFamily: \"atk46\",\r\n secondary: {\r\n name: \"critical\",\r\n family: \"cr72\",\r\n },\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/book/sifengyuandian.ts?"); /***/ }), @@ -1179,7 +1190,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"wanguozhuhaitupu\", \"万国诸海图谱\", \"mappamare\"],\r\n baseAtkFamily: \"atk44\",\r\n secondary: {\r\n name: \"elementalMastery\",\r\n family: \"em24\"\r\n },\r\n effect: function (attribute) {\r\n let that = this;\r\n let value = that.refine * 0.02 + 0.06;\r\n attribute.elementalBonus += value;\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/book/wanguozhuhaitupu.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"wanguozhuhaitupu\", \"万国诸海图谱\", \"mappamare\"],\r\n baseAtkFamily: \"atk44\",\r\n secondary: {\r\n name: \"elementalMastery\",\r\n family: \"em24\"\r\n },\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/book/wanguozhuhaitupu.ts?"); /***/ }), @@ -1289,7 +1300,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"ganglungong\", \"钢轮弓\", \"compoundbow\"],\r\n baseAtkFamily: \"atk41\",\r\n effect: function (attribute) {\r\n let that = this;\r\n let percentage = that.refine * 0.01 + 0.03;\r\n attribute.attackPercentage += attribute.attackBasic * percentage;\r\n },\r\n secondary: {\r\n name: \"physicalBonus\",\r\n family: \"physical150\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/bow/ganglungong.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"ganglungong\", \"钢轮弓\", \"compoundbow\"],\r\n baseAtkFamily: \"atk41\",\r\n secondary: {\r\n name: \"physicalBonus\",\r\n family: \"physical150\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/bow/ganglungong.ts?"); /***/ }), @@ -1366,7 +1377,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"shensheshouzhishi\", \"神射手之誓\", \"sharpshootersoath\"],\r\n effect: function (attribute) {\r\n let that = this;\r\n let percentage = that.refine * 0.06 + 0.18;\r\n attribute.bonus += percentage;\r\n },\r\n baseAtkFamily: \"atk39\",\r\n secondary: {\r\n name: \"criticalDamage\",\r\n family: \"cd102\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/bow/shensheshouzhishi.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"shensheshouzhishi\", \"神射手之誓\", \"sharpshootersoath\"],\r\n // effect: function (attribute: Attribute) {\r\n // let that = this as any as Weapon;\r\n // let percentage = that.refine * 0.06 + 0.18;\r\n // attribute.bonus += percentage;\r\n // },\r\n baseAtkFamily: \"atk39\",\r\n secondary: {\r\n name: \"criticalDamage\",\r\n family: \"cd102\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/bow/shensheshouzhishi.ts?"); /***/ }), @@ -1388,7 +1399,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"tangong\", \"弹弓\", \"slingshot\"],\r\n effect: function (attribute) {\r\n let that = this;\r\n let value = that.refine * 0.06 + 0.3;\r\n attribute.bonus += value;\r\n },\r\n baseAtkFamily: \"atk38\",\r\n secondary: {\r\n name: \"critical\",\r\n family: \"cr68\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/bow/tangong.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"tangong\", \"弹弓\", \"slingshot\"],\r\n effect: function (attribute) {\r\n let that = this;\r\n if (that.args.within03) {\r\n let value = that.refine * 0.06 + 0.3;\r\n attribute.bonus += value;\r\n }\r\n else {\r\n attribute.bonus = Math.max(attribute.bonus - 0.1, 0);\r\n }\r\n },\r\n baseAtkFamily: \"atk38\",\r\n secondary: {\r\n name: \"critical\",\r\n family: \"cr68\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/bow/tangong.ts?"); /***/ }), @@ -1432,7 +1443,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"yayugong\", \"鸦羽弓\", \"ravenbow\"],\r\n effect: function (attribute) {\r\n let that = this;\r\n let percentage = that.refine * 0.03 + 0.09;\r\n attribute.bonus += percentage;\r\n },\r\n baseAtkFamily: \"atk40\",\r\n secondary: {\r\n name: \"elementalMastery\",\r\n family: \"em20\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/bow/yayugong.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"yayugong\", \"鸦羽弓\", \"ravenbow\"],\r\n // effect: function (attribute: Attribute) {\r\n // let that = this as any as Weapon;\r\n // let percentage = that.refine * 0.03 + 0.09;\r\n // attribute.bonus += percentage;\r\n // },\r\n baseAtkFamily: \"atk40\",\r\n secondary: {\r\n name: \"elementalMastery\",\r\n family: \"em20\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/bow/yayugong.ts?"); /***/ }), @@ -1465,7 +1476,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"guanhongzhishuo\", \"贯虹之槊\", \"vortexvanquisher\"],\r\n baseAtkFamily: \"atk46\",\r\n secondary: {\r\n name: \"attackPercentage\",\r\n family: \"atk108\"\r\n },\r\n effect: function (attribute) {\r\n let that = this;\r\n let value = that.refine * 0.05 + 0.15;\r\n attribute.shield += value;\r\n value = that.refine * 0.01 + 0.03;\r\n attribute.attackPercentage += attribute.attackBasic * value * 2.5;\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/stick/guanhongzhishuo.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"guanhongzhishuo\", \"贯虹之槊\", \"vortexvanquisher\"],\r\n baseAtkFamily: \"atk46\",\r\n secondary: {\r\n name: \"attackPercentage\",\r\n family: \"atk108\"\r\n },\r\n effect: function (attribute) {\r\n let that = this;\r\n let value = that.refine * 0.05 + 0.15;\r\n attribute.shield += value;\r\n // value = that.refine * 0.01 + 0.03;\r\n // attribute.attackPercentage += attribute.attackBasic * value * 2.5;\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/stick/guanhongzhishuo.ts?"); /***/ }), @@ -1487,7 +1498,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"heiyingqiang\", \"黑缨枪\", \"blacktassel\"],\r\n baseAtkFamily: \"atk38\",\r\n secondary: {\r\n name: \"lifePercentage\",\r\n family: \"hp102\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/stick/heiyingqiang.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"heiyingqiang\", \"黑缨枪\", \"blacktassel\"],\r\n baseAtkFamily: \"atk38\",\r\n secondary: {\r\n name: \"lifePercentage\",\r\n family: \"hp102\"\r\n },\r\n effect: function (attribute) {\r\n let that = this;\r\n if (that.args.slime) {\r\n attribute.bonus += that.refine * 0.1 + 0.3;\r\n }\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/stick/heiyingqiang.ts?"); /***/ }), @@ -1498,7 +1509,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"hepuyuan\", \"和璞鸢\", \"primordialjadewingedspear\"],\r\n baseAtkFamily: \"atk48\",\r\n secondary: {\r\n name: \"critical\",\r\n family: \"cr48\",\r\n },\r\n effect: function (attribute) {\r\n let that = this;\r\n let value = that.refine * 0.007 + 0.025;\r\n attribute.attackPercentage += attribute.attackBasic * value * 3;\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/stick/hepuyuan.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"hepuyuan\", \"和璞鸢\", \"primordialjadewingedspear\"],\r\n baseAtkFamily: \"atk48\",\r\n secondary: {\r\n name: \"critical\",\r\n family: \"cr48\",\r\n },\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/stick/hepuyuan.ts?"); /***/ }), @@ -1520,7 +1531,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"juedouzhiqiang\", \"决斗之枪\", \"deathmatch\"],\r\n baseAtkFamily: \"atk41\",\r\n secondary: {\r\n name: \"critical\",\r\n family: \"cr80\",\r\n },\r\n effect: function (attribute) {\r\n let that = this;\r\n let value = 0.04 * that.refine + 0.12;\r\n attribute.attackPercentage += attribute.attackBasic * value * 1.25;\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/stick/juedouzhiqiang.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"juedouzhiqiang\", \"决斗之枪\", \"deathmatch\"],\r\n baseAtkFamily: \"atk41\",\r\n secondary: {\r\n name: \"critical\",\r\n family: \"cr80\",\r\n },\r\n effect: function (attribute) {\r\n let that = this;\r\n if (that.args.enemyAbove2) {\r\n let percentage = that.refine * 0.04 + 0.12;\r\n attribute.attackPercentage += attribute.attackBasic * percentage;\r\n attribute.defendPercentage += attribute.defendBasic * percentage;\r\n }\r\n else {\r\n let percentage = that.refine * 0.06 + 0.18;\r\n attribute.attackPercentage += attribute.attackBasic * percentage;\r\n }\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/stick/juedouzhiqiang.ts?"); /***/ }), @@ -1553,7 +1564,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"qianyanchangqiang\", \"千岩长枪\", \"lithicspear\"],\r\n effect: function (attribute) {\r\n let that = this;\r\n let liyueCount = that.args.liyueCount || 0;\r\n let percentage = that.refine * 0.01 + 0.06;\r\n attribute.attackPercentage += attribute.attackBasic * percentage * liyueCount;\r\n percentage = that.refine * 0.01 + 0.02;\r\n attribute.critical += percentage * liyueCount;\r\n attribute.bCritical += percentage * liyueCount;\r\n attribute.eCritical += percentage * liyueCount;\r\n attribute.qCritical += percentage * liyueCount;\r\n attribute.airCritical += percentage * liyueCount;\r\n },\r\n baseAtkFamily: \"atk44\",\r\n secondary: {\r\n name: \"attackPercentage\",\r\n family: \"atk60\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/stick/qianyanchangqiang.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"qianyanchangqiang\", \"千岩长枪\", \"lithicspear\"],\r\n effect: function (attribute) {\r\n let that = this;\r\n let liyueCount = that.args.liyueCount || 0;\r\n let percentage = that.refine * 0.01 + 0.06;\r\n attribute.attackPercentage += attribute.attackBasic * percentage * liyueCount;\r\n percentage = that.refine * 0.01 + 0.02;\r\n attribute.crit(percentage * liyueCount);\r\n },\r\n baseAtkFamily: \"atk44\",\r\n secondary: {\r\n name: \"attackPercentage\",\r\n family: \"atk60\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/stick/qianyanchangqiang.ts?"); /***/ }), @@ -1575,7 +1586,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"tiankongzhiji\", \"天空之脊\", \"skywardspine\"],\r\n baseAtkFamily: \"atk48\",\r\n secondary: {\r\n name: \"recharge\",\r\n family: \"recharge80\",\r\n },\r\n effect: function (attribute) {\r\n let that = this;\r\n let value = that.refine * 0.02 + 0.06;\r\n attribute.critical += value;\r\n attribute.bCritical += value;\r\n attribute.eCritical += value;\r\n attribute.qCritical += value;\r\n attribute.airCritical += value;\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/stick/tiankongzhiji.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"tiankongzhiji\", \"天空之脊\", \"skywardspine\"],\r\n baseAtkFamily: \"atk48\",\r\n secondary: {\r\n name: \"recharge\",\r\n family: \"recharge80\",\r\n },\r\n effect: function (attribute) {\r\n let that = this;\r\n let value = that.refine * 0.02 + 0.06;\r\n attribute.crit(value);\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/stick/tiankongzhiji.ts?"); /***/ }), @@ -1597,7 +1608,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"xialimiechen\", \"匣里灭辰\", \"dragonsbane\"],\r\n baseAtkFamily: \"atk41\",\r\n secondary: {\r\n name: \"elementalMastery\",\r\n family: \"em48\"\r\n },\r\n effect: function (attribute) {\r\n let that = this;\r\n let value = that.refine * 0.04 + 0.16;\r\n attribute.bonus += value;\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/stick/xialimiechen.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"xialimiechen\", \"匣里灭辰\", \"dragonsbane\"],\r\n baseAtkFamily: \"atk41\",\r\n secondary: {\r\n name: \"elementalMastery\",\r\n family: \"em48\"\r\n },\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/stick/xialimiechen.ts?"); /***/ }), @@ -1674,7 +1685,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"chigujian\", \"螭骨剑\", \"serpentspine\"],\r\n effect: function (attribute) {\r\n let that = this;\r\n let value = that.refine * 0.01 + 0.05;\r\n attribute.bonus += value;\r\n },\r\n baseAtkFamily: \"atk42\",\r\n secondary: {\r\n name: \"critical\",\r\n family: \"cr60\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword2/chigujian.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"chigujian\", \"螭骨剑\", \"serpentspine\"],\r\n baseAtkFamily: \"atk42\",\r\n secondary: {\r\n name: \"critical\",\r\n family: \"cr60\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword2/chigujian.ts?"); /***/ }), @@ -1707,7 +1718,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.jilidajianData = void 0;\r\nexports.jilidajianData = {\r\n alt: [\"jilidajian\", \"祭礼大剑\", \"sacrificialgreatsword\"],\r\n baseAtkFamily: \"atk44\",\r\n secondary: {\r\n name: \"recharge\",\r\n family: \"recharge67\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword2/jilidajian.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"jilidajian\", \"祭礼大剑\", \"sacrificialgreatsword\"],\r\n baseAtkFamily: \"atk44\",\r\n secondary: {\r\n name: \"recharge\",\r\n family: \"recharge67\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword2/jilidajian.ts?"); /***/ }), @@ -1740,7 +1751,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"qianyangujian\", \"千岩古剑\", \"lithicblade\"],\r\n effect: function (attribute) {\r\n let that = this;\r\n let liyueCount = that.args.liyueCount || 0;\r\n let percentage = that.refine * 0.01 + 0.06;\r\n attribute.attackPercentage += attribute.attackBasic * percentage * liyueCount;\r\n percentage = that.refine * 0.01 + 0.02;\r\n attribute.critical += percentage * liyueCount;\r\n attribute.bCritical += percentage * liyueCount;\r\n attribute.eCritical += percentage * liyueCount;\r\n attribute.qCritical += percentage * liyueCount;\r\n attribute.airCritical += percentage * liyueCount;\r\n },\r\n baseAtkFamily: \"atk42\",\r\n secondary: {\r\n name: \"attackPercentage\",\r\n family: \"atk90\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword2/qianyangujian.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"qianyangujian\", \"千岩古剑\", \"lithicblade\"],\r\n effect: function (attribute) {\r\n let that = this;\r\n let liyueCount = that.args.liyueCount || 0;\r\n let percentage = that.refine * 0.01 + 0.06;\r\n attribute.attackPercentage += attribute.attackBasic * percentage * liyueCount;\r\n percentage = that.refine * 0.01 + 0.02;\r\n attribute.crit(percentage * liyueCount);\r\n },\r\n baseAtkFamily: \"atk42\",\r\n secondary: {\r\n name: \"attackPercentage\",\r\n family: \"atk90\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword2/qianyangujian.ts?"); /***/ }), @@ -1773,7 +1784,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"tieyingkuojian\", \"铁影阔剑\", \"ferrousshadow\"],\r\n effect: function (attribute) {\r\n let that = this;\r\n let value = that.refine * 0.05 + 0.25;\r\n attribute.bBonus += value;\r\n },\r\n baseAtkFamily: \"atk39\",\r\n secondary: {\r\n name: \"lifePercentage\",\r\n family: \"hp77\",\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword2/tieyingkuojian.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"tieyingkuojian\", \"铁影阔剑\", \"ferrousshadow\"],\r\n baseAtkFamily: \"atk39\",\r\n secondary: {\r\n name: \"lifePercentage\",\r\n family: \"hp77\",\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword2/tieyingkuojian.ts?"); /***/ }), @@ -1784,7 +1795,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"wugongzhijian\", \"无工之剑\", \"theunforged\"],\r\n baseAtkFamily: \"atk46\",\r\n secondary: {\r\n name: \"attackPercentage\",\r\n family: \"atk108\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword2/wugongzhijian.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"wugongzhijian\", \"无工之剑\", \"theunforged\"],\r\n baseAtkFamily: \"atk46\",\r\n secondary: {\r\n name: \"attackPercentage\",\r\n family: \"atk108\"\r\n },\r\n effect: function (attribute) {\r\n let that = this;\r\n attribute.shield += that.refine * 0.05 + 0.15;\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword2/wugongzhijian.ts?"); /***/ }), @@ -1916,7 +1927,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"飞天御剑\", \"feitianyujian\", \"skyridersword\"],\r\n effect: function (attribute) {\r\n let that = this;\r\n let percentage = that.refine * 0.03 + 0.09;\r\n attribute.attackPercentage += attribute.attackBasic * percentage;\r\n },\r\n baseAtkFamily: \"atk38\",\r\n secondary: {\r\n name: \"recharge\",\r\n family: \"recharge113\",\r\n },\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword/feitianyujian.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"飞天御剑\", \"feitianyujian\", \"skyridersword\"],\r\n baseAtkFamily: \"atk38\",\r\n secondary: {\r\n name: \"recharge\",\r\n family: \"recharge113\",\r\n },\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword/feitianyujian.ts?"); /***/ }), @@ -2004,7 +2015,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"limingshenjian\", \"黎明神剑\", \"harbingerofdawn\"],\r\n effect: function (attribute) {\r\n let that = this;\r\n let percentage = that.refine * 0.025 + 0.115;\r\n attribute.critical += percentage;\r\n },\r\n baseAtkFamily: \"atk39\",\r\n secondary: {\r\n name: \"criticalDamage\",\r\n family: \"cd102\"\r\n },\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword/limingshenjian.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"limingshenjian\", \"黎明神剑\", \"harbingerofdawn\"],\r\n effect: function (attribute) {\r\n let that = this;\r\n if (that.args.lifeAbove90) {\r\n let percentage = 0.035 * that.refine + 0.105;\r\n attribute.crit(percentage);\r\n }\r\n },\r\n baseAtkFamily: \"atk39\",\r\n secondary: {\r\n name: \"criticalDamage\",\r\n family: \"cd102\"\r\n },\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword/limingshenjian.ts?"); /***/ }), @@ -2048,7 +2059,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"tiankongzhiren\", \"天空之刃\", \"skywardblade\"],\r\n effect: function (attribute) {\r\n let that = this;\r\n let percentage = that.refine * 0.01 + 0.03;\r\n attribute.critical += percentage;\r\n },\r\n baseAtkFamily: \"atk46\",\r\n secondary: {\r\n name: \"recharge\",\r\n family: \"recharge120\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword/tiankongzhiren.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"tiankongzhiren\", \"天空之刃\", \"skywardblade\"],\r\n effect: function (attribute) {\r\n let that = this;\r\n let percentage = that.refine * 0.01 + 0.03;\r\n attribute.crit(percentage);\r\n },\r\n baseAtkFamily: \"atk46\",\r\n secondary: {\r\n name: \"recharge\",\r\n family: \"recharge120\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword/tiankongzhiren.ts?"); /***/ }), @@ -2081,7 +2092,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"xialilongyin\", \"匣里龙吟\", \"lionsroar\"],\r\n effect: function (attribute) {\r\n let that = this;\r\n let percentage = that.refine * 0.04 + 0.15;\r\n attribute.bonus += percentage;\r\n },\r\n baseAtkFamily: \"atk42\",\r\n secondary: {\r\n name: \"attackPercentage\",\r\n family: \"atk90\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword/xialilongyin.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"xialilongyin\", \"匣里龙吟\", \"lionsroar\"],\r\n baseAtkFamily: \"atk42\",\r\n secondary: {\r\n name: \"attackPercentage\",\r\n family: \"atk90\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword/xialilongyin.ts?"); /***/ }), @@ -2114,7 +2125,7 @@ eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\n /***/ ((__unused_webpack_module, exports) => { "use strict"; -eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"zhuofengzhiren\", \"斫峰之刃\", \"summitshaper\"],\r\n baseAtkFamily: \"atk46\",\r\n secondary: {\r\n name: \"attackPercentage\",\r\n family: \"atk108\"\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword/zhuofengzhiren.ts?"); +eval("\r\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\r\nexports.default = {\r\n alt: [\"zhuofengzhiren\", \"斫峰之刃\", \"summitshaper\"],\r\n baseAtkFamily: \"atk46\",\r\n secondary: {\r\n name: \"attackPercentage\",\r\n family: \"atk108\"\r\n },\r\n effect: function (attribute) {\r\n let that = this;\r\n let percentage = that.refine * 0.05 + 0.15;\r\n attribute.shield += percentage;\r\n }\r\n};\r\n\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/weapon/data/sword/zhuofengzhiren.ts?"); /***/ }), @@ -2157,7 +2168,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpac \*************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -eval("var map = {\n\t\"./fire/anbo.ts\": \"./src/numerics/character/data/fire/anbo.ts\",\n\t\"./fire/bannite.ts\": \"./src/numerics/character/data/fire/bannite.ts\",\n\t\"./fire/diluke.ts\": \"./src/numerics/character/data/fire/diluke.ts\",\n\t\"./fire/keli.ts\": \"./src/numerics/character/data/fire/keli.ts\",\n\t\"./fire/xiangling.ts\": \"./src/numerics/character/data/fire/xiangling.ts\",\n\t\"./fire/xinyan.ts\": \"./src/numerics/character/data/fire/xinyan.ts\",\n\t\"./ice/chongyun.ts\": \"./src/numerics/character/data/ice/chongyun.ts\",\n\t\"./ice/diaona.ts\": \"./src/numerics/character/data/ice/diaona.ts\",\n\t\"./ice/ganyu.ts\": \"./src/numerics/character/data/ice/ganyu.ts\",\n\t\"./ice/kaiya.ts\": \"./src/numerics/character/data/ice/kaiya.ts\",\n\t\"./ice/qiqi.ts\": \"./src/numerics/character/data/ice/qiqi.ts\",\n\t\"./index.d.ts\": \"./src/numerics/character/data/index.d.ts\",\n\t\"./rock/abeiduo.ts\": \"./src/numerics/character/data/rock/abeiduo.ts\",\n\t\"./rock/me_rock.ts\": \"./src/numerics/character/data/rock/me_rock.ts\",\n\t\"./rock/ningguang.ts\": \"./src/numerics/character/data/rock/ningguang.ts\",\n\t\"./rock/nuoaier.ts\": \"./src/numerics/character/data/rock/nuoaier.ts\",\n\t\"./rock/zhongli.ts\": \"./src/numerics/character/data/rock/zhongli.ts\",\n\t\"./thunder/beidou.ts\": \"./src/numerics/character/data/thunder/beidou.ts\",\n\t\"./thunder/feixieer.ts\": \"./src/numerics/character/data/thunder/feixieer.ts\",\n\t\"./thunder/keqing.ts\": \"./src/numerics/character/data/thunder/keqing.ts\",\n\t\"./thunder/leize.ts\": \"./src/numerics/character/data/thunder/leize.ts\",\n\t\"./thunder/lisha.ts\": \"./src/numerics/character/data/thunder/lisha.ts\",\n\t\"./water/babala.ts\": \"./src/numerics/character/data/water/babala.ts\",\n\t\"./water/dadaliya.ts\": \"./src/numerics/character/data/water/dadaliya.ts\",\n\t\"./water/mona.ts\": \"./src/numerics/character/data/water/mona.ts\",\n\t\"./water/xingqiu.ts\": \"./src/numerics/character/data/water/xingqiu.ts\",\n\t\"./wind/me_wind.ts\": \"./src/numerics/character/data/wind/me_wind.ts\",\n\t\"./wind/qin.ts\": \"./src/numerics/character/data/wind/qin.ts\",\n\t\"./wind/shatang.ts\": \"./src/numerics/character/data/wind/shatang.ts\",\n\t\"./wind/wendi.ts\": \"./src/numerics/character/data/wind/wendi.ts\",\n\t\"./wind/xiao.ts\": \"./src/numerics/character/data/wind/xiao.ts\"\n};\n\n\nfunction webpackContext(req) {\n\tvar id = webpackContextResolve(req);\n\treturn __webpack_require__(id);\n}\nfunction webpackContextResolve(req) {\n\tif(!__webpack_require__.o(map, req)) {\n\t\tvar e = new Error(\"Cannot find module '\" + req + \"'\");\n\t\te.code = 'MODULE_NOT_FOUND';\n\t\tthrow e;\n\t}\n\treturn map[req];\n}\nwebpackContext.keys = function webpackContextKeys() {\n\treturn Object.keys(map);\n};\nwebpackContext.resolve = webpackContextResolve;\nmodule.exports = webpackContext;\nwebpackContext.id = \"./src/numerics/character/data sync recursive \\\\.ts$\";\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/character/data/_sync_\\.ts$?"); +eval("var map = {\n\t\"./fire/anbo.ts\": \"./src/numerics/character/data/fire/anbo.ts\",\n\t\"./fire/bannite.ts\": \"./src/numerics/character/data/fire/bannite.ts\",\n\t\"./fire/diluke.ts\": \"./src/numerics/character/data/fire/diluke.ts\",\n\t\"./fire/hutao.ts\": \"./src/numerics/character/data/fire/hutao.ts\",\n\t\"./fire/keli.ts\": \"./src/numerics/character/data/fire/keli.ts\",\n\t\"./fire/xiangling.ts\": \"./src/numerics/character/data/fire/xiangling.ts\",\n\t\"./fire/xinyan.ts\": \"./src/numerics/character/data/fire/xinyan.ts\",\n\t\"./ice/chongyun.ts\": \"./src/numerics/character/data/ice/chongyun.ts\",\n\t\"./ice/diaona.ts\": \"./src/numerics/character/data/ice/diaona.ts\",\n\t\"./ice/ganyu.ts\": \"./src/numerics/character/data/ice/ganyu.ts\",\n\t\"./ice/kaiya.ts\": \"./src/numerics/character/data/ice/kaiya.ts\",\n\t\"./ice/qiqi.ts\": \"./src/numerics/character/data/ice/qiqi.ts\",\n\t\"./index.d.ts\": \"./src/numerics/character/data/index.d.ts\",\n\t\"./rock/abeiduo.ts\": \"./src/numerics/character/data/rock/abeiduo.ts\",\n\t\"./rock/me_rock.ts\": \"./src/numerics/character/data/rock/me_rock.ts\",\n\t\"./rock/ningguang.ts\": \"./src/numerics/character/data/rock/ningguang.ts\",\n\t\"./rock/nuoaier.ts\": \"./src/numerics/character/data/rock/nuoaier.ts\",\n\t\"./rock/zhongli.ts\": \"./src/numerics/character/data/rock/zhongli.ts\",\n\t\"./thunder/beidou.ts\": \"./src/numerics/character/data/thunder/beidou.ts\",\n\t\"./thunder/feixieer.ts\": \"./src/numerics/character/data/thunder/feixieer.ts\",\n\t\"./thunder/keqing.ts\": \"./src/numerics/character/data/thunder/keqing.ts\",\n\t\"./thunder/leize.ts\": \"./src/numerics/character/data/thunder/leize.ts\",\n\t\"./thunder/lisha.ts\": \"./src/numerics/character/data/thunder/lisha.ts\",\n\t\"./water/babala.ts\": \"./src/numerics/character/data/water/babala.ts\",\n\t\"./water/dadaliya.ts\": \"./src/numerics/character/data/water/dadaliya.ts\",\n\t\"./water/mona.ts\": \"./src/numerics/character/data/water/mona.ts\",\n\t\"./water/xingqiu.ts\": \"./src/numerics/character/data/water/xingqiu.ts\",\n\t\"./wind/me_wind.ts\": \"./src/numerics/character/data/wind/me_wind.ts\",\n\t\"./wind/qin.ts\": \"./src/numerics/character/data/wind/qin.ts\",\n\t\"./wind/shatang.ts\": \"./src/numerics/character/data/wind/shatang.ts\",\n\t\"./wind/wendi.ts\": \"./src/numerics/character/data/wind/wendi.ts\",\n\t\"./wind/xiao.ts\": \"./src/numerics/character/data/wind/xiao.ts\"\n};\n\n\nfunction webpackContext(req) {\n\tvar id = webpackContextResolve(req);\n\treturn __webpack_require__(id);\n}\nfunction webpackContextResolve(req) {\n\tif(!__webpack_require__.o(map, req)) {\n\t\tvar e = new Error(\"Cannot find module '\" + req + \"'\");\n\t\te.code = 'MODULE_NOT_FOUND';\n\t\tthrow e;\n\t}\n\treturn map[req];\n}\nwebpackContext.keys = function webpackContextKeys() {\n\treturn Object.keys(map);\n};\nwebpackContext.resolve = webpackContextResolve;\nmodule.exports = webpackContext;\nwebpackContext.id = \"./src/numerics/character/data sync recursive \\\\.ts$\";\n\n//# sourceURL=webpack://genshinPanel/./src/numerics/character/data/_sync_\\.ts$?"); /***/ }), @@ -2237,10 +2248,13 @@ eval("var map = {\n\t\"./book/chenshizhisuo.ts\": \"./src/numerics/weapon/data/b /******/ })(); /******/ /************************************************************************/ -/******/ // module exports must be returned from runtime so entry inlining is disabled +/******/ /******/ // startup /******/ // Load entry module and return exports -/******/ return __webpack_require__("./src/index.ts"); +/******/ // This entry module can't be inlined because the eval devtool is used. +/******/ var __webpack_exports__ = __webpack_require__("./src/index.ts"); +/******/ +/******/ return __webpack_exports__; /******/ })() ; }); \ No newline at end of file diff --git a/dist/numerics/character/data/fire/hutao.d.ts b/dist/numerics/character/data/fire/hutao.d.ts new file mode 100644 index 0000000..c1bad3a --- /dev/null +++ b/dist/numerics/character/data/fire/hutao.d.ts @@ -0,0 +1,3 @@ +import CharacterDataType from "../../data_type"; +declare const _default: CharacterDataType; +export default _default; diff --git a/dist/numerics/weapon/data/sword2/jilidajian.d.ts b/dist/numerics/weapon/data/sword2/jilidajian.d.ts index 3e8b7f0..67e5000 100644 --- a/dist/numerics/weapon/data/sword2/jilidajian.d.ts +++ b/dist/numerics/weapon/data/sword2/jilidajian.d.ts @@ -1,2 +1,3 @@ import WeaponDataType from "../../data_type"; -export declare const jilidajianData: WeaponDataType; +declare const _default: WeaponDataType; +export default _default; diff --git a/package-lock.json b/package-lock.json index 2fdfe6c..0da0a42 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "genshin_panel", - "version": "1.3.2", + "version": "2.1.6", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -289,13 +289,10 @@ } }, "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "assertion-error": { "version": "1.1.0", @@ -316,9 +313,9 @@ "dev": true }, "binary-extensions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", - "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, "brace-expansion": { @@ -366,9 +363,9 @@ "dev": true }, "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", + "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==", "dev": true }, "caniuse-lite": { @@ -408,14 +405,14 @@ "dev": true }, "chokidar": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", - "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", + "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", "dev": true, "requires": { "anymatch": "~3.1.1", "braces": "~3.0.2", - "fsevents": "~2.1.2", + "fsevents": "~2.3.1", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -433,40 +430,46 @@ } }, "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.1.tgz", + "integrity": "sha512-LL0OLyN6AnfV9xqGQpDBwedT2Rt63737LxvsRxbcwpa2aIeynBApG2Sm//F3TaLHIR1aJBN52DWklc06b94o5Q==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } }, "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^5.0.0" } } } @@ -533,18 +536,26 @@ } }, "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" + }, + "dependencies": { + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } } }, "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", "dev": true }, "deep-eql": { @@ -557,9 +568,9 @@ } }, "diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", "dev": true }, "electron-to-chromium": { @@ -569,9 +580,9 @@ "dev": true }, "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, "emojis-list": { @@ -642,12 +653,6 @@ "estraverse": "^4.1.1" } }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, "esrecurse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", @@ -744,9 +749,9 @@ "dev": true }, "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "optional": true }, @@ -976,13 +981,12 @@ } }, "js-yaml": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", - "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", + "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", "dev": true, "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "^2.0.1" } }, "json-parse-better-errors": { @@ -1119,48 +1123,59 @@ "dev": true }, "mocha": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz", - "integrity": "sha512-cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.3.0.tgz", + "integrity": "sha512-TQqyC89V1J/Vxx0DhJIXlq9gbbL9XFNdeLQ1+JsnZsVaSOV1z3tWfw0qZmQJGQRIfkvZcs7snQnZnOCKoldq1Q==", "dev": true, "requires": { "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", "browser-stdout": "1.3.1", - "chokidar": "3.4.3", - "debug": "4.2.0", - "diff": "4.0.2", + "chokidar": "3.5.1", + "debug": "4.3.1", + "diff": "5.0.0", "escape-string-regexp": "4.0.0", "find-up": "5.0.0", "glob": "7.1.6", "growl": "1.10.5", "he": "1.2.0", - "js-yaml": "3.14.0", + "js-yaml": "4.0.0", "log-symbols": "4.0.0", "minimatch": "3.0.4", - "ms": "2.1.2", - "nanoid": "3.1.12", + "ms": "2.1.3", + "nanoid": "3.1.20", "serialize-javascript": "5.0.1", "strip-json-comments": "3.1.1", - "supports-color": "7.2.0", + "supports-color": "8.1.1", "which": "2.0.2", "wide-align": "1.1.3", - "workerpool": "6.0.2", - "yargs": "13.3.2", - "yargs-parser": "13.1.2", + "workerpool": "6.1.0", + "yargs": "16.2.0", + "yargs-parser": "20.2.4", "yargs-unparser": "2.0.0" + }, + "dependencies": { + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, "nanoid": { - "version": "3.1.12", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz", - "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==", + "version": "3.1.20", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz", + "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==", "dev": true }, "neo-async": { @@ -1209,12 +1224,12 @@ } }, "p-limit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz", - "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "requires": { - "p-try": "^2.0.0" + "yocto-queue": "^0.1.0" } }, "p-locate": { @@ -1390,19 +1405,13 @@ "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "dev": true }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, "resolve": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", - "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", "dev": true, "requires": { - "is-core-module": "^2.1.0", + "is-core-module": "^2.2.0", "path-parse": "^1.0.6" } }, @@ -1456,12 +1465,6 @@ "randombytes": "^2.1.0" } }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, "shallow-clone": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", @@ -1514,12 +1517,6 @@ "source-map": "^0.6.0" } }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -1771,9 +1768,9 @@ }, "dependencies": { "commander": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.0.0.tgz", - "integrity": "sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz", + "integrity": "sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==", "dev": true } } @@ -1807,12 +1804,6 @@ "isexe": "^2.0.0" } }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, "wide-align": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", @@ -1829,70 +1820,52 @@ "dev": true }, "workerpool": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz", - "integrity": "sha512-DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz", + "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==", "dev": true }, "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", "dev": true }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.1.tgz", + "integrity": "sha512-LL0OLyN6AnfV9xqGQpDBwedT2Rt63737LxvsRxbcwpa2aIeynBApG2Sm//F3TaLHIR1aJBN52DWklc06b94o5Q==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } }, "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^5.0.0" } } } @@ -1904,9 +1877,9 @@ "dev": true }, "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz", + "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==", "dev": true }, "yallist": { @@ -1916,103 +1889,59 @@ "dev": true }, "yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", "dev": true }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { + "is-fullwidth-code-point": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.1.tgz", + "integrity": "sha512-LL0OLyN6AnfV9xqGQpDBwedT2Rt63737LxvsRxbcwpa2aIeynBApG2Sm//F3TaLHIR1aJBN52DWklc06b94o5Q==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } }, "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^5.0.0" } } } }, "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true }, "yargs-unparser": { "version": "2.0.0", @@ -2024,20 +1953,6 @@ "decamelize": "^4.0.0", "flat": "^5.0.2", "is-plain-obj": "^2.1.0" - }, - "dependencies": { - "camelcase": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", - "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==", - "dev": true - }, - "decamelize": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", - "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", - "dev": true - } } }, "yocto-queue": { diff --git a/package.json b/package.json index da0f702..320d865 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "genshin_panel", - "version": "2.1.2", + "version": "2.1.7", "description": "genshin panel calculator", "main": "dist/index.js", "files": [ @@ -29,7 +29,7 @@ "devDependencies": { "chai": "^4.2.0", "ignore-loader": "^0.1.2", - "mocha": "^8.2.1", + "mocha": "^8.3.0", "ts-loader": "^8.0.14", "typescript": "^4.1.3", "webpack": "^5.20.1", diff --git a/scripts/test.js b/scripts/test.js index 3f37d4f..f07f274 100644 --- a/scripts/test.js +++ b/scripts/test.js @@ -1,6 +1,6 @@ const app = require("../dist"); -let character = new app.Character("旅行者-岩", 90, false, 0); +let character = new app.Character("hutao", 90, false, 0); let weapon = new app.Weapon("tiankongzhiren", 1, false, 2); console.log(character); diff --git a/src/attribute/attribute.ts b/src/attribute/attribute.ts index 0a62f22..ca2e68b 100644 --- a/src/attribute/attribute.ts +++ b/src/attribute/attribute.ts @@ -69,4 +69,12 @@ export default class Attribute { defend(): number { return this.defendBasic + this.defendPercentage + this.defendStatic; } + + crit(value: number) { + this.critical += value; + this.bCritical += value; + this.eCritical += value; + this.qCritical += value; + this.airCritical += value; + } } \ No newline at end of file diff --git a/src/numerics/character/data/fire/hutao.ts b/src/numerics/character/data/fire/hutao.ts new file mode 100644 index 0000000..6d0cfb9 --- /dev/null +++ b/src/numerics/character/data/fire/hutao.ts @@ -0,0 +1,14 @@ +import WeaponType from "../../../weapon/weapon_type"; +import CharacterDataType from "../../data_type"; + +export default { + alt: ["hutao", "胡桃"], + life: [1211, 3141, 4179, 6253, 6990, 8042, 9026, 10089, 10826, 11899, 12637, 13721, 14459, 15552], + attack: [8, 21, 29, 43, 48, 55, 62, 69, 74, 81, 86, 94, 99, 106], + defend: [68, 177, 235, 352, 394, 453, 508, 568, 610, 670, 712, 773, 815, 876], + secondary: { + name: "criticalDamage", + family: "cd384", + }, + weapon: WeaponType.Stick, +} as CharacterDataType \ No newline at end of file diff --git a/src/numerics/weapon/data/book/chenshizhisuo.ts b/src/numerics/weapon/data/book/chenshizhisuo.ts index d943f1c..01a27f1 100644 --- a/src/numerics/weapon/data/book/chenshizhisuo.ts +++ b/src/numerics/weapon/data/book/chenshizhisuo.ts @@ -12,7 +12,7 @@ export default { effect: function (attribute: Attribute) { let that = this as any as Weapon; - let value = 0.01 * that.refine + 0.03; - attribute.attackPercentage += attribute.attackBasic * value * 2.5; + let value = 0.05 * that.refine + 0.15; + attribute.shield += value; } } as WeaponDataType \ No newline at end of file diff --git a/src/numerics/weapon/data/book/modaoxulun.ts b/src/numerics/weapon/data/book/modaoxulun.ts index 830c09e..d3f8b2d 100644 --- a/src/numerics/weapon/data/book/modaoxulun.ts +++ b/src/numerics/weapon/data/book/modaoxulun.ts @@ -9,10 +9,10 @@ export default { name: "elementalMastery", family: "em41", }, - effect: function (attribute: Attribute) { - let that = this as any as Weapon; + // effect: function (attribute: Attribute) { + // let that = this as any as Weapon; - let value = that.refine * 0.03 + 0.09; - attribute.bonus += value; - } + // let value = that.refine * 0.03 + 0.09; + // attribute.bonus += value; + // } } as WeaponDataType \ No newline at end of file diff --git a/src/numerics/weapon/data/book/sifengyuandian.ts b/src/numerics/weapon/data/book/sifengyuandian.ts index 490d519..9b55cb2 100644 --- a/src/numerics/weapon/data/book/sifengyuandian.ts +++ b/src/numerics/weapon/data/book/sifengyuandian.ts @@ -9,10 +9,10 @@ export default { name: "critical", family: "cr72", }, - effect: function (attribute: Attribute) { - let that = this as any as Weapon; + // effect: function (attribute: Attribute) { + // let that = this as any as Weapon; - let value = that.refine * 0.02 + 0.06; - attribute.elementalBonus += value * 4; - } + // let value = that.refine * 0.02 + 0.06; + // attribute.elementalBonus += value * 4; + // } } as WeaponDataType \ No newline at end of file diff --git a/src/numerics/weapon/data/book/wanguozhuhaitupu.ts b/src/numerics/weapon/data/book/wanguozhuhaitupu.ts index fbdfda6..63a3503 100644 --- a/src/numerics/weapon/data/book/wanguozhuhaitupu.ts +++ b/src/numerics/weapon/data/book/wanguozhuhaitupu.ts @@ -9,10 +9,10 @@ export default { name: "elementalMastery", family: "em24" }, - effect: function (attribute: Attribute) { - let that = this as any as Weapon; + // effect: function (attribute: Attribute) { + // let that = this as any as Weapon; - let value = that.refine * 0.02 + 0.06; - attribute.elementalBonus += value; - } + // let value = that.refine * 0.02 + 0.06; + // attribute.elementalBonus += value; + // } } as WeaponDataType \ No newline at end of file diff --git a/src/numerics/weapon/data/bow/ganglungong.ts b/src/numerics/weapon/data/bow/ganglungong.ts index 22d74c5..35ea91d 100644 --- a/src/numerics/weapon/data/bow/ganglungong.ts +++ b/src/numerics/weapon/data/bow/ganglungong.ts @@ -5,12 +5,6 @@ import WeaponDataType from "../../data_type"; export default { alt: ["ganglungong", "钢轮弓", "compoundbow"], baseAtkFamily: "atk41", - effect: function (attribute: Attribute) { - let that = this as any as Weapon; - - let percentage = that.refine * 0.01 + 0.03; - attribute.attackPercentage += attribute.attackBasic * percentage; - }, secondary: { name: "physicalBonus", family: "physical150" diff --git a/src/numerics/weapon/data/bow/shensheshouzhishi.ts b/src/numerics/weapon/data/bow/shensheshouzhishi.ts index 538d7cd..8c35cc3 100644 --- a/src/numerics/weapon/data/bow/shensheshouzhishi.ts +++ b/src/numerics/weapon/data/bow/shensheshouzhishi.ts @@ -4,12 +4,12 @@ import WeaponDataType from "../../data_type"; export default { alt: ["shensheshouzhishi", "神射手之誓", "sharpshootersoath"], - effect: function (attribute: Attribute) { - let that = this as any as Weapon; + // effect: function (attribute: Attribute) { + // let that = this as any as Weapon; - let percentage = that.refine * 0.06 + 0.18; - attribute.bonus += percentage; - }, + // let percentage = that.refine * 0.06 + 0.18; + // attribute.bonus += percentage; + // }, baseAtkFamily: "atk39", secondary: { name: "criticalDamage", diff --git a/src/numerics/weapon/data/bow/tangong.ts b/src/numerics/weapon/data/bow/tangong.ts index 083a523..6461dd7 100644 --- a/src/numerics/weapon/data/bow/tangong.ts +++ b/src/numerics/weapon/data/bow/tangong.ts @@ -7,8 +7,12 @@ export default { effect: function (attribute: Attribute) { let that = this as any as Weapon; - let value = that.refine * 0.06 + 0.3; - attribute.bonus += value; + if (that.args.within03) { + let value = that.refine * 0.06 + 0.3; + attribute.bonus += value; + } else { + attribute.bonus = Math.max(attribute.bonus - 0.1, 0); + } }, baseAtkFamily: "atk38", secondary: { diff --git a/src/numerics/weapon/data/bow/yayugong.ts b/src/numerics/weapon/data/bow/yayugong.ts index a9516b7..c454fa4 100644 --- a/src/numerics/weapon/data/bow/yayugong.ts +++ b/src/numerics/weapon/data/bow/yayugong.ts @@ -4,12 +4,12 @@ import WeaponDataType from "../../data_type"; export default { alt: ["yayugong", "鸦羽弓", "ravenbow"], - effect: function (attribute: Attribute) { - let that = this as any as Weapon; + // effect: function (attribute: Attribute) { + // let that = this as any as Weapon; - let percentage = that.refine * 0.03 + 0.09; - attribute.bonus += percentage; - }, + // let percentage = that.refine * 0.03 + 0.09; + // attribute.bonus += percentage; + // }, baseAtkFamily: "atk40", secondary: { name: "elementalMastery", diff --git a/src/numerics/weapon/data/stick/guanhongzhishuo.ts b/src/numerics/weapon/data/stick/guanhongzhishuo.ts index 7e90a5e..ba21a48 100644 --- a/src/numerics/weapon/data/stick/guanhongzhishuo.ts +++ b/src/numerics/weapon/data/stick/guanhongzhishuo.ts @@ -15,7 +15,7 @@ export default { let value = that.refine * 0.05 + 0.15; attribute.shield += value; - value = that.refine * 0.01 + 0.03; - attribute.attackPercentage += attribute.attackBasic * value * 2.5; + // value = that.refine * 0.01 + 0.03; + // attribute.attackPercentage += attribute.attackBasic * value * 2.5; } } as WeaponDataType \ No newline at end of file diff --git a/src/numerics/weapon/data/stick/heiyingqiang.ts b/src/numerics/weapon/data/stick/heiyingqiang.ts index 4c776ad..d4221cc 100644 --- a/src/numerics/weapon/data/stick/heiyingqiang.ts +++ b/src/numerics/weapon/data/stick/heiyingqiang.ts @@ -1,4 +1,6 @@ +import Attribute from "../../../../attribute/attribute"; import WeaponDataType from "../../data_type"; +import Weapon from "../../weapon"; export default { alt: ["heiyingqiang", "黑缨枪", "blacktassel"], @@ -6,5 +8,12 @@ export default { secondary: { name: "lifePercentage", family: "hp102" + }, + effect: function (attribute: Attribute) { + let that = this as any as Weapon; + + if (that.args.slime) { + attribute.bonus += that.refine * 0.1 + 0.3; + } } } as WeaponDataType \ No newline at end of file diff --git a/src/numerics/weapon/data/stick/hepuyuan.ts b/src/numerics/weapon/data/stick/hepuyuan.ts index b275773..ab7e5a1 100644 --- a/src/numerics/weapon/data/stick/hepuyuan.ts +++ b/src/numerics/weapon/data/stick/hepuyuan.ts @@ -9,10 +9,10 @@ export default { name: "critical", family: "cr48", }, - effect: function (attribute: Attribute) { - let that = this as any as Weapon; + // effect: function (attribute: Attribute) { + // let that = this as any as Weapon; - let value = that.refine * 0.007 + 0.025; - attribute.attackPercentage += attribute.attackBasic * value * 3; - } + // let value = that.refine * 0.007 + 0.025; + // attribute.attackPercentage += attribute.attackBasic * value * 3; + // } } as WeaponDataType \ No newline at end of file diff --git a/src/numerics/weapon/data/stick/juedouzhiqiang.ts b/src/numerics/weapon/data/stick/juedouzhiqiang.ts index dc2b263..dab47d2 100644 --- a/src/numerics/weapon/data/stick/juedouzhiqiang.ts +++ b/src/numerics/weapon/data/stick/juedouzhiqiang.ts @@ -12,7 +12,13 @@ export default { effect: function (attribute: Attribute) { let that = this as any as Weapon; - let value = 0.04 * that.refine + 0.12; - attribute.attackPercentage += attribute.attackBasic * value * 1.25; + if (that.args.enemyAbove2) { + let percentage = that.refine * 0.04 + 0.12; + attribute.attackPercentage += attribute.attackBasic * percentage; + attribute.defendPercentage += attribute.defendBasic * percentage; + } else { + let percentage = that.refine * 0.06 + 0.18; + attribute.attackPercentage += attribute.attackBasic * percentage; + } } } as WeaponDataType \ No newline at end of file diff --git a/src/numerics/weapon/data/stick/qianyanchangqiang.ts b/src/numerics/weapon/data/stick/qianyanchangqiang.ts index 6dcfbcd..8baf56d 100644 --- a/src/numerics/weapon/data/stick/qianyanchangqiang.ts +++ b/src/numerics/weapon/data/stick/qianyanchangqiang.ts @@ -12,11 +12,7 @@ export default { attribute.attackPercentage += attribute.attackBasic * percentage * liyueCount; percentage = that.refine * 0.01 + 0.02; - attribute.critical += percentage * liyueCount; - attribute.bCritical += percentage * liyueCount; - attribute.eCritical += percentage * liyueCount; - attribute.qCritical += percentage * liyueCount; - attribute.airCritical += percentage * liyueCount; + attribute.crit(percentage * liyueCount); }, baseAtkFamily: "atk44", secondary: { diff --git a/src/numerics/weapon/data/stick/tiankongzhiji.ts b/src/numerics/weapon/data/stick/tiankongzhiji.ts index e1f3264..3d4b055 100644 --- a/src/numerics/weapon/data/stick/tiankongzhiji.ts +++ b/src/numerics/weapon/data/stick/tiankongzhiji.ts @@ -13,10 +13,6 @@ export default { let that = this as any as Weapon; let value = that.refine * 0.02 + 0.06; - attribute.critical += value; - attribute.bCritical += value; - attribute.eCritical += value; - attribute.qCritical += value; - attribute.airCritical += value; + attribute.crit(value); } } as WeaponDataType \ No newline at end of file diff --git a/src/numerics/weapon/data/stick/xialimiechen.ts b/src/numerics/weapon/data/stick/xialimiechen.ts index 3c229c0..a3813ba 100644 --- a/src/numerics/weapon/data/stick/xialimiechen.ts +++ b/src/numerics/weapon/data/stick/xialimiechen.ts @@ -9,10 +9,10 @@ export default { name: "elementalMastery", family: "em48" }, - effect: function (attribute: Attribute) { - let that = this as any as Weapon; + // effect: function (attribute: Attribute) { + // let that = this as any as Weapon; - let value = that.refine * 0.04 + 0.16; - attribute.bonus += value; - } + // let value = that.refine * 0.04 + 0.16; + // attribute.bonus += value; + // } } as WeaponDataType \ No newline at end of file diff --git a/src/numerics/weapon/data/sword/feitianyujian.ts b/src/numerics/weapon/data/sword/feitianyujian.ts index 2e9d3f4..1d76345 100644 --- a/src/numerics/weapon/data/sword/feitianyujian.ts +++ b/src/numerics/weapon/data/sword/feitianyujian.ts @@ -4,12 +4,6 @@ import WeaponDataType from "../../data_type"; export default { alt: ["飞天御剑", "feitianyujian", "skyridersword"], - effect: function (attribute: Attribute) { - let that = this as any as Weapon; - let percentage = that.refine * 0.03 + 0.09; - - attribute.attackPercentage += attribute.attackBasic * percentage; - }, baseAtkFamily: "atk38", secondary: { name: "recharge", diff --git a/src/numerics/weapon/data/sword/limingshenjian.ts b/src/numerics/weapon/data/sword/limingshenjian.ts index e16d37c..222d52b 100644 --- a/src/numerics/weapon/data/sword/limingshenjian.ts +++ b/src/numerics/weapon/data/sword/limingshenjian.ts @@ -6,9 +6,11 @@ export default { alt: ["limingshenjian", "黎明神剑", "harbingerofdawn"], effect: function (attribute: Attribute) { let that = this as any as Weapon; - let percentage = that.refine * 0.025 + 0.115; - attribute.critical += percentage; + if (that.args.lifeAbove90) { + let percentage = 0.035 * that.refine + 0.105; + attribute.crit(percentage); + } }, baseAtkFamily: "atk39", secondary: { diff --git a/src/numerics/weapon/data/sword/tiankongzhiren.ts b/src/numerics/weapon/data/sword/tiankongzhiren.ts index bd386a9..145d39f 100644 --- a/src/numerics/weapon/data/sword/tiankongzhiren.ts +++ b/src/numerics/weapon/data/sword/tiankongzhiren.ts @@ -8,7 +8,7 @@ export default { let that = this as any as Weapon; let percentage = that.refine * 0.01 + 0.03; - attribute.critical += percentage; + attribute.crit(percentage); }, baseAtkFamily: "atk46", secondary: { diff --git a/src/numerics/weapon/data/sword/xialilongyin.ts b/src/numerics/weapon/data/sword/xialilongyin.ts index 922939f..4dce2e8 100644 --- a/src/numerics/weapon/data/sword/xialilongyin.ts +++ b/src/numerics/weapon/data/sword/xialilongyin.ts @@ -4,12 +4,6 @@ import WeaponDataType from "../../data_type"; export default { alt: ["xialilongyin", "匣里龙吟", "lionsroar"], - effect: function (attribute: Attribute) { - let that = this as any as Weapon; - let percentage = that.refine * 0.04 + 0.15; - - attribute.bonus += percentage; - }, baseAtkFamily: "atk42", secondary: { name: "attackPercentage", diff --git a/src/numerics/weapon/data/sword/zhuofengzhiren.ts b/src/numerics/weapon/data/sword/zhuofengzhiren.ts index 98ab3d7..5d25288 100644 --- a/src/numerics/weapon/data/sword/zhuofengzhiren.ts +++ b/src/numerics/weapon/data/sword/zhuofengzhiren.ts @@ -1,4 +1,6 @@ +import Attribute from "../../../../attribute/attribute"; import WeaponDataType from "../../data_type"; +import Weapon from "../../weapon"; export default { alt: ["zhuofengzhiren", "斫峰之刃", "summitshaper"], @@ -6,5 +8,11 @@ export default { secondary: { name: "attackPercentage", family: "atk108" + }, + effect: function (attribute: Attribute) { + let that = this as any as Weapon; + + let percentage = that.refine * 0.05 + 0.15; + attribute.shield += percentage; } } as WeaponDataType \ No newline at end of file diff --git a/src/numerics/weapon/data/sword2/chigujian.ts b/src/numerics/weapon/data/sword2/chigujian.ts index b7affee..061f5af 100644 --- a/src/numerics/weapon/data/sword2/chigujian.ts +++ b/src/numerics/weapon/data/sword2/chigujian.ts @@ -4,12 +4,6 @@ import WeaponDataType from "../../data_type"; export default { alt: ["chigujian", "螭骨剑", "serpentspine"], - effect: function (attribute: Attribute) { - let that = this as any as Weapon; - - let value = that.refine * 0.01 + 0.05; - attribute.bonus += value; - }, baseAtkFamily: "atk42", secondary: { name: "critical", diff --git a/src/numerics/weapon/data/sword2/jilidajian.ts b/src/numerics/weapon/data/sword2/jilidajian.ts index c82ff04..1074688 100644 --- a/src/numerics/weapon/data/sword2/jilidajian.ts +++ b/src/numerics/weapon/data/sword2/jilidajian.ts @@ -1,6 +1,6 @@ import WeaponDataType from "../../data_type"; -export const jilidajianData = { +export default { alt: ["jilidajian", "祭礼大剑", "sacrificialgreatsword"], baseAtkFamily: "atk44", secondary: { diff --git a/src/numerics/weapon/data/sword2/qianyangujian.ts b/src/numerics/weapon/data/sword2/qianyangujian.ts index 30fa9d3..753b5ac 100644 --- a/src/numerics/weapon/data/sword2/qianyangujian.ts +++ b/src/numerics/weapon/data/sword2/qianyangujian.ts @@ -12,11 +12,7 @@ export default { attribute.attackPercentage += attribute.attackBasic * percentage * liyueCount; percentage = that.refine * 0.01 + 0.02; - attribute.critical += percentage * liyueCount; - attribute.bCritical += percentage * liyueCount; - attribute.eCritical += percentage * liyueCount; - attribute.qCritical += percentage * liyueCount; - attribute.airCritical += percentage * liyueCount; + attribute.crit(percentage * liyueCount); }, baseAtkFamily: "atk42", secondary: { diff --git a/src/numerics/weapon/data/sword2/tieyingkuojian.ts b/src/numerics/weapon/data/sword2/tieyingkuojian.ts index 8db7009..1849d93 100644 --- a/src/numerics/weapon/data/sword2/tieyingkuojian.ts +++ b/src/numerics/weapon/data/sword2/tieyingkuojian.ts @@ -4,12 +4,6 @@ import WeaponDataType from "../../data_type"; export default { alt: ["tieyingkuojian", "铁影阔剑", "ferrousshadow"], - effect: function (attribute: Attribute) { - let that = this as any as Weapon; - - let value = that.refine * 0.05 + 0.25; - attribute.bBonus += value; - }, baseAtkFamily: "atk39", secondary: { name: "lifePercentage", diff --git a/src/numerics/weapon/data/sword2/wugongzhijian.ts b/src/numerics/weapon/data/sword2/wugongzhijian.ts index eeebab4..232098a 100644 --- a/src/numerics/weapon/data/sword2/wugongzhijian.ts +++ b/src/numerics/weapon/data/sword2/wugongzhijian.ts @@ -1,4 +1,6 @@ +import Attribute from "../../../../attribute/attribute"; import WeaponDataType from "../../data_type"; +import Weapon from "../../weapon"; export default { alt: ["wugongzhijian", "无工之剑", "theunforged"], @@ -6,5 +8,10 @@ export default { secondary: { name: "attackPercentage", family: "atk108" + }, + effect: function (attribute: Attribute) { + let that = this as any as Weapon; + + attribute.shield += that.refine * 0.05 + 0.15; } } as WeaponDataType \ No newline at end of file