update hashing

stutxo · Apr 5, 2024 · d6769a3 · d6769a3
1 parent 8a31618
commit d6769a3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -112,7 +112,7 @@ <h1 style="text-align: center; color: #333;">blockwars.gg</h1>
     <script>
         //This is a base64 encoded WebAssembly binary, it is 33% bigger than the original .wasm binary, im just testing it out.
         // Base64WasmStart 
-        const base64Wasm = 'AGFzbQEAAAABBAFgAAADAgEABQMBABQGOQd/AUGAgMAAC38AQcGBwAALfwBBwIHAAAt/AEHI8c8AC38AQcSBwAALfwBByPnPAAt/AEHQ+c8ACwdPCAZtZW1vcnkCAAlibG9ja3dhcnMAAAVSRVNFVAMBBUlOUFVUAwIEU0VFRAMDBERSQVcDBApfX2RhdGFfZW5kAwULX19oZWFwX2Jhc2UDBgqiDAGfDAINfwp9IwBBgAhrIgokAAJAQcGBwAAtAABBAUYEQEHAgcAAQQA6AABBwYHAAEEAOgAAQQAgCiIBa0EDcSICIAFqIQcgAgRAIAEhBUHI8c8AIQgDQCAFIAgtAAA6AAAgCEEBaiEIIAVBAWoiBSAHSQ0ACwsgB0GACCACayILQXxxIglqIQUCQCACQcjxzwBqIgJBA3EEQCAJQQBMDQEgAkEDdCIEQRhxIQwgAkF8cSIIQQRqIQNBACAEa0EYcSEEIAgoAgAhCANAIAcgCCAMdiADKAIAIgggBHRyNgIAIANBBGohAyAHQQRqIgcgBUkNAAsMAQsgCUEATA0AIAIhAwNAIAcgAygCADYCACADQQRqIQMgB0EEaiIHIAVJDQALCyACIAlqIQMgC0EDcSICBEAgAiAFaiECA0AgBSADLQAAOgAAIANBAWohAyAFQQFqIgUgAkkNAAsLA0AgACABaigCACAGcyEGIABBBGoiAEGACEcNAAtBACEAIAZBDXQgBnMiAUERdiABcyIBQQV0IAFzIgJBCnBBAmoiBiEEIAIhAQNAIARFBEAgAkEEdCACQQpuQaABbGtBoIDAAGohAANAIAZBDE8EQEH8j3AhAANAIABFDQYgAEHI8c8AakEANgIAIABBBGohAAwACwAFIABBADYCACAAQRBqIQAgBkEBaiEGDAELAAsACyAAQcABRwRAIABBgIBAa0EBNgIAIABBjIDAAGpDAAAAQEMAAEBAIABBEEYbQwAAgD8gABs4AgAgAEGEgMAAaiABQQ10IAFzIgFBEXYgAXMiAUEFdCABcyIBQRhwQQpsszgCACAAQYiAwABqIAFBDXQgAXMiAUERdiABcyIBQQV0IAFzIgFBGHBBCmyzOAIAIARBAWshBCAAQRBqIQAMAQsLA0AMAAsACwJAQcCBwAAtAABBAUcNAEHAfiEAA0AgAEUNAQJAIABBwIHAAGooAgBBAUYEQCAAQcyBwABqKgIAQwAAgD9bDQELIABBEGohACAGQQFqIQYMAQsLQcB+IQADQCAARQ0BAkAgAEHAgcAAaigCAEEBRgRAIABBzIHAAGoqAgBDAAAAQFsNAQsgAEEQaiEAIARBAWohBAwBCwsgBkEEdCICQYCAQGsiAygCAEEBRw0AIARBBHQiAUGAgEBrIgUoAgBBAUcNAAJAIAFBhIDAAGoqAgAiESACQYSAwABqKgIAIhWTIhIgEpQgAUGIgMAAaioCACITIAJBiIDAAGoqAgAiFpMiFCAUlJIiDUMAAAAAXyANQwAAgD9bcg0AIA1DAAAAP5RDAACAP5IhECANIQ4DQCAQIg8gDl0EQCAPIA0gD5WSQwAAAD+UIRAgDyEODAELCyAOQwAAIEFfDQAgA0EBNgIAIAMgFiAUIA6VQwAAIEGUkjgCCCADIBUgEiAOlUMAACBBlJI4AgQMAQsgA0EBNgIAIAMgETgCBCADIBM4AgggA0GAgICEBDYCDCAFQQE2AgAgBSAROAIEIAUgEzgCCCAFQYCAgPwDNgIMIARBAWoiAUEAIAFBDEcbQQR0QYCAQGsiASgCAARAIAFBgICAgAQ2AgwgAUEBNgIAC0HAgcAAQQA6AAALQQQhBEEBIQADQCAAQQFxRQ0BIASzIRBBACEBA0AgASICQcABRwRAIAJBEGohASACQYCAQGsoAgBFDQEgAkGMgMAAaioCACAQXA0BIAJBiIDAAGoqAgAhDiACQYSAwABqKgIAIQ9BACEDA0AgA0H/AXEiAkEJSw0CIA4gArOSIg1DAAAAAGAhAkEAIQBBfwJ/IA1DAACAT10gDUMAAAAAYHEEQCANqQwBC0EAC0EAIAIbIA1D//9/T14bQf8BbCEFA0AgAEH/AXEiAkEJTQRAIA8gArOSIg1DAAAAAGAhAiAAQQFqIQBBfwJ/IA1DAACAT10gDUMAAAAAYHEEQCANqQwBC0EAC0EAIAIbIA1D//9/T14bIAVqIgJBgPwDSw0BIAJBAnRBxIHAAGogBDYCAAwBCwsgA0EBaiEDDAALAAsLIARBAEchACAEQQFrIgFBACABIARNGyEEDAALAAsgCkGACGokAAs=';
+    const base64Wasm = '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';
         // Base64WasmEnd
         const canvas = document.getElementById('canvas');
 
@@ -128,10 +128,8 @@ <h1 style="text-align: center; color: #333;">blockwars.gg</h1>
         };
         const blockHeightInput = document.getElementById('block-input');
 
-
         let blockHeight = 0;
         let lastWorkingBlockHeight = 0;
-
         let seedData = [];
 
         async function loadWasm() {
@@ -232,6 +230,7 @@ <h1 style="text-align: center; color: #333;">blockwars.gg</h1>
                 if (blockHeight < 0) {
                     blockHeight = 0;
                 }
+
                 blockHeightInput.value = blockHeight;
 
 
@@ -338,6 +337,7 @@ <h1 style="text-align: center; color: #333;">blockwars.gg</h1>
                 for (var i = 0; i < hexString.length; i += 2) {
                     byteArray.push(parseInt(hexString.slice(i, i + 2), 16));
                 }
+                console.log(byteArray);
                 return byteArray;
             }
         }

diff --git a/src/lib.rs b/src/lib.rs
@@ -18,14 +18,20 @@ const GRID_HEIGHT: usize = (HEIGHT as usize) / TELEPORT_SIZE as usize;
 #[inline]
 fn rng(seed: [u32; 256]) -> impl Iterator<Item = u32> {
     let seed_slice = &seed[..];
-    let mut random = seed_slice.iter().fold(0, |acc, &x| acc ^ x);
+    let mut random = seed_init(&seed_slice);
     repeat_with(move || {
         random ^= random << 13;
         random ^= random >> 17;
         random ^= random << 5;
         random
     })
 }
+fn seed_init(seed: &[u32]) -> u32 {
+    seed.iter().enumerate().fold(0u32, |acc, (i, &x)| {
+        acc.wrapping_add(x.rotate_left(i as u32 % 32)) ^ 0x9E3779B9
+    })
+}
+
 #[no_mangle]
 static mut INPUT: [u8; 1] = [0; 1];
 
@@ -76,12 +82,7 @@ fn spawn_tele(
     let max_index_x = GRID_WIDTH - 1;
     let max_index_y = GRID_HEIGHT - 1;
 
-    let num_teleporters = match rng.next() {
-        Some(random_value) => {
-            ((random_value % (MAX_TELEPORT as u32 - 2)) as usize + 2).min(teleporters.len())
-        }
-        None => 2,
-    };
+    let num_teleporters = 4 + rng.next().unwrap_or(0) as usize % (MAX_TELEPORT - 4);
 
     for i in 0..num_teleporters {
         let x = match rng.next() {