Mascali
/
shapez
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Further adjustments

This commit is contained in:
tobspr 2020-09-24 16:37:44 +02:00
parent d4dd30857e
commit a4b46f8527
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/ui/building_tutorials/storage.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 40 KiB

2
src/js/game/hud/parts/buildings_toolbar.js
View File

@ -32,10 +32,10 @@ export class HUDBuildingsToolbar extends HUDBaseToolbar {
], ],
secondaryBuildings: [ secondaryBuildings: [
MetaStorageBuilding, MetaStorageBuilding,
MetaReaderBuilding,
MetaLeverBuilding, MetaLeverBuilding,
MetaFilterBuilding, MetaFilterBuilding,
MetaDisplayBuilding, MetaDisplayBuilding,
MetaReaderBuilding,
], ],
visibilityCondition: () => visibilityCondition: () =>
!this.root.camera.getIsMapOverlayActive() && this.root.currentLayer === "regular", !this.root.camera.getIsMapOverlayActive() && this.root.currentLayer === "regular",

15
src/js/game/key_action_mapper.js
View File

@ -26,7 +26,7 @@ export const KEYMAPPINGS = {
exportScreenshot: { keyCode: 114 }, // F3PS exportScreenshot: { keyCode: 114 }, // F3PS
toggleFPSInfo: { keyCode: 115 }, // F4 toggleFPSInfo: { keyCode: 115 }, // F4
switchLayers: { keyCode: key("Y") }, switchLayers: { keyCode: key("E") },
}, },
navigation: { navigation: {
@ -44,6 +44,7 @@ export const KEYMAPPINGS = {
}, },
buildings: { buildings: {
// Primary Toolbar
belt: { keyCode: key("1") }, belt: { keyCode: key("1") },
balancer: { keyCode: key("2") }, balancer: { keyCode: key("2") },
underground_belt: { keyCode: key("3") }, underground_belt: { keyCode: key("3") },
@ -54,13 +55,15 @@ export const KEYMAPPINGS = {
mixer: { keyCode: key("8") }, mixer: { keyCode: key("8") },
painter: { keyCode: key("9") }, painter: { keyCode: key("9") },
trash: { keyCode: key("0") }, trash: { keyCode: key("0") },
storage: { keyCode: key("I") },
lever: { keyCode: key("L") }, // Secondary toolbar
filter: { keyCode: key("B") }, storage: { keyCode: key("Y") },
display: { keyCode: key("N") }, reader: { keyCode: key("U") },
reader: { keyCode: key("J") }, lever: { keyCode: key("I") },
filter: { keyCode: key("O") },
display: { keyCode: key("P") },
// Wires toolbar
wire: { keyCode: key("1") }, wire: { keyCode: key("1") },
wire_tunnel: { keyCode: key("2") }, wire_tunnel: { keyCode: key("2") },
constant_signal: { keyCode: key("3") }, constant_signal: { keyCode: key("3") },

6
translations/base-en.yaml
View File

@ -331,7 +331,7 @@ ingame:
infoTexts: infoTexts:
speed: Speed speed: Speed
range: Range range: Range
storage: Storage storage: Capacity
oneItemPerSecond: 1 item / second oneItemPerSecond: 1 item / second
itemsPerSecond: <x> items / s itemsPerSecond: <x> items / s
itemsPerSecondDouble: (x2) itemsPerSecondDouble: (x2)
@ -601,7 +601,7 @@ buildings:
transistor: transistor:
default: default:
name: &transistor Gate name: &transistor Transistor
description: &transistor_desc Forwards the bottom input if the side input is truthy (a shape, color or "1"). description: &transistor_desc Forwards the bottom input if the side input is truthy (a shape, color or "1").
mirrored: mirrored:
@ -1039,7 +1039,7 @@ keybindings:
storage: *storage storage: *storage
wire: *wire wire: *wire
constant_signal: *constant_signal constant_signal: *constant_signal
logic_gate: *logic_gate logic_gate: Logic Gate
lever: *lever lever: *lever
filter: *filter filter: *filter
wire_tunnel: *wire_tunnel wire_tunnel: *wire_tunnel