From e259fc2f3b28e019fa82ab367024a3330fa92506 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Mon, 29 May 2023 20:43:17 +0900 Subject: [PATCH] world size classification is now Tiny-Small-Big-Huge --- .../torvald/terrarum/modulebasegame/ui/UINewWorld.kt | 10 +++++----- .../terrarum/modulebasegame/ui/UIWorldPortalListing.kt | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UINewWorld.kt b/src/net/torvald/terrarum/modulebasegame/ui/UINewWorld.kt index 2941703f5..fa4a5fa52 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UINewWorld.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UINewWorld.kt @@ -43,7 +43,7 @@ class UINewWorld(val remoCon: UIRemoCon) : UICanvas() { private val drawX = (Toolkit.drawWidth - width) / 2 private val drawY = (App.scr.height - height) / 2 - private val radioCellWidth = 100 + private val radioCellWidth = 116 private val inputWidth = 340 private val radioX = (width - (radioCellWidth * NEW_WORLD_SIZE.size + 9)) / 2 private val inputX = width - inputWidth @@ -57,15 +57,15 @@ class UINewWorld(val remoCon: UIRemoCon) : UICanvas() { if (App.IS_DEVELOPMENT_BUILD) listOf( { Lang["CONTEXT_DESCRIPTION_TINY"] }, -// { Lang["CONTEXT_DESCRIPTION_SMALL"] }, // only available for World Portal - { Lang["MENU_SETTING_MEDIUM"] }, // ;p +// { Lang["CONTEXT_DESCRIPTION_TINY"] }, // only available for World Portal + { Lang["CONTEXT_DESCRIPTION_SMALL"] }, // ;p { Lang["CONTEXT_DESCRIPTION_BIG"] }, { Lang["CONTEXT_DESCRIPTION_HUGE"] } ) else listOf( -// { Lang["CONTEXT_DESCRIPTION_SMALL"] }, // only available for World Portal - { Lang["MENU_SETTING_MEDIUM"] }, // ;p +// { Lang["CONTEXT_DESCRIPTION_TINY"] }, // only available for World Portal + { Lang["CONTEXT_DESCRIPTION_SMALL"] }, // ;p { Lang["CONTEXT_DESCRIPTION_BIG"] }, { Lang["CONTEXT_DESCRIPTION_HUGE"] } ) diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortalListing.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortalListing.kt index 6f14b2aff..4473cada7 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortalListing.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortalListing.kt @@ -192,8 +192,8 @@ class UIWorldPortalListing(val full: UIWorldPortal) : UICanvas() { private val nullTimestamp = "0000-00-00 --:--:--" private val nullDurationStamp = "--h--m--s" private fun Int.chunkCountToWorldSize() = when(this) { - in 0 until 2000 -> "CONTEXT_DESCRIPTION_SMALL" - in 2000 until 4500 -> "MENU_SETTING_MEDIUM" + in 0 until 2000 -> "CONTEXT_DESCRIPTION_TINY" + in 2000 until 4500 -> "CONTEXT_DESCRIPTION_SMALL" in 4500 until 10000 -> "CONTEXT_DESCRIPTION_BIG" else -> "CONTEXT_DESCRIPTION_HUGE" }