From 8d9bb60d3cba7fec72592c02aa863241987c555d Mon Sep 17 00:00:00 2001 From: isaisstillalive Date: Mon, 29 Jun 2020 17:41:53 +0900 Subject: [PATCH] Rename Bleacher to "Painter (bleach)" --- src/js/core/config.js | 2 +- src/js/game/buildings/painter.js | 14 +++++++------- src/js/game/components/item_processor.js | 2 +- src/js/game/hub_goals.js | 2 +- src/js/game/systems/item_processor.js | 4 ++-- translations/base-en.yaml | 6 +++--- translations/base-ja.yaml | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/js/core/config.js b/src/js/core/config.js index f57f935d..9f484b99 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -64,7 +64,7 @@ export const globalConfig = { painter: 1 / 6, painterDouble: 1 / 8, painterQuad: 1 / 8, - bleacher: 1 / 8, + painterBleach: 1 / 8, mixer: 1 / 5, stacker: 1 / 6, advancedProcessor: 1 / 15, diff --git a/src/js/game/buildings/painter.js b/src/js/game/buildings/painter.js index c9ec6675..311caac9 100644 --- a/src/js/game/buildings/painter.js +++ b/src/js/game/buildings/painter.js @@ -15,7 +15,7 @@ export const enumPainterVariants = { mirrored: "mirrored", double: "double", quad: "quad", - bleacher: "bleacher", + bleach: "bleach", }; export class MetaPainterBuilding extends MetaBuilding { @@ -32,7 +32,7 @@ export class MetaPainterBuilding extends MetaBuilding { return new Vector(2, 2); case enumPainterVariants.quad: return new Vector(4, 1); - case enumPainterVariants.bleacher: + case enumPainterVariants.bleach: return new Vector(1, 1); default: assertAlways(false, "Unknown painter variant: " + variant); @@ -63,8 +63,8 @@ export class MetaPainterBuilding extends MetaBuilding { const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.painterQuad); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } - case enumPainterVariants.bleacher: { - const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.bleacher); + case enumPainterVariants.bleach: { + const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.painterBleach); 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)) { variants.push(enumPainterVariants.quad); - variants.push(enumPainterVariants.bleacher); + variants.push(enumPainterVariants.bleach); } return variants; } @@ -218,7 +218,7 @@ export class MetaPainterBuilding extends MetaBuilding { ]); break; } - case enumPainterVariants.bleacher: { + case enumPainterVariants.bleach: { entity.components.ItemAcceptor.setSlots([ { 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.ItemEjector.setSlots([ { pos: new Vector(0, 0), direction: enumDirection.right }, diff --git a/src/js/game/components/item_processor.js b/src/js/game/components/item_processor.js index 98ca461e..0f98b554 100644 --- a/src/js/game/components/item_processor.js +++ b/src/js/game/components/item_processor.js @@ -16,7 +16,7 @@ export const enumItemProcessorTypes = { painter: "painter", painterDouble: "painterDouble", painterQuad: "painterQuad", - bleacher: "bleacher", + painterBleach: "painterBleach", advancedProcessor: "advancedProcessor", hub: "hub", }; diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index b5b7b4e0..4d324961 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -409,7 +409,7 @@ export class HubGoals extends BasicSerializableObject { case enumItemProcessorTypes.painter: case enumItemProcessorTypes.painterDouble: case enumItemProcessorTypes.painterQuad: - case enumItemProcessorTypes.bleacher: { + case enumItemProcessorTypes.painterBleach: { assert( globalConfig.buildingSpeeds[processorType], "Processor type has no speed set in globalConfig.buildingSpeeds: " + processorType diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index 09bd02ee..0a746661 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -321,9 +321,9 @@ export class ItemProcessorSystem extends GameSystemWithFilter { break; } - // BLEACHER + // PAINTER (BLEACH) - case enumItemProcessorTypes.bleacher: { + case enumItemProcessorTypes.painterBleach: { const shapeItem = /** @type {ShapeItem} */ (items[0].item); const colorizedDefinition = this.root.shapeDefinitionMgr.shapeActionPaintWith( diff --git a/translations/base-en.yaml b/translations/base-en.yaml index a8d5e334..cced2c47 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -524,9 +524,9 @@ buildings: name: Painter (Quad) description: Allows to color each quadrant of the shape with a different color. - bleacher: - name: Bleacher - description: Bleaches the whole shape.. + bleach: + name: Painter (Bleach) + description: Bleaches the whole shape. trash: default: diff --git a/translations/base-ja.yaml b/translations/base-ja.yaml index f90ab998..9bda8635 100644 --- a/translations/base-ja.yaml +++ b/translations/base-ja.yaml @@ -507,7 +507,7 @@ buildings: mirrored: name: *painter description: *painter_desc - bleacher: + bleach: name: 脱色機 description: 入力された形の全体を無色にします。