Pregenerate province positions and tag capitals

While tag capital locations were already pregenerated, instead we switch this system to generate
1) the position of each province by id, and
2) the id of the initial capital province or each nation by tag
in respective yaml files.

This removes the need to include an entire save file, significantly reducing slug size, as well as reducing lookup time in some cases.

Author: 2kai2kai2

EU4Bot.py

@@ -1337,58 +1337,24 @@ async def process(self, message: discord.Message):
         elif text.upper() == "END" and await checkResAdmin(message.guild, message.author):  # END
             await message.delete()
             finalReserves: List[EU4Reserve.reservePick] = []
-            # This stores the capitals of all possible tags, so that their factions can be determined.
-            tagCapitals: Dict[str, int] = {}
-            # Add all possibly reserved nations to the tagCapitals dictionary with a capital of -1
             reserves = self.reserve.getPlayers()
-            for res in reserves:
-                for tag in res.picks:
-                    if tagCapitals.get(tag.upper()) is None:
-                        tagCapitals[tag.upper()] = -1
-            # Get the actual capitals and add to tagCapitals.
-            srcFile = open("resources/save_1444.eu4", "r", encoding="cp1252")
-            brackets: List[str] = []
-            linenum = 0
-            for line in srcFile:
-                linenum += 1
-                if "{" in line:
-                    if line.count("{") == line.count("}"):
-                        continue
-                    elif line.count("}") == 0 and line.count("{") == 1:
-                        brackets.append(line.rstrip("\n "))
-                    elif line.count("}") == 0 and line.count("{") > 1:
-                        for x in range(line.count("{")):
-                            # TODO: fix this so it has more
-                            brackets.append("{")
-                    else:
-                        print(f"Unexpected brackets at line {linenum}: {line}")
-                elif "}" in line:
-                    try:
-                        brackets.pop()
-                    except IndexError:  # This shouldn't happen.
-                        print(
-                            f"No brackets to delete at line {linenum}: {line}")
-                elif len(brackets) > 1 and brackets[0] == "countries={":
-                    for x in tagCapitals:
-                        if x in brackets[1]:
-                            # Here we have all the stats for country x on the players list
-                            if len(brackets) == 2 and "capital=" in line and not "original_capital=" in line and not "fixed_capital=" in line:
-                                tagCapitals[x] = int(line.strip("\tcapitl=\n"))
+
             # Draft Executive Reserves
             for res in reserves:
                 if res.priority:
                     finalReserves.append(EU4Reserve.reservePick(
                         res.userID, res.picks[0].upper()))
-                    self.getFaction(
-                        tagCapitals[res.picks[0].upper()]).taken += 1
+                    self.getFaction(EU4Lib.tagCapital(
+                        res.picks[0].upper())).taken += 1
                     reserves.remove(res)
             # Shuffle
             shuffle(reserves)
             # Draft Reserves
             for res in reserves:
                 finaltag = None
                 for tag in res.picks:
-                    resFaction = self.getFaction(tagCapitals[tag.upper()])
+                    resFaction = self.getFaction(
+                        EU4Lib.tagCapital(tag.upper()))
                     # if faction is full, skip to next one
                     if resFaction is None or resFaction.taken >= resFaction.maxPlayers:
                         continue

EU4Lib.py

@@ -1,7 +1,8 @@
-# This will need to be updated. Currently for 1.30.2
-from typing import Dict, List, Optional, Tuple, Union
+from typing import Dict, Optional, Tuple, Union
+import yaml
 
 from PIL import Image, ImageDraw
+from os import listdir, path
 
 
 def country(text: str, mod: str = "vanilla") -> Optional[str]:
@@ -72,69 +73,40 @@ def tagToName(tag: str, mod: str = "vanilla") -> Optional[str]:
     return None
 
 
