curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-09 18:14:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

removing 'small' world size for new worlds: gamedesign choice

Browse Source
This commit is contained in:
minjaesong
2023-05-28 21:31:14 +09:00
parent 76bfc0fde4
commit 1646871ddf
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
View File

@@ -144,10 +144,11 @@ open class TerrarumIngame(batch: FlippingSpriteBatch) : IngameInstance(batch) {
val SIZE_NORMAL = Point2i(9000, 2250) val SIZE_NORMAL = Point2i(9000, 2250)
val SIZE_LARGE = Point2i(13500, 2970) val SIZE_LARGE = Point2i(13500, 2970)
val SIZE_HUGE = Point2i(22500, 4500) val SIZE_HUGE = Point2i(22500, 4500)
val WORLDSIZE = if (App.IS_DEVELOPMENT_BUILD) val NEW_WORLD_SIZE = if (App.IS_DEVELOPMENT_BUILD)
arrayOf(Point2i(2880, 1350), SIZE_SMALL, SIZE_NORMAL, SIZE_LARGE, SIZE_HUGE) arrayOf(Point2i(2880, 1350), /*SIZE_SMALL, */SIZE_NORMAL, SIZE_LARGE, SIZE_HUGE)
else else
arrayOf(SIZE_SMALL, SIZE_NORMAL, SIZE_LARGE, SIZE_HUGE) arrayOf(/*SIZE_SMALL, */SIZE_NORMAL, SIZE_LARGE, SIZE_HUGE)
val WORLDPORTAL_NEW_WORLD_SIZE = arrayOf(SIZE_SMALL, SIZE_NORMAL, SIZE_LARGE, SIZE_HUGE)
val worldgenThreadExecutor = ThreadExecutor() val worldgenThreadExecutor = ThreadExecutor()
} }

11
src/net/torvald/terrarum/modulebasegame/ui/UINewWorld.kt
View File

@@ -14,6 +14,7 @@ import net.torvald.terrarum.Second
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.langpack.Lang import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.modulebasegame.TerrarumIngame import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.TerrarumIngame.Companion.NEW_WORLD_SIZE
import net.torvald.terrarum.modulebasegame.WorldgenLoadScreen import net.torvald.terrarum.modulebasegame.WorldgenLoadScreen
import net.torvald.terrarum.modulebasegame.gameactors.IngamePlayer import net.torvald.terrarum.modulebasegame.gameactors.IngamePlayer
import net.torvald.terrarum.savegame.ByteArray64Reader import net.torvald.terrarum.savegame.ByteArray64Reader
@@ -34,7 +35,7 @@ class UINewWorld(val remoCon: UIRemoCon) : UICanvas() {
private val normalTex = TextureRegion(Texture(ModMgr.getGdxFile("basegame", "gui/normal.png"))) private val normalTex = TextureRegion(Texture(ModMgr.getGdxFile("basegame", "gui/normal.png")))
private val smallTex = TextureRegion(Texture(ModMgr.getGdxFile("basegame", "gui/small.png"))) private val smallTex = TextureRegion(Texture(ModMgr.getGdxFile("basegame", "gui/small.png")))
private val tex = arrayOf(smallTex, normalTex, largeTex, hugeTex) private val tex = arrayOf(/*smallTex, */normalTex, largeTex, hugeTex)
override var width = 480 override var width = 480
override var height = 480 override var height = 480
@@ -44,7 +45,7 @@ class UINewWorld(val remoCon: UIRemoCon) : UICanvas() {
private val radioCellWidth = 100 private val radioCellWidth = 100
private val inputWidth = 340 private val inputWidth = 340
private val radioX = (width - (radioCellWidth * (if (App.IS_DEVELOPMENT_BUILD) 5 else 4) + 9)) / 2 private val radioX = (width - (radioCellWidth * NEW_WORLD_SIZE.size + 9)) / 2
private val inputX = width - inputWidth private val inputX = width - inputWidth
private val sizeSelY = 186 + 40 private val sizeSelY = 186 + 40
@@ -56,14 +57,14 @@ class UINewWorld(val remoCon: UIRemoCon) : UICanvas() {
if (App.IS_DEVELOPMENT_BUILD) if (App.IS_DEVELOPMENT_BUILD)
listOf( listOf(
{ Lang["CONTEXT_DESCRIPTION_TINY"] }, { Lang["CONTEXT_DESCRIPTION_TINY"] },
{ Lang["CONTEXT_DESCRIPTION_SMALL"] }, // { Lang["CONTEXT_DESCRIPTION_SMALL"] }, // only available for World Portal
{ Lang["MENU_SETTING_MEDIUM"] }, // ;p { Lang["MENU_SETTING_MEDIUM"] }, // ;p
{ Lang["CONTEXT_DESCRIPTION_BIG"] }, { Lang["CONTEXT_DESCRIPTION_BIG"] },
{ Lang["CONTEXT_DESCRIPTION_HUGE"] } { Lang["CONTEXT_DESCRIPTION_HUGE"] }
) )
else else
listOf( listOf(
{ Lang["CONTEXT_DESCRIPTION_SMALL"] }, // { Lang["CONTEXT_DESCRIPTION_SMALL"] }, // only available for World Portal
{ Lang["MENU_SETTING_MEDIUM"] }, // ;p { Lang["MENU_SETTING_MEDIUM"] }, // ;p
{ Lang["CONTEXT_DESCRIPTION_BIG"] }, { Lang["CONTEXT_DESCRIPTION_BIG"] },
{ Lang["CONTEXT_DESCRIPTION_HUGE"] } { Lang["CONTEXT_DESCRIPTION_HUGE"] }
@@ -98,7 +99,7 @@ class UINewWorld(val remoCon: UIRemoCon) : UICanvas() {
catch (e: NumberFormatException) { catch (e: NumberFormatException) {
XXHash64.hash(seedInput.getTextOrPlaceholder().toByteArray(Charsets.UTF_8), 10000) XXHash64.hash(seedInput.getTextOrPlaceholder().toByteArray(Charsets.UTF_8), 10000)
} }
val (wx, wy) = TerrarumIngame.WORLDSIZE[sizeSelector.selection] val (wx, wy) = TerrarumIngame.NEW_WORLD_SIZE[sizeSelector.selection]
val worldParam = TerrarumIngame.NewGameParams( val worldParam = TerrarumIngame.NewGameParams(
player, TerrarumIngame.NewWorldParameters( player, TerrarumIngame.NewWorldParameters(
wx, wy, seed, nameInput.getTextOrPlaceholder() wx, wy, seed, nameInput.getTextOrPlaceholder()