From 11de6afd00b44c860806526af4f7cf396fc9ed83 Mon Sep 17 00:00:00 2001 From: ntr Date: Mon, 17 Dec 2018 14:53:13 +1100 Subject: [PATCH] text and results early return --- client/src/scenes/combat.render.resolutions.js | 4 +++- client/src/scenes/game.list.js | 8 ++++---- server/src/skill.rs | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/client/src/scenes/combat.render.resolutions.js b/client/src/scenes/combat.render.resolutions.js index d4098cc3..5e907b6c 100644 --- a/client/src/scenes/combat.render.resolutions.js +++ b/client/src/scenes/combat.render.resolutions.js @@ -45,6 +45,8 @@ function calculateTweenParams(sourceSpawn, targetSpawn, account) { } function animatePhase(scene, game, resolution, cb) { + + console.log(resolution); // return early for disabled skills if (resolution.resolution.disable.disabled) return cb(); const group = scene.scene.get('CombatCryps').cryps; @@ -60,7 +62,7 @@ function animatePhase(scene, game, resolution, cb) { // ew const { resolution: { results } } = resolution; - if (results.len === 0) return cb(); + if (results.length === 0) return cb(); // Move cryps into posistion if (moveSourceBattle) scene.tweens.add(moveSourceBattle); diff --git a/client/src/scenes/game.list.js b/client/src/scenes/game.list.js index b61972f4..54abeb47 100644 --- a/client/src/scenes/game.list.js +++ b/client/src/scenes/game.list.js @@ -23,7 +23,7 @@ class GameList extends Phaser.GameObjects.Group { .setOrigin(0); this.add(list.add - .text(spawn.getCenter().x, spawn.getCenter().y, 'SPAWN', TEXT.HEADER) + .text(spawn.getCenter().x, spawn.getCenter().y, 'spawn\ncryp', TEXT.HEADER) .setOrigin(0.5, 0.5)); const pvp = list.add @@ -32,7 +32,7 @@ class GameList extends Phaser.GameObjects.Group { .setOrigin(0); this.add(list.add - .text(pvp.getCenter().x, pvp.getCenter().y, 'PVP', TEXT.HEADER) + .text(pvp.getCenter().x, pvp.getCenter().y, 'new PVP\ngame', TEXT.HEADER) .setOrigin(0.5, 0.5)); const pve = list.add @@ -41,7 +41,7 @@ class GameList extends Phaser.GameObjects.Group { .setOrigin(0); this.add(list.add - .text(pve.getCenter().x, pve.getCenter().y, 'PVE', TEXT.HEADER) + .text(pve.getCenter().x, pve.getCenter().y, 'new PVE\ngame', TEXT.HEADER) .setOrigin(0.5, 0.5)); const refresh = list.add @@ -50,7 +50,7 @@ class GameList extends Phaser.GameObjects.Group { .setOrigin(0); this.add(list.add - .text(refresh.getCenter().x, refresh.getCenter().y, 'REFRESH', TEXT.HEADER) + .text(refresh.getCenter().x, refresh.getCenter().y, 'refresh\ngame list', TEXT.HEADER) .setOrigin(0.5, 0.5)); diff --git a/server/src/skill.rs b/server/src/skill.rs index 402ae3cd..8f7903d5 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -360,7 +360,7 @@ impl Skill { Skill::Parry => Some(1), // avoid all dmg Skill::Snare => Some(2), - Skill::Paralyse => Some(3), + Skill::Paralyse => Some(2), Skill::Strangle => Some(3), // Strangle