From 3cf1e3b4d48cc9903256d7b45b909cc0f2bb03d3 Mon Sep 17 00:00:00 2001
From: Ivan Savenko <saven.ivan@gmail.com>
Date: Mon, 19 Dec 2022 12:22:02 +0200
Subject: [PATCH] Restored neutral faction ID, changed warnings related to H3
 ID's

---
 config/factions/neutral.json | 1 +
 lib/CModHandler.cpp          | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/factions/neutral.json b/config/factions/neutral.json
index 8d8a7d2a2..6a6abac52 100644
--- a/config/factions/neutral.json
+++ b/config/factions/neutral.json
@@ -2,6 +2,7 @@
 	"neutral" :
 	{
 		"name" : "Neutral",
+		"index" : 9,
 		"alignment" : "neutral",
 		"creatureBackground" :
 		{
diff --git a/lib/CModHandler.cpp b/lib/CModHandler.cpp
index abbab842b..a05f851f8 100644
--- a/lib/CModHandler.cpp
+++ b/lib/CModHandler.cpp
@@ -404,6 +404,9 @@ bool ContentTypeHandler::loadMod(std::string modName, bool validate)
 
 		if (vstd::contains(data.Struct(), "index") && !data["index"].isNull())
 		{
+			if (modName != "core")
+				logMod->warn("Mod %s is attempting to load original data! This should be reserved for built-in mod.", modName);
+
 			// try to add H3 object data
 			size_t index = static_cast<size_t>(data["index"].Float());
 
@@ -416,7 +419,7 @@ bool ContentTypeHandler::loadMod(std::string modName, bool validate)
 			}
 			else
 			{
-				logMod->warn("no original data in loadMod(%s) at index %d", name, index);
+				logMod->trace("no original data in loadMod(%s) at index %d", name, index);
 			}
 			performValidate(data, name);
 			handler->loadObject(modName, name, data, index);