Aug 12 update thorns etc.

xulai1001 · Aug 12, 2020 · 47c7a44 · 47c7a44
1 parent d536a95
commit 47c7a44
Show file tree

Hide file tree

Showing 29 changed files with 51,112 additions and 39,304 deletions.
diff --git a/_docs/dps.js b/_docs/dps.js
@@ -42,8 +42,8 @@ function load() {
     $('#update_prompt').text(`有新数据，请更新`);
     console.log(version.reason);
   } else {
-    $('#update_prompt').text(`程序版本: ${AKDATA.akdata}, 游戏数据版本: ${AKDATA.gamedata} (${AKDATA.customdata})`);
-    $("#btn_update_data").text("最新版本");
+    $('#update_prompt').text(`程序版本: ${AKDATA.akdata}, 游戏数据版本: ${AKDATA.gamedata} (${AKDATA.customdata}), 如有问题请点击`);
+    $("#btn_update_data").text("手动刷新");
     $("#btn_update_data").attr("class", "btn btn-success");
   }
 

diff --git a/_docs/mastery.js b/_docs/mastery.js
@@ -18,7 +18,7 @@ const DefaultAttribute = {
   favor: 200,
   potential: 5,  // 0-5
   skillLevel: 9,  // 0-9
-  options: { cond: true, crit: true, stack: true }
+  options: { cond: true, crit: true, stack: true, warmup: true }
 };
 const DefaultEnemy = { def: 0, magicResistance: 0, count: 1, hp: 0 };
 
@@ -117,8 +117,8 @@ function load() {
     $('#vue_version').text(`有新数据，请更新`);
     console.log(version.reason);
   } else {
-    $("#vue_version").html("程序版本: {{ version.akdata }}, 数据版本: {{ version.gamedata }} ({{ version.customdata }})");
-    $("#btn_update_data").text("最新版本");
+    $("#vue_version").html("程序版本: {{ version.akdata }}, 数据版本: {{ version.gamedata }} ({{ version.customdata }}), 如有问题请点击");
+    $("#btn_update_data").text("手动刷新");
     $("#btn_update_data").attr("class", "btn btn-success");
   }
 

diff --git a/_docs/whatsnew.md b/_docs/whatsnew.md
@@ -5,6 +5,10 @@ order: 4
 category: 工具
 icon: info-circle
 ---
+## 20.08.12
+- [update] 棘刺等
+- [update] 增加了对毒伤和暖机的说明。棘刺和小羊1的暖机使用统一的选项控制  
+
 ## 20.07.30
 - [update] 稀音等
 - [bugfix] 判断了白金天赋的上下限，以及一般攻速的上下限。攻速达到上下限时会有额外提示。

