Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2026-03-02 03:39:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tobspr/shapez.io

Browse Source
This commit is contained in:
tobspr
2020-06-10 11:33:19 +02:00
parent b56dd6fa7f fa12332b16
commit 67b68c1216
4 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/js/game/hud/hud.js
View File

@@ -71,6 +71,7 @@ export class GameHUD {
this.signals = {
selectedPlacementBuildingChanged: /** @type {TypedSignal<[MetaBuilding|null]>} */ (new Signal()),
shapePinRequested: /** @type {TypedSignal<[ShapeDefinition, number]>} */ (new Signal()),
shapeUnpinRequested: /** @type {TypedSignal<[string]>} */ (new Signal()),
notification: /** @type {TypedSignal<[string, enumNotificationType]>} */ (new Signal()),
buildingsSelectedForCopy: /** @type {TypedSignal<[Array<number>]>} */ (new Signal()),
};

1
src/js/game/hud/parts/pinned_shapes.js
View File

@@ -35,6 +35,7 @@ export class HUDPinnedShapes extends BaseHUDPart {
this.root.signals.storyGoalCompleted.add(this.rerenderFull, this);
this.root.signals.postLoadHook.add(this.rerenderFull, this);
this.root.hud.signals.shapePinRequested.add(this.pinNewShape, this);
this.root.hud.signals.shapeUnpinRequested.add(this.unpinShape, this);
}
/**

16
src/js/game/hud/parts/shop.js
View File

@@ -117,7 +117,10 @@ export class HUDShop extends BaseHUDPart {
pinButton.classList.add("pin");
container.appendChild(pinButton);
if (this.root.hud.parts.pinnedShapes.isShapePinned(shape)) {
const currentGoalShape = this.root.hubGoals.currentGoal.definition.getHash();
if (shape === currentGoalShape) {
pinButton.classList.add("isGoal");
} else if (this.root.hud.parts.pinnedShapes.isShapePinned(shape)) {
pinButton.classList.add("alreadyPinned");
}
@@ -126,8 +129,15 @@ export class HUDShop extends BaseHUDPart {
preventDefault: true,
});
pinDetector.click.add(() => {
this.root.hud.signals.shapePinRequested.dispatch(shapeDef, amount);
pinButton.classList.add("pinned");
if (this.root.hud.parts.pinnedShapes.isShapePinned(shape)) {
this.root.hud.signals.shapeUnpinRequested.dispatch(shape);
pinButton.classList.add("unpinned");
pinButton.classList.remove("pinned", "alreadyPinned");
} else {
this.root.hud.signals.shapePinRequested.dispatch(shapeDef, amount);
pinButton.classList.add("pinned");
pinButton.classList.remove("unpinned");
}
});
handle.requireIndexToElement.push({