Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2026-02-18 22:09:20 +00:00
Code Issues Projects Releases Wiki Activity

Rename Bleacher to "Painter (bleach)"

Browse Source
This commit is contained in:
isaisstillalive 2020-06-29 17:41:53 +09:00
parent 9b8679c41a
commit 8d9bb60d3c
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ export const globalConfig = {
painter: 1 / 6, painter: 1 / 6,
painterDouble: 1 / 8, painterDouble: 1 / 8,
painterQuad: 1 / 8, painterQuad: 1 / 8,
bleacher: 1 / 8, painterBleach: 1 / 8,
mixer: 1 / 5, mixer: 1 / 5,
stacker: 1 / 6, stacker: 1 / 6,
advancedProcessor: 1 / 15, advancedProcessor: 1 / 15,

14
src/js/game/buildings/painter.js
View File

@ -15,7 +15,7 @@ export const enumPainterVariants = {
mirrored: "mirrored", mirrored: "mirrored",
double: "double", double: "double",
quad: "quad", quad: "quad",
bleacher: "bleacher", bleach: "bleach",
}; };
export class MetaPainterBuilding extends MetaBuilding { export class MetaPainterBuilding extends MetaBuilding {
@ -32,7 +32,7 @@ export class MetaPainterBuilding extends MetaBuilding {
return new Vector(2, 2); return new Vector(2, 2);
case enumPainterVariants.quad: case enumPainterVariants.quad:
return new Vector(4, 1); return new Vector(4, 1);
case enumPainterVariants.bleacher: case enumPainterVariants.bleach:
return new Vector(1, 1); return new Vector(1, 1);
default: default:
assertAlways(false, "Unknown painter variant: " + variant); assertAlways(false, "Unknown painter variant: " + variant);
@ -63,8 +63,8 @@ export class MetaPainterBuilding extends MetaBuilding {
const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.painterQuad); const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.painterQuad);
return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]];
} }
case enumPainterVariants.bleacher: { case enumPainterVariants.bleach: {
const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.bleacher); const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.painterBleach);
return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]];
} }
} }
@ -80,7 +80,7 @@ export class MetaPainterBuilding extends MetaBuilding {
} }
if (root.hubGoals.isRewardUnlocked(enumHubGoalRewards.reward_painter_quad)) { if (root.hubGoals.isRewardUnlocked(enumHubGoalRewards.reward_painter_quad)) {
variants.push(enumPainterVariants.quad); variants.push(enumPainterVariants.quad);
variants.push(enumPainterVariants.bleacher); variants.push(enumPainterVariants.bleach);
} }
return variants; return variants;
} }
@ -218,7 +218,7 @@ export class MetaPainterBuilding extends MetaBuilding {
]); ]);
break; break;
} }
case enumPainterVariants.bleacher: { case enumPainterVariants.bleach: {
entity.components.ItemAcceptor.setSlots([ entity.components.ItemAcceptor.setSlots([
{ {
pos: new Vector(0, 0), pos: new Vector(0, 0),
@ -227,7 +227,7 @@ export class MetaPainterBuilding extends MetaBuilding {
}, },
]); ]);
entity.components.ItemProcessor.type = enumItemProcessorTypes.bleacher; entity.components.ItemProcessor.type = enumItemProcessorTypes.painterBleach;
entity.components.ItemProcessor.inputsPerCharge = 1; entity.components.ItemProcessor.inputsPerCharge = 1;
entity.components.ItemEjector.setSlots([ entity.components.ItemEjector.setSlots([
{ pos: new Vector(0, 0), direction: enumDirection.right }, { pos: new Vector(0, 0), direction: enumDirection.right },

2
src/js/game/components/item_processor.js
View File

@ -16,7 +16,7 @@ export const enumItemProcessorTypes = {
painter: "painter", painter: "painter",
painterDouble: "painterDouble", painterDouble: "painterDouble",
painterQuad: "painterQuad", painterQuad: "painterQuad",
bleacher: "bleacher", painterBleach: "painterBleach",
advancedProcessor: "advancedProcessor", advancedProcessor: "advancedProcessor",
hub: "hub", hub: "hub",
}; };

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

@ -409,7 +409,7 @@ export class HubGoals extends BasicSerializableObject {
case enumItemProcessorTypes.painter: case enumItemProcessorTypes.painter:
case enumItemProcessorTypes.painterDouble: case enumItemProcessorTypes.painterDouble:
case enumItemProcessorTypes.painterQuad: case enumItemProcessorTypes.painterQuad:
case enumItemProcessorTypes.bleacher: { case enumItemProcessorTypes.painterBleach: {
assert( assert(
globalConfig.buildingSpeeds[processorType], globalConfig.buildingSpeeds[processorType],
"Processor type has no speed set in globalConfig.buildingSpeeds: " + processorType "Processor type has no speed set in globalConfig.buildingSpeeds: " + processorType

4
src/js/game/systems/item_processor.js
View File

@ -321,9 +321,9 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
break; break;
} }
// BLEACHER // PAINTER (BLEACH)
case enumItemProcessorTypes.bleacher: { case enumItemProcessorTypes.painterBleach: {
const shapeItem = /** @type {ShapeItem} */ (items[0].item); const shapeItem = /** @type {ShapeItem} */ (items[0].item);
const colorizedDefinition = this.root.shapeDefinitionMgr.shapeActionPaintWith( const colorizedDefinition = this.root.shapeDefinitionMgr.shapeActionPaintWith(

6
translations/base-en.yaml
View File

@ -524,9 +524,9 @@ buildings:
name: Painter (Quad) name: Painter (Quad)
description: Allows to color each quadrant of the shape with a different color. description: Allows to color each quadrant of the shape with a different color.
bleacher: bleach:
name: Bleacher name: Painter (Bleach)
description: Bleaches the whole shape.. description: Bleaches the whole shape.
trash: trash:
default: default:

2
translations/base-ja.yaml
View File

@ -507,7 +507,7 @@ buildings:
mirrored: mirrored:
name: *painter name: *painter
description: *painter_desc description: *painter_desc
bleacher: bleach:
name: 脱色機 name: 脱色機
description: 入力された形の全体を無色にします。 description: 入力された形の全体を無色にします。