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

client/src/scenes/combat.cryps.js

@@ -68,7 +68,10 @@ class CrypImage extends Phaser.GameObjects.Image {
 class CrypSkill extends Phaser.GameObjects.Text {
     constructor(scene, x, y, team, skill, cryp) {
         // Avatar will be a property of cryp
-        super(scene, x, y, skill.skill, TEXT.NORMAL);
+
+        const CD_TEXT = skill.cd ? `(${skill.cd}T)` : '';
+        const SKILL_TEXT = `${skill.skill} ${CD_TEXT}`;
+        super(scene, x, y, SKILL_TEXT, TEXT.NORMAL);
         this.cryp = cryp; this.skill = skill; this.scene = scene;
         this.setInteractive();
     }

client/src/socket.js

@@ -6,8 +6,9 @@ const SOCKET_URL = process.env.NODE_ENV === 'production' ? 'wss://cryps.gg/ws' :
 function errorToast(err) {
     console.error(err);
     return toast.error({
-        title: 'Error',
+        title: 'BEEP BOOP',
         message: err,
+        position: 'topRight',
     });
 }
 
@@ -24,6 +25,7 @@ function createSocket(events) {
         ws.addEventListener('open', (event) => {
             toast.info({
                 message: 'connected',
+                position: 'topRight',
             });
 
             events.loginPrompt();