From 94a207d72a412eeff7db992837d3baf223bcba6b Mon Sep 17 00:00:00 2001 From: minjaesong Date: Tue, 7 Nov 2023 00:38:33 +0900 Subject: [PATCH] loadscreen texts --- assets/locales/en/terrarum_sentences.json | 10 ++++++++-- .../modulebasegame/serialise/WriteSavegame.kt | 4 ++-- .../modulebasegame/worldgenerator/Worldgen.kt | 11 ++++++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/assets/locales/en/terrarum_sentences.json b/assets/locales/en/terrarum_sentences.json index 32505efef..9a434cbaa 100644 --- a/assets/locales/en/terrarum_sentences.json +++ b/assets/locales/en/terrarum_sentences.json @@ -8,11 +8,17 @@ "GAME_APPLE_ROSETTA_WARNING2": "Please use the native build for improved performance and gameplay experiences.", "APP_NOMODULE_1": "No Module is currently loaded.", "APP_NOMODULE_2": "Please configure your Load Order and restart:", - "MENU_LABEL_KEYCONFIG_HELP1": "Click On the Keycap to Assign Actions", "GAME_PREV_SAVE_WAS_LOADED1": "The most recently saved game was corrupted.", "GAME_PREV_SAVE_WAS_LOADED2": "The previously saved game was loaded.", "GAME_MORE_RECENT_AUTOSAVE1": "The Autosave is more recent than the manual save.", "GAME_MORE_RECENT_AUTOSAVE2": "Please select the saved game you wish to play:", + "MENU_IO_LOAD_UPDATING_BLOCK_MAPPINGS": "Updating Block Mappings...", + "MENU_IO_WORLDGEN_CARVING_EARTH": "Carving Earth...", + "MENU_IO_WORLDGEN_PAINTING_GREEN": "Painting Green...", + "MENU_IO_WORLDGEN_GROWING_MINERALS": "Growing Minerals...", + "MENU_IO_WORLDGEN_POSITIONING_ROCKS": "Positioning Rocks...", + "MENU_IO_WORLDGEN_RETICULATING_SPLINES": "Reticulating Splines...", + "MENU_LABEL_KEYCONFIG_HELP1": "Click On the Keycap to Assign Actions", "MENU_LABEL_SAVE_WILL_BE_DELETED": "The selected save file will be deleted.", - "MENU_LABEL_UNSAVED_PROGRESS_WILL_BE_LOST": "Unsaved progress will be lost." + "MENU_LABEL_UNSAVED_PROGRESS_WILL_BE_LOST": "Unsaved progress will be lost.", } \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/serialise/WriteSavegame.kt b/src/net/torvald/terrarum/modulebasegame/serialise/WriteSavegame.kt index 86b3546a1..125f9ee81 100644 --- a/src/net/torvald/terrarum/modulebasegame/serialise/WriteSavegame.kt +++ b/src/net/torvald/terrarum/modulebasegame/serialise/WriteSavegame.kt @@ -193,7 +193,7 @@ object LoadSavegame { val layerCount = worldLayer.size for (chunk in 0L until (world.width * world.height) / (cw * ch)) { for (layer in worldLayer.indices) { - loadscreen.addMessage("${Lang["MENU_IO_LOADING"]} ${chunk*layerCount+layer+1}/${chunkCount*layerCount}") + loadscreen.addMessage(Lang["MENU_IO_LOADING"]) val chunkFile = newIngame.worldDisk.getFile(0x1_0000_0000L or layer.toLong().shl(24) or chunk)!! val chunkXY = LandUtil.chunkNumToChunkXY(world, chunk.toInt()) @@ -203,7 +203,7 @@ object LoadSavegame { loadscreen.progress.getAndAdd(1) } - loadscreen.addMessage("Updating Block Mappings...") + loadscreen.addMessage(Lang["MENU_IO_LOAD_UPDATING_BLOCK_MAPPINGS"]) world.renumberTilesAfterLoad() diff --git a/src/net/torvald/terrarum/modulebasegame/worldgenerator/Worldgen.kt b/src/net/torvald/terrarum/modulebasegame/worldgenerator/Worldgen.kt index dfd0d82ee..63a1d4df5 100644 --- a/src/net/torvald/terrarum/modulebasegame/worldgenerator/Worldgen.kt +++ b/src/net/torvald/terrarum/modulebasegame/worldgenerator/Worldgen.kt @@ -8,6 +8,7 @@ import net.torvald.terrarum.BlockCodex import net.torvald.terrarum.LoadScreenBase import net.torvald.terrarum.gameitems.ItemID import net.torvald.terrarum.gameworld.GameWorld +import net.torvald.terrarum.langpack.Lang import net.torvald.terrarum.modulebasegame.TerrarumIngame import kotlin.math.max import kotlin.math.roundToLong @@ -57,11 +58,11 @@ object Worldgen { } } return listOf( - Work("Reticulating Splines", Terragen(world, highlandLowlandSelectCache, params.seed, params.terragenParams), listOf("TERRAIN")), - Work("Adding Rocks", Oregen(world, caveAttenuateBiasScaled, params.seed, oreRegistry), listOf("ORES")), - Work("Positioning Rocks", OregenAutotiling(world, params.seed, oreTilingModes), listOf("ORES")), - Work("Carving", Cavegen(world, highlandLowlandSelectCache, params.seed, params.terragenParams), listOf("TERRAIN", "CAVE")), - Work("Adding Vegetations", Biomegen(world, params.seed, params.biomegenParams), listOf("BIOME")), + Work(Lang["MENU_IO_WORLDGEN_RETICULATING_SPLINES"], Terragen(world, highlandLowlandSelectCache, params.seed, params.terragenParams), listOf("TERRAIN")), + Work(Lang["MENU_IO_WORLDGEN_GROWING_MINERALS"], Oregen(world, caveAttenuateBiasScaled, params.seed, oreRegistry), listOf("ORES")), + Work(Lang["MENU_IO_WORLDGEN_POSITIONING_ROCKS"], OregenAutotiling(world, params.seed, oreTilingModes), listOf("ORES")), + Work(Lang["MENU_IO_WORLDGEN_CARVING_EARTH"], Cavegen(world, highlandLowlandSelectCache, params.seed, params.terragenParams), listOf("TERRAIN", "CAVE")), + Work(Lang["MENU_IO_WORLDGEN_PAINTING_GREEN"], Biomegen(world, params.seed, params.biomegenParams), listOf("BIOME")), ).filter(tagFilter) }