Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2024-10-27 20:34:29 +00:00
Code Issues Projects Releases Wiki Activity

Removed logic from application_settings

Browse Source
This commit is contained in:
Jaysc 2020-06-14 14:16:37 +01:00
parent 7552d23f40
commit 5de2c2de94
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/game/camera.js
View File

@ -901,9 +901,9 @@ export class Camera extends BasicSerializableObject {
forceX += 1; forceX += 1;
} }
let movementSpeed = this.root.app.settings.getMovementSpeed( let movementSpeed =
actionMapper.getBinding(KEYMAPPINGS.navigation.mapMoveFaster).isCurrentlyPressed() this.root.app.settings.getMovementSpeed() *
); (actionMapper.getBinding(KEYMAPPINGS.navigation.mapMoveFaster).isCurrentlyPressed() ? 2 : 1);
this.center.x += moveAmount * forceX * movementSpeed; this.center.x += moveAmount * forceX * movementSpeed;
this.center.y += moveAmount * forceY * movementSpeed; this.center.y += moveAmount * forceY * movementSpeed;

7
src/js/profile/application_settings.js
View File

@ -302,14 +302,11 @@ export class ApplicationSettings extends ReadWriteProxy {
return 1; return 1;
} }
/** getMovementSpeed() {
* @param {boolean} moveFaster
*/
getMovementSpeed(moveFaster = false) {
const id = this.getAllSettings().movementSpeed; const id = this.getAllSettings().movementSpeed;
for (let i = 0; i < movementSpeeds.length; ++i) { for (let i = 0; i < movementSpeeds.length; ++i) {
if (movementSpeeds[i].id === id) { if (movementSpeeds[i].id === id) {
return movementSpeeds[i].multiplier * (moveFaster ? 2 : 1); return movementSpeeds[i].multiplier;
} }
} }
logger.error("Unknown movement speed id:", id); logger.error("Unknown movement speed id:", id);