Merge pull request #177 from lvlvllvlvllvlvl/dev

Improve monster pack export and fix links to Shroud of the Lightless
Project-Path-of-Exile-Wiki · Apr 13, 2024 · 199253f · 199253f
2 parents 25fb31d + 32c60cd
commit 199253f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/PyPoE/cli/exporter/wiki/parser.py b/PyPoE/cli/exporter/wiki/parser.py
@@ -1667,6 +1667,7 @@ class TagHandler:
     UNIQ_FORMATS = {
         "Lightpoacher": "[[%s]]",
         "Precursor's Emblem": "[[%s]]",
+        "Shroud of the Lightless": "[[%s]]",
         "Thread of Hope": "{{il|page=%s}}",
     }
 

diff --git a/PyPoE/cli/exporter/wiki/parsers/lua.py b/PyPoE/cli/exporter/wiki/parsers/lua.py
@@ -65,7 +65,9 @@ def lua_format_value(key, value):
 def markup_to_wiki(text: str):
     return re.sub(
         r"<([^>]+)>{([^}]+)}",
-        lambda match: "{{c|%s|%s}}" % (match.group(1).lower(), match.group(2)),
+        lambda match: "\n".join(
+            "{{c|%s|%s}}" % (match.group(1).lower(), line) for line in match.group(2).splitlines()
+        ),
         text,
     )
 
@@ -1959,19 +1961,24 @@ def main(self, parsed_args):
         if "MonsterPacksKey" not in self.rr["MonsterPackEntries.dat64"].index:
             self.rr["MonsterPackEntries.dat64"].build_index("MonsterPacksKey")
         monsterpack_data = {}
+
+        def monster(m):
+            return {"monster_id": m["Id"], "name": m["Name"]}
+
         for pack in self.rr["MonsterPacks.dat64"]:
             data = self._copy_from_keys(pack, self._DATA, rtr=True)
-            data["weight_by_area"] = dict(
-                zip([area["Id"] for area in pack["WorldAreasKeys"]], pack["Data0"])
-            )
-            monster_types = []
-            for entry in self.rr["MonsterPackEntries.dat64"].index["MonsterPacksKey"][pack]:
-                if entry["MonsterVarietiesKey"]:
-                    monster_types.append({"monster_id": entry["MonsterVarietiesKey"]["Id"]})
-            data["monster_ids"] = monster_types
-            boss_types = []
-            for boss in pack["BossMonster_MonsterVarietiesKeys"]:
-                boss_types.append({"monster_id": boss["Id"]})
+            data["areas"] = [
+                {"area_id": area["Id"], "name": area["Name"], "weight": weight}
+                for area, weight in zip(pack["WorldAreasKeys"], pack["Data0"])
+            ]
+            data["monsters"] = [
+                monster(entry["MonsterVarietiesKey"])
+                for entry in self.rr["MonsterPackEntries.dat64"].index["MonsterPacksKey"][pack]
+                if entry["MonsterVarietiesKey"]
+            ]
+            data["boss_monsters"] = [
+                monster(boss) for boss in pack["BossMonster_MonsterVarietiesKeys"]
+            ]
             monsterpack_data[data["id"]] = data
 
         if "NecropolisPack" not in self.rr["MonsterPacks.dat64"].index: