Updated item/location ID's to match rando update.

Added `Storm Ruler` and `Cell Key` to item tracker window. Added new locations, including: FS: Master NPC HWL: Greirat's Ashes SL: Knight Slayer Tsorig NPC LC: Gotthard Twinswords GA: Hostile NPC Trio
Br00ty · Jul 26, 2022 · 49c554f · 49c554f
1 parent 1ba015f
commit 49c554f
Show file tree

Hide file tree

Showing 5 changed files with 387 additions and 330 deletions.
diff --git a/datapackage.json b/datapackage.json
diff --git a/images/maps/FS.jpg b/images/maps/FS.jpg
diff --git a/locations/locations.json b/locations/locations.json
@@ -51,6 +51,30 @@
                     }
                 ]
             },
+            {
+                "name": "FS: Master NPC",
+                "sections": [
+                    {
+                        "name": "FS: Uchigatana",
+                        "item_count": 1
+                    },
+                    {
+                        "name": "FS: Master's Attire",
+                        "item_count": 1
+                    },
+                    {
+                        "name": "FS: Master's Gloves",
+                        "item_count": 1
+                    }
+                ],
+                "map_locations": [
+                    {
+                        "map": "FS",
+                        "x": 123,
+                        "y": 280
+                    }
+                ]
+            },
             {
                 "name": "FSBT: Covetous Silver Serpent Ring",
                 "access_rules": [
@@ -2539,6 +2563,22 @@
                     }
                 ]
             },
+            {
+                "name": "SL: Knight Slayer Tsorig NPC",
+                "sections": [
+                    {
+                        "name": "SL: Knight Slayer's Ring",
+                        "item_count": 1
+                    }
+                ],
+                "map_locations": [
+                    {
+                        "map": "SL",
+                        "x": 819,
+                        "y": 1007
+                    }
+                ]
+            },
             {
                 "name": "SL: Soul of the Old Demon King",
                 "sections": [
@@ -3528,6 +3568,7 @@
                 "sections": [
                     {
                         "name": "CKG: Path of the Dragon Gesture",
+                        "hosted_item": "dragon",
                         "item_count": 1
                     }
                 ],
@@ -3892,11 +3933,16 @@
                 ]
             },
             {
-                "name": "LC: Grand Archives Key",
+                "name": "LC: Grand Archives Key+Gotthard Twinswords",
+                "access_rules": ["aldrich,yhorm"],
                 "sections": [
                     {
                         "name": "LC: Grand Archives Key",
                         "item_count": 1
+                    },
+                    {
+                        "name": "LC: Gotthard Twinswords",
+                        "item_count": 1
                     }
                 ],
                 "map_locations": [
@@ -4035,7 +4081,7 @@
                 ]
             },
             {
-                "name": "GA: Golden Wing Crest Shield+Onikiri and Ubadachi",
+                "name": "GA: Hostile NPC Trio ",
                 "sections": [
                     {
                         "name": "GA: Golden Wing Crest Shield",
@@ -4044,6 +4090,10 @@
                     {
                         "name": "GA: Onikiri and Ubadachi",
                         "item_count": 1
+                    },
+                    {
+                        "name": "GA: Sage's Crystal Staff",
+                        "item_count": 1
                     }
                 ],
                 "map_locations": [

diff --git a/scripts/autotracking/item_mapping.lua b/scripts/autotracking/item_mapping.lua
@@ -1,15 +1,16 @@
 ITEM_MAPPING = {
-    [100259] = {"banner", "toggle"},
-    [100275] = {"basin", "toggle"},
-    [100266] = {"doll", "toggle"},
-    [100292] = {"dragon", "toggle"},
-    [100294] = {"storm", "toggle"},
-    [100286] = {"jailbreaker", "toggle"},
-    [100291] = {"jailring", "toggle"},
-    [100290] = {"oldcell", "toggle"},
-    [100274] = {"archives", "toggle"},
-    [100271] = {"abyss", "toggle"},
-    [100272] = {"yhorm", "toggle"},
-    [100273] = {"aldrich", "toggle"},
-    [100276] = {"lothric", "toggle"},
+    [100264] = {"banner", "toggle"},
+    [100280] = {"basin", "toggle"},
+    [100271] = {"doll", "toggle"},
+    [100298] = {"storm", "toggle"},
+    [100261] = {"tower", "toggle"},
+    [100263] = {"cell", "toggle"},
+    [100291] = {"jailbreaker", "toggle"},
+    [100296] = {"jailring", "toggle"},
+    [100295] = {"oldcell", "toggle"},
+    [100279] = {"archives", "toggle"},
+    [100276] = {"abyss", "toggle"},
+    [100277] = {"yhorm", "toggle"},
+    [100278] = {"aldrich", "toggle"},
+    [100281] = {"lothric", "toggle"},
 }