games/spacetac
games/spacetac
1
0
Fork 0
Code Releases Activity

Fixed some weapon effects issues

Browse source
This commit is contained in:
Michaël Lemaire 2017-07-23 19:31:46 +02:00
parent e068b70b9d
commit 4575bc9eb7
3 changed files with 48 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
TODO.md
View file

@ -75,11 +75,6 @@ Artificial Intelligence
* New duel page with producers/evaluators tweaking
* Work in a dedicated process (webworker)
Technical
---------
* Ensure that tweens and particle emitters get destroyed once animation is done (or view changes)
Common UI
---------

31
src/ui/battle/WeaponEffect.spec.ts
View file

@ -2,8 +2,20 @@ module TS.SpaceTac.UI.Specs {
describe("WeaponEffect", function () {
let testgame = setupBattleview();
function checkEmitters(step: string, expected: number) {
expect(testgame.battleview.arena.layer_weapon_effects.children.length).toBe(expected, `${step} - layer children`);
expect(keys(testgame.battleview.game.particles.emitters).length).toBe(expected, `${step} - registered emitters`);
}
function fastForward(milliseconds: number) {
jasmine.clock().tick(milliseconds);
testgame.ui.updateLogic(milliseconds);
}
it("displays shield hit effect", function () {
let battleview = testgame.battleview;
battleview.timer = new Timer();
let effect = new WeaponEffect(battleview.arena, new Ship(), new Target(0, 0), new Equipment());
effect.shieldImpactEffect({ x: 10, y: 10 }, { x: 20, y: 15 }, 1000, 3000, true);
@ -19,6 +31,8 @@ module TS.SpaceTac.UI.Specs {
it("displays gatling gun effect", function () {
let battleview = testgame.battleview;
battleview.timer = new Timer();
let ship = nn(battleview.battle.playing_ship);
let sprite = nn(battleview.arena.findShipSprite(ship));
ship.setArenaPosition(50, 30);
@ -46,5 +60,22 @@ module TS.SpaceTac.UI.Specs {
expect(mock_shield_impact).toHaveBeenCalledWith(jasmine.objectContaining({ x: 0, y: 0 }), jasmine.objectContaining({ x: 50, y: 30 }), 100, 800, true);
expect(mock_hull_impact).toHaveBeenCalledTimes(1);
});
it("removes particle emitters when done", function () {
let battleview = testgame.battleview;
battleview.timer = new Timer();
let effect = new WeaponEffect(battleview.arena, new Ship(), Target.newFromLocation(50, 50), new Equipment());
effect.gunEffect();
checkEmitters("gun effect started", 2);
fastForward(6000);
checkEmitters("gun effect ended", 0);
effect.hullImpactEffect({ x: 0, y: 0 }, { x: 50, y: 50 }, 1000, 2000);
checkEmitters("hull effect started", 1);
fastForward(8500);
checkEmitters("hull effect ended", 0);
});
});
}

28
src/ui/battle/WeaponEffect.ts
View file

@ -17,6 +17,9 @@ module TS.SpaceTac.UI {
// Link to arena
private arena: Arena
// Timer to use
private timer: Timer
// Display group in which to display the visual effects
private layer: Phaser.Group
@ -37,6 +40,7 @@ module TS.SpaceTac.UI {
constructor(arena: Arena, ship: Ship, target: Target, weapon: Equipment) {
this.ui = arena.getGame();
this.arena = arena;
this.timer = arena.battleview.timer;
this.layer = arena.layer_weapon_effects;
this.ship = ship;
this.target = target;
@ -98,7 +102,7 @@ module TS.SpaceTac.UI {
effect.alpha = 0;
effect.rotation = angle;
effect.anchor.set(0.5, 0.5);
this.layer.addChild(effect);
this.layer.add(effect);
let tween1 = this.ui.add.tween(effect).to({ alpha: 1 }, 100).delay(delay);
let tween2 = this.ui.add.tween(effect).to({ alpha: 0 }, 100).delay(duration);
@ -116,8 +120,9 @@ module TS.SpaceTac.UI {
emitter.setRotation(0, 0);
emitter.setXSpeed(-Math.cos(angle) * 20, -Math.cos(angle) * 80);
emitter.setYSpeed(-Math.sin(angle) * 20, -Math.sin(angle) * 80);
this.arena.battleview.timer.schedule(delay, () => emitter.start(false, 200, 30, duration * 0.8 / 30));
this.layer.addChild(emitter);
this.timer.schedule(delay, () => emitter.start(false, 200, 30, duration * 0.8 / 30));
this.layer.add(emitter);
this.timer.schedule(delay + duration + 5000, () => emitter.destroy());
}
}
@ -136,8 +141,9 @@ module TS.SpaceTac.UI {
emitter.setRotation(0, 0);
emitter.setXSpeed(-Math.cos(angle) * 120, -Math.cos(angle) * 260);
emitter.setYSpeed(-Math.sin(angle) * 120, -Math.sin(angle) * 260);
this.arena.battleview.timer.schedule(delay, () => emitter.start(false, 200, 30, duration * 0.8 / 30));
this.layer.addChild(emitter);
this.timer.schedule(delay, () => emitter.start(false, 200, 30, duration * 0.8 / 30));
this.layer.add(emitter);
this.timer.schedule(delay + duration + 5000, () => emitter.destroy());
}
/**
@ -149,7 +155,7 @@ module TS.SpaceTac.UI {
let missile = new Phaser.Image(this.ui, this.source.x, this.source.y, "battle-weapon-default");
missile.anchor.set(0.5, 0.5);
missile.rotation = arenaAngle(this.source, this.destination);
this.layer.addChild(missile);
this.layer.add(missile);
let blast_radius = this.weapon.action.getBlastRadius(this.ship);
@ -169,13 +175,13 @@ module TS.SpaceTac.UI {
tween1.start();
let tween2 = this.ui.tweens.create(blast).to({ alpha: 0 }, 1450, Phaser.Easing.Quadratic.In);
tween2.start();
this.layer.addChild(blast);
this.layer.add(blast);
}
});
tween.start();
if (blast_radius > 0) {
let ships = this.arena.getShipsInCircle(new ArenaCircleArea());
let ships = this.arena.getShipsInCircle(new ArenaCircleArea(this.destination.x, this.destination.y, blast_radius));
ships.forEach(sprite => {
if (sprite.getValue("shield") > 0) {
this.shieldImpactEffect(this.target, sprite, 1200, 800);
@ -199,8 +205,7 @@ module TS.SpaceTac.UI {
var angle = arenaAngle(this.source, this.target);
var distance = arenaDistance(this.source, this.target);
var emitter = new Phaser.Particles.Arcade.Emitter(this.ui,
this.source.x + Math.cos(angle) * 35, this.source.y + Math.sin(angle) * 35, 10);
var emitter = this.ui.add.emitter(this.source.x + Math.cos(angle) * 35, this.source.y + Math.sin(angle) * 35, 10);
var speed = 2000;
emitter.particleClass = BulletParticle;
emitter.gravity = 0;
@ -214,7 +219,8 @@ module TS.SpaceTac.UI {
guard = distance - 1;
}
emitter.start(false, 1000 * (distance - guard) / speed, 50, 10);
this.layer.addChild(emitter);
this.layer.add(emitter);
this.timer.schedule(5000, () => emitter.destroy());
if (has_shield) {
this.shieldImpactEffect(this.source, this.target, 100, 800, true);