Merge branch 'master' of https://github.com/Log-Wall/nexskills3

NexusUnleashed · Sep 16, 2024 · 5b6e43b · 5b6e43b
2 parents bc68454 + 9ae87af
commit 5b6e43b
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 10 deletions.
diff --git a/dist/nexskills.min.js b/dist/nexskills.min.js
diff --git a/src/base/skills/attainment/runewarden.js b/src/base/skills/attainment/runewarden.js
@@ -1,5 +1,4 @@
 export const runewarden = {
-  //#region Attainment
   collide: {
     id: "collide",
     fullName: "Collide",
@@ -26,7 +25,32 @@ export const runewarden = {
     tags: ["pve", "damage"],
     length: 3.0,
   },
-  //#endregion
+  bulwark: {
+    id: "bulwark",
+    fullName: "Bulwark",
+    firstPerson:
+      /^The runes on your armour flare brightly as you adopt a defensive stance\.$/,
+    secondPerson: false,
+    thirdPerson: false,
+    profession: ["runewarden"],
+    skill: "attainment",
+    balance: "battlerage",
+    tags: [],
+    length: 3.0,
+  },
+  bulwark: {
+    id: "bulwark",
+    fullName: "Bulwark",
+    firstPerson:
+      /^You strike at (?<target>.+?)'s translucent shield with (?:a|an) .+?, drawing the outline of a rough rune that detonates, consuming the shield\.$/,
+    secondPerson: false,
+    thirdPerson: false,
+    profession: ["runewarden"],
+    skill: "attainment",
+    balance: "battlerage",
+    tags: [],
+    length: 3.0,
+  },
 };
 
 export default Object.values(runewarden);
diff --git a/src/base/skills/bladedance.js b/src/base/skills/bladedance.js
@@ -73,7 +73,6 @@ const bladedance = {
     balance: "balance",
     tags: ["pve", "damage"],
     affs: [],
-    // From front at the arms: broken limb. From front at torso: nausea. From side at arms: clumsiness. From side at torso: asthma. From back at arms: weariness. From back at torso: anorexia
     info: false,
     length: 2.3,
     reaction(action) {

diff --git a/src/base/skills/weaponmastery.js b/src/base/skills/weaponmastery.js
@@ -1,4 +1,41 @@
 export const weaponmastery = {
+  slash: {
+    id: "slash",
+    fullName: "Slash",
+    firstPerson: /^You slash into (?<target>.+?) with (a|an) .+?\.$/,
+    secondPerson: false,
+    thirdPerson: false,
+    profession: ["runewarden", "paladin", "infernal", "unnamable"],
+    skill: "weaponmastery",
+    balance: "balance",
+    tags: ["pve", "damage"],
+    length: 2.2,
+  },
+  slash2: {
+    id: "slash2",
+    fullName: "Slash",
+    firstPerson: /^You swing .+? at (?<target>.+?) with all your might\.$/,
+    secondPerson: false,
+    thirdPerson: false,
+    profession: ["runewarden", "paladin", "infernal", "unnamable"],
+    skill: "weaponmastery",
+    balance: "balance",
+    tags: ["pve", "damage"],
+    length: 2.2,
+  },
+  slash3: {
+    id: "slash3",
+    fullName: "Slash",
+    firstPerson: /^Lightning-quick, you jab (?<target>.+?) with .+?\.$/,
+    secondPerson: false,
+    thirdPerson: false,
+    profession: ["runewarden", "paladin", "infernal", "unnamable"],
+    skill: "weaponmastery",
+    balance: "balance",
+    tags: ["pve", "damage"],
+    length: 2.2,
+  },
+
   razeNone: {
     id: "razeNone",
     fullName: "Raze",

diff --git a/src/base/utilities.js b/src/base/utilities.js
@@ -1,17 +1,35 @@
 export const nextLine = (txt) => {
-  const nextLine =
+  /*const nextLine =
     nexusclient.current_block[
       nexusclient.current_block.indexOf(nexusclient.current_line) + 1
-    ];
+    ];*/
+  const nextLine =
+    nexusclient.current_block[nexusclient.current_line.index + 1];
   const line = nextLine.parsed_line ? nextLine.parsed_line.text() : "";
   return line.includees(txt);
 };
 
+export const inBlock = (txt) => {
+  let res = false;
+  const cb = nexusclient.current_block;
+  const index = nexusclient.current_block.current_line.index;
+  for (let i = index + 1; i < nexusclient.current_block.length; i++) {
+    const element = nexusclient.current_block[i];
+    if (element.parsed_line.text().includes(txt)) {
+      res = true;
+      break;
+    }
+  }
+  return res;
+};
+
 export const nextLines = (txt, num = 1) => {
-  const nextLine =
+  /*const nextLine =
     nexusclient.current_block[
       nexusclient.current_block.indexOf(nexusclient.current_line) + num
-    ];
+    ];*/
+  const nextLine =
+    nexusclient.current_block[nexusclient.current_line.index + num];
   return nextLine.parsed_line ? nextLine.parsed_line.text() : "";
 };
 
@@ -43,10 +61,12 @@ export const addAction = (action) => {
 };
 
 export const checkRandomLimb = () => {
-  const nextLine =
+  /*const nextLine =
     nexusclient.current_block[
       nexusclient.current_block.indexOf(nexusclient.current_line) + 1
-    ];
+    ];*/
+  const nextLine =
+    nexusclient.current_block[nexusclient.current_line.index + 1];
   const line = nextLine.parsed_line ? nextLine.parsed_line.text() : "";
   const match = line.match(/^Your (\w+) (\w+) breaks with a loud crack\.$/);
   if (match) {