v0.6.0 (#328)

* [Parse Error] - Rarity: Magic #285 (#315)

* Add in fix

Co-authored-by: @vagrant-soul

* Adds regression tests

* Features/uniqueRollsRewrite (#316)

* update with new rolls system

* More or less working now

* adds fix for some stats from json having +

* Features/jewels (#317)

* Fix help text on jewels

* Add fix for shock

* [Not Recognized Modifier] - (most monster map modifiers) #314

* Features/showItemOnHover (#322)

* Move row into own component

* add tooltip on shift and hover

* works MVP

* style and fix affix strings

* pseudo add

* change tooltip method to more dynamic

* Corrupted back to red

* style updates

* Add option for tooltip in settings

* Features/relics (#323)

* update en strings

* translation client strings

* Fix relic parse error

* Tag text

* enable relic filters by default

* add spanish? (#324)


Co-authored-by: @mgallego

* Divider line shows when it shouldn't on non weapons or armour #325

* Features/newRunes (#326)

* Rip out old rune code

* final removed stuff?

* change filter back to number

* use new rune filter

* done runes

* Remove alpha

* Features/runeSocketsPart4 (#327)

* some stat change is working

* iron working?

* new betterer way?

* DONE DONE DONE

* add translation line

* version bump

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.5.0.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.0.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)
 

dataParser/.gitignore

@@ -140,6 +140,7 @@ vendor/json-api/ko/*.json
 vendor/json-api/cmn-Hant/*.json
 vendor/json-api/ja/*.json
 vendor/json-api/de/*.json
+vendor/json-api/es/*.json
 vendor/client/tables/*.json
 vendor/client/descriptions/*
 !vendor/client/descriptions/.gitkeep
@@ -154,13 +155,15 @@ vendor/client/tables/*
 !vendor/client/tables/cmn-Hant/ArmourTypesOverride.json
 !vendor/client/tables/ja/ArmourTypesOverride.json
 !vendor/client/tables/de/ArmourTypesOverride.json
+!vendor/client/tables/es/ArmourTypesOverride.json
 
 !vendor/client/tables/en/.gitkeep
 !vendor/client/tables/ru/.gitkeep
 !vendor/client/tables/ko/.gitkeep
 !vendor/client/tables/cmn-Hant/.gitkeep
 !vendor/client/tables/ja/.gitkeep
 !vendor/client/tables/de/.gitkeep
+!vendor/client/tables/es/.gitkeep
 
 
 
@@ -172,6 +175,7 @@ vendor/client/tables/*
 !vendor/json-api/cmn-Hant/.gitkeep
 !vendor/json-api/ja/.gitkeep
 !vendor/json-api/de/.gitkeep
+!vendor/json-api/es/.gitkeep
 
 
 EXPORT/tables/**/*.json
@@ -184,5 +188,7 @@ vendor/json-api/ko/*.json
 vendor/json-api/cmn-Hant/*.json
 vendor/json-api/ja/*.json
 vendor/json-api/de/*.json
+vendor/json-api/de/*.json
+vendor/json-api/es/*.json
 
 EXPORT/files/**/*.csd

dataParser/EXPORT/config.json

@@ -28,7 +28,8 @@
     "Korean",
     "Traditional Chinese",
     "Japanese",
-    "German"
+    "German",
+    "Spanish"
   ],
   "tables": [
     {
@@ -121,7 +122,9 @@
         "Stat5Value",
         "Stat6Value",
         "RadiusJewelType",
-        "Level"
+        "Level",
+        "GenerationType",
+        "Families"
       ]
     },
     {

dataParser/copy-py-ndjson.sh

@@ -1,6 +1,6 @@
 
 
-supported_languages=("en" "ru" "ko" "cmn-Hant" "ja" "de")
+supported_languages=("en" "ru" "ko" "cmn-Hant" "ja" "de" "es")
 
 for lang in "${supported_languages[@]}"; do
     echo "Copying $lang"

dataParser/copy-tables.sh

@@ -17,6 +17,9 @@ cp -R EXPORT/tables/Japanese/* vendor/client/tables/ja/
 echo "Copying files from EXPORT/tables/German to data/de"
 cp -R EXPORT/tables/German/* vendor/client/tables/de/
 
+echo "Copying files from EXPORT/tables/Spanish to data/es"
+cp -R EXPORT/tables/Spanish/* vendor/client/tables/es/
+
 echo "Copying not generated files from english to other languages"
 
 # Copy without overwriting English -> data/ru
@@ -25,6 +28,7 @@ cp -n vendor/client/tables/en/* vendor/client/tables/ko/
 cp -n vendor/client/tables/en/* vendor/client/tables/cmn-Hant/
 cp -n vendor/client/tables/en/* vendor/client/tables/ja/
 cp -n vendor/client/tables/en/* vendor/client/tables/de/
+cp -n vendor/client/tables/en/* vendor/client/tables/es/
 
 # Copy description files from EXPORT/files to client/descriptions
 echo "Copying description files from EXPORT/files to client/descriptions"

dataParser/data/imageFix.py

@@ -1,7 +1,7 @@
 import json
 import os
 
-SUPPORTED_LANG = ("en", "ru", "ko", "cmn-Hant", "ja", "de")
+SUPPORTED_LANG = ("en", "ru", "ko", "cmn-Hant", "ja", "de", "es")
 
 
 def get_script_dir(lang="en"):

dataParser/pull-json.sh

@@ -8,6 +8,7 @@ declare -A lang_urls=(
     ["cmn-Hant"]="https://pathofexile.tw"
     ["ja"]="https://jp.pathofexile.com"
     ["de"]="https://de.pathofexile.com"
+    ["es"]="https://es.pathofexile.com"
 )
 
 # URLs to fetch JSON from (relative paths)

dataParser/push-ndjson.sh

@@ -7,7 +7,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 # Get the data directory
 DATA_DIR="./data"
-SUPPORTED_LANG=("en" "ru" "ko" "cmn-Hant" "ja" "de")
+SUPPORTED_LANG=("en" "ru" "ko" "cmn-Hant" "ja" "de" "es")
 # Get all *.ndjson files in the data directory
 
 echo "current dir: $DIR"

dataParser/vendor/client/modTiers/modTierBuilder.py

@@ -113,15 +113,38 @@ def modTierBuilderB(mod_data, base_item_types, gold_mod_prices, tags):
         mod_stats = []
         mod_stat_ids = []
         mod_allowed_base_types = gold_with_readable_tags.get(mod_unique_id, [])
-        for stat_index in range(1, 7):
-            stat = mod.get(f"Stat{stat_index}")
-            if stat is None:
-                continue
-            stat_value = mod.get(f"Stat{stat_index}Value")
-            if stat_value is None or not isinstance(stat_value, list):
-                continue
-            mod_stat_ids.append(stat)
-            mod_stats.append(stat_value)
+        is_processed_map = False
+        if mod_unique_id.lower().startswith("map"):
+            stat1 = mod.get("Stat1")
+            if stat1 == 1004:
+                stat2 = mod.get("Stat2")
+                stat2_value = mod.get("Stat2Value")
+
+                if stat2 == 1202:
+                    stat3 = mod.get("Stat3")
+                    stat3_value = mod.get("Stat3Value")
+                    if (
+                        stat3 is not None
+                        and stat3_value is not None
+                        and isinstance(stat3_value, list)
+                    ):
+                        mod_stats.append(stat3_value)
+                        mod_stat_ids.append(stat3)
+                        is_processed_map = True
+                else:
+                    mod_stats.append(stat2_value)
+                    mod_stat_ids.append(stat2)
+                    is_processed_map = True
+        if not is_processed_map:
+            for stat_index in range(1, 7):
+                stat = mod.get(f"Stat{stat_index}")
+                if stat is None:
+                    continue
+                stat_value = mod.get(f"Stat{stat_index}Value")
+                if stat_value is None or not isinstance(stat_value, list):
+                    continue
+                mod_stat_ids.append(stat)
+                mod_stats.append(stat_value)
 
         mod_mod = {
             "mod_index": mod_index,
@@ -181,7 +204,9 @@ def modTierBuilderB(mod_data, base_item_types, gold_mod_prices, tags):
         }
         all_stats = set()
         for mod_group in mod_groups:
-            all_stats = all_stats.union(mod_group["mod_stat_ids"])
+            # HACK: overwrite for things that are not hybrid that should be included
+            if mod_group["mods_id"] not in ("ShockEffectUnique__"):
+                all_stats = all_stats.union(mod_group["mod_stat_ids"])
             mod_id = mod_group["mods_id"].lower()
             if one_id is None:
                 one_id = mod_id