-def province(id: Union[str, int], mod: str = "vanilla") -> Optional[Tuple[float, float]]:
+# LOAD PROVINCE LOCATION DATA
+# Even if not __main__
+province_locations: Dict[str, Dict[int, Tuple[float, float]]] = {}
+for p in listdir("resources"):
+    filepath = path.join("resources", p, "positions.yml")
+    if path.isfile(filepath):
+        province_locations_file = open(filepath, "r")
+        province_locations[p] = yaml.load(
+            province_locations_file, yaml.CLoader)
+        province_locations_file.close()
+
+
+def province(id: Union[str, int], mod: str = "vanilla") -> Tuple[float, float]:
     """
     Gets the location of a province on a screenshot map.
 
     Returns a tuple of floats, (x, y).
     """
-    # Read file
-    srcFile = open(f"resources/{mod}/positions.txt", "r", encoding="cp1252")
-    """
-    Format of the file:
-    1={
-        position={
-            3085.000 1723.000 3086.000 1730.000 3084.500 1729.000 3095.000 1724.500 3082.000 1730.000 3080.000 1736.000 0.000 0.000 
-        }
-        rotation={
-            0.000 0.000 0.087 -0.698 0.000 0.000 0.000 
-        }
-        height={
-            0.000 0.000 1.000 0.000 0.000 0.000 0.000 
-        }
-    }
-    
-    So we want the 3085.000 1723.000 from the 1={ because the first two are the location of the city in the province
-    """
-    beyond = 0
-    for line in srcFile:
-        if beyond == 2:  # Two after the province, this is the line with the position.
-            vals = line.split()
-            # Need to subtract the y value because the position starts from the bottom rather than the top like images
-            return (float(vals[0]), 2048-float(vals[1]))
-        elif beyond == 1:  # One after the province, wait one more line for the position
-            beyond = 2
-        elif line.strip() == str(id)+"={":
-            # So we have the province... Wait two lines for the position
-            beyond = 1
-    return None
+    return province_locations[mod][int(id)]
 
 
-def provinces(ids: List[Union[str, int]], mod: str = "vanilla") -> Dict[int, Tuple[float, float]]:
-    """
-    Gets the location of multiple provinces on a screenshot map.
-    Similar to province() except that it will only go through the file once to find all provinces.
-    """
-    out: Dict[int, Optional[Tuple[float, float]]] = {}
-    ids: List[int] = [int(x) for x in ids]
-    srcFile = open(f"resources/{mod}/positions.txt", "r", encoding="cp1252")
-    currentID: int = None
-    beyond = 0
-    for line in srcFile:
-        if beyond == 2:  # Two after the province, this is the line with the position.
-            vals = line.split()
-            # Need to subtract the y value because the position starts from the bottom rather than the top like images
-            out[currentID] = (float(vals[0]), 2048-float(vals[1]))
-            currentID = None
-            beyond = 0
-        elif beyond == 1:  # One after the province, wait one more line for the position
-            beyond = 2
-        elif line.strip("\t ={\n").isdigit():  # Province top-level bracket
-            id = int(line[:line.index("={")])
-            if id in ids:
-                currentID = id
-                beyond = 1
-    return out
+# LOAD INITIAL TAG CAPITAL DATA
+# Even if not __main__
+tag_capitals: Dict[str, Dict[str, int]] = {}
+for p in listdir("resources"):
+    filepath = path.join("resources", p, "tagCapitals.yml")
+    if path.isfile(filepath):
+        tag_capitals_file = open(filepath, "r")
+        tag_capitals[p] = yaml.load(tag_capitals_file, yaml.CLoader)
+        tag_capitals_file.close()
+
+
+def tagCapital(tag: str, mod: str = "vanilla") -> int:
+    return tag_capitals[mod][tag]
 
 
 def flag(tag: str, mod: str = "vanilla") -> Image.Image:
@@ -328,88 +300,3 @@ def colonialFlag(overlordTag: str, colReg: str, mod: str = "vanilla") -> Image.I
     flagDraw = ImageDraw.Draw(flagimg)
     flagDraw.rectangle([64, 0, 127, 127], color)
     return flagimg
