Oct 17 fartth

xulai1001 · Oct 17, 2021 · cbafccf · cbafccf
1 parent 28b3d13
commit cbafccf
Show file tree

Hide file tree

Showing 46 changed files with 136,855 additions and 86,742 deletions.
diff --git a/_docs/mastery.js b/_docs/mastery.js
@@ -6,7 +6,7 @@ const DefaultAttribute = {
   potential: 5,  // 0-5
   skillLevel: 9,  // 0-9,
   equip: false,
-  options: { cond: true, crit: true, stack: true, warmup: true, charge: true, equip: true}
+  options: { cond: true, crit: true, stack: true, warmup: true, charge: true, equip: true, far: true}
 };
 const DefaultEnemy = { def: 0, magicResistance: 0, count: 1, hp: 0 };
 

diff --git a/_docs/whatsnew.md b/_docs/whatsnew.md
@@ -5,6 +5,9 @@ order: 4
 category: 工具
 icon: info-circle
 ---
+## 21.10.17
+- [update] 远牙等
+
 ## 21.10.08
 - [mastery] 新图表引擎测试
 

diff --git a/resources/akdata.js b/resources/akdata.js
@@ -7,11 +7,11 @@ const useCache = true;
 const cacheBeginTime = new Date(2019, 12, 10).getTime();
 
 window.AKDATA = {
-  akdata: "210917", // jsdelivr tag version
+  akdata: "211017", // jsdelivr tag version
 
   Data: {},
 
-  new_op: ["char_479_sleach", "char_473_mberry", "char_484_robrta"],
+  new_op: ["char_430_fartth", "char_431_ashlok"],
 
   professionNames: {
     "PIONEER": "先锋",

diff --git a/resources/attributes.js b/resources/attributes.js
@@ -461,6 +461,8 @@ function applyBuff(charAttr, buffFrm, tag, blackbd, isSkill, isCrit, log, enemy)
           blackboard.base_attack_time *= basic.baseAttackTime;
           applyBuffDefault();
           break;
+        case "tachr_431_ashlok_1":
+          applyBuffDefault(); break;
       };
       done = true;
     } else {
@@ -535,7 +537,11 @@ function applyBuff(charAttr, buffFrm, tag, blackbd, isSkill, isCrit, log, enemy)
           log.writeNote("半血斩杀加攻");
           writeBuff(`base_attack_time: ${blackboard.base_attack_time}x`);
           blackboard.base_attack_time *= basic.baseAttackTime;
-          break;  
+          break;
+        case "tachr_431_ashlok_1":
+          blackboard.atk = blackboard["ashlok_t_1.atk"];
+          log.writeNote("周围四格为地面");
+          break;
       }
     }
   } else if (checkSpecs(tag, "ranged_penalty")) { // 距离惩罚类
@@ -851,6 +857,7 @@ function applyBuff(charAttr, buffFrm, tag, blackbd, isSkill, isCrit, log, enemy)
       case "skchr_whispr_2":
       case "skchr_pasngr_2":
       case "skchr_indigo_1":
+      case "skchr_ashlok_2":
         writeBuff(`base_attack_time: ${blackboard.base_attack_time}x`);
         blackboard.base_attack_time *= basic.baseAttackTime;
         break;
@@ -1214,6 +1221,9 @@ function applyBuff(charAttr, buffFrm, tag, blackbd, isSkill, isCrit, log, enemy)
       case "tachr_479_sleach_1":
         blackboard.attack_speed = blackboard["sleach_t_1[ally].attack_speed"];
         break;
+      case "skchr_fartth_3":
+        if (!options.far) delete blackboard.damage_scale;
+        break;
     }
 
   }
@@ -1228,9 +1238,10 @@ function applyBuff(charAttr, buffFrm, tag, blackbd, isSkill, isCrit, log, enemy)
   switch (tag) {
     case "uniequip_002_cuttle":
     case "uniequip_002_glaze":
+    case "uniequip_002_fartth":
       if (options.equip) {
         if (blackboard.damage_scale < 1) blackboard.damage_scale += 1;
-        console.log(blackboard);
+        log.writeNote("距离>4.5");
       } else blackboard.damage_scale = 1;
       break;
   }
