diff --git a/artwork/buildings/buildings_2x1.psd b/artwork/buildings/buildings_2x1.psd index 21889669..e0ef0a8b 100644 --- a/artwork/buildings/buildings_2x1.psd +++ b/artwork/buildings/buildings_2x1.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7697c34997a719bed9ddf9c16c19c672a0fdf9641edf0a9761aea9c2c7e17c6b -size 632609 +oid sha256:6463b33b2cae50d1ecb11f0a845f06633aff331a5c2c0998d9eb93e40ad576b1 +size 636254 diff --git a/artwork/buildings/hub.psd b/artwork/buildings/hub.psd index 8964402a..efc6f486 100644 --- a/artwork/buildings/hub.psd +++ b/artwork/buildings/hub.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87ff03f1c77d8c245e4e2fe716b6243aecca174425ae24cfd19ffb5bd1df52f6 -size 1191627 +oid sha256:25c712f823de0491c6c2db7b065b3940cf257402aafdfd6676af919b7a928e42 +size 1164218 diff --git a/res_built/atlas/atlas0_10.json b/res_built/atlas/atlas0_10.json index 28090a45..52fb27cc 100644 --- a/res_built/atlas/atlas0_10.json +++ b/res_built/atlas/atlas0_10.json @@ -607,6 +607,6 @@ "format": "RGBA8888", "size": {"w":407,"h":128}, "scale": "0.1", - "smartupdate": "$TexturePacker:SmartUpdate:feeaacb789d7182e6aef553861c19982:774c2c10210542582abaa8efc495510d:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:3dd7a89f30024dd4787ad4af6b14588a:9ba11f8b02134c4376ab4e0a44f8b850:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_10.png b/res_built/atlas/atlas0_10.png index 6781e78d..35d9ea6e 100644 Binary files a/res_built/atlas/atlas0_10.png and b/res_built/atlas/atlas0_10.png differ diff --git a/res_built/atlas/atlas0_100.json b/res_built/atlas/atlas0_100.json index 8f5fbf32..ed6e5338 100644 --- a/res_built/atlas/atlas0_100.json +++ b/res_built/atlas/atlas0_100.json @@ -607,6 +607,6 @@ "format": "RGBA8888", "size": {"w":1997,"h":1801}, "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:feeaacb789d7182e6aef553861c19982:774c2c10210542582abaa8efc495510d:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:3dd7a89f30024dd4787ad4af6b14588a:9ba11f8b02134c4376ab4e0a44f8b850:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_100.png b/res_built/atlas/atlas0_100.png index 4c35f10e..570464fe 100644 Binary files a/res_built/atlas/atlas0_100.png and b/res_built/atlas/atlas0_100.png differ diff --git a/res_built/atlas/atlas0_25.json b/res_built/atlas/atlas0_25.json index c91c45f4..2969f3de 100644 --- a/res_built/atlas/atlas0_25.json +++ b/res_built/atlas/atlas0_25.json @@ -607,6 +607,6 @@ "format": "RGBA8888", "size": {"w":510,"h":512}, "scale": "0.25", - "smartupdate": "$TexturePacker:SmartUpdate:feeaacb789d7182e6aef553861c19982:774c2c10210542582abaa8efc495510d:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:3dd7a89f30024dd4787ad4af6b14588a:9ba11f8b02134c4376ab4e0a44f8b850:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_25.png b/res_built/atlas/atlas0_25.png index 0d92677d..c7c7041e 100644 Binary files a/res_built/atlas/atlas0_25.png and b/res_built/atlas/atlas0_25.png differ diff --git a/res_built/atlas/atlas0_50.json b/res_built/atlas/atlas0_50.json index c8a2597d..8fd9b5ba 100644 --- a/res_built/atlas/atlas0_50.json +++ b/res_built/atlas/atlas0_50.json @@ -607,6 +607,6 @@ "format": "RGBA8888", "size": {"w":475,"h":1968}, "scale": "0.5", - "smartupdate": "$TexturePacker:SmartUpdate:feeaacb789d7182e6aef553861c19982:774c2c10210542582abaa8efc495510d:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:3dd7a89f30024dd4787ad4af6b14588a:9ba11f8b02134c4376ab4e0a44f8b850:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_50.png b/res_built/atlas/atlas0_50.png index e22b308e..ea864923 100644 Binary files a/res_built/atlas/atlas0_50.png and b/res_built/atlas/atlas0_50.png differ diff --git a/res_built/atlas/atlas0_75.json b/res_built/atlas/atlas0_75.json index 0b2dd870..23042b66 100644 --- a/res_built/atlas/atlas0_75.json +++ b/res_built/atlas/atlas0_75.json @@ -607,6 +607,6 @@ "format": "RGBA8888", "size": {"w":2016,"h":1024}, "scale": "0.75", - "smartupdate": "$TexturePacker:SmartUpdate:feeaacb789d7182e6aef553861c19982:774c2c10210542582abaa8efc495510d:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:3dd7a89f30024dd4787ad4af6b14588a:9ba11f8b02134c4376ab4e0a44f8b850:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_75.png b/res_built/atlas/atlas0_75.png index 5c9438c7..d6185e44 100644 Binary files a/res_built/atlas/atlas0_75.png and b/res_built/atlas/atlas0_75.png differ diff --git a/res_raw/atlas.tps b/res_raw/atlas.tps index 883a6932..75377d4f 100644 --- a/res_raw/atlas.tps +++ b/res_raw/atlas.tps @@ -445,6 +445,7 @@ sprites/map_overview/belt_forward.png sprites/map_overview/belt_left.png sprites/map_overview/belt_right.png + sprites/misc/waypoint.png pivotPoint 0.5,0.5 diff --git a/res_raw/sprites/blueprints/stacker.png b/res_raw/sprites/blueprints/stacker.png index f11116b4..4489ded5 100644 Binary files a/res_raw/sprites/blueprints/stacker.png and b/res_raw/sprites/blueprints/stacker.png differ diff --git a/res_raw/sprites/buildings/hub.png b/res_raw/sprites/buildings/hub.png index 56a92ae7..8fdd5305 100644 Binary files a/res_raw/sprites/buildings/hub.png and b/res_raw/sprites/buildings/hub.png differ diff --git a/res_raw/sprites/buildings/stacker.png b/res_raw/sprites/buildings/stacker.png index 9524bbaf..62caf2c9 100644 Binary files a/res_raw/sprites/buildings/stacker.png and b/res_raw/sprites/buildings/stacker.png differ diff --git a/src/js/changelog.js b/src/js/changelog.js index 186363df..f3397810 100644 --- a/src/js/changelog.js +++ b/src/js/changelog.js @@ -4,6 +4,7 @@ export const CHANGELOG = [ date: "unreleased", entries: [ "Support for translations! Interested in helping out? Check out the translation guide!", + "Update stacker artwork to clarify how it works", "Make shapes unpinnable in the upgrades tab (By hexy)", ], }, diff --git a/src/js/core/config.js b/src/js/core/config.js index e6eb7b00..540bccfd 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -82,7 +82,7 @@ export const globalConfig = { debug: { /* dev:start */ - // fastGameEnter: true, + fastGameEnter: true, // noArtificialDelays: true, // disableSavegameWrite: true, // showEntityBounds: true, diff --git a/src/js/game/systems/hub.js b/src/js/game/systems/hub.js index b371de6e..95ac2783 100644 --- a/src/js/game/systems/hub.js +++ b/src/js/game/systems/hub.js @@ -74,9 +74,7 @@ export class HubSystem extends GameSystemWithFilter { context.fillText("" + formatBigNumber(delivered), pos.x + textOffsetX, pos.y + textOffsetY); // Required - context.font = "13px GameFont"; - context.fillStyle = "#a4a6b0"; context.fillText( "/ " + formatBigNumber(goals.required), @@ -95,6 +93,17 @@ export class HubSystem extends GameSystemWithFilter { context.fillStyle = "#fff"; context.fillText("" + this.root.hubGoals.level, pos.x - 42, pos.y - 36); + // Texts + context.textAlign = "center"; + context.fillStyle = "#fff"; + context.font = "bold 7px GameFont"; + context.fillText(T.buildings.hub.levelShortcut, pos.x - 42, pos.y - 47); + + context.fillStyle = "#64666e"; + context.font = "bold 11px GameFont"; + context.fillText(T.buildings.hub.deliver.toUpperCase(), pos.x, pos.y - 40); + context.fillText(T.buildings.hub.toUnlock.toUpperCase(), pos.x, pos.y + 30); + context.textAlign = "left"; } } diff --git a/translations/base-en.yaml b/translations/base-en.yaml index 7497c4e7..7f529537 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -414,6 +414,11 @@ shopUpgrades: # Buildings and their name / description buildings: + hub: + deliver: Deliver + toUnlock: to unlock + levelShortcut: LVL + belt: default: name: &belt Conveyor Belt