Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-06-13 13:04:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'macro_fix_2' into puzzle

Browse Source
This commit is contained in:
Sense101 2021-06-25 00:18:55 +01:00
commit d3ac6db86c
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/core/config.js
View File

@ -72,7 +72,7 @@ export const globalConfig = {
readerAnalyzeIntervalSeconds: 10, readerAnalyzeIntervalSeconds: 10,
goalAcceptorItemsRequired: 10, goalAcceptorItemsRequired: 13,
goalAcceptorsPerProducer: 5, goalAcceptorsPerProducer: 5,
puzzleModeSpeed: 3, puzzleModeSpeed: 3,
puzzleMinBoundsSize: 2, puzzleMinBoundsSize: 2,

9
src/js/game/systems/goal_acceptor.js
View File

@ -67,8 +67,9 @@ export class GoalAcceptorSystem extends GameSystemWithFilter {
const staticComp = contents[i].components.StaticMapEntity; const staticComp = contents[i].components.StaticMapEntity;
const item = goalComp.item; const item = goalComp.item;
const requiredItemsForSuccess = globalConfig.goalAcceptorItemsRequired; const requiredItems = globalConfig.goalAcceptorItemsRequired;
const percentage = clamp(goalComp.currentDeliveredItems / requiredItemsForSuccess, 0, 1);
const fillPercentage = clamp(requiredItems, 0, 1);
const center = staticComp.getTileSpaceBounds().getCenter().toWorldSpace(); const center = staticComp.getTileSpaceBounds().getCenter().toWorldSpace();
if (item) { if (item) {
@ -81,7 +82,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.translate(center.x, center.y);
parameters.context.rotate((staticComp.rotation / 180) * Math.PI); parameters.context.rotate((staticComp.rotation / 180) * Math.PI);
@ -93,7 +94,7 @@ export class GoalAcceptorSystem extends GameSystemWithFilter {
// progress arc // 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 startAngle = Math.PI * 0.595;
const maxAngle = Math.PI * 1.82; const maxAngle = Math.PI * 1.82;

12
src/js/platform/api.js
View File

@ -24,12 +24,12 @@ export class ClientAPI {
} }
getEndpoint() { getEndpoint() {
if (G_IS_DEV) { //if (G_IS_DEV) {
return "https://api.shapez.io"; // return "http://localhost:15001";
} //}
if (window.location.host === "beta.shapez.io") { //if (window.location.host === "beta.shapez.io") {
return "https://api-staging.shapez.io"; // return "https://api-staging.shapez.io";
} //}
return "https://api.shapez.io"; return "https://api.shapez.io";
} }