diff --git a/res_raw/sprites/blueprints/balancer-merger-inverse.png b/res_raw/sprites/blueprints/balancer-merger-inverse.png index db528f32..f646ba6e 100644 Binary files a/res_raw/sprites/blueprints/balancer-merger-inverse.png and b/res_raw/sprites/blueprints/balancer-merger-inverse.png differ diff --git a/res_raw/sprites/blueprints/balancer-merger.png b/res_raw/sprites/blueprints/balancer-merger.png index 3e3c81f7..83535337 100644 Binary files a/res_raw/sprites/blueprints/balancer-merger.png and b/res_raw/sprites/blueprints/balancer-merger.png differ diff --git a/res_raw/sprites/blueprints/balancer-splitter-inverse.png b/res_raw/sprites/blueprints/balancer-splitter-inverse.png index 90a429c0..c9c4c4c9 100644 Binary files a/res_raw/sprites/blueprints/balancer-splitter-inverse.png and b/res_raw/sprites/blueprints/balancer-splitter-inverse.png differ diff --git a/res_raw/sprites/blueprints/balancer-splitter.png b/res_raw/sprites/blueprints/balancer-splitter.png index 93488fd9..3d59d05f 100644 Binary files a/res_raw/sprites/blueprints/balancer-splitter.png and b/res_raw/sprites/blueprints/balancer-splitter.png differ diff --git a/res_raw/sprites/buildings/balancer-merger-inverse.png b/res_raw/sprites/buildings/balancer-merger-inverse.png index 1d9bd4c9..dd71b929 100644 Binary files a/res_raw/sprites/buildings/balancer-merger-inverse.png and b/res_raw/sprites/buildings/balancer-merger-inverse.png differ diff --git a/res_raw/sprites/buildings/balancer-merger.png b/res_raw/sprites/buildings/balancer-merger.png index f0f80a0b..37ce312d 100644 Binary files a/res_raw/sprites/buildings/balancer-merger.png and b/res_raw/sprites/buildings/balancer-merger.png differ diff --git a/res_raw/sprites/buildings/balancer-splitter-inverse.png b/res_raw/sprites/buildings/balancer-splitter-inverse.png index 704663c0..4a765fa4 100644 Binary files a/res_raw/sprites/buildings/balancer-splitter-inverse.png and b/res_raw/sprites/buildings/balancer-splitter-inverse.png differ diff --git a/res_raw/sprites/buildings/balancer-splitter.png b/res_raw/sprites/buildings/balancer-splitter.png index d5a72dd4..e8fb62be 100644 Binary files a/res_raw/sprites/buildings/balancer-splitter.png and b/res_raw/sprites/buildings/balancer-splitter.png differ diff --git a/res_raw/sprites/buildings/underground_belt_entry-tier2.png b/res_raw/sprites/buildings/underground_belt_entry-tier2.png index 3a30f4b5..96dd4f66 100644 Binary files a/res_raw/sprites/buildings/underground_belt_entry-tier2.png and b/res_raw/sprites/buildings/underground_belt_entry-tier2.png differ diff --git a/res_raw/sprites/buildings/underground_belt_entry.png b/res_raw/sprites/buildings/underground_belt_entry.png index 3b771f60..c1e4c4e8 100644 Binary files a/res_raw/sprites/buildings/underground_belt_entry.png and b/res_raw/sprites/buildings/underground_belt_entry.png differ diff --git a/res_raw/sprites/buildings/underground_belt_exit-tier2.png b/res_raw/sprites/buildings/underground_belt_exit-tier2.png index 87c59bf3..e3c8df88 100644 Binary files a/res_raw/sprites/buildings/underground_belt_exit-tier2.png and b/res_raw/sprites/buildings/underground_belt_exit-tier2.png differ diff --git a/res_raw/sprites/buildings/underground_belt_exit.png b/res_raw/sprites/buildings/underground_belt_exit.png index c281ed0e..9614ae11 100644 Binary files a/res_raw/sprites/buildings/underground_belt_exit.png and b/res_raw/sprites/buildings/underground_belt_exit.png differ diff --git a/src/js/core/restriction_manager.js b/src/js/core/restriction_manager.js index 6daa4026..fb34acb8 100644 --- a/src/js/core/restriction_manager.js +++ b/src/js/core/restriction_manager.js @@ -1,4 +1,6 @@ +/* typehints:start */ import { Application } from "../application"; +/* typehints:end */ import { IS_MAC } from "./config"; import { ExplainedResult } from "./explained_result"; import { queryParamOptions } from "./query_parameters"; diff --git a/src/js/core/utils.js b/src/js/core/utils.js index 6982fb28..98327378 100644 --- a/src/js/core/utils.js +++ b/src/js/core/utils.js @@ -713,3 +713,40 @@ export function startFileChoose(acceptedType = ".bin") { input.click(); }); } + +const romanLiterals = [ + "0", // NULL + "I", + "II", + "III", + "IV", + "V", + "VI", + "VII", + "VIII", + "IX", + "X", + "XI", + "XII", + "XIII", + "XIV", + "XV", + "XVI", + "XVII", + "XVIII", + "XIX", + "XX", +]; + +/** + * + * @param {number} number + * @returns {string} + */ +export function getRomanNumber(number) { + number = Math.max(0, Math.round(number)); + if (number < romanLiterals.length) { + return romanLiterals[number]; + } + return String(number); +} diff --git a/src/js/game/hud/hud.js b/src/js/game/hud/hud.js index bcfa9b54..a9edffd0 100644 --- a/src/js/game/hud/hud.js +++ b/src/js/game/hud/hud.js @@ -45,7 +45,6 @@ import { HUDLeverToggle } from "./parts/lever_toggle"; import { HUDLayerPreview } from "./parts/layer_preview"; import { HUDMinerHighlight } from "./parts/miner_highlight"; import { HUDBetaOverlay } from "./parts/beta_overlay"; -import { HUDPerformanceWarning } from "./parts/performance_warning"; import { HUDStandaloneAdvantages } from "./parts/standalone_advantages"; import { HUDCatMemes } from "./parts/cat_memes"; @@ -88,7 +87,6 @@ export class GameHUD { layerPreview: new HUDLayerPreview(this.root), minerHighlight: new HUDMinerHighlight(this.root), - performanceWarning: new HUDPerformanceWarning(this.root), // Typing hints /* typehints:start */ diff --git a/src/js/game/hud/parts/performance_warning.js b/src/js/game/hud/parts/performance_warning.js deleted file mode 100644 index 4875acc8..00000000 --- a/src/js/game/hud/parts/performance_warning.js +++ /dev/null @@ -1,16 +0,0 @@ -import { T } from "../../../translations"; -import { BaseHUDPart } from "../base_hud_part"; - -export class HUDPerformanceWarning extends BaseHUDPart { - initialize() { - this.warningShown = false; - this.root.signals.entityManuallyPlaced.add(this.checkAfterPlace, this); - } - - checkAfterPlace() { - if (!this.warningShown && this.root.entityMgr.entities.length > 10000) { - this.root.hud.parts.dialogs.showInfo(T.dialogs.entityWarning.title, T.dialogs.entityWarning.desc); - this.warningShown = true; - } - } -} diff --git a/src/js/game/hud/parts/shop.js b/src/js/game/hud/parts/shop.js index c543200f..96521898 100644 --- a/src/js/game/hud/parts/shop.js +++ b/src/js/game/hud/parts/shop.js @@ -1,6 +1,6 @@ import { ClickDetector } from "../../../core/click_detector"; import { InputReceiver } from "../../../core/input_receiver"; -import { formatBigNumber, makeDiv } from "../../../core/utils"; +import { formatBigNumber, getRomanNumber, makeDiv } from "../../../core/utils"; import { T } from "../../../translations"; import { KeyActionMapper, KEYMAPPINGS } from "../../key_action_mapper"; import { BaseHUDPart } from "../base_hud_part"; @@ -67,7 +67,7 @@ export class HUDShop extends BaseHUDPart { // Set tier handle.elemTierLabel.innerText = T.ingame.shop.tier.replace( "", - "" + T.ingame.shop.tierLabels[currentTier] + getRomanNumber(currentTier + 1) ); handle.elemTierLabel.setAttribute("data-tier", currentTier); diff --git a/src/js/game/modes/regular.js b/src/js/game/modes/regular.js index dba39e8c..b7f84216 100644 --- a/src/js/game/modes/regular.js +++ b/src/js/game/modes/regular.js @@ -31,7 +31,15 @@ function generateUpgrades(limitedVersion = false) { // Fill in endgame upgrades for (let i = 0; i < numEndgameUpgrades; ++i) { - fixedImprovements.push(0.1); + if (i < 20) { + fixedImprovements.push(0.1); + } else if (i < 50) { + fixedImprovements.push(0.05); + } else if (i < 100) { + fixedImprovements.push(0.025); + } else { + fixedImprovements.push(0.0125); + } } const upgrades = { diff --git a/translations/base-en.yaml b/translations/base-en.yaml index 86bc8c90..0f707c1b 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -272,10 +272,6 @@ dialogs: title: Rename Savegame desc: You can rename your savegame here. - entityWarning: - title: Performance Warning - desc: You have placed a lot of buildings, this is just a friendly reminder that the game can not handle an endless number of buildings - try to keep your factories compact! - ingame: # This is shown in the top left corner and displays useful keybindings in # every situation @@ -355,10 +351,6 @@ ingame: # Gets replaced to e.g. "Tier IX" tier: Tier - # The roman number for each tier - tierLabels: - [I, II, III, IV, V, VI, VII, VIII, IX, X, XI, XII, XIII, XIV, XV, XVI, XVII, XVIII, XIX, XX] - maximumLevel: MAXIMUM LEVEL (Speed x) # The "Statistics" window