Better errors for missing decompile behaviors

include/errors_warnings.h

@@ -115,6 +115,9 @@ void error_invalidCsvRowFormat(ErrorsAndWarnings &err, std::string filePath, std
 void error_unknownMetatileBehavior(ErrorsAndWarnings &err, std::string filePath, std::size_t line,
                                    std::string behavior);
 
+void error_unknownMetatileBehaviorValue(ErrorsAndWarnings &err, std::string filePath, std::size_t entry,
+                                        std::uint16_t behaviorValue);
+
 void error_duplicateAttribute(ErrorsAndWarnings &err, std::string filePath, std::size_t line, std::size_t id,
                               std::size_t previousLine);
 

include/types.h

@@ -780,7 +780,14 @@ struct DecompilerSourcePaths {
     return path / "anim";
   }
 
+  std::filesystem::path secondaryAttributesBin() const
+  {
+    std::filesystem::path path{secondarySourcePath};
+    return path / "metatile_attributes.bin";
+  }
+
   std::filesystem::path modeBasedSrcPath(DecompilerMode mode) const;
+  std::filesystem::path modeBasedAttrPath(DecompilerMode mode) const;
 };
 
 struct Output {

src/driver.cpp

@@ -581,6 +581,7 @@ static void driveDecompile(PtContext &ctx)
   png::image<png::rgba_pixel> bottomPrimaryPng{128, static_cast<png::uint_32>(imageHeight)};
   png::image<png::rgba_pixel> middlePrimaryPng{128, static_cast<png::uint_32>(imageHeight)};
   png::image<png::rgba_pixel> topPrimaryPng{128, static_cast<png::uint_32>(imageHeight)};
+  // FIXME : if any errors are thrown in this method, it will partially emit the attr file which is not intuitive
   porytiles::emitDecompiled(ctx, bottomPrimaryPng, middlePrimaryPng, topPrimaryPng, outAttributes, *decompiled,
                             attributesMap, behaviorReverseMap);
   outAttributes.close();

src/emitter.cpp

@@ -353,14 +353,8 @@ void emitDecompiled(PtContext &ctx, png::image<png::rgba_pixel> &bottom, png::im
                << encounterTypeString(attributesMap.at(metatileIndex).encounterType) << std::endl;
       }
       else {
-        /*
-         * TODO : print warning that reverse map did not contain a mapping for this behavior, this case also occurs if
-         * the reverse map has 0 size, which may occur if user does not specify a behavior header (right now this is not
-         * allowed, but in the future we may make it allowed)
-         */
-        outCsv << metatileIndex << "," << attributesMap.at(metatileIndex).metatileBehavior << ","
-               << terrainTypeString(attributesMap.at(metatileIndex).terrainType) << ","
-               << encounterTypeString(attributesMap.at(metatileIndex).encounterType) << std::endl;
+        error_unknownMetatileBehaviorValue(ctx.err, ctx.decompilerSrcPaths.modeBasedAttrPath(ctx.decompilerConfig.mode),
+                                           metatileIndex, attributesMap.at(metatileIndex).metatileBehavior);
       }
     }
     else {
@@ -369,15 +363,16 @@ void emitDecompiled(PtContext &ctx, png::image<png::rgba_pixel> &bottom, png::im
                << std::endl;
       }
       else {
-        /*
-         * TODO : print warning that reverse map did not contain a mapping for this behavior, this case also occurs if
-         * the reverse map has 0 size, which may occur if user does not specify a behavior header (right now this is not
-         * allowed, but in the future we may make it allowed)
-         */
-        outCsv << metatileIndex << "," << attributesMap.at(metatileIndex).metatileBehavior << std::endl;
+        error_unknownMetatileBehaviorValue(ctx.err, ctx.decompilerSrcPaths.modeBasedAttrPath(ctx.decompilerConfig.mode),
+                                           metatileIndex, attributesMap.at(metatileIndex).metatileBehavior);
       }
     }
   }
+
+  if (ctx.err.errCount > 0) {
+    die_errorCount(ctx.err, ctx.decompilerSrcPaths.modeBasedSrcPath(ctx.decompilerConfig.mode),
+                   "behavior value did not have reverse mapping");
+  }
 }
 
 } // namespace porytiles

src/errors_warnings.cpp

@@ -174,6 +174,17 @@ void error_unknownMetatileBehavior(ErrorsAndWarnings &err, std::string filePath,
   }
 }
 
+void error_unknownMetatileBehaviorValue(ErrorsAndWarnings &err, std::string filePath, std::size_t entry,
+                                        std::uint16_t behaviorValue)
+{
+  err.errCount++;
+  if (err.printErrors) {
+    pt_err("{}: in metatile entry {}: unmapped metatile behavior value '{}'", filePath, entry,
+           fmt::styled(behaviorValue, fmt::emphasis::bold));
+    pt_println(stderr, "");
+  }
+}
+
 void error_duplicateAttribute(ErrorsAndWarnings &err, std::string filePath, std::size_t line, std::size_t id,
                               std::size_t previousLine)
 {

src/types.cpp

@@ -415,7 +415,22 @@ std::filesystem::path DecompilerSourcePaths::modeBasedSrcPath(DecompilerMode mod
     internalerror_unknownDecompilerMode("types::InputPaths::modeBasedInputPath");
   }
   // unreachable, here for compiler
-  throw std::runtime_error("types::InputPaths::modeBasedInputPath (decompile) reached unreachable code path");
+  throw std::runtime_error(
+      "types::InputPaths::DecompilerSourcePaths::modeBasedInputPath reached unreachable code path");
+}
+
+std::filesystem::path DecompilerSourcePaths::modeBasedAttrPath(DecompilerMode mode) const
+{
+  switch (mode) {
+  case DecompilerMode::PRIMARY:
+    return primaryAttributesBin();
+  case DecompilerMode::SECONDARY:
+    return secondaryAttributesBin();
+  default:
+    internalerror_unknownDecompilerMode("types::InputPaths::modeBasedAttrPath");
+  }
+  // unreachable, here for compiler
+  throw std::runtime_error("types::InputPaths::DecompilerSourcePaths::modeBasedAttrPath reached unreachable code path");
 }
 
 std::string compilerModeString(CompilerMode mode)