Merge branch 'main' into main

d4lfteam · Aug 17, 2024 · 87991b7 · 87991b7
2 parents 649e4ba + 8317380
commit 87991b7
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 3 deletions.
diff --git a/assets/lang/enUS/uniques.json b/assets/lang/enUS/uniques.json
@@ -675,7 +675,7 @@
             0
         ]
     },
-    "the_umbacrux": {
+    "the_umbracrux": {
         "desc": "your subterfuge skills create an attackable shade totem for seconds",
         "num_idx": [
             0

diff --git a/src/__init__.py b/src/__init__.py
@@ -2,4 +2,4 @@
 
 TP = concurrent.futures.ThreadPoolExecutor()
 
-__version__ = "5.7.4"
+__version__ = "5.7.5"
diff --git a/src/tools/data/custom_uniques_enUS.json b/src/tools/data/custom_uniques_enUS.json
@@ -39,7 +39,7 @@
 		"desc": "your weapon mastery skills are now also core skills that have no cooldowns but",
 		"num_idx": [0]
 	},
-	"the_umbacrux": {
+	"the_umbracrux": {
 		"desc": "your subterfuge skills create an attackable shade totem for seconds",
 		"num_idx": [0]
 	},

diff --git a/tests/assets/item/season5/1080p_small_read_descr_3.png b/tests/assets/item/season5/1080p_small_read_descr_3.png
diff --git a/tests/assets/item/season5/1080p_small_read_descr_4.png b/tests/assets/item/season5/1080p_small_read_descr_4.png
diff --git a/tests/item/read_descr_season5_test.py b/tests/item/read_descr_season5_test.py
@@ -264,6 +264,39 @@
             rarity=ItemRarity.Mythic,
         ),
     ),
+    (
+        (1920, 1080),
+        f"{BASE_PATH}/1080p_small_read_descr_3.png",
+        Item(
+            affixes=[
+                Affix(name="maximum_life", value=950),
+                Affix(name="cooldown_reduction", value=9.1, type=AffixType.rerolled),
+                Affix(name="to_conjuration_mastery", value=2),
+                Affix(name="unstable_currents_cooldown_reduction", value=16.1, type=AffixType.tempered),
+                Affix(name="overpower_damage", value=80.5, type=AffixType.tempered),
+            ],
+            inherent=[Affix(name="resistance_to_all_elements", value=25, type=AffixType.inherent)],
+            item_type=ItemType.Amulet,
+            power=925,
+            rarity=ItemRarity.Legendary,
+        ),
+    ),
+    (
+        # TODO fix multi line detection via bottom limit / find_affixes
+        (1920, 1080),
+        f"{BASE_PATH}/1080p_small_read_descr_4.png",
+        Item(
+            affixes=[
+                Affix(name="maximum_life", value=1342),
+                Affix(name="life_on_hit", value=39),
+                Affix(name="lucky_hit_up_to_a_chance_to_restore_primary_resource", value=None),
+            ],
+            inherent=[Affix(name="damage_over_time", value=40, type=AffixType.inherent)],
+            item_type=ItemType.Staff,
+            power=925,
+            rarity=ItemRarity.Legendary,
+        ),
+    ),
     (
         (1920, 1080),
         f"{BASE_PATH}/1080p_medium_read_descr_2.png",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		TP = concurrent.futures.ThreadPoolExecutor()

		__version__ = "5.7.4"
		__version__ = "5.7.5"