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

Minor artwork update

Browse Source
This commit is contained in:
tobspr
2020-05-11 14:21:59 +02:00
parent 6cce1b7c08
commit 653ddf9a3a
30 changed files with 62 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ export const globalConfig = {
physicsDeltaSeconds: 0,
// Update physics at N fps, independent of rendering
physicsUpdateRate: 60,
physicsUpdateRate: 55,
// Map
mapChunkSize: 32,
@@ -39,8 +39,8 @@ export const globalConfig = {
undergroundBeltMaxTiles: 5,
buildingSpeeds: {
cutter: 1 / 6,
rotater: 1 / 2,
cutter: 1 / 2,
rotater: 1 / 1,
painter: 1 / 3,
mixer: 1 / 2,
stacker: 1 / 5,
@@ -66,7 +66,7 @@ export const globalConfig = {
debug: {
/* dev:start */
fastGameEnter: false,
fastGameEnter: true,
noArtificialDelays: true,
disableSavegameWrite: false,
showEntityBounds: false,

2
src/js/game/buildings/belt_base.js
View File

@@ -24,7 +24,7 @@ export class MetaBeltBaseBuilding extends MetaBuilding {
}
getDescription() {
return "Transports items, hold and drag to place multiple, press 'R' to rotate.";
return "Transports items, hold and drag to place multiple.";
}
getPreviewSprite(rotationVariant) {

4
src/js/game/buildings/splitter.js
View File

@@ -18,7 +18,7 @@ export class MetaSplitterBuilding extends MetaBuilding {
}
getName() {
return "Distribute";
return "Balancer";
}
getSilhouetteColor() {
@@ -26,7 +26,7 @@ export class MetaSplitterBuilding extends MetaBuilding {
}
getDescription() {
return "Accepts up to two inputs and evenly distributes them on the outputs. Can also be used to merge two inputs into one output.";
return "Multifunctional - Evenly distributes all inputs onto all outputs.";
}
/**

2
src/js/game/hub_goals.js
View File

@@ -311,7 +311,7 @@ export class HubGoals extends BasicSerializableObject {
case enumItemProcessorTypes.hub:
return 1e30;
case enumItemProcessorTypes.splitter:
return (2 / globalConfig.beltSpeedItemsPerSecond) * this.upgradeImprovements.processors;
return (2 / globalConfig.beltSpeedItemsPerSecond) * this.upgradeImprovements.belt;
case enumItemProcessorTypes.cutter:
case enumItemProcessorTypes.rotater:
case enumItemProcessorTypes.stacker:

12
src/js/game/map_chunk.js
View File

@@ -162,15 +162,21 @@ export class MapChunk {
weights = {
[enumSubShape.rect]: 100,
[enumSubShape.circle]: Math_round(50 + clamp(distanceToOriginInChunks * 2, 0, 50)),
[enumSubShape.star]: Math_round(20 + clamp(distanceToOriginInChunks * 2, 0, 30)),
[enumSubShape.windmill]: Math_round(5 + clamp(distanceToOriginInChunks * 2, 0, 20)),
[enumSubShape.star]: Math_round(5 + clamp(distanceToOriginInChunks, 0, 30)),
[enumSubShape.windmill]: Math_round(3 + clamp(distanceToOriginInChunks / 2, 0, 20)),
};
if (distanceToOriginInChunks < 5) {
// Initial chunks can not spawn the good stuff
weights[enumSubShape.star] = 0;
weights[enumSubShape.windmill] = 0;
}
if (distanceToOriginInChunks < 7) {
// Initial chunk patches always have the same shape
const subShape = this.internalGenerateRandomSubShape(weights);
subShapes = [subShape, subShape, subShape, subShape];
} else if (distanceToOriginInChunks < 12) {
} else if (distanceToOriginInChunks < 17) {
// Later patches can also have mixed ones
const subShapeA = this.internalGenerateRandomSubShape(weights);
const subShapeB = this.internalGenerateRandomSubShape(weights);

167
src/js/game/upgrades.js
View File

@@ -43,7 +43,7 @@ export const UPGRADES = {
},
{
required: [{ shape: "RgRgSpSp:CwSwCwSw:Cr--Sw--", amount: 80000 }],
improvement: 8,
improvement: 4,
},
],
},
@@ -66,7 +66,7 @@ export const UPGRADES = {
},
{
required: [{ shape: "WyWgWyWg:CbCpCbCp:Rp----Rp", amount: 90000 }],
improvement: 8,
improvement: 4,
},
],
},
@@ -89,7 +89,7 @@ export const UPGRADES = {
},
{
required: [{ shape: "WyWgWyWg:CbCpCbCp:Rp----Rp", amount: 90000 }],
improvement: 8,
improvement: 4,
},
],
},
@@ -112,169 +112,10 @@ export const UPGRADES = {
},
{
required: [{ shape: "WyWgWyWg:CbCpCbCp:Rp----Rp", amount: 90000 }],
improvement: 8,
improvement: 4,
},
],
},
// cutter: {
// label: "Cut Half",
// description: improvement => "Speed +" + Math.floor(improvement * 100.0) + "%",
// tiers: [
// {
// required: [{ shape: "----CuCu", amount: 450 }],
// improvement: 1,
// },
// {
// required: [{ shape: "CpCpCpCp", amount: 12000 }],
// improvement: 2,
// },
// {
// required: [{ shape: "CwRrWbSp:WcWrCpCw", amount: 45000 }],
// improvement: 4,
// },
// {
// required: [{ shape: "CwRrWbSp:WcWrCpCw:WpWpWb--", amount: 100000 }],
// improvement: 8,
// },
// ],
// },
// splitter: {
// label: "Distribute",
// description: improvement => "Speed +" + Math.floor(improvement * 100.0) + "%",
// tiers: [
// {
// required: [{ shape: "CuCu----", amount: 350 }],
// improvement: 1,
// },
// {
// required: [{ shape: "CrCrCrCr", amount: 7000 }],
// improvement: 2,
// },
// {
// required: [{ shape: "WyWyWyWy", amount: 30000 }],
// improvement: 4,
// },
// {
// required: [{ shape: "WyWyWyWy:CwSpRgRc", amount: 100000 }],
// improvement: 8,
// },
// ],
// },
// rotater: {
// label: "Rotate",
// description: improvement => "Speed +" + Math.floor(improvement * 100.0) + "%",
// tiers: [
// {
// required: [{ shape: "RuRu----", amount: 750 }],
// improvement: 1,
// },
// {
// required: [{ shape: "ScScScSc", amount: 3000 }],
// improvement: 2,
// },
// {
// required: [{ shape: "ScSpRwRw:Cw----Cw", amount: 15000 }],
// improvement: 4,
// },
// {
// required: [{ shape: "ScSpRwRw:Cw----Cw:CpCpCpCp", amount: 80000 }],
// improvement: 8,
// },
// ],
// },
// underground_belt: {
// label: "Tunnel",
// description: improvement => "Speed +" + Math.floor(improvement * 100.0) + "%",
// tiers: [
// {
// required: [{ shape: "--CuCu--", amount: 1000 }],
// improvement: 1,
// },
// {
// required: [{ shape: "RbRb----", amount: 9000 }],
// improvement: 2,
// },
// {
// required: [{ shape: "RbRb----:WpWpWpWp", amount: 25000 }],
// improvement: 4,
// },
// {
// required: [{ shape: "RbRb----:WpWpWpWp:RwRwRpRp", amount: 100000 }],
// improvement: 8,
// },
// ],
// },
// painter: {
// label: "Dye",
// description: improvement => "Speed +" + Math.floor(improvement * 100.0) + "%",
// tiers: [
// {
// required: [{ shape: "------Ru", amount: 4000 }],
// improvement: 1,
// },
// {
// required: [{ shape: "CcCcRgRg", amount: 15000 }],
// improvement: 2,
// },
// {
// required: [{ shape: "CcCcRgRg:WgWgWgWg", amount: 35000 }],
// improvement: 4,
// },
// {
// required: [{ shape: "CcCcRgRg:WgWgWgWg:CpRpCpRp", amount: 100000 }],
// improvement: 8,
// },
// ],
// },
// mixer: {
// label: "Mix Colors",
// description: improvement => "Speed +" + Math.floor(improvement * 100.0) + "%",
// tiers: [
// {
// required: [{ shape: "RgRgRgRg:CcCcCcCc", amount: 11000 }],
// improvement: 1,
// },
// {
// required: [{ shape: "WyWgWyWg:CbCpCbCp", amount: 15000 }],
// improvement: 2,
// },
// {
// required: [{ shape: "CcCcRgRg:WgWgWgWg:CpRpCpRp", amount: 45000 }],
// improvement: 4,
// },
// {
// required: [{ shape: "CcCcRgRg:WgWgWgWg:CpRpCpRp:CpCpCpCp", amount: 100000 }],
// improvement: 8,
// },
// ],
// },
// stacker: {
// label: "Combine",
// description: improvement => "Speed +" + Math.floor(improvement * 100.0) + "%",
// tiers: [
// {
// required: [{ shape: "CgCgRgRg", amount: 20000 }],
// improvement: 1,
// },
// {
// required: [{ shape: "CgCgRgRg:WpRpWpRp", amount: 50000 }],
// improvement: 2,
// },
// {
// required: [{ shape: "CgCgRgRg:WpRpWpRp:SpSwSpSw", amount: 70000 }],
// improvement: 4,
// },
// {
// required: [{ shape: "CgCgRgRg:WpRpWpRp:SpSwSpSw:CwCwCwCw", amount: 100000 }],
// improvement: 8,
// },
// ],
// },
};
// Tiers need % of the previous tier as requirement too