diff --git a/graphics/exported/equipment/harcoatedhull.png b/graphics/exported/equipment/hardcoatedhull.png similarity index 100% rename from graphics/exported/equipment/harcoatedhull.png rename to graphics/exported/equipment/hardcoatedhull.png diff --git a/package.json b/package.json index 16375bd..eb773e3 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "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", "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 .", "test": "karma start spec/support/karma.conf.js && remap-istanbul -i out/coverage/coverage.json -o out/coverage -t html", "prestart": "tsc -p . || true", diff --git a/src/ui/character/CharacterCargo.ts b/src/ui/character/CharacterCargo.ts index c3e5a65..c1f7d66 100644 --- a/src/ui/character/CharacterCargo.ts +++ b/src/ui/character/CharacterCargo.ts @@ -27,12 +27,12 @@ module TS.SpaceTac.UI { return { 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, - scale: this.scale.x, + scale: this.scale.x * 1.25, alpha: this.alpha, } } getPriceOffset(): number { - return 82; + return 66; } addEquipment(equipment: CharacterEquipment, source: CharacterEquipmentContainer | null, test: boolean): boolean { if (this.sheet.ship.critical) {