Mascali
/
shapez.io
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implements some linter recommendations for CI check.

This commit is contained in:
Magnus Grimstvedt Saltnes 2020-06-18 22:48:36 +02:00
parent efdaf74659
commit 9a00931c3f
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/js/game/hud/parts/building_placer_logic.js
View File

@ -1,4 +1,3 @@
import { Math_abs, Math_degrees, Math_round } from "../../../core/builtins"; import { Math_abs, Math_degrees, Math_round } from "../../../core/builtins";
import { globalConfig } from "../../../core/config"; import { globalConfig } from "../../../core/config";
import { gMetaBuildingRegistry } from "../../../core/global_registries"; import { gMetaBuildingRegistry } from "../../../core/global_registries";
@ -61,8 +60,7 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart {
} }
const id = this.currentMetaBuilding.get().getId(); const id = this.currentMetaBuilding.get().getId();
return this.preferredRotations[id] || this.currentBaseRotationGeneral; return this.preferredRotations[id] || this.currentBaseRotationGeneral;
};
}
this.setBaseRotation = function (rotation) { this.setBaseRotation = function (rotation) {
const rotationByBuilding = this.root.app.settings.getAllSettings().rotationByBuilding; const rotationByBuilding = this.root.app.settings.getAllSettings().rotationByBuilding;
@ -72,8 +70,7 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart {
const id = this.currentMetaBuilding.get().getId(); const id = this.currentMetaBuilding.get().getId();
this.preferredRotations[id] = rotation; this.preferredRotations[id] = rotation;
} }
} };
/** /**
* Whether we are currently dragging * Whether we are currently dragging

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

@ -530,7 +530,6 @@ export class ApplicationSettings extends ReadWriteProxy {
} }
if (data.version < 13) { if (data.version < 13) {
<<<<<<< HEAD
data.settings.compactBuildingInfo = false; data.settings.compactBuildingInfo = false;
data.version = 13; data.version = 13;
} }
@ -554,11 +553,10 @@ export class ApplicationSettings extends ReadWriteProxy {
if (data.version < 17) { if (data.version < 17) {
data.settings.enableColorBlindHelper = false; data.settings.enableColorBlindHelper = false;
data.version = 17; data.version = 17;
======= }
if(data.version < 18) {
data.settings.rotationByBuilding = true; data.settings.rotationByBuilding = true;
data.version = 13; data.version = 18;
>>>>>>> 655c356... Adds tracking for rotation per building type.
} }
return ExplainedResult.good(); return ExplainedResult.good();