handle MapgenValue in place_terrain

nornagon · Nov 11, 2024 · a62cf95 · a62cf95
1 parent bbecee5
commit a62cf95
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/src/types.ts b/src/types.ts
@@ -1143,7 +1143,7 @@ interface MapgenPlace {
 }
 
 export type MapgenPlaceTerrain = {
-  ter: string;
+  ter: MapgenValue;
 };
 
 export type MapgenPlaceFurniture = {

diff --git a/src/types/item/spawnLocations.ts b/src/types/item/spawnLocations.ts
@@ -493,15 +493,15 @@ function addLoot(loots: Loot[]): Loot {
 }
 
 function getMapgenValue(val: raw.MapgenValue): string | undefined {
-  if (typeof val === "string") return val;
-  if (
-    "switch" in val &&
-    typeof val.switch === "object" &&
-    "fallback" in val.switch &&
-    val.switch.fallback
-  )
-    return val.cases[val.switch["fallback"]];
-  // TODO: support distribution, param/fallback?
+  const distribution = getMapgenValueDistribution(val);
+  let maxProb = -Infinity;
+  let maxId: string | undefined;
+  for (const [id, prob] of distribution.entries())
+    if (prob > maxProb) {
+      maxProb = prob;
+      maxId = id;
+    }
+  return maxId;
 }
 
 function getMapgenValueDistribution(val: raw.MapgenValue): Map<string, number> {
@@ -512,7 +512,7 @@ function getMapgenValueDistribution(val: raw.MapgenValue): Map<string, number> {
     "fallback" in val.switch &&
     val.switch.fallback
   )
-    return new Map([[val.cases[val.switch["fallback"]], 1]]);
+    return new Map([[val.cases[val.switch.fallback], 1]]);
   if ("distribution" in val) {
     const opts = val.distribution;
     const totalProb = opts.reduce(
@@ -527,6 +527,11 @@ function getMapgenValueDistribution(val: raw.MapgenValue): Map<string, number> {
       )
     );
   }
+  if ("param" in val) {
+    if ("fallback" in val && val.fallback) {
+      return new Map([[val.fallback, 1]]);
+    }
+  }
   return new Map();
 }
 
@@ -670,9 +675,13 @@ export function getTerrainForMapgen(data: CddaData, mapgen: raw.Mapgen): Loot {
   if (terrainForMapgenCache.has(mapgen))
     return terrainForMapgenCache.get(mapgen)!;
   const palette = parseTerrainPalette(data, mapgen.object);
-  const place_terrain = (mapgen.object.place_terrain ?? []).map(
-    ({ ter }) => new Map([[ter, { prob: 1, expected: 1 }]])
-  );
+  const place_terrain = (mapgen.object.place_terrain ?? []).map(({ ter }) => {
+    const distribution = getMapgenValueDistribution(ter);
+    const loot = new Map<string, ItemChance>();
+    for (const [id, prob] of distribution.entries())
+      loot.set(id, { prob, expected: prob });
+    return loot;
+  });
   const additional_items = collection([...place_terrain]);
   const countByPalette = new Map<string, number>();
   for (const row of mapgen.object.rows ?? [])