localized name edb entry

youneuoy · Nov 8, 2024 · 5a9316c · 5a9316c
1 parent 4768183
commit 5a9316c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/M2TWEOP Code/M2TWEOP library/types/battle.cpp b/M2TWEOP Code/M2TWEOP library/types/battle.cpp
@@ -217,7 +217,7 @@ namespace battleHelpers
 		const DWORD offset = reinterpret_cast<DWORD>(perimeters) + 0x48;
 		battlePos pos{x,y};
 		const auto posPtr = &pos;
-		return GAME_FUNC(int(__thiscall*)(DWORD, battlePos*), getZoneID)(offset, posPtr);
+		return GAME_FUNC(int(__thiscall*)(DWORD, battlePos*), getZoneID)(offset, posPtr) & 0b111;
 	}
 
 	battlePerimeters* getBattlePerimeters()

diff --git a/M2TWEOP Code/M2TWEOP library/types/eopBuildings.cpp b/M2TWEOP Code/M2TWEOP library/types/eopBuildings.cpp
@@ -649,6 +649,7 @@ namespace buildingHelpers
 		Basic edbEntry table.
 
 		@tfield int buildingID
+		@tfield string localizedName
 		@tfield int classification
 		@tfield int isCoreBuilding
 		@tfield int isPort
@@ -673,6 +674,7 @@ namespace buildingHelpers
 		types.edbEntry.set("religionID", &edbEntry::religionID);
 		types.edbEntry.set("isHinterland", &edbEntry::isHinterland);
 		types.edbEntry.set("isFarm", &edbEntry::isFarm);
+		types.edbEntry.set("localizedName", sol::property(&edbEntry::getLocalizedName, &edbEntry::setLocalizedName));
 		types.edbEntry.set("buildingLevelCount", &edbEntry::buildingLevelCount);
 
 		/***

diff --git a/M2TWEOP Code/M2TWEOP library/types/eopBuildings.h b/M2TWEOP Code/M2TWEOP library/types/eopBuildings.h
@@ -339,7 +339,7 @@ struct edbEntry { /* SETTLEMENT_CONDITION_SETTLEMENT_FACTION */
 	int8_t isHinterland; //0x0068
 	int8_t isFarm; //0x0069
 	char pad_006A[2]; //0x006A
-	UNICODE_STRING** localizedName;
+	UNICODE_STRING*** localizedName;
 	gameStdVector<stringWithHash> converts;
 	char* type; /* type of building (core_building,barracks)  */
 	int typeHash;
@@ -355,6 +355,16 @@ struct edbEntry { /* SETTLEMENT_CONDITION_SETTLEMENT_FACTION */
 			return nullptr;
 		return &levels[index];
 	}
+	std::string getLocalizedName()
+	{
+		return gameStringHelpers::uniStringToStr(*localizedName);
+	}
+	void setLocalizedName(const std::string& newName)
+	{
+		const auto nameMem = techFuncs::createGameClass<UNICODE_STRING**>();
+		localizedName = nameMem;
+		gameStringHelpers::createUniString(*localizedName, newName.c_str());
+	}
 };
 
 struct hiddenResource