@@ -1470,6 +1481,10 @@ function calcDurations(isSkill, attackTime, attackSpeed, levelData, buffList, bu
       duration = levelData.duration - prepDuration;
       // 抬手时间
       var frameBegin = Math.round((checkSpecs(skillId, "attack_begin") || 12));
+      if (skillId == "skchr_glaze_2" && options.far) {
+        log.writeNote("技能前摇增加至27帧");
+        frameBegin = 27;
+      }
       var t = frameBegin / 30;
       attackCount = Math.ceil((duration - t) / attackTime);
       log.write(`技能前摇: ${t.toFixed(3)}s, ${frameBegin} 帧`);
@@ -1845,7 +1860,7 @@ function calculateAttack(charAttr, enemy, raidBlackboard, isSkill, charData, lev
     log.write(`[特殊] ${displayNames["skchr_bubble_2"]}: 攻击力以防御计算(${basicFrame.def + buffFrame.def})`);
   }
   // 迷迭香
-  if (["char_391_rosmon", "char_421_crow"].includes(charId)) {
+  if (["char_391_rosmon", "char_421_crow", "char_431_ashlok"].includes(charId)) {
     buffFrame.maxTarget = 999;
     log.write(`[特殊] ${displayNames[charId]}: maxTarget = 999`);
   }

diff --git a/resources/customdata/dps_anim.json b/resources/customdata/dps_anim.json
@@ -1056,6 +1056,19 @@
       "OnStart": 6
     }
   },
+  "char_126_shotst_epoque#10": {
+    "Attack": {
+      "duration": 30,
+      "OnAttack": 16
+    },
+    "Default": 0,
+    "Idle": 60,
+    "Start": {
+      "duration": 25,
+      "OnStart": 6
+    },
+    "Die": 30
+  },
   "char_127_estell": {
     "Attack": {
       "duration": 30,
@@ -3666,6 +3679,16 @@
     },
     "Die": 30
   },
+  "char_254_vodfox_witch#2": {
+    "Attack": {
+      "duration": 30,
+      "OnAttack": 14
+    },
+    "Default": 0,
+    "Die": 30,
+    "Idle": 80,
+    "Start": 30
+  },
   "char_258_podego": {
     "Attack": {
       "duration": 30,
@@ -3872,6 +3895,36 @@
       "OnStart": 9
     }
   },
+  "char_265_sophia_epoque#11": {
+    "Attack_End": 8,
+    "Attack_Loop": {
+      "duration": 32,
+      "OnAttack": 8
+    },
+    "Attack_Loop_Down": {
+      "duration": 32,
+      "OnAttack": 8
+    },
+    "Attack_Start": 15,
+    "Default": 0,
+    "Die": 30,
+    "Idle": 36,
+    "Skill_Begin": 30,
+    "Skill_End": 10,
+    "Skill_Idle": 30,
+    "Skill_Loop": {
+      "duration": 36,
+      "OnAttack": 12
+    },
+    "Skill_Loop_Down": {
+      "duration": 36,
+      "OnAttack": 12
+    },
+    "Start": {
+      "duration": 30,
+      "OnStart": 9
+    }
+  },
   "char_271_spikes": {
     "Attack_01": {
       "duration": 40,
@@ -4845,6 +4898,26 @@
     },
     "Die": 28
   },
+  "char_328_cammou_witch#2": {
+    "Attack": {
+      "duration": 45,
+      "OnAttack": 17
+    },
+    "Default": 0,
+    "Idle": 120,
+    "Skill2_Begin": 17,
+    "Skill2_End": 25,
+    "Skill2_Idle": 120,
+    "Skill2_Loop": {
+      "duration": 34,
+      "OnAttack": 15
+    },
+    "Start": {
+      "duration": 30,
+      "OnStart": 5
+    },
+    "Die": 28
+  },
   "char_332_archet": {
     "Attack": {
       "duration": 36,
@@ -5685,6 +5758,31 @@
     },
     "Die": 30
   },
+  "char_383_snsant_witch#2": {
+    "Attack": {
+      "duration": 45,
+      "OnAttack": 14
+    },
+    "Default": 0,
+    "Idle": 30,
+    "Skill_2_Begin": {
+      "duration": 42,
+      "OnAttack": 28
+    },
+    "Skill_2_End": 30,
+    "Skill_2_Loop": 18,
+    "Skill_Begin": {
+      "duration": 30,
+      "OnAttack": 16
+    },
+    "Skill_End": 24,
+    "Skill_Loop": 18,
+    "Start": {
+      "duration": 30,
+      "OnStart": 4
+    },
+    "Die": 30
+  },
   "char_385_finlpp": {
     "Attack": {
       "duration": 28,
@@ -6168,6 +6266,35 @@
       "OnStart": 7
     }
   },
