Merge pull request #66 from angelic-knight/patches-delve

Fix Delve export, Mark Old Watchstones as Drop-Disabled, and Allow Passive Image Exports
Project-Path-of-Exile-Wiki · Feb 7, 2022 · 5fecd90 · 5fecd90
2 parents a96d40a + db64781
commit 5fecd90
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/PyPoE/cli/exporter/wiki/parsers/item.py b/PyPoE/cli/exporter/wiki/parsers/item.py
@@ -594,7 +594,7 @@ class ItemsParser(SkillParserShared):
         'Metadata/Items/Currency/CurrencyImprint',
         # Transmute Shard
         'Metadata/Items/Currency/CurrencyUpgradeToMagicShard',
-        'Metadata/Items/Currency/CurrencyIdentificationShard'
+        'Metadata/Items/Currency/CurrencyIdentificationShard',
     }
 
     _DROP_DISABLED_ITEMS_BY_ID = {
@@ -610,6 +610,25 @@ class ItemsParser(SkillParserShared):
         # Demigod items
         'Metadata/Items/Belts/BeltDemigods1',
         'Metadata/Items/Rings/RingDemigods1',
+        'Metadata/Items/AtlasUpgrades/AtlasRegionUpgradeFinal', # Ivory Watchstone Base Item
+
+        # Old Watchstones
+        # Tirn's End:
+        'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable1_2',
+        'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable2_2',
+        'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable3_2',
+        # Lex Proxima:
+        'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable1_3',
+        'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable2_3',
+        'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable3_3',
+        # Lex Ejoris:
+        'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable1_4',
+        'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable2_4',
+        'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable3_4',
+        # New Vastir:
+        'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable1_5',
+        'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable2_5',
+        'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable3_5',
     }
 
     _NAME_OVERRIDE_BY_ID = {

diff --git a/PyPoE/cli/exporter/wiki/parsers/lua.py b/PyPoE/cli/exporter/wiki/parsers/lua.py
@@ -749,6 +749,9 @@ def main(self, parsed_args):
                 delve_upgrade_stats[-1]['value'] = value
 
         for row in self.rr['DelveCraftingModifiers.dat']:
+            # Ignore all the weird RandomFossileOutcome items.
+            if('RandomFossilOutcome' in row['BaseItemTypesKey']['Id']):
+                continue
             self._copy_from_keys(row, self._COPY_KEYS_DELVE_CRAFTING_MODIFIERS,
                                  fossils)
 

diff --git a/PyPoE/cli/exporter/wiki/parsers/passives.py b/PyPoE/cli/exporter/wiki/parsers/passives.py
@@ -362,7 +362,7 @@ def export(self, parsed_args, passives):
                         psg_id]['Id'] for psg_id in node.connections])
 
             # extract icons if specified
-            if parsed_args.store_images:
+            if parsed_args.store_images and data['icon'] != '':
                 fn = data['icon'] + ' passive skill icon'
                 dds = os.path.join(self._img_path, fn + '.dds')
                 png = os.path.join(self._img_path, fn + '.png')

diff --git a/PyPoE/poe/file/specification/data/stable.py b/PyPoE/poe/file/specification/data/stable.py
@@ -6214,11 +6214,11 @@
                 type='int',
             ),
             Field(
-                name='MoreMonsterLife',
+                name='MoreMonsterDamage',
                 type='int',
             ),
             Field(
-                name='MoreMonsterDamage',
+                name='MoreMonsterLife',
                 type='int',
             ),
             Field(
@@ -6249,6 +6249,10 @@
                 name='Unknown5',
                 type='int',
             ),
+            Field( 
+                name='EndlessDelveMonsterLevel', #This is pobably endless delve mosnter level scaling.
+                type='int',
+            ),
         ),
     ),
     'DelveMonsterSpawners.dat': File(