diff --git a/src/net/torvald/terrarum/ModMgr.kt b/src/net/torvald/terrarum/ModMgr.kt index 15a043d24..93292a025 100644 --- a/src/net/torvald/terrarum/ModMgr.kt +++ b/src/net/torvald/terrarum/ModMgr.kt @@ -299,7 +299,7 @@ object ModMgr { } } catch (e: Throwable) { - printdbgerr(this, "$moduleName failed to load, skipping...") + printdbgerr(this, "Module failed to load, skipping: $moduleName") printdbgerr(this, "\t$e") print(App.csiR); e.printStackTrace(System.out); print(App.csi0) @@ -316,20 +316,20 @@ object ModMgr { entryPointClasses.add(newClassInstance as ModuleEntryPoint) (newClassInstance as ModuleEntryPoint).invoke() - printdbg(this, "$moduleName loaded successfully") + printdbg(this, "Module loaded successfully: $moduleName") } else { moduleInfo.remove(moduleName) moduleInfoErrored[moduleName] = module - printdbg(this, "$moduleName did not load...") + printdbg(this, "Module did not load: $moduleName") } } - printmsg(this, "Module $moduleName processed") + printmsg(this, "Module processed: $moduleName") } catch (noSuchModule: FileNotFoundException) { - printmsgerr(this, "No such module: $moduleName, skipping...") + printmsgerr(this, "No such module, skipping: $moduleName") logError(LoadErrorType.NOT_EVEN_THERE, moduleName, noSuchModule) diff --git a/src/net/torvald/terrarum/modulebasegame/FancyWorldReadLoadScreen.kt b/src/net/torvald/terrarum/modulebasegame/FancyWorldReadLoadScreen.kt index deb6ce034..89ee65c8d 100644 --- a/src/net/torvald/terrarum/modulebasegame/FancyWorldReadLoadScreen.kt +++ b/src/net/torvald/terrarum/modulebasegame/FancyWorldReadLoadScreen.kt @@ -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() diff --git a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt index 18d3e5a51..f9415f3cb 100644 --- a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt +++ b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt @@ -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) diff --git a/src/net/torvald/terrarum/modulebasegame/worldgenerator/Biomegen.kt b/src/net/torvald/terrarum/modulebasegame/worldgenerator/Biomegen.kt index 4f8588ab7..29d88ceff 100644 --- a/src/net/torvald/terrarum/modulebasegame/worldgenerator/Biomegen.kt +++ b/src/net/torvald/terrarum/modulebasegame/worldgenerator/Biomegen.kt @@ -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