-
-
-class dataReq:
-    DATATYPE_PROVINCEDAT = 0
-    REQUEST_PROVINCE_NAME = 0
-    REQUEST_PROVINCE_TRADE = 1
-    REQUEST_PROVINCE_CULTURE_ORIGINAL = 2
-    REQUEST_PROVINCE_RELIGION_ORIGINAL = 3
-
-    def __init__(self, datatype: int, key: str, request: int):
-        self.datatype = datatype
-        self.key = key
-        self.request = request
-        self.response = None
-
-    def respond(self, r):
-        if self.datatype == self.DATATYPE_PROVINCEDAT:
-            if self.request == self.REQUEST_PROVINCE_NAME:
-                if isinstance(r, str):
-                    self.response = r
-                else:
-                    raise ValueError(
-                        f"PROVINCE NAME request for {self.key} was the wrong type.")
-            elif self.request == self.REQUEST_PROVINCE_TRADE:
-                if isinstance(r, str):
-                    self.response = r
-                else:
-                    raise ValueError(
-                        f"PROVINCE TRADE request for {self.key} was the wrong type.")
-            elif self.request == self.REQUEST_PROVINCE_CULTURE_ORIGINAL:
-                if isinstance(r, str):
-                    self.response = r
-                else:
-                    raise ValueError(
-                        f"PROVINCE CULTURE ORIGINAL request for {self.key} was the wrong type.")
-            elif self.request == self.REQUEST_PROVINCE_RELIGION_ORIGINAL:
-                if isinstance(r, str):
-                    self.response = r
-                else:
-                    raise ValueError(
-                        f"PROVINCE RELIGION ORIGINAL request for {self.key} was the wrong type.")
-            # More things
-        # More datatypes
-
-
-def provinceData(*requests: dataReq, mod: str = "vanilla") -> List[dataReq]:
-    data = requests
-    srcFile = open(f"resources/{mod}/save_1444.eu4", encoding="cp1252")
-    brackets: List[str] = []
-
-    # Reading save file...
-    linenum = 0
-    for line in srcFile:
-        linenum += 1
-        if "{" in line:
-            if line.count("{") == line.count("}"):
-                continue
-            elif line.count("}") == 0 and line.count("{") == 1:
-                brackets.append(line.rstrip("\n "))
-            elif line.count("}") == 0 and line.count("{") > 1:
-                # TODO: fix this so it has more stuff
-                brackets.append("{" * line.count("{"))
-            else:
-                pass
-        elif "}" in line:
-            try:
-                brackets.pop()
-            except IndexError:
-                pass
-        elif len(brackets) == 2 and "provinces={" == brackets[0]:
-            for request in data:
-                if request.response is None and request.datatype == dataReq.DATATYPE_PROVINCEDAT and ("-" + str(request.key) + "={") == brackets[1]:
-                    if request.request == dataReq.REQUEST_PROVINCE_NAME and line.startswith("\t\tname="):
-                        request.respond(line.split("\"", 2)[1].strip("\n\t "))
-                    elif request.request == dataReq.REQUEST_PROVINCE_TRADE and line.startswith("\t\ttrade="):
-                        request.respond(line.split("\"", 2)[1].strip("\n\t "))
-                    elif request.request == dataReq.REQUEST_PROVINCE_CULTURE_ORIGINAL and line.startswith("\t\toriginal_culture="):
-                        request.respond(line.split("=", 1)[1].strip("\n\t "))
-                    elif request.request == dataReq.REQUEST_PROVINCE_RELIGION_ORIGINAL and line.startswith("\t\toriginal_religion="):
-                        request.respond(line.split("=", 1)[1].strip("\n\t "))
-        # elif len(brackets) < 0 and ("trade={" == brackets[1]  or "rebel_faction={" == brackets[0] or (len(brackets) < 1 and "\tledger_data={" == brackets[1]) or "_area={" in brackets[0] or "change_price={" == brackets[0]):
-        #    continue
-        else:
-            pass
-    return data

EU4Reserve.py

@@ -9,6 +9,7 @@
 from PIL import Image
 from pymongo.collection import Collection
 from pymongo.database import Database
+import EU4Lib
 
 dotenv.load_dotenv()
 client = pymongo.MongoClient(
@@ -404,20 +405,11 @@ def createMap(reserve: Reserve) -> Image.Image:
     countries: List[reservePick] = reserve.getPlayers()
     capitalLocs: Dict[str, Tuple[float, float]] = {}
 
-    srcFile = open("resources/tagCapitals.txt", "r", encoding="cp1252")
+    for country in countries:
+        capitalLocs[country.tag] = EU4Lib.province(
+            EU4Lib.tagCapital(country.tag))
 
-    for line in srcFile:
-        for natnum in range(len(countries)):
-            if line.startswith(countries[natnum].tag):
-                capitalLocs[countries[natnum].tag] = (
-                    float(line[4:line.index(",", 4)]), float(line[line.index(",", 4) + 1:]))
-                countries.pop(natnum)
-                break
-        if len(countries) == 0:
-            break
-    srcFile.close()
-
-    mapFinal: Image.Image = Image.open("resources/map_1444.png")
+    mapFinal: Image.Image = Image.open("resources/vanilla/map_1444.png")
     imgX: Image.Image = Image.open("resources/xIcon.png")
     for x in capitalLocs:
         mapFinal.paste(

EU4cpplib.cpp

@@ -522,45 +522,6 @@ py::bytes pyDrawMap(const std::map<std::string, std::tuple<uint8_t, uint8_t, uin
     return drawMap(tagColors, provinceOwners, mod);
 }
 
-std::pair<float, float> provinceLocation(size_t id, const std::string &mod) {
-    std::string idstr = std::to_string(id);
-    std::ifstream file;
-    file.open(std::string("resources/") + mod + "/positions.txt");
-
-    std::string line;
-    while (std::getline(file, line)) {
-        // While items such as "11={" will catch "1={", that is fine because the smaller number will come first, meaning the larger number should not be reached.
-        if (line.find(idstr + "={") != std::string::npos) {
-
-            std::getline(file, line); // position={
-            std::getline(file, line); // Line with position data. We want the first two.
-
-            std::pair<float, float> out;
-            bool second = false;
-            size_t start = std::string::npos;
-
-            // Go through each character to get the first two numbers
-            for (size_t i = 0; i < line.size(); ++i) {
-                if (start == std::string::npos && !std::isspace(line[i])) {
-                    // The first character of the number
-                    start = i;
-                } else if (start != std::string::npos && std::isspace(line[i])) {
-                    // The first whitespace after the number
-                    if (second) {
-                        out.second = std::stof(line.substr(start, i - start));
-                        return out;
-                    } else {
-                        out.first = std::stof(line.substr(start, i - start));
-                        start = std::string::npos;
-                        second = true;
-                    }
-                }
-            }
-        }
-    }
-    return std::pair<float, float>(-1.0f, -1.0f);
-}
-
 PYBIND11_MODULE(EU4cpplib, m) {
     m.doc() = "Libraries for eu4img written in C++ to improve speed and resource-consumption.";
 
@@ -581,7 +542,6 @@ PYBIND11_MODULE(EU4cpplib, m) {
         .def("isEU4Date", &EU4Date::isEU4Date)
         .def_static("stringValid", &EU4Date::stringValid, py::arg("text"));
 
-    m.def("provinceLocation", &provinceLocation, py::arg("id"), py::arg("mod"));
     m.def("drawBorders", &drawBorders, py::arg("playerColors"), py::arg("pixels"), py::arg("width"), py::arg("height"));
     m.def("loadProvinceMap", &pyProvMap, py::arg("mod"));
     m.def("loadMapDef", &loadMapDef, py::arg("mod"));

EU4cpplib.pyi

@@ -16,7 +16,6 @@ class EU4Date:
     def stringValid(text: str) -> bool: ...
 
 
-def provinceLocation(id: int, mod: str) -> Tuple[float, float]: ...
 def drawBorders(playerColors: Dict, pixels: bytes,
                 width: int, height: int) -> Dict: ...
 

requirements.txt

@@ -4,6 +4,7 @@ Pillow>=8.3.2
 pymongo[srv]>=3.11.3
 python-dateutil>=2.8.1
 python-dotenv>=0.17.0
+pyyaml>=6.0
 requests>=2.25.1
 cppimport>=21.3.7
 pybind11>=2.6.2