From d339e1876709a1707c48d6eecda4713b73f98035 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Fri, 25 Jun 2021 00:19:44 +0100 Subject: [PATCH 1/4] removed api override --- src/js/platform/api.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/js/platform/api.js b/src/js/platform/api.js index 1b8bcdac..db27360d 100644 --- a/src/js/platform/api.js +++ b/src/js/platform/api.js @@ -24,12 +24,12 @@ export class ClientAPI { } getEndpoint() { - //if (G_IS_DEV) { - // return "http://localhost:15001"; - //} - //if (window.location.host === "beta.shapez.io") { - // return "https://api-staging.shapez.io"; - //} + if (G_IS_DEV) { + return "http://localhost:15001"; + } + if (window.location.host === "beta.shapez.io") { + return "https://api-staging.shapez.io"; + } return "https://api.shapez.io"; } From 11bb62b42c330ce27b60449f882becf8e41e1d5e Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Fri, 25 Jun 2021 11:30:53 +0100 Subject: [PATCH 2/4] fixed mistake with fill percentage --- src/js/game/components/goal_acceptor.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/js/game/components/goal_acceptor.js b/src/js/game/components/goal_acceptor.js index bb13ee61..fa5f5908 100644 --- a/src/js/game/components/goal_acceptor.js +++ b/src/js/game/components/goal_acceptor.js @@ -56,4 +56,12 @@ export class GoalAcceptorComponent extends Component { (globalConfig.puzzleModeSpeed * globalConfig.beltSpeedItemsPerSecond) ); } + + /** + * Copy the current state to another component + * @param {GoalAcceptorComponent} otherComponent + */ + copyAdditionalStateTo(otherComponent) { + otherComponent.item = this.item; + } } From feb780394b7d63de5e564f0568a8e650b73dc0fb Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Fri, 25 Jun 2021 11:31:26 +0100 Subject: [PATCH 3/4] Allowed for copying acceptors to remember the required shape --- src/js/game/systems/goal_acceptor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/game/systems/goal_acceptor.js b/src/js/game/systems/goal_acceptor.js index 3eeb16b7..60d4a984 100644 --- a/src/js/game/systems/goal_acceptor.js +++ b/src/js/game/systems/goal_acceptor.js @@ -69,7 +69,7 @@ export class GoalAcceptorSystem extends GameSystemWithFilter { const requiredItems = globalConfig.goalAcceptorItemsRequired; - const fillPercentage = clamp(requiredItems, 0, 1); + const fillPercentage = clamp(goalComp.currentDeliveredItems / requiredItems, 0, 1); const center = staticComp.getTileSpaceBounds().getCenter().toWorldSpace(); if (item) { From c70f910f7055e7917e05d379204cd2b494175d4b Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Fri, 25 Jun 2021 11:33:33 +0100 Subject: [PATCH 4/4] further adjusted required items, so it looks a bit nicer --- src/js/core/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/core/config.js b/src/js/core/config.js index 1a4fb57e..b4a2e3dd 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -72,7 +72,7 @@ export const globalConfig = { readerAnalyzeIntervalSeconds: 10, - goalAcceptorItemsRequired: 13, + goalAcceptorItemsRequired: 12, goalAcceptorsPerProducer: 5, puzzleModeSpeed: 3, puzzleMinBoundsSize: 2,