1
0
Fork 0

Fixed missing equipment image

This commit is contained in:
Michaël Lemaire 2017-07-31 18:25:00 +02:00
parent dd37f20a43
commit 5700e7c16a
3 changed files with 3 additions and 3 deletions

View file

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

View file

@ -7,7 +7,7 @@
"shell": "${SHELL} || true", "shell": "${SHELL} || true",
"postinstall": "typings install && rm -rf out/vendor && mkdir -p out/vendor && cp -r node_modules/phaser/build out/vendor/phaser && cp -r node_modules/phaser-plugin-scene-graph/dist out/vendor/phaser-plugin-scene-graph && cp -r node_modules/parse/dist out/vendor/parse && cp -r node_modules/jasmine-core/lib/jasmine-core out/vendor/jasmine", "postinstall": "typings install && rm -rf out/vendor && mkdir -p out/vendor && cp -r node_modules/phaser/build out/vendor/phaser && cp -r node_modules/phaser-plugin-scene-graph/dist out/vendor/phaser-plugin-scene-graph && cp -r node_modules/parse/dist out/vendor/parse && cp -r node_modules/jasmine-core/lib/jasmine-core out/vendor/jasmine",
"build": "tsc -p .", "build": "tsc -p .",
"pack": "rm -f out/assets/atlas* && find graphics/exported -name '*.png' -print0 | xargs -0 gf-pack --name out/assets/atlas --fullpath --width 1024 --height 1024 --square --powerOfTwo --trim", "pack": "rm -f out/assets/atlas* && find graphics/exported -name '*.png' -print0 | xargs -0 gf-pack --name out/assets/atlas --fullpath --width 1024 --height 1024 --square --powerOfTwo --trim --padding 2",
"pretest": "tsc -p .", "pretest": "tsc -p .",
"test": "karma start spec/support/karma.conf.js && remap-istanbul -i out/coverage/coverage.json -o out/coverage -t html", "test": "karma start spec/support/karma.conf.js && remap-istanbul -i out/coverage/coverage.json -o out/coverage -t html",
"prestart": "tsc -p . || true", "prestart": "tsc -p . || true",

View file

@ -27,12 +27,12 @@ module TS.SpaceTac.UI {
return { return {
x: this.x + (this.parent ? this.parent.x : 0) + 98 * this.scale.x, x: this.x + (this.parent ? this.parent.x : 0) + 98 * this.scale.x,
y: this.y + (this.parent ? this.parent.y : 0) + 98 * this.scale.y, y: this.y + (this.parent ? this.parent.y : 0) + 98 * this.scale.y,
scale: this.scale.x, scale: this.scale.x * 1.25,
alpha: this.alpha, alpha: this.alpha,
} }
} }
getPriceOffset(): number { getPriceOffset(): number {
return 82; return 66;
} }
addEquipment(equipment: CharacterEquipment, source: CharacterEquipmentContainer | null, test: boolean): boolean { addEquipment(equipment: CharacterEquipment, source: CharacterEquipmentContainer | null, test: boolean): boolean {
if (this.sheet.ship.critical) { if (this.sheet.ship.critical) {