Add fix for mod specific UI in data/ui/generic

Author: EddieEldridge

.github/workflows/build-and-release-eop.yml

@@ -96,5 +96,4 @@ jobs:
         artifacts: "${{ env.EOP_VERSION }}.zip"
         bodyFile: "./documentationGenerator/releaseInfo/releaseDescription.md"
         token: ${{ secrets.GITHUB_TOKEN }}
-        commit: "master"
         allowUpdates: true

M2TWEOP Code/M2TWEOP library/patchesForGame.cpp

@@ -341,6 +341,9 @@ char* __fastcall patchesForGame::getBrowserPicConstructed(int cultureID, edbEntr
 		}
 	}
 	unitActions::logStringGame("getBrowserPicConstructed error: " + std::string(modPath + picPath));
+	FILE_PATH = modPath + "/data/ui/generic/generic_constructed_building.tga";
+	if (std::filesystem::exists(FILE_PATH))
+		return FILE_PATH.data();
 	FILE_PATH = GAME_PATH + "/data/ui/generic/generic_constructed_building.tga";
 	return FILE_PATH.data();
 }
@@ -401,6 +404,9 @@ char* __fastcall patchesForGame::getBrowserPicConstruction(int cultureID, edbEnt
 		}
 	}
 	unitActions::logStringGame("getBrowserPicConstruction error: " + std::string(modPath + picPath));
+	FILE_PATH = modPath + "/data/ui/generic/generic_preconstructed_building.tga";
+	if (std::filesystem::exists(FILE_PATH))
+		return FILE_PATH.data();
 	FILE_PATH = GAME_PATH + "/data/ui/generic/generic_preconstructed_building.tga";
 	return FILE_PATH.data();
 }
@@ -460,6 +466,9 @@ char* __fastcall patchesForGame::getBuildingPic(buildingLevel* level, int cultur
 		}
 	}
 	unitActions::logStringGame("getBuildingPic error: " + std::string(modPath + picPath));
+	FILE_PATH = modPath + "/data/ui/generic/generic_building.tga";
+	if (std::filesystem::exists(FILE_PATH))
+		return FILE_PATH.data();
 	FILE_PATH = GAME_PATH + "/data/ui/generic/generic_building.tga";
 	return FILE_PATH.data();
 }
@@ -519,6 +528,9 @@ char* __fastcall patchesForGame::getBuildingPicConstructed(buildingLevel* level,
 		}
 	}
 	unitActions::logStringGame("getBuildingPicConstructed error: " + std::string(modPath + picPath));
+	FILE_PATH = modPath + "/data/ui/generic/generic_constructed_building.tga";
+	if (std::filesystem::exists(FILE_PATH))
+		return FILE_PATH.data();
 	FILE_PATH = GAME_PATH + "/data/ui/generic/generic_constructed_building.tga";
 	return FILE_PATH.data();
 }
@@ -578,6 +590,9 @@ char* __fastcall patchesForGame::getBuildingPicConstruction(buildingLevel* level
 		}
 	}
 	unitActions::logStringGame("getBuildingPicConstruction error: " + std::string(modPath + picPath));
+	FILE_PATH = modPath + "/data/ui/generic/generic_preconstructed_building.tga";
+	if (std::filesystem::exists(FILE_PATH))
+		return FILE_PATH.data();
 	FILE_PATH = GAME_PATH + "/data/ui/generic/generic_preconstructed_building.tga";
 	return FILE_PATH.data();
 }

documentationGenerator/releaseInfo/releaseDescription.md

@@ -7,8 +7,12 @@
 ## **Release Notes**
 ***NOTE : NOT SAVEGAME COMPATIBLE!!!!***
 
+#### **M2TWEOP-3-3-1**
+- Fixed custom mod building UI in `data/ui/generic` not being read correctly when EOP was installed - *Medik*
+
 <!-- ### **Launcher** -->
 
+#### **M2TWEOP-3-3-0**
 
 (all changes by Fynn)
 ### **Library**