Merge branch 'combos'

2019-02-21 15:03:21 +11:00
parent 536414a227 168cdd4104
commit 9b68fd0a09
30 changed files with 1388 additions and 588 deletions
@@ -66,11 +66,11 @@ class StatSheet extends Phaser.Scene {

        const CRYP_STATS = [
            cryp.stamina,
-            cryp.armour,
-            cryp.spell_shield,
+            cryp.red_shield,
+            cryp.blue_shield,
            cryp.evasion,
-            cryp.phys_dmg,
-            cryp.spell_dmg,
+            cryp.red_damage,
+            cryp.blue_damage,
            cryp.speed,
        ];