Merge branch 'main' of https://github.com/blkerby/MapRandomizer

Author: lordlou

.dockerignore

@@ -4,4 +4,5 @@ seeds/
 models/
 tmp/
 map-rando-videos/
-map-rando-videos-pgdump/
+map-rando-videos-pgdump/
+asar/CMakeCache.txt

.github/workflows/rust_checks.yml

@@ -23,6 +23,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: 'true'
       - uses: dtolnay/rust-toolchain@stable
       - run: cargo fmt --check
       - run: cargo check --all

.gitignore

@@ -22,4 +22,5 @@ patches/mosaic
 **/out.perf-folded
 compressed_data/
 map-rando-videos/
-map-rando-videos-pgdump/
+map-rando-videos-pgdump/
+stats/

.gitmodules

@@ -11,4 +11,10 @@
 	branch = expanded
 [submodule "Mosaic"]
 	path = Mosaic
-	url = https://github.com/amoebaOfDoom/Mosaic
+	url = https://github.com/blkerby/Mosaic
+[submodule "asar"]
+	path = asar
+	url = https://github.com/RPGHacker/asar.git
+[submodule "rust/lznint"]
+	path = rust/lznint
+	url = https://github.com/blkerby/lznint.git

CHANGELOG.html

@@ -1,4 +1,4 @@
-FROM rust:1.79.0-bullseye AS build
+FROM rust:1.84.0-bullseye AS build
 
 RUN apt-get update && apt-get install -y zstd
 
@@ -21,14 +21,17 @@ COPY rust/maprando-logic/Cargo.toml /rust/maprando-logic/Cargo.toml
 COPY rust/maprando/src/bin/dummy.rs /rust/maprando-logic/src/bin/dummy-logic.rs
 COPY rust/maprando-wasm/Cargo.toml /rust/maprando-wasm/Cargo.toml
 COPY rust/maprando/src/bin/dummy.rs /rust/maprando-wasm/src/bin/dummy-wasm.rs
+COPY rust/lznint/Cargo.toml /rust/lznint/Cargo.toml
+COPY rust/maprando/src/bin/dummy.rs /rust/lznint/src/bin/dummy-lznint.rs
+
 RUN mkdir -p /rust/maprando-wasm/src && touch /rust/maprando-wasm/src/lib.rs
 RUN cargo build --release
 RUN rm /rust/src/*.rs
 
 # Download the map datasets and Mosaic patches
 WORKDIR /
 COPY /scripts /scripts
-COPY /MOSAIC_COMMIT_ID /MOSAIC_COMMIT_ID
+COPY /MOSAIC_BUILD_ID /MOSAIC_BUILD_ID
 RUN bash /scripts/download_data.sh
 
 # Now copy over the source code and build the real binary
@@ -39,8 +42,19 @@ RUN wasm-pack build --target="web" --release
 WORKDIR /rust
 RUN cargo build --release --bin maprando-web
 
+# Test the correctness of the IPS patches
+FROM debian:bullseye AS ips-test
+RUN apt-get update && apt-get install -y g++ cmake python3
+COPY asar /asar
+WORKDIR /asar
+RUN cmake src && make
+WORKDIR /
+COPY scripts /scripts
+COPY patches /patches
+RUN python3 scripts/build_ips.py --assembler-path=/asar/asar/bin/asar --verify
+
 # Now restart with a slim base image and just copy over the binary and data needed at runtime.
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 RUN apt-get update && apt-get install -y \
     libssl1.1 \
     && rm -rf /var/lib/apt/lists/*

Dockerfile

@@ -0,0 +1 @@
+93f0be00-baa0-4ff9-a1c1-42eb3cb2ab40