+  "char_423_blemsh_witch#2": {
+    "Attack": {
+      "duration": 36,
+      "OnAttack": 15
+    },
+    "Attack_Down": {
+      "duration": 36,
+      "OnAttack": 15
+    },
+    "Default": 0,
+    "Die": 30,
+    "Idle": 90,
+    "Skill_1": {
+      "duration": 36,
+      "OnAttack": 15
+    },
+    "Skill_2": {
+      "duration": 30,
+      "OnAttack": 15
+    },
+    "Skill_3": {
+      "duration": 36,
+      "OnAttack": 17
+    },
+    "Start": {
+      "duration": 30,
+      "OnStart": 7
+    }
+  },
   "char_426_billro": {
     "Default": 0,
     "Die": 31,
@@ -6191,6 +6318,70 @@
       "OnStart": 5
     }
   },
+  "char_430_fartth": {
+    "Attack_Begin": 5,
+    "Attack_Down_Begin": 5,
+    "Attack_Down_End": 5,
+    "Attack_Down_Loop": {
+      "duration": 80,
+      "OnAttack": 3,
+      "OnPlayAudio": 50
+    },
+    "Attack_End": 5,
+    "Attack_Loop": {
+      "duration": 80,
+      "OnAttack": 3,
+      "OnPlayAudio": 50
+    },
+    "Default": 0,
+    "Die": 30,
+    "Idle": 80,
+    "Skill3_Begin": 5,
+    "Skill3_End": 5,
+    "Skill3_Idle": 80,
+    "Skill3_Loop": {
+      "duration": 80,
+      "OnAttack": 3,
+      "OnPlayAudio": 50
+    },
+    "Start": {
+      "duration": 30,
+      "OnStart": 7
+    }
+  },
+  "char_431_ashlok": {
+    "Attack01": {
+      "duration": 35,
+      "OnAttack": 16
+    },
+    "Attack02": {
+      "duration": 44,
+      "OnAttack": 21
+    },
+    "Default": 0,
+    "Idle": 40,
+    "Skill_Idle_Up": 40,
+    "Skill_Loop_Up": {
+      "duration": 34,
+      "OnAttack": 16
+    },
+    "Start": 30,
+    "Attack01_Down": {
+      "duration": 35,
+      "OnAttack": 16
+    },
+    "Die": 28,
+    "Skill_Idle": 40,
+    "Skill_Idle_Down": 40,
+    "Skill_Loop": {
+      "duration": 34,
+      "OnAttack": 16
+    },
+    "Skill_Loop_Down": {
+      "duration": 34,
+      "OnAttack": 15
+    }
+  },
   "char_436_whispr": {
     "Attack": {
       "duration": 85,
@@ -7117,6 +7308,15 @@
       "OnStart": 5
     }
   },
+  "token_10006_vodfox_doll_witch#2": {
+    "Default": 0,
+    "Die": 20,
+    "Idle": 28,
+    "Start": {
+      "duration": 30,
+      "OnStart": 15
+    }
+  },
   "token_10007_phatom_twin_ghost#1": {
     "Attack": {
       "duration": 26,

diff --git a/resources/customdata/dps_options.json b/resources/customdata/dps_options.json
@@ -17,7 +17,8 @@
         "annie": { "type": "bool", "displaytext": "替身", "explain": "贝娜-显示替身数据", "off": true },
         "pallas": { "type": "bool", "displaytext": "加成自身", "explain": "帕拉斯-3技能加成自己的情况", "off": true },
         "water": { "type": "bool", "displaytext": "水地形", "explain": "假日威龙陈-水地形", "off": true },
-        "equip": { "type": "bool", "displaytext": "模组效果", "explain": "触发模组效果/叠满" }
+        "equip": { "type": "bool", "displaytext": "模组效果", "explain": "触发模组效果/叠满" },
+        "far": { "type": "bool", "displaytext": "原本范围以外", "explain": "远牙/安比尔-攻击原本范围以外的敌人" }
     },
     "cond_info": {
         "char_126_shotst": 1,
@@ -76,7 +77,9 @@
         "char_421_crow":    { "text": "[s2]半血敌人", "tooltip": "勾选表示2技能攻击半血敌人" },
         "char_1013_chen2":  "trait",
         "char_437_mizuki":  2,
-        "char_473_mberry":  1
+        "char_473_mberry":  1,
+        "char_430_fartth":  1,
+        "char_431_ashlok":  1
     },
     "char" : {
         "char_103_angel": [ "archet", "chen" ],
@@ -186,6 +189,8 @@
         "char_437_mizuki": [ "cond" ],
         "char_473_mberry":  [ "cond" ],
         "char_218_cuttle":  [ "equip" ],
-        "char_302_glaze":   [ "equip" ]
+        "char_302_glaze":   [ "equip", "far" ],
+        "char_430_fartth":  [ "cond", "equip", "far" ],
+        "char_431_ashlok":  [ "cond" ]
     }
 }