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 11:44:24 +01:00
commit ad50bd64f7
4 changed files with 16 additions and 8 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: 13, goalAcceptorItemsRequired: 12,
goalAcceptorsPerProducer: 5, goalAcceptorsPerProducer: 5,
puzzleModeSpeed: 3, puzzleModeSpeed: 3,
puzzleMinBoundsSize: 2, puzzleMinBoundsSize: 2,

8
src/js/game/components/goal_acceptor.js
View File

@ -56,4 +56,12 @@ export class GoalAcceptorComponent extends Component {
(globalConfig.puzzleModeSpeed * globalConfig.beltSpeedItemsPerSecond) (globalConfig.puzzleModeSpeed * globalConfig.beltSpeedItemsPerSecond)
); );
} }
/**
* Copy the current state to another component
* @param {GoalAcceptorComponent} otherComponent
*/
copyAdditionalStateTo(otherComponent) {
otherComponent.item = this.item;
}
} }

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

@ -69,7 +69,7 @@ export class GoalAcceptorSystem extends GameSystemWithFilter {
const requiredItems = globalConfig.goalAcceptorItemsRequired; const requiredItems = globalConfig.goalAcceptorItemsRequired;
const fillPercentage = clamp(requiredItems, 0, 1); const fillPercentage = clamp(goalComp.currentDeliveredItems / requiredItems, 0, 1);
const center = staticComp.getTileSpaceBounds().getCenter().toWorldSpace(); const center = staticComp.getTileSpaceBounds().getCenter().toWorldSpace();
if (item) { if (item) {

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 "http://localhost:15001"; 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";
} }