v0.6.2 (#342)

* The calculated defense of an item is sometimes double (?) what it actually is #339 * [Not Recognized Modifier] - multiple Waystone modifiers #331 * version bump
Kvan7 · Jan 22, 2025 · 61dcd4b · 61dcd4b
1 parent e838549
commit 61dcd4b
Show file tree

Hide file tree

Showing 36 changed files with 42,991 additions and 43,226 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # ![Perfect Jewelers Orb](./renderer/public/images/jeweler.png) Exiled Exchange 2
 
-![GitHub Downloads (specific asset, latest release)](https://img.shields.io/github/downloads/kvan7/exiled-exchange-2/latest/Exiled-Exchange-2-Setup-0.6.1.exe?style=plastic&link=https%3A%2F%2Ftooomm.github.io%2Fgithub-release-stats%2F%3Fusername%3Dkvan7%26repository%3DExiled-Exchange-2)
+![GitHub Downloads (specific asset, latest release)](https://img.shields.io/github/downloads/kvan7/exiled-exchange-2/latest/Exiled-Exchange-2-Setup-0.6.2.exe?style=plastic&link=https%3A%2F%2Ftooomm.github.io%2Fgithub-release-stats%2F%3Fusername%3Dkvan7%26repository%3DExiled-Exchange-2)
 ![GitHub Tag](https://img.shields.io/github/v/tag/kvan7/exiled-exchange-2?style=plastic&label=latest%20version)
 ![GitHub commits since latest release (branch)](https://img.shields.io/github/commits-since/kvan7/exiled-exchange-2/latest/dev?style=plastic)
 

diff --git a/dataParser/data/cmn-Hant/stats.ndjson b/dataParser/data/cmn-Hant/stats.ndjson
diff --git a/dataParser/data/de/stats.ndjson b/dataParser/data/de/stats.ndjson
diff --git a/dataParser/data/en/stats.ndjson b/dataParser/data/en/stats.ndjson
diff --git a/dataParser/data/es/stats.ndjson b/dataParser/data/es/stats.ndjson
diff --git a/dataParser/data/ja/stats.ndjson b/dataParser/data/ja/stats.ndjson
diff --git a/dataParser/data/ko/stats.ndjson b/dataParser/data/ko/stats.ndjson
diff --git a/dataParser/data/ru/stats.ndjson b/dataParser/data/ru/stats.ndjson
diff --git a/dataParser/vendor/client/parser.py b/dataParser/vendor/client/parser.py
@@ -42,6 +42,109 @@
     "es": "Spanish",
 }
 
+HARDCODE_MAP_HYBRID_MODS = {
+    "mapmonsterstunailmentthreshold",
+    "mapmonsterelementailmentchance",
+    "mapmonsterdamageasfire",
+    "mapmonsterdamageascold",
+    "mapmonsterdamageaslightning",
+    "mapmonsterdamageincrease",
+    "mapmonsterspeedincrease",
+    "mapmonstercritincrease",
+    "mapmonsterlifeincrease",
+    "mapmonsterelementalresistances",
+    "mapmonsterarmoured",
+    "mapmonsterevasive",
+    "mapmonsterenergyshield",
+    "mapmonsterpoisoning",
+    "mapmonsterbleeding",
+    "mapmonsterarmourbreak",
+    "mapmonsteraccuracy",
+    "mapmonsterdamageaschaos",
+    "mapmonsterstunbuildup",
+    "mapmonsteradditionalprojectiles",
+    "mapmonsterincreasedareaofeffect",
+    "mapplayerenfeeble",
+    "mapplayertemporalchains",
+    "mapplayerelementalweakness",
+    "mapmonsterselementalpenetration",
+    "mapplayermaximumresists",
+    "mapplayerflaskchargegain",
+    "mapplayerrecoveryrate",
+    "mapmonstersbaseselfcriticalmultiplier",
+    "mapmonsterscurseeffectonself",
+    "mapmonstersstealcharges",
+    "mapplayercooldownrecovery",
+}
+
+HARDCODE_MAP_MODS = {
+    "mapdroppeditemrarityincrease",
+    "mapdroppedgoldincrease",
+    "mapexperiencegainincrease",
+    "mappacksizeincrease",
+    "maptotaleffectivenessincrease",
+    "mapchestcountincrease",
+    "mapmagicpackincrease",
+    "maprarepackincrease",
+    "mapmagicchestcountincrease",
+    "maprarechestcountincrease",
+    "mapmagicpacksizeincrease",
+    # "mapraremonstersadditionalmodifier",
+    "mapadditionalshrine",
+    "mapadditionalstrongbox",
+    "mapadditionalessence",
+    "mapmonsteradditionalpacksundead",
+    "mapmonsteradditionalpacksbeasts",
+    "mapmonsteradditionalpacksezomyte",
+    "mapmonsteradditionalpacksfaridun",
+    "mapmonsteradditionalpacksvaal",
+    "mapmonsteradditionalpacksbaron",
+    "mapmonsteradditionalpacksperennial",
+    "mapmonsteradditionalpacksdoryani",
+    "mapmonsteradditionalpackbramble",
+    "mapspreadburningground",
+    "mapspreadchilledground",
+    "mapspreadshockedground",
+    "mapchestsalwaysmagicrare",
+    "base_item_found_quantity_+%",
+    "map_map_item_drop_chance_+%",
+    # "mapsimulacrumdamageasfire",
+    # "mapsimulacrumdamageascold",
+    # "mapsimulacrumdamageaslightning",
+    # "mapsimulacrumdamageaschaos",
+    # "mapsimulacrumdamage",
+    "mapmonsterdamageasfire",
+    "mapmonsterdamageascold",
+    "mapmonsterdamageaslightning",
+    "mapmonsterdamageincrease",
+    "mapmonsterspeedincrease",
+    "mapmonstercritincrease",
+    "mapmonsterlifeincrease",
+    "mapmonsterelementalresistances",
+    "mapmonsterarmoured",
+    "mapmonsterevasive",
+    "mapmonsterenergyshield",
+    "mapmonsterpoisoning",
+    "mapmonsterbleeding",
+    "mapmonsterarmourbreak",
+    "mapmonsteraccuracy",
+    "mapmonsterdamageaschaos",
+    "mapmonsterstunbuildup",
+    "mapmonsteradditionalprojectiles",
+    "mapmonsterincreasedareaofeffect",
+    "mapplayerenfeeble",
+    "mapplayertemporalchains",
+    "mapplayerelementalweakness",
+    "mapmonsterselementalpenetration",
+    "mapplayermaximumresists",
+    "mapplayerflaskchargegain",
+    "mapplayerrecoveryrate",
+    "mapmonstersbaseselfcriticalmultiplier",
+    "mapmonsterscurseeffectonself",
+    "mapmonstersstealcharges",
+    "mapplayercooldownrecovery",
+}
+
 
 def find_first_matching_item(items, field: str, value: str) -> dict | None:
     return next((item for item in items if item.get(field) == value), None)
@@ -540,24 +643,40 @@ def parse_mods(self):
             if main_translation is None:
                 continue
 
-            if len(translations) > 1:
+            if len(translations) > 1 and base_id not in HARDCODE_MAP_HYBRID_MODS:
                 # first translation where
                 if main_translation.get("ref").count("#") == 1:
                     hybrid_count += 1
                     hybrids.append((base_id, translations))
                     continue
             stats_from_tiers.add(stat_id)
-            self.mods[base_id] = {
-                "ref": main_translation.get("ref"),
-                "better": 1,
-                "id": stat_id,
-                "matchers": main_translation.get("matchers"),
-                "trade": trade,
-                "tiers": tiers,
-            }
-
-            if base_id.lower().startswith("map"):
-                self.mods[base_id]["fromAreaMods"] = True
+            if base_id in HARDCODE_MAP_HYBRID_MODS:
+                non_waystone_translations = [
+                    t for t in translations if "waystone" not in t.get("ref").lower()
+                ]
+                for index, allowed_hybrid_translation in enumerate(
+                    non_waystone_translations
+                ):
+                    self.mods[f"{base_id}_{index}"] = {
+                        "ref": allowed_hybrid_translation.get("ref"),
+                        "better": 1,
+                        "id": f"{base_id}_{index}",
+                        "matchers": allowed_hybrid_translation.get("matchers"),
+                        "trade": {"ids": ids_list[index]},
+                        "tiers": tiers,
+                        "fromAreaMods": True,
+                    }
+            else:
+                self.mods[base_id] = {
+                    "ref": main_translation.get("ref"),
+                    "better": 1,
+                    "id": stat_id,
+                    "matchers": main_translation.get("matchers"),
+                    "trade": trade,
+                    "tiers": tiers,
+                }
+                if base_id in HARDCODE_MAP_MODS:
+                    self.mods[base_id]["fromAreaMods"] = True
 
         for mod in self.mods_file:
             id = mod.get("Id")
@@ -613,8 +732,7 @@ def parse_mods(self):
                         "matchers": translation.get("matchers"),
                         "trade": trade,
                     }
-
-                    if id.lower().startswith("map"):
+                    if stats_id in HARDCODE_MAP_MODS:
                         self.mods[id]["fromAreaMods"] = True
                 else:
                     logger.debug(