diff --git a/resources/akdata.js b/resources/akdata.js
@@ -7,9 +7,9 @@ const useCache = true;
 const cacheBeginTime = new Date(2019, 12, 10).getTime();
 
 window.AKDATA = {
-  akdata: "200730",   // 主程序Tag版本
-  gamedata: "20-07-29-04-47-07-b36de9", // CDN游戏数据版本
-  customdata: "200730", // 额外数据版本
+  akdata: "200812",   // 主程序Tag版本
+  gamedata: "20-08-10-07-52-45-69cad6", // CDN游戏数据版本
+  customdata: "200812", // 额外数据版本
 
   Data: {},
 

diff --git a/resources/attributes.js b/resources/attributes.js
@@ -533,7 +533,7 @@ function applyBuff(charAttr, buffFrm, tag, blackbd, isSkill, isCrit, log, enemy)
         break;
       case "tachr_344_beewax_trait":
         if (isSkill) done = true; break;
-      // ---- 技能 ----
+        // ---- 技能 ----
       case "skchr_swllow_1":
       case "skchr_helage_1":
       case "skchr_helage_2":
@@ -568,11 +568,29 @@ function applyBuff(charAttr, buffFrm, tag, blackbd, isSkill, isCrit, log, enemy)
       case "skchr_shining_2": 
       case "skchr_cgbird_2":
         done = true; break;
+      // 多段暖机
       case "skchr_amgoat_1":
-        buffFrame.atk += basic.atk * blackboard['amgoat_s_1[b].atk'];
-        buffFrame.attackSpeed += blackboard['amgoat_s_1[b].attack_speed'];
-        writeBuff(`按第二次之后计算: atk + ${buffFrame.atk}, attackSpeed + ${buffFrame.attackSpeed}`);
-        done = true; break;
+        if (options.warmup) {
+          blackboard.atk = blackboard['amgoat_s_1[b].atk'];
+          blackboard.attack_speed = blackboard['amgoat_s_1[b].attack_speed'];
+          if (isSkill) log.writeNote("暖机完成");
+        } else {
+          blackboard.attack_speed = blackboard["amgoat_s_1[a].attack_speed"];
+          log.writeNote("首次启动时");
+        }
+        break;
+      case "skchr_thorns_3":
+        if (options.warmup) {
+          blackboard.atk = blackboard["thorns_s_3[b].atk"];
+          blackboard.attack_speed = blackboard["thorns_s_3[b].attack_speed"];
+          if (isSkill) log.writeNote("暖机完成");
+        } else
+          log.writeNote("首次启动时");
+        if (options.ranged_penalty) {
+          buffFrame.atk_scale = 1;
+          writeBuff(`不受距离惩罚`);
+        }
+        break;
       case "skchr_amgoat_2":
         blackboard.atk_scale = blackboard.fk;
         break;
@@ -761,6 +779,12 @@ function applyBuff(charAttr, buffFrm, tag, blackbd, isSkill, isCrit, log, enemy)
     blackboard.attack_speed = 0;
     writeBuff("每秒造成一次伤害/治疗");
   }
+  if (tag == "skchr_thorns_2") {
+    log.writeNote("反击按最小间隔计算");
+    blackboard.base_attack_time = blackboard.cooldown - (basic.baseAttackTime + buffFrame.baseAttackTime);
+    buffFrame.attackSpeed = 0;
+    blackboard.attack_speed = 0;
+  }
 
   if (!done) applyBuffDefault();
   return buffFrame;
@@ -948,9 +972,12 @@ function calcDurations(isSkill, attackTime, attackSpeed, levelData, buffList, bu
     }
     // 技能类型
     if (levelData.description.includes("持续时间无限")) {
-      attackCount = Math.ceil(1800 / attackTime);
-      duration = attackCount * attackTime;
-      tags.push("infinity"); log.writeNote("持续时间无限 (记为1800s)");
+      if (skillId == "skchr_thorns_3" && !options.warmup) {}
+      else {
+        attackCount = Math.ceil(1800 / attackTime);
+        duration = attackCount * attackTime;
+        tags.push("infinity"); log.writeNote("持续时间无限 (记为1800s)");
+      }
     } else if (spData.spType == 8) {
       if (levelData.duration <= 0 && blackboard.duration > 0) {
         // 砾的技能也是落地点火，但是持续时间在blackboard里
@@ -1506,6 +1533,13 @@ function calculateAttack(charAttr, enemy, raidBlackboard, isSkill, charData, lev
           log.write(`[特殊] ${displayNames["skchr_bluep_1"]}: 副目标毒伤 ${damage2} * 3s`);
         }
         pool[1] += total_damage;
+        log.writeNote("毒伤按循环时间计算");
+        break;
+      case "tachr_293_thorns_1":
+        var poison = options.thorns_ranged ? bb["damage[ranged]"] : bb["damage[normal]"];
+        damage = Math.max(poison * (1-emrpct), poison * 0.05) * dur.duration * ecount;
+        pool[1] = damage;
+        if (isSkill) log.writeNote("毒伤按循环时间计算");
         break;
       case "tachr_181_flower_1":
         pool[2] += bb.atk_to_hp_recovery_ratio * finalFrame.atk * dur.duration * enemy.count;
@@ -1603,6 +1637,8 @@ function calculateAttack(charAttr, enemy, raidBlackboard, isSkill, charData, lev
       // 间接治疗
       case "skchr_tiger_2":
         pool[2] += damagePool[1] * bb.heal_scale; break;
+      case "skchr_strong_2":
+        pool[2] += damagePool[0] * bb.scale; break;
       case "skcom_heal_self[1]":
       case "skcom_heal_self[2]":
         damagePool[2] = 0;
@@ -1652,7 +1688,13 @@ function calculateAttack(charAttr, enemy, raidBlackboard, isSkill, charData, lev
     let hpratiosec = bb["hp_recovery_per_sec_by_max_hp_ratio"];
     let hpsec = bb["hp_recovery_per_sec"];
     if (hpratiosec) {
-      if (buffName == "tachr_344_beewax_1" && isSkill) {} else {
+      if (buffName == "tachr_344_beewax_1" && isSkill) {}
+      else if (buffName == "tachr_293_thorns_2") {
+        if (blackboard.id == "skchr_thorns_2" && isSkill) {
+          pool[2] += hpratiosec * finalFrame.maxHp * (dur.duration + dur.stunDuration - 2);
+          log.writeNote("治疗从2秒后开始计算");
+        } else {}
+      } else {
         pool[2] += hpratiosec * finalFrame.maxHp * (dur.duration + dur.stunDuration);
       }
     }
@@ -1662,7 +1704,6 @@ function calculateAttack(charAttr, enemy, raidBlackboard, isSkill, charData, lev
       else
       {
         pool[2] += hpsec * (dur.duration + dur.stunDuration);
-        log.writeNote("可以治疗召唤物");
       }
     }
     // 自身血量百分比相关的治疗/伤害

diff --git a/resources/customdata/dps_options.json b/resources/customdata/dps_options.json
@@ -7,7 +7,9 @@
         "stack" : { "type" : "bool", "displaytext" : "被动叠满", "explain": "按天赋叠满层数计算" },
         "noblock" : { "type" : "bool", "displaytext" : "未阻挡", "explain": "计算未阻挡时恢复的生命" },
         "cannon":  { "type": "bool", "displaytext": "水炮充能", "explain": "模拟温蒂水炮的充能情况" },
-        "buff":  { "type": "bool", "displaytext": "计算团辅", "explain": "加算页面下方填写的团辅增益" }
+        "buff":  { "type": "bool", "displaytext": "计算团辅", "explain": "加算页面下方填写的团辅增益" },
+        "warmup":  { "type": "bool", "displaytext": "多段暖机完成", "explain": "勾选计算特定技能开启第二次和以后的效果，否则计算第一次启动效果" },
+        "thorns_ranged":  { "type": "bool", "displaytext": "远程敌人", "explain": "对远程敌人毒伤翻倍" }
     },
     "char" : {
         "char_503_rang" : [ "cond" ],
@@ -17,6 +19,7 @@
         "char_187_ccheal" : [ "cond" ],
         "char_158_milu" : [ "cond" ],
         "char_173_slchan" : [ "cond" ],
+        "char_180_amgoat" : [ "warmup" ],
         "char_230_savage" : [ "cond" ],
         "char_188_helage" : [ "noblock", "stack" ],
         "char_166_skfire" : [ "cond" ],
@@ -68,6 +71,8 @@
         "char_197_poca":    [ "cond" ],
         "char_358_lisa":    [ "cond" ],
         "char_349_chiave":  [ "cond" ],
-        "char_336_folivo":  [ "token" ]
+        "char_336_folivo":  [ "token" ],
+        "char_272_strong":  [ "cond" ],
+        "char_293_thorns":  [ "ranged_penalty", "warmup", "thorns_ranged"]
     }
 }
diff --git a/resources/customdata/dps_specialtags.json b/resources/customdata/dps_specialtags.json
@@ -11,6 +11,7 @@
     "char_180_amgoat":  { "frame_corr": 1 },
     "char_195_glassb":  { "frame_corr": 1 },
     "char_202_demkni":	{ "damage_type": 2, "frame_corr": 1 },
+    "char_218_cuttle":  { "frame_corr": 1 },
     "char_219_meteo":   { "frame_corr": 1 },
     "char_252_bibeak":  { "times": 2, "frame_corr": 1 },
     "char_258_podego":  { "frame_corr": 1 },
@@ -60,6 +61,7 @@
     "skchr_cqbw_3":     { "cast_time": 60, "reset_attack": "ogcd" },
     "skchr_cutter_1":   { "reset_attack": "ogcd", "cast_time": 30 },
     "skchr_cutter_2":   { "cond" : true, "reset_attack": "ogcd", "cast_time": 30 },
+    "skchr_cuttle_2":   { "reset_attack": true },
     "skchr_deepcl_1":	{ "damage_type": 1 },
     "skchr_demkni_1":   { "frame_corr": -1 },
     "skchr_demkni_2":   { "frame_corr": 0 },
@@ -124,9 +126,12 @@
     "skchr_slchan_2":   { "damage_type": 3, "cast_time": 50 },
     "skchr_snsant_1":   { "cast_time": 50 },
     "skchr_snsant_2":   { "cast_time": 75 },
+    "skchr_strong_2":   { "damage_type": "0" },
     "skchr_swllow_1":   { "sim": true },
     "skchr_swllow_2":   { "reset_attack": true, "attack_begin": 2 },
     "skchr_texas_2":    { "cast_time": 65 },
+    "skchr_thorns_2":   { "reset_attack": true },
+    "skchr_thorns_3":   { "reset_attack": true },
     "skchr_tknogi_2":   { "sec": true },
     "skchr_vodfox_2":   { "instant_buff": true, "duration": 15, "note": "召唤类技能，结果无意义" },
     "skchr_whitew_2":	{ "reset_attack": true },
@@ -160,13 +165,15 @@
     "tachr_225_haak_1":     { "crit": true },
     "tachr_226_hmau_1":     { "cond": true },
     "tachr_230_savage_1":	{ "cond": true },
-    "tachr_243_waaifu_1":	{ "crit": true },    
+    "tachr_243_waaifu_1":	{ "crit": true }, 
+    "tachr_272_strong_1":   { "cond": true },   
     "tachr_274_astesi_1":	{ "stack": true },
     "tachr_279_excu_trait":	{ "cond": true },
     "tachr_283_midn_1":	{ "crit": true },
     "tachr_283_midn_trait":	{ "ranged_penalty": true },
     "tachr_286_cast3_1":	{ "cond": true },
     "tachr_290_vigna_1":	{ "crit": true },
+    "tachr_293_thorns_trait": { "ranged_penalty": true },
     "tachr_294_ayer_trait": { "ranged_penalty": true },
     "tachr_298_susuro_1":	{ "cond": true },
     "tachr_306_leizi_1": { "cond": true },

diff --git a/resources/gamedata/art/handbookcard_table.json b/resources/gamedata/art/handbookcard_table.json
@@ -428,6 +428,17 @@
     "name": null,
     "cardID": null
   },
+  "char_218_cuttle": {
+    "charID": "char_218_cuttle",
+    "xPos": -749.977966,
+    "yPos": -519.6,
+    "sixPosX": -10,
+    "sixPosY": -6,
+    "lvl": 0.0,
+    "teamID": 0,
+    "name": null,
+    "cardID": null
+  },
   "char_284_spot": {
     "charID": "char_284_spot",
     "xPos": -899.9736,
@@ -714,6 +725,17 @@
     "name": null,
     "cardID": null
   },
+  "char_272_strong": {
+    "charID": "char_272_strong",
+    "xPos": -224.9934,
+    "yPos": -389.699982,
+    "sixPosX": -3,
+    "sixPosY": -5,
+    "lvl": 0.0,
+    "teamID": 0,
+    "name": null,
+    "cardID": null
+  },
   "char_134_ifrit": {
     "charID": "char_134_ifrit",
     "xPos": 374.988983,
@@ -1231,6 +1253,17 @@
     "name": null,
     "cardID": null
   },
+  "char_293_thorns": {
+    "charID": "char_293_thorns",
+    "xPos": -974.9714,
+    "yPos": 476.3,
+    "sixPosX": -13,
+    "sixPosY": 5,
+    "lvl": 0.0,
+    "teamID": 0,
+    "name": null,
+    "cardID": null
+  },
   "char_294_ayer": {
     "charID": "char_294_ayer",
     "xPos": -899.9736,