From e45e9dc658a301b9755b328d40508c42ad6b34b0 Mon Sep 17 00:00:00 2001 From: Br00ty <83629348+Br00ty@users.noreply.github.com> Date: Thu, 11 Aug 2022 10:25:34 -0400 Subject: [PATCH 1/7] Update items_data.py added `Red and White Round Shield`, `Crystal Scroll`, `Magic Stoneplate Ring`, and `Outrider Knight` gear. --- worlds/dark_souls_3/data/items_data.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/worlds/dark_souls_3/data/items_data.py b/worlds/dark_souls_3/data/items_data.py index 9add18820b..ce8d2f227c 100644 --- a/worlds/dark_souls_3/data/items_data.py +++ b/worlds/dark_souls_3/data/items_data.py @@ -131,7 +131,7 @@ shields_table = { "Golden Wing Crest Shield": 0x0143CAA0, "Ancient Dragon Greatshield": 0x013599D0, "Spirit Tree Crest Shield": 0x014466E0, - + "Red and White Round Shield": 0x01343A40, } goods_table = { @@ -244,6 +244,10 @@ armor_table = { "Shadow Garb": 0x14D3FA28, "Shadow Gauntlets": 0x14D3FE10, "Shadow Leggings": 0x14D401F8, + "Outrider Knight Helm": 0x1328B740, + "Outrider Knight Armor": 0x1328BB28, + "Outrider Knight Gauntlets": 0x1328BF10, + "Outrider Knight Leggings": 0x1328C2F8, } rings_table = { @@ -292,6 +296,7 @@ rings_table = { "Red Tearstone Ring": 0x20004ECA, "Dragonscale Ring": 0x2000515E, "Knight Slayer's Ring": 0x20005000, + "Magic Stoneplate Ring": 0x20004E66, } spells_table = { @@ -313,6 +318,7 @@ spells_table = { "Divine Pillars of Light": 0x4038C340, "Great Magic Barrier": 0x40365628, "Great Magic Shield": 0x40144F38, + "Crystal Scroll": 0x40000856, } misc_items_table = { From 0ca347c775e8e43fdb919468f2f24ffd46ea184b Mon Sep 17 00:00:00 2001 From: Br00ty <83629348+Br00ty@users.noreply.github.com> Date: Thu, 11 Aug 2022 10:29:21 -0400 Subject: [PATCH 2/7] Update locations_data.py Added `US: Red and White Round Shield`, `CKG: Magic Stoneplate Ring`, `GA: Outrider Knight` set, and `GA: Crystal Scroll` --- worlds/dark_souls_3/data/locations_data.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/worlds/dark_souls_3/data/locations_data.py b/worlds/dark_souls_3/data/locations_data.py index 384da049ac..6b10be8690 100644 --- a/worlds/dark_souls_3/data/locations_data.py +++ b/worlds/dark_souls_3/data/locations_data.py @@ -92,6 +92,7 @@ undead_settlement_table = { "US: Soul of the Rotted Greatwood": 0x400002D7, "US: Hawk Ring": 0x20004F92, "US: Warrior of Sunlight Covenant": 0x20002738, + "US: Red and White Round Shield": 0x01343A40, } road_of_sacrifice_table = { @@ -375,6 +376,7 @@ consumed_king_garden_table = { "CKG: Shadow Leggings": 0x14D401F8, "CKG: Claw": 0x00A7D8C0, "CKG: Soul of Consumed Oceiros": 0x400002CE, + "CKG: Magic Stoneplate Ring": 0x20004E66, # "CKG: Path of the Dragon Gesture": 0x40002346, I can't technically randomize it as it is a gesture and not an item } @@ -393,6 +395,11 @@ grand_archives_table = { "GA: Cinders of a Lord - Lothric Prince": 0x4000084E, "GA: Soul of the Twin Princes": 0x400002DB, "GA: Sage's Crystal Staff": 0x00C8CE40, + "GA: Outrider Knight Helm": 0x1328B740, + "GA: Outrider Knight Armor": 0x1328BB28, + "GA: Outrider Knight Gauntlets": 0x1328BF10, + "GA: Outrider Knight Leggings": 0x1328C2F8, + "GA: Crystal Scroll": 0x40000856, } untended_graves_table = { From 9b12810d59cf441d92ee7a6ff4e0c51f5a17a09b Mon Sep 17 00:00:00 2001 From: Br00ty <83629348+Br00ty@users.noreply.github.com> Date: Wed, 17 Aug 2022 13:41:53 -0400 Subject: [PATCH 3/7] Update __init__.py Add `Karla's Ashes` requirements --- worlds/dark_souls_3/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/worlds/dark_souls_3/__init__.py b/worlds/dark_souls_3/__init__.py index 0ff27acc43..577dcf8055 100644 --- a/worlds/dark_souls_3/__init__.py +++ b/worlds/dark_souls_3/__init__.py @@ -197,6 +197,8 @@ class DarkSouls3World(World): lambda state: state.has("Jailer's Key Ring", self.player)) set_rule(self.world.get_location("ID: Covetous Gold Serpent Ring", self.player), lambda state: state.has("Old Cell Key", self.player)) + set_rule(self.world.get_location("ID: Karla's Ashes", self.player), + lambda state: state.has("Jailers Key Ring", self.player)) black_hand_gotthard_corpse_rule = lambda state: \ (state.can_reach("AL: Cinders of a Lord - Aldrich", "Location", self.player) and state.can_reach("PC: Cinders of a Lord - Yhorm the Giant", "Location", self.player)) From b2ccda2c4b46340ecbd5688f844f55953439f734 Mon Sep 17 00:00:00 2001 From: Br00ty <83629348+Br00ty@users.noreply.github.com> Date: Wed, 17 Aug 2022 13:43:25 -0400 Subject: [PATCH 4/7] Update items_data.py Add `Irithyll Rapier, Hollow's Ashes, Irina's Ashes, Karla's Ashes, Cornyx's Ashes, and Orbeck's Ashes` --- worlds/dark_souls_3/data/items_data.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/worlds/dark_souls_3/data/items_data.py b/worlds/dark_souls_3/data/items_data.py index ce8d2f227c..ab9518d3f1 100644 --- a/worlds/dark_souls_3/data/items_data.py +++ b/worlds/dark_souls_3/data/items_data.py @@ -52,6 +52,7 @@ weapons_upgrade_5_table = { "Storm Curved Sword": 0x003E4180, "Dragonslayer Swordspear": 0x008BC540, "Sage's Crystal Staff": 0x00C8CE40, + "Irithyll Rapier": 0x002E8A10 } weapons_upgrade_10_table = { @@ -365,6 +366,11 @@ misc_items_table = { "Dragon Chaser's Ashes": 0x40000867, "Twinkling Dragon Torso Stone": 0x40000184, "Braille Divine Tome of Lothric": 0x40000848, + "Hollow's Ashes": 0x40000865, + "Irina's Ashes": 0x40000843, + "Karla's Ashes": 0x40000842, + "Cornyx's Ashes": 0x40000841, + "Orbeck's Ashes": 0x40000840 } key_items_list = { From 26d02342202387f5b0ed0c1ad642da0e3980c586 Mon Sep 17 00:00:00 2001 From: Br00ty <83629348+Br00ty@users.noreply.github.com> Date: Wed, 17 Aug 2022 13:44:48 -0400 Subject: [PATCH 5/7] Update locations_data.py Add `Irithyll Rapier, Hollow's Ashes, Irina's Ashes, Karla's Ashes, Orbeck's Ashes, and Cornyx's Ashes` --- worlds/dark_souls_3/data/locations_data.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/worlds/dark_souls_3/data/locations_data.py b/worlds/dark_souls_3/data/locations_data.py index 6b10be8690..290142199e 100644 --- a/worlds/dark_souls_3/data/locations_data.py +++ b/worlds/dark_souls_3/data/locations_data.py @@ -93,6 +93,9 @@ undead_settlement_table = { "US: Hawk Ring": 0x20004F92, "US: Warrior of Sunlight Covenant": 0x20002738, "US: Red and White Round Shield": 0x01343A40, + "US: Hollow's Ashes": 0x40000865, + "US: Irina's Ashes": 0x40000843, + "US: Cornyx's Ashes": 0x40000841 } road_of_sacrifice_table = { @@ -150,6 +153,7 @@ road_of_sacrifice_table = { "RS: Grass Crest Shield": 0x01437C80, "RS: Soul of a Crystal Sage": 0x400002CB, "RS: Great Swamp Ring": 0x20004F10, + "RS: Orbeck's Ashes": 0x40000840 } cathedral_of_the_deep_table = { @@ -316,6 +320,7 @@ irithyll_dungeon_table = { "ID: Jailer's Key Ring": 0x400007D8, "ID: Dusk Crown Ring": 0x20004F4C, "ID: Dark Clutch Ring": 0x20005028, + "ID: Karla's Ashes": 0x40000842 } profaned_capital_table = { @@ -360,6 +365,7 @@ lothric_castle_table = { "LC: Caitha's Chime": 0x00CA06C0, "LC: Braille Divine Tome of Lothric": 0x40000848, "LC: Knight's Ring": 0x20004FEC, + "LC: Irithyll Rapier": 0x002E8A10, "LC: Sunlight Straight Sword": 0x00203230, "LC: Soul of Dragonslayer Armour": 0x400002D1, From 3c4473f0a17e4a7445b18d61ec76ec3e03500054 Mon Sep 17 00:00:00 2001 From: Br00ty <83629348+Br00ty@users.noreply.github.com> Date: Thu, 18 Aug 2022 05:18:48 -0400 Subject: [PATCH 6/7] Update items_data.py removed "hollows ashes" --- worlds/dark_souls_3/data/items_data.py | 1 - 1 file changed, 1 deletion(-) diff --git a/worlds/dark_souls_3/data/items_data.py b/worlds/dark_souls_3/data/items_data.py index ab9518d3f1..f155558c1f 100644 --- a/worlds/dark_souls_3/data/items_data.py +++ b/worlds/dark_souls_3/data/items_data.py @@ -366,7 +366,6 @@ misc_items_table = { "Dragon Chaser's Ashes": 0x40000867, "Twinkling Dragon Torso Stone": 0x40000184, "Braille Divine Tome of Lothric": 0x40000848, - "Hollow's Ashes": 0x40000865, "Irina's Ashes": 0x40000843, "Karla's Ashes": 0x40000842, "Cornyx's Ashes": 0x40000841, From bb6bbee06044427ee0b3c8a4640a48d55f0440de Mon Sep 17 00:00:00 2001 From: Br00ty <83629348+Br00ty@users.noreply.github.com> Date: Thu, 18 Aug 2022 05:19:25 -0400 Subject: [PATCH 7/7] Update locations_data.py remove "hollows ashes" --- worlds/dark_souls_3/data/locations_data.py | 1 - 1 file changed, 1 deletion(-) diff --git a/worlds/dark_souls_3/data/locations_data.py b/worlds/dark_souls_3/data/locations_data.py index 290142199e..94a3c4ea81 100644 --- a/worlds/dark_souls_3/data/locations_data.py +++ b/worlds/dark_souls_3/data/locations_data.py @@ -93,7 +93,6 @@ undead_settlement_table = { "US: Hawk Ring": 0x20004F92, "US: Warrior of Sunlight Covenant": 0x20002738, "US: Red and White Round Shield": 0x01343A40, - "US: Hollow's Ashes": 0x40000865, "US: Irina's Ashes": 0x40000843, "US: Cornyx's Ashes": 0x40000841 }