diff --git a/package.json b/package.json index 2e34ec9..9d61980 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "test": "karma start spec/support/karma.conf.js && remap-istanbul -i out/coverage/coverage.json -o out/coverage -t html", "prestart": "tsc -p . || true", "start": "live-server out --host=127.0.0.1 --port=8012 --ignore=coverage", - "codecov": "remap-istanbul -i out/coverage/coverage.json -o out/coverage/mapped.json -t json && codecov -f out/coverage/mapped.json" + "codecov": "remap-istanbul -i out/coverage/coverage.json -o out/coverage/mapped.json -t json && codecov -f out/coverage/mapped.json", + "deploy": "rsync -avz --delete ./out/ hosting.thunderk.net:/srv/website/spacetac/" }, "repository": { "type": "git", @@ -41,4 +42,4 @@ "phaser": "2.6.2", "phaser-plugin-scene-graph": "1.0.4" } -} \ No newline at end of file +} diff --git a/src/core/actions/EndTurnAction.spec.ts b/src/core/actions/EndTurnAction.spec.ts index d1736c5..976dfdb 100644 --- a/src/core/actions/EndTurnAction.spec.ts +++ b/src/core/actions/EndTurnAction.spec.ts @@ -132,6 +132,7 @@ module TK.SpaceTac.Specs { ship.active_effects.add(effect1); ship.active_effects.add(effect2); effect2.base.getOnDiffs(ship, ship).forEach(effect => effect.apply(battle)); + check.patch(battle, "iAreaEffects", () => isingle(effect1)); TestTools.actionChain(check, battle, [ [ship, EndTurnAction.SINGLETON, Target.newFromShip(ship)],