mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-06-13 03:54:06 +09:00
new world size is now much taller; loadscreen bar now has fixed ratio
This commit is contained in:
@@ -42,11 +42,11 @@ open class FancyWorldReadLoadScreen(screenToBeLoaded: IngameInstance, private va
|
||||
|
||||
val ratio = worldwidth * sqrt(2.0 / (worldwidth.sqr() + worldheight.sqr())) // world size is always wider than tall
|
||||
val htilesCount = worldwidth / CHUNK_W
|
||||
val vtilesCount = worldheight / CHUNK_H
|
||||
// val vtilesCount = worldheight / CHUNK_H
|
||||
|
||||
val unitSize = ((540 * ratio) / htilesCount).roundToInt() // (visible tilesize + gapSize)
|
||||
val previewWidth = unitSize * htilesCount
|
||||
val previewHeight = unitSize * vtilesCount
|
||||
val previewHeight = (previewWidth / 5f).roundToInt()
|
||||
|
||||
val xoff = (Math.random() * (1024-764)/2).toInt()
|
||||
|
||||
|
||||
@@ -168,10 +168,10 @@ open class TerrarumIngame(batch: FlippingSpriteBatch) : IngameInstance(batch) {
|
||||
// x: neither
|
||||
(this.hitbox.endX >= WorldCamera.x && this.hitbox.startX <= WorldCamera.xEnd))
|
||||
|
||||
val SIZE_SMALL = Point2i(6030, 1800)
|
||||
val SIZE_NORMAL = Point2i(9000, 2250)
|
||||
val SIZE_LARGE = Point2i(13500, 2970)
|
||||
val SIZE_HUGE = Point2i(22500, 4500)
|
||||
val SIZE_SMALL = Point2i(6030, 4500)
|
||||
val SIZE_NORMAL = Point2i(9000, 6750)
|
||||
val SIZE_LARGE = Point2i(13500, 10080)
|
||||
val SIZE_HUGE = Point2i(22500, 16920) // world ratio: 4:3
|
||||
val NEW_WORLD_SIZE = arrayOf(SIZE_SMALL, SIZE_NORMAL, SIZE_LARGE, SIZE_HUGE)
|
||||
val WORLDPORTAL_NEW_WORLD_SIZE = arrayOf(SIZE_SMALL, SIZE_NORMAL, SIZE_LARGE, SIZE_HUGE)
|
||||
|
||||
|
||||
@@ -161,7 +161,7 @@ class Biomegen(world: GameWorld, isFinal: Boolean, seed: Long, params: Any, val
|
||||
0 -> {
|
||||
if (tileThis == Block.DIRT && hasNoFloor) {
|
||||
if (exposedToAir) biomeMapOut[ba] = BIOME_KEY_GRAVELS
|
||||
Block.STONE_QUARRIED to null
|
||||
Block.STONE to null
|
||||
}
|
||||
else if (tileThis == Block.DIRT) {
|
||||
if (exposedToAir) biomeMapOut[ba] = BIOME_KEY_GRAVELS
|
||||
|
||||
Reference in New Issue
Block a user