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

Fixed hull slot receiving any kind of equipment

Browse source
This commit is contained in:
Michaël Lemaire 2017-03-09 20:11:19 +01:00
parent 0b327fec26
commit 4d991cd43e
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/LootGenerator.ts
View file

@ -39,7 +39,7 @@ module TS.SpaceTac {
// Generate equipments matching conditions, with each template
var equipments: Equipment[] = [];
this.templates.forEach((template: LootTemplate) => {
if (slot && slot != template.slot) {
if (slot !== null && slot != template.slot) {
return;
}

5
src/core/ShipGenerator.ts
View file

@ -30,7 +30,10 @@ module TS.SpaceTac {
result.slots.forEach((slot: Slot) => {
var equipment = loot.generate(new IntegerRange(level, level), slot.type);
if (equipment) {
slot.attach(equipment);
slot.attach(equipment)
if (slot.attached !== equipment) {
console.error("Cannot attach generated equipment to slot", equipment, slot);
}
}
});

4
src/ui/character/CharacterEquipment.ts
View file

@ -11,8 +11,8 @@ module TS.SpaceTac.UI {
*/
export class CharacterEquipment extends Phaser.Image {
constructor(sheet: CharacterSheet, equipment: Equipment) {
let action_icon = equipment.action != null && !(equipment.action instanceof MoveAction);
super(sheet.game, 0, 0, action_icon ? `battle-actions-${equipment.action.code}` : `equipment-${equipment.code}`);
let icon = sheet.game.cache.checkImageKey(`equipment-${equipment.code}`) ? `equipment-${equipment.code}` : `battle-actions-${equipment.action.code}`;
super(sheet.game, 0, 0, icon);
this.anchor.set(0.5, 0.5);
this.scale.set(0.5, 0.5);