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

Fixed action description in actionbar tooltip

Browse source
This commit is contained in:
Michaël Lemaire 2017-05-03 20:25:12 +02:00
parent 3e0b0ce173
commit ed86f57529
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ui/battle/ActionTooltip.spec.ts
View file

@ -14,7 +14,7 @@ module TS.SpaceTac.UI.Specs {
let a1 = bar.addAction(ship, new MoveAction(new Equipment()));
nn(a1.action.equipment).name = "Engine";
a1.action.name = "Move";
let a2 = bar.addAction(ship, new FireWeaponAction(new Equipment()));
let a2 = bar.addAction(ship, new FireWeaponAction(new Equipment(), 2, 50, 0, [new DamageEffect(12)]));
nn(a2.action.equipment).name = "Weapon";
a2.action.name = "Fire";
let a3 = bar.addAction(ship, new EndTurnAction());
@ -24,16 +24,19 @@ module TS.SpaceTac.UI.Specs {
expect(tooltip.main_title.text).toEqual("Engine");
expect(tooltip.sub_title.text).toEqual("Move");
expect(tooltip.shortcut.text).toEqual("[ 1 ]");
expect(tooltip.description.text).toEqual("Move: 0km per power point");
tooltip.setAction(a2);
expect(tooltip.main_title.text).toEqual("Weapon");
expect(tooltip.sub_title.text).toEqual("Fire");
expect(tooltip.shortcut.text).toEqual("[ 2 ]");
expect(tooltip.description.text).toEqual("Fire (power usage 2, max range 50km):\n- do 12 damage on target");
tooltip.setAction(a3);
expect(tooltip.main_title.text).toEqual("End turn");
expect(tooltip.sub_title.text).toEqual("");
expect(tooltip.shortcut.text).toEqual("[ space ]");
expect(tooltip.description.text).toEqual("");
});
});
}

2
src/ui/battle/ActionTooltip.ts
View file

@ -58,7 +58,7 @@ module TS.SpaceTac.UI {
let cost = action.action.getActionPointsUsage(action.ship, null);
this.cost.setText(cost == 0 ? "" : `Cost: ${cost} power`);
}
this.description.setText(action.action.equipment ? action.action.equipment.getEffectsDescription() : "");
this.description.setText(action.action.getEffectsDescription());
let position = this.bar.action_icons.indexOf(action);
if (action.action instanceof EndTurnAction) {