Merge branch 'master' of ssh://cryps.gg:40022/~/cryps

client/src/scenes/elements/combat.statbar.js

@@ -28,7 +28,7 @@ class StatBar extends Phaser.GameObjects.Graphics {
 
         if (type === 'HP') {
             this.val = this.crypObj.cryp.hp.value;
-            this.max = this.crypObj.cryp.stamina.value;
+            this.max = this.crypObj.cryp.hp.value;
             this.margin = 0;
         } else if (type === 'Red Shield') {
             this.val = this.crypObj.cryp.red_shield.value;

client/src/scenes/statsheet.js

@@ -63,11 +63,11 @@ class StatSheet extends Phaser.Scene {
         const crypStat = (stat, i) => {
             const STAT_X = X;
             const STAT_Y = Y + (i + 2) * TEXT_MARGIN;
-            this.add.text(STAT_X, STAT_Y, `${stat.stat}: ${stat.value}`, TEXT.NORMAL);
+            this.add.text(STAT_X, STAT_Y, `${stat.stat}: ${stat.base} -> ${stat.value}`, TEXT.NORMAL);
         };
 
         const CRYP_STATS = [
-            cryp.stamina,
+            cryp.hp,
             cryp.red_shield,
             cryp.blue_shield,
             cryp.evasion,
@@ -90,7 +90,7 @@ class StatSheet extends Phaser.Scene {
         this.add.text(X + WIDTH * 0.175, Y, 'Skills', TEXT.HEADER);
 
         this.add.text(X + WIDTH * 0.175, Y + HEIGHT * 0.25, 'Specs', TEXT.HEADER);
-       const knownSpec = (spec, i) => {
+        const knownSpec = (spec, i) => {
             const SKILL_X = X + WIDTH * 0.21 + WIDTH * 0.125 * i;
             const SKILL_Y = Y + HEIGHT * 0.4;
             const itemObj = new Item(this, spec, i, SKILL_X, SKILL_Y, SKILL_WIDTH, Math.floor(SKILL_WIDTH / 2));

client/src/tutorial.js

@@ -19,7 +19,7 @@ This homepage shows your cryps, joinable online games, PVE options and your item
 If you have no cryps yet, press SPAWN and give your cryp a name to create one.
 Once you have made a cryp, click on them to visit their stat page and teach them some SKILLS.
 The stat page also has descriptions of each skill and their effects.
-cryps have 3 basic stats: stamina, red damage and magic damage.
+cryps have 3 basic stats: hp, red damage and magic damage.
 Toggle whether a cryp is selected for your team by clicking the coloured stripes next to the cryp or press 1,2,3.
 Once you have a team ready press the New PVE Game button to start playing.
 `;