Map gen changes

.github/deploy/rtx/dev.json

@@ -0,0 +1,12 @@
+{
+  "args": [
+    "--dev",
+    "--map-server",
+    "map-gen-2:5000",
+    "--seed-repository-url",
+    "s3:map-rando-seeds",
+    "--video-storage-url",
+    "https://map-rando-videos.b-cdn.net",
+    "--test-map-server"
+  ]
+}

.github/scripts/create_image_metadata.py

@@ -0,0 +1,35 @@
+import json
+import os
+from pathlib import Path
+
+
+def main():
+    config_root = Path(".github/deploy")
+    deploy_configs = {
+        path.relative_to(config_root).with_suffix("").as_posix(): json.loads(path.read_text())
+        for path in sorted(config_root.glob("*/*.json"))
+    }
+    if not deploy_configs:
+        raise ValueError("No deployment configurations found in .github/deploy/*/*.json")
+    metadata = {
+        "digest": os.environ["IMAGE_DIGEST"],
+        "commit": os.environ["GITHUB_SHA"],
+        "run_id": int(os.environ["GITHUB_RUN_ID"]),
+        "run_attempt": int(os.environ["GITHUB_RUN_ATTEMPT"]),
+        "deploy_configs": deploy_configs,
+    }
+    Path("image-metadata.json").write_text(json.dumps(metadata, indent=2) + "\n")
+    repository_url = f"{os.environ['GITHUB_SERVER_URL']}/{os.environ['GITHUB_REPOSITORY']}"
+    summary = (
+        "### Published image\n\n"
+        f"- Image: `docker.io/bkerby/map-rando@{metadata['digest']}`\n"
+        f"- Commit: [{metadata['commit']}]({repository_url}/commit/{metadata['commit']})\n"
+        f"- Build: [run {metadata['run_id']}, attempt {metadata['run_attempt']}]"
+        f"({repository_url}/actions/runs/{metadata['run_id']}/attempts/{metadata['run_attempt']})\n"
+    )
+    with Path(os.environ["GITHUB_STEP_SUMMARY"]).open("a") as summary_file:
+        summary_file.write(summary)
+
+
+if __name__ == "__main__":
+    main()

.github/workflows/ci.yml

@@ -65,6 +65,9 @@ jobs:
     env:
       DOCKER_TAG: ${{ github.ref == 'refs/heads/main' && 'latest' || github.ref_name }}
     steps:
+      -
+        name: Check out deployment configurations
+        uses: actions/checkout@v4
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -91,21 +94,7 @@ jobs:
         name: Write image metadata
         env:
           IMAGE_DIGEST: ${{ steps.build.outputs.digest }}
-        run: |
-          jq -n \
-            --arg digest "$IMAGE_DIGEST" \
-            --arg commit "$GITHUB_SHA" \
-            --argjson run_id "$GITHUB_RUN_ID" \
-            --argjson run_attempt "$GITHUB_RUN_ATTEMPT" \
-            '{digest: $digest, commit: $commit, run_id: $run_id, run_attempt: $run_attempt}' \
-            > image-metadata.json
-
-          printf '### Published image\n\n- Image: `docker.io/bkerby/map-rando@%s`\n- Commit: [%s](%s/%s/commit/%s)\n- Build: [run %s, attempt %s](%s/%s/actions/runs/%s/attempts/%s)\n' \
-            "$IMAGE_DIGEST" \
-            "$GITHUB_SHA" "$GITHUB_SERVER_URL" "$GITHUB_REPOSITORY" "$GITHUB_SHA" \
-            "$GITHUB_RUN_ID" "$GITHUB_RUN_ATTEMPT" \
-            "$GITHUB_SERVER_URL" "$GITHUB_REPOSITORY" "$GITHUB_RUN_ID" "$GITHUB_RUN_ATTEMPT" \
-            >> "$GITHUB_STEP_SUMMARY"
+        run: python3 .github/scripts/create_image_metadata.py
       -
         name: Upload image metadata
         uses: actions/upload-artifact@v7

.github/workflows/deploy-dev.yml

@@ -35,6 +35,10 @@ jobs:
             const fs = require('node:fs/promises');
             const run = context.payload.workflow_run;
             const metadata = JSON.parse(await fs.readFile('image-metadata/image-metadata.json', 'utf8'));
+            const deployConfig = metadata.deploy_configs['rtx/dev'];
+            if (deployConfig === undefined) {
+              throw new Error('Build metadata is missing .github/deploy/rtx/dev.json');
+            }
             // Rerunning this publisher creates a new request, including to retry a failed rollout.
             const response = await github.rest.repos.createDeployment({
               ...context.repo,
@@ -48,6 +52,7 @@ jobs:
               description: `CI run ${run.id}, attempt ${run.run_attempt}`,
               payload: {
                 digest: metadata.digest,
+                deploy_config: deployConfig,
                 build_run_id: run.id,
                 build_run_attempt: run.run_attempt
               }

.github/workflows/deploy-experimental.yml

@@ -35,6 +35,10 @@ jobs:
             const fs = require('node:fs/promises');
             const run = context.payload.workflow_run;
             const metadata = JSON.parse(await fs.readFile('image-metadata/image-metadata.json', 'utf8'));
+            const deployConfig = metadata.deploy_configs['rtx/experimental'];
+            if (deployConfig === undefined) {
+              throw new Error('Build metadata is missing .github/deploy/rtx/experimental.json');
+            }
             // Rerunning this publisher creates a new request, including to retry a failed rollout.
             const response = await github.rest.repos.createDeployment({
               ...context.repo,
@@ -48,6 +52,7 @@ jobs:
               description: `Experimental CI run ${run.id}, attempt ${run.run_attempt}`,
               payload: {
                 digest: metadata.digest,
+                deploy_config: deployConfig,
                 build_run_id: run.id,
                 build_run_attempt: run.run_attempt
               }

rust/data/presets/full-settings/Community Race Season 5.json

@@ -4904,7 +4904,7 @@
                     0.21052631578947367
                 ]
             },
-            "reward_missing_connect_utility": 1.0,
+            "reward_missing_connect_utility": 2.0,
             "reward_area_x": 10.0,
             "reward_area_y": 10.0,
             "target_area_rooms": [

rust/data/presets/full-settings/Default.json

@@ -4820,7 +4820,8 @@
                     0.7
                 ]
             },
-            "reward_missing_connect_utility": 1.0,
+            "reward_missing_connect_utility": 2.0,
+            "max_return_distance": 13.0,
             "reward_area_x": 10.0,
             "reward_area_y": 10.0,
             "target_area_rooms": [

rust/data/presets/full-settings/Mentor Tournament.json

@@ -4904,7 +4904,7 @@
                     0.21052631578947367
                 ]
             },
-            "reward_missing_connect_utility": 1.0,
+            "reward_missing_connect_utility": 2.0,
             "reward_area_x": 10.0,
             "reward_area_y": 10.0,
             "target_area_rooms": [

rust/data/presets/full-settings/Summer Series Expert Challenge.json

@@ -4816,7 +4816,7 @@
                     0.21052631578947367
                 ]
             },
-            "reward_missing_connect_utility": 1.0,
+            "reward_missing_connect_utility": 2.0,
             "reward_area_x": 10.0,
             "reward_area_y": 10.0,
             "target_area_rooms": [

rust/maprando-game/src/lib.rs

@@ -3107,7 +3107,7 @@ impl GameData {
                     .notable_map
                     .unwrap()
                     .get(&notable_name)
-                    .context(format!("Undefined notable: {}", &notable_name))?;
+                    .context(format!("Undefined notable: {}", notable_name))?;
                 return Ok(Requirement::Notable(notable_idx));
             } else if key == "heatFramesWithEnergyDrops" {
                 let frames = self.parse_numeric(&value["frames"]).unwrap_or_else(|e| {