From 6d414a8f5ea136b648a84a3cb4380f615c1ef524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Fri, 20 Jul 2018 21:42:50 +0200 Subject: [PATCH] WIP --- TODO.md | 2 -- src/core/MoveFireSimulator.ts | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/TODO.md b/TODO.md index 66a1a78..e9cdd27 100644 --- a/TODO.md +++ b/TODO.md @@ -53,9 +53,7 @@ Battle * [WIP] Add an hexagonal grid * Use the grid for "border" exclusion areas * Fix repel effect to snap to grid and use grid units (beware of two ships being moved to the same location!) - * Display the grid in targetting mode, with colors (replaces range hint) * Fix move-fire simulator's scanCircle - * Fix occupied space in move action targetting being displayed as "not enough power" * Apply to action's default targets * Add engine trail effect, and sound * Find incentives to move from starting position (permanent drones or anomalies?) diff --git a/src/core/MoveFireSimulator.ts b/src/core/MoveFireSimulator.ts index 0b73652..c04716c 100644 --- a/src/core/MoveFireSimulator.ts +++ b/src/core/MoveFireSimulator.ts @@ -169,7 +169,7 @@ module TK.SpaceTac { // TODO Split in "this turn" part and "next turn" part if needed result.parts.push({ action: move_action, target: move_target, ap: result.total_move_ap, possible: result.can_move }); - if (!result.can_end_move) { + if (result.status == MoveFireStatus.OK && !result.can_end_move) { result.status = MoveFireStatus.NOT_ENOUGH_POWER; }