From 1abf4ebd56b937be3d1a0204bcb542c0090d51a7 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Thu, 24 Jun 2021 21:48:31 +0100 Subject: [PATCH] minor goal acceptor adjustments to help prevent backing up belts to complete --- src/js/core/config.js | 3 ++- src/js/game/systems/goal_acceptor.js | 13 +++++++++---- src/js/platform/api.js | 12 ++++++------ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/js/core/config.js b/src/js/core/config.js index a4793384..bc4b403f 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -72,7 +72,8 @@ export const globalConfig = { readerAnalyzeIntervalSeconds: 10, - goalAcceptorItemsRequired: 10, + goalAcceptorItemsToFill: 10, + goalAcceptorItemsRequired: 13, goalAcceptorsPerProducer: 5, puzzleModeSpeed: 3, puzzleMinBoundsSize: 2, diff --git a/src/js/game/systems/goal_acceptor.js b/src/js/game/systems/goal_acceptor.js index 40100324..f0adb5ba 100644 --- a/src/js/game/systems/goal_acceptor.js +++ b/src/js/game/systems/goal_acceptor.js @@ -67,8 +67,13 @@ export class GoalAcceptorSystem extends GameSystemWithFilter { const staticComp = contents[i].components.StaticMapEntity; const item = goalComp.item; - const requiredItemsForSuccess = globalConfig.goalAcceptorItemsRequired; - const percentage = clamp(goalComp.currentDeliveredItems / requiredItemsForSuccess, 0, 1); + const requiredItems = globalConfig.goalAcceptorItemsRequired; + + const fillPercentage = clamp( + goalComp.currentDeliveredItems / globalConfig.goalAcceptorItemsToFill, + 0, + 1 + ); const center = staticComp.getTileSpaceBounds().getCenter().toWorldSpace(); if (item) { @@ -81,7 +86,7 @@ export class GoalAcceptorSystem extends GameSystemWithFilter { ); } - const isValid = item && goalComp.currentDeliveredItems >= requiredItemsForSuccess; + const isValid = item && goalComp.currentDeliveredItems >= requiredItems; parameters.context.translate(center.x, center.y); parameters.context.rotate((staticComp.rotation / 180) * Math.PI); @@ -93,7 +98,7 @@ export class GoalAcceptorSystem extends GameSystemWithFilter { // progress arc - goalComp.displayPercentage = lerp(goalComp.displayPercentage, percentage, 0.2); + goalComp.displayPercentage = lerp(goalComp.displayPercentage, fillPercentage, 0.2); const startAngle = Math.PI * 0.595; const maxAngle = Math.PI * 1.82; diff --git a/src/js/platform/api.js b/src/js/platform/api.js index db27360d..1b8bcdac 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"; }