Merge pull request #15 from J-888/master

Beastmaster tree, texts pending

src/components/Skill/index.js

@@ -29,12 +29,13 @@ export default function Skill ({
   const isAugment = [
     SKILLS.AUGMENT_CHEVRON,
     SKILLS.AUGMENT_DIAMOND,
-    SKILLS.ACTION_SKILL,
+    SKILLS.AUGMENT_ACTION_SKILL,
   ].includes(type);
   let shapeStyle = null;
+  if (type === SKILLS.ACTION_SKILL) { shapeStyle = style.actionSkill; }
   if (type === SKILLS.AUGMENT_CHEVRON) { shapeStyle = style.chevron; }
   if (type === SKILLS.AUGMENT_DIAMOND) { shapeStyle = style.diamond; }
-  if (type === SKILLS.ACTION_SKILL) { shapeStyle = style.actionSkill; }
+  if (type === SKILLS.AUGMENT_ACTION_SKILL) { shapeStyle = style.actionSkill; }
   function clickListener (event) {
     var newValue;
     if (event.type === 'click') {

src/constants/skills.js

@@ -2,4 +2,5 @@ export default {
   ACTION_SKILL: 1,
   AUGMENT_CHEVRON: 2,
   AUGMENT_DIAMOND: 3,
+  AUGMENT_ACTION_SKILL: 4,
 }

src/pages/Beastmaster/skills.js

@@ -2,30 +2,379 @@ import SKILLS from '@constants/skills';
 
 /* eslint-disable quotes */
 const skills = {
-  "Tree One": {
+  "Stalker": {
     "0": {
-      "?": {
-        text: "?",
+      "Jabber Sidekick": {
+        text: "FL4K is joined by a loyal Jabber companion, armed with a Pistol. While accompanied by the Jabber, FL4K’s Movement Speed is increased. Hold F to issue an Attack Command, which will cause the Jabber to throw a Radiation Barrel at enemies.",
+        type: SKILLS.AUGMENT_DIAMOND,
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "Fade Away": {
+        text: "FL4K cloaks, turning invisible. FL4K can fire 3 shots while cloaked, and each shot is automatically a Critical Hit. While cloaked, FL4K has increased Movement Speed and Health Regeneration.",
         type: SKILLS.ACTION_SKILL,
         ranks: 0,
         effect: (rank, level) => `?`,
       },
     },
-  },
-  "Tree Two": {
-    "0": {
-      "?": {
+    "1": {
+      "TODO_1": {
         text: "?",
-        type: SKILLS.ACTION_SKILL,
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_2": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_3": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+    },
+    "2": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_CHEVRON,
+      },
+      "TODO_2": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_3": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_4": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+    },
+    "3": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_CHEVRON,
+      },
+      "TODO_2": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_3": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_4": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_DIAMOND,
+      },
+    },
+    "4": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_CHEVRON,
+      },
+      "TODO_2": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_3": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_4": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_DIAMOND,
+      },
+    },
+    "5": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_CHEVRON,
+      },
+      "TODO_2": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+    },
+    "6": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
         effect: (rank, level) => `?`,
       },
     },
   },
-  "Tree Three": {
+  "Master": {
     "0": {
-      "?": {
-        text: "?",
+      "Jabber Sidekick": {
+        text: "FL4K is joined by a loyal Jabber companion, armed with a Pistol. While accompanied by the Jabber, FL4K’s Movement Speed is increased. Hold F to issue an Attack Command, which will cause the Jabber to throw a Radiation Barrel at enemies.",
+        type: SKILLS.AUGMENT_DIAMOND,
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "Fade Away": {
+        text: "FL4K cloaks, turning invisible. FL4K can fire 3 shots while cloaked, and each shot is automatically a Critical Hit. While cloaked, FL4K has increased Movement Speed and Health Regeneration.",
         type: SKILLS.ACTION_SKILL,
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+    },
+    "1": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_2": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_3": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+    },
+    "2": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_CHEVRON,
+      },
+      "TODO_2": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_3": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_4": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+    },
+    "3": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_CHEVRON,
+      },
+      "TODO_2": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_3": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_4": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_DIAMOND,
+      },
+    },
+    "4": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_CHEVRON,
+      },
+      "TODO_2": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_3": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_4": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_DIAMOND,
+      },
+    },
+    "5": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_CHEVRON,
+      },
+      "TODO_2": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_3": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+    },
+    "6": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+    },
+  },
+  "Hunter": {
+    "0": {
+      "Jabber Sidekick": {
+        text: "FL4K is joined by a loyal Jabber companion, armed with a Pistol. While accompanied by the Jabber, FL4K’s Movement Speed is increased. Hold F to issue an Attack Command, which will cause the Jabber to throw a Radiation Barrel at enemies.",
+        type: SKILLS.AUGMENT_DIAMOND,
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "Fade Away": {
+        text: "FL4K cloaks, turning invisible. FL4K can fire 3 shots while cloaked, and each shot is automatically a Critical Hit. While cloaked, FL4K has increased Movement Speed and Health Regeneration.",
+        type: SKILLS.ACTION_SKILL,
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+    },
+    "1": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_2": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_3": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+    },
+    "2": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_CHEVRON,
+      },
+      "TODO_2": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_3": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_4": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+    },
+    "3": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_CHEVRON,
+      },
+      "TODO_2": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_3": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_DIAMOND,
+      },
+    },
+    "4": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_CHEVRON,
+      },
+      "TODO_2": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_3": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_4": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_DIAMOND,
+      },
+    },
+    "5": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+        type: SKILLS.AUGMENT_CHEVRON,
+      },
+      "TODO_2": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+      "TODO_3": {
+        text: "?",
+        ranks: 0,
+        effect: (rank, level) => `?`,
+      },
+    },
+    "6": {
+      "TODO_1": {
+        text: "?",
+        ranks: 0,
         effect: (rank, level) => `?`,
       },
     },

src/pages/Gunner/skills.js

@@ -54,7 +54,7 @@ const skills = {
       },
       "Salamander": {
         text: "The Salamander is a flamethrower that deals Fire Damage to enemies at close range. Though the Salamander has infinite ammo, it drains Fuel with use.",
-        type: SKILLS.ACTION_SKILL,
+        type: SKILLS.AUGMENT_ACTION_SKILL,
         effect: (rank, level) => `Fire... for effect.`,
       },
     },
@@ -176,7 +176,7 @@ const skills = {
       },
       "Vanquisher Rocket Pod": {
         text: "The Vanquisher Rocket Pod is a rocket launcher capable of rapid-firing volleys of unguided explosive rockets.",
-        type: SKILLS.ACTION_SKILL,
+        type: SKILLS.AUGMENT_ACTION_SKILL,
         effect: (rank, level) => `If you want guidance, get a sherpa. If you want explosions, get a Vladof.`,
       },
     },
@@ -297,7 +297,7 @@ const skills = {
       },
       "Bear Fist": {
         text: "The Bear Fist is a pneumatic-driven fist that deals massive damage to a single target at close range.",
-        type: SKILLS.ACTION_SKILL,
+        type: SKILLS.AUGMENT_ACTION_SKILL,
         effect: (rank, level) => `Vladof supports the right to bear armored bear arms.`,
       },
     },
@@ -332,7 +332,7 @@ const skills = {
       "Behind the Iron Curtain": {
         text: "Moze's Shield Recharge Delay is reduced, and her Shield Recharge Rate is increased.",
         ranks: 3,
-        effect: (rank, level) => `Shield Recharge Rate: +${percent(rank, 7)}%, Shield Recharge Rate: -${percent(rank, 8)}%`,
+        effect: (rank, level) => `Shield Recharge Rate: +${percent(rank, 7)}%, Shield Recharge Delay: -${percent(rank, 8)}%`,
       },
       "Desperate Measures": {
         text: "Moze's Gun Damage is increased depending on how low her health is. The lower her health, the greater the increase.",

src/pages/Siren/skills.js

@@ -63,7 +63,7 @@ const skills = {
         ranks: 0,
         text: "Amara summons a Handful of Fists that erupt from the ground, dealing damage in front of Amara.",
         effect: (rank, level) => `Damage ${flat(rank, level, 124)}, Cooldown 26 sec`,
-        type: SKILLS.ACTION_SKILL,
+        type: SKILLS.AUGMENT_ACTION_SKILL,
       },
       "Mindfulness": {
         ranks: 3,
@@ -92,7 +92,7 @@ const skills = {
         ranks: 0,
         text: "Amara leaps into the air and shoots an Elemental Beam below her, followed by a Slam.",
         effect: (rank, level) => `Damage ${flat(rank, level, 141)}, Beam Damage ${flat(rank, level, 21)} per sec, Cooldown 36 sec`,
-        type: SKILLS.ACTION_SKILL,
+        type: SKILLS.AUGMENT_ACTION_SKILL,
       },
       "Samsara": {
         ranks: 3,
@@ -185,7 +185,7 @@ const skills = {
         ranks: 0,
         text: "Amara sends forward an Astral Projection of herself that damages everything in its path. Deals increased damage for every enemy hit.",
         effect: (rank, level) => `Damage 116, Damage Bonus +50% per enemy hit, Cooldown 24 sec`,
-        type: SKILLS.ACTION_SKILL,
+        type: SKILLS.AUGMENT_ACTION_SKILL,
       },
       "Ascendant": {
         ranks: 1,
@@ -204,7 +204,7 @@ const skills = {
         ranks: 0,
         text: "Amara sends forward an Astral Projection of herself that deals damage to everything in its path. Upon hitting enemies, it releases homing Elemental Projectiles that trigger Action Skill Elemental Effect on enemies.",
         effect: (rank, level) => `Damage ${flat(rank, level, 124)}, Elemental Projectiles 3 per enemy hit, Cooldown 24 sec`,
-        type: SKILLS.ACTION_SKILL,
+        type: SKILLS.AUGMENT_ACTION_SKILL,
       },
       "From Rest": {
         ranks: 3,
@@ -237,7 +237,7 @@ const skills = {
         ranks: 0,
         text: "Amara sends forward an Astral Projection of herself that explodes when it hits a target, damaging all nearby enemies.",
         effect: (rank, level) => `Damage: ${flat(rank, level, 166)}, Cooldown 28 sec`,
-        type: SKILLS.ACTION_SKILL,
+        type: SKILLS.AUGMENT_ACTION_SKILL,
       },
     },
     "6": {
@@ -301,7 +301,7 @@ const skills = {
         ranks: 0,
         text: "Amara summons a giant fist that bursts into the ground and locks targeted enemy in place. If Grasped enemy is killed, up to 3 new targets can be Grasped as well.",
         effect: (rank, level) => `Bonus Targets up to +4, Cooldown 23 sec, Grasp Immune Damage ${flat(rank, level, 66)}`,
-        type: SKILLS.ACTION_SKILL,
+        type: SKILLS.AUGMENT_ACTION_SKILL,
       },
       "Dread": {
         ranks: 1,
@@ -335,7 +335,7 @@ const skills = {
         ranks: 0,
         text: "Amara summons a giant fist that bursts from the ground and locks targeted enemy in place. Enemies near Grasped target are linked, and any damage dealt to a linked target is shared between all links.",
         effect: (rank, level) => `Link Damage 35% of damage dealt, Cooldown 17 sec, Grasp Immune Damage ${flat(rank, level, 80)}`,
-        type: SKILLS.ACTION_SKILL,
+        type: SKILLS.AUGMENT_ACTION_SKILL,
       },
     },
     "5": {
@@ -343,7 +343,7 @@ const skills = {
         ranks: 0,
         text: "Amara summons a giant fist that bursts from the ground and locks targeted enemy in place. After Grasping, large fists appear to smash the area, dealing damage to nearby enemies.",
         effect: (rank, level) => `Damage ${flat(rank, level, 21)}, Cooldown 31 sec, Grasp Immune Damage ${flat(rank, level, 93)}`,
-        type: SKILLS.ACTION_SKILL,
+        type: SKILLS.AUGMENT_ACTION_SKILL,
       },
       "Sustainment": {
         ranks: 5,