From 4bea5e9bf9126bb2cbe3dae9ac05233550038730 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sat, 4 Nov 2023 21:49:27 +0900
Subject: [PATCH] different randomising for different layers

---
 .../modulebasegame/worldgenerator/OregenAutotiling.kt         | 2 +-
 src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/net/torvald/terrarum/modulebasegame/worldgenerator/OregenAutotiling.kt b/src/net/torvald/terrarum/modulebasegame/worldgenerator/OregenAutotiling.kt
index 243821401..4363ca39e 100644
--- a/src/net/torvald/terrarum/modulebasegame/worldgenerator/OregenAutotiling.kt
+++ b/src/net/torvald/terrarum/modulebasegame/worldgenerator/OregenAutotiling.kt
@@ -34,7 +34,7 @@ class OregenAutotiling(world: GameWorld, seed: Long, val tilingModes: HashMap<It
         Worldgen.threadExecutor.join()
     }
 
-    private fun getHashCoord(x: Int, y: Int, mod: Int) = (XXHash64.hash(LandUtil.getBlockAddr(world, x, y).toBig64(), mod.toLong()) fmod mod.toLong()).toInt()
+    private fun getHashCoord(x: Int, y: Int, mod: Int) = (XXHash64.hash(LandUtil.getBlockAddr(world, x, y).toBig64(), ((x*16777619) xor (y+1073)).toLong()) fmod mod.toLong()).toInt()
 
     private fun draw(x: Int) {
         for (y in 0 until world.height) {
diff --git a/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt b/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
index 5ad0fa282..2d374c4a0 100644
--- a/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
+++ b/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
@@ -307,7 +307,7 @@ internal object BlocksDrawer {
     }
 
 
-    private fun getHashCoord(x: Int, y: Int, mod: Int) = (XXHash64.hash(LandUtil.getBlockAddr(world, x, y).toBig64(), mod.toLong()) fmod mod.toLong()).toInt()
+    private fun getHashCoord(x: Int, y: Int, mod: Int, layer: Int) = (XXHash64.hash(LandUtil.getBlockAddr(world, x, y).toBig64(), ((x*16777619) xor (y+1+layer)).toLong()) fmod mod.toLong()).toInt()
 
     /**
      * Autotiling; writes to buffer. Actual draw code must be called after this operation.
@@ -355,7 +355,7 @@ internal object BlocksDrawer {
                 }
 
                 var hash = if ((mode == WALL || mode == TERRAIN) && !BlockCodex[world.tileNumberToNameMap[thisTile.toLong()]].hasTag("NORANDTILE"))
-                    getHashCoord(x, y, 8)
+                    getHashCoord(x, y, 8, mode)
                 else 0
 
                 // draw a tile