Skip to content

Commit 8341b6d

Browse files
nex3ScipioWrightExempt-Medicnicholassaylorbeauxq
authored and
AustinSumigray
committed
DS3: Version 3.0.0 (ArchipelagoMW#3128)
* Update worlds/dark_souls_3/Locations.py Co-authored-by: Scipio Wright <scipiowright@gmail.com> * Fix Covetous Silver Serpent Ring location * Update location groups This should cover pretty much all of the seriously hidden items. It also splits out miniboss drops, mimic drops, and hostile NPC drops. * Remove the "Guarded by Keys" group On reflection, I don't think this is actually that useful. It'll also get a lot muddier once we can randomize shops and ashes become pseudo-"keys". * Restore Knight Slayer's Ring classification * Support infusions/upgrades in the new DS3 mod system * Support random starting loadouts * Make an item's NPC status orthogonal to its category * Track location groups with flags * Track Archipelago/Offline mismatches on the server Also fix a few incorrect item names. * Add additional locations that are now randomizable * Don't put soul and multiple items in shops * Add an option to enable whether NG+ items/locations are included * Clean up useful item categorization There are so many weapons in the game now, it doesn't make sense to treat them all as useful * Add more variety to filler items * Iron out a few bugs and incompatibilities * Fix more silly bugs * Get tests passing * Update options to cover new item types Also recategorize some items. * Verify the default values of `Option`s. Since `Option.verify()` can handle normalization of option names, this allows options to define defaults which rely on that normalization. For example, it allows a world to exclude certain locations by default. This also makes it easier to catch errors if a world author accidentally sets an invalid default. * Make a few more improvements and fixes * Randomize Path of the Dragon * Mark items that unlock checks as useful These items all unlock missable checks, but they're still good to ahve in the game for variety's sake. * Guarantee more NPC quests are completable * Fix a syntax error * Fix rule definition * Support enemy randomization * Support online Yhorm randomization * Remove a completed TODO * Fix tests * Fix force_unique * Add an option to smooth out upgrade item progression * Add helpers for setting location/entrance rules * Support smoother soul item progression * Fill extra smoothing items into conditional locations as well as other worlds * Add health item smoothing * Handle infusions at item generation time * Handle item upgrades at genreation time * Fix Grave Warden's Ashes * Don't overwrite old rules * Randomize items based on spheres instead of DS3 locations * Add a smoothing option for weapon upgrades * Add rules for crow trades * Small fixes * Fix a few more bugs * Fix more bugs * Try to prevent Path of the Dragon from going somewhere it doesn't work * Add the ability to provide enemy presets * Various fixes and features * Bug fixes * Better Coiled Sword placement * Structure DarkSouls3Location more like DarkSouls3Item * Add events to make DS3's spheres more even * Restructure locations to work like items do now * Add rules for more missable locations * Don't add two Storm Rulers * Place Hawk Ring in Farron Keep * Mark the Grass Crest Shield as useful * Mark new progression items * Fix a bug * Support newer better Path of the Dragon code * Don't lock the player out of Coiled Sword * Don't create events for missable locations * Don't throw strings * Don't smooth event items * Properly categorize Butcher Knife * Be more careful about placing Yhorm in low-randomization scenarios * Don't try to smooth DLC items with DLC disabled * Fix another Yhorm bug * Fix upgrade/infusion logic * Remove the PoolType option This distinction is no longer meaningful now that every location in the game of each type is randomized * Categorize HWL: Red Eye Orb as an NPC location * Don't place Storm Ruler on CA: Coiled Sword * Define flatten() locally to make this APWorld capable * Fix some more Leonhard weirdness * Fix unique item randomization * Don't double Twin Dragon Greatshield * Remove debugging print * Don't add double Storm Ruler Also remove now-redundant item sorting by category in create_items. * Don't add double Storm Ruler Also remove now-redundant item sorting by category in create_items. * Add a missing dlc_enabled check * Use nicer options syntax * Bump data_version * Mention where Yhorm is in which world * Better handle excluded events * Add a newline to Yhorm location * Better way of handling excluded unradomized progression locations * Fix a squidge of nondeterminism * Only smooth items from this world * Don't smooth progression weapons * Remove a location that doesn't actually exist in-game * Classify Power Within as useful * Clarify location names * Fix location requirements * Clean up randomization options * Properly name Coiled Sword location * Add an option for configuring how missable items are handled * Fix some bugs from location name updates * Fix location guide link * Fix a couple locations that were busted offline * Update detailed location descriptions * Fix some bugs when generating for a multiworld * Inject Large Leather Shield * Fix a few location issues * Don't allow progression_skip_balancing for unnecessary locs * Update some location info * Don't uniquify the wrong items * Fix some more location issues * More location fixes * Use hyphens instead of parens for location descriptions * Update and fix more locations * Fix Soul of Cinder boss name * Fix some logic issues * Add item groups and document item/location groups * Fix the display name for "Impatient Mimics" * Properly handle Transposing Kiln and Pyromancer's Flame * Testing * Some fixes to NPC quests, late basin, and transposing kiln * Improve a couple location names * Split out and improve missable NPC item logic * Don't allow crow trades to have foreign items * Fix a variable capture bug * Make sure early items are accessible early even with early Castle * Mark ID giant slave drops as missable * Make sure late basin means that early items aren't behind it * Make is_location_available explicitly private * Add an _add_item_rule utility that checks availability * Clear excluded items if excluded_locations == "unnecessary" * Don't allow upgrades/infusions in crow trades * Fix the documentation for deprecated options * Create events for all excluded locations This allows `can_reach` logic to work even if the locations are randomized. * Fix up Patches' and Siegward's logic based on some manual testing * Factor out more sub-methods for setting location rules * Oops, left these in * Fixing name * Left that in too * Changing to NamedRange to support special_range_names * Alphabetizing * Don't call _is_location_available on foreign locations * Add missing Leonhard items * Changing late basin to have a post-small-doll option * Update basin option, add logic for some of Leonhard Hawkwood and Orbeck * Simplifying an option, fixing a copy-paste error * Removing trailing whitespace * Changing lost items to go into start inventory * Revert Basin changes * Oops * Update Options.py * Reverting small doll changes * Farron Keep boss requirement logic * Add Scroll for late_dlc * Fixing excluded unnecessary locations * Adding Priestess Ring as being after UG boss * Removing missable from Corvian Titanite Slab * Adding KFF Yhorm boss locks * Screams about Creighton * Elite Knight Set isn't permanently missable * Adding Kiln requirement to KFF * fixing valid_keys and item groups * Fixing an option-checker * Throwing unplaceable Storm Ruler into start inventory * Update locations * Refactor item injection * Update setup doc * Small fixes * Fix another location name * Fix injection calculation * Inject guaranteed items along with progression items * Mark boss souls as required for access to regions This allows us to set quest requirements for boss souls and have them automatically propagated to regions, means we need less machinery for Yhorm bosses, and allows us to get rid of a few region-transition events. * Make sure Sirris's quest can be completed before Pontiff * Removing unused list * Changing dict to list * Removing unused test * Update __init__.py * self.multiworld.random -> self.random (ArchipelagoMW#9) * Fix some miscellaneous location issues * Rewrite the DS3 intro page/FAQ * Removing modifying the itempool after fill (ArchipelagoMW#7) Co-authored-by: Natalie Weizenbaum <nweiz@google.com> * Small fixes to the setup guide (ArchipelagoMW#10) Small fixes, adding an example for connecting * Expanded Late Basin of Vows and Late DLC (ArchipelagoMW#6) * Add proper requirements for CD: Black Eye Orb * Fix Aldrich's name * Document the differences with the 2.x.x branch * Don't crash if there are more items than locations in smoothing * Apply suggestions from code review Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * Code review * Fix _replace_with_filler * Don't use the shared flatten function in SM * Track local items separately rather than iterating the multiworld * Various formatting/docs changes suggested by PyCharm (ArchipelagoMW#12) * Drop deprecated options * Rename "offline randomizer" to "static randomizer" which is clearer * Move `enable_*_locations` under removed options. * Avoid excluded locations for locally-filled items * Adding Removed options to error (ArchipelagoMW#14) * Changes for WebHost options display and the options overhaul * unpack iterators in item list (ArchipelagoMW#13) * Allow worlds to add options to prebuilt groups Previously, this crashed because `typing.NamedTuple` fields such as `group.name` aren't assignable. Now it will only fail for group names that are actually incorrectly cased, and will fail with a better error message. * Style changes, rename exclude behavior options, remove guaranteed items option * Spacing/Formatting (ArchipelagoMW#18) * Various Fixes (ArchipelagoMW#19) * Universally Track Yhorm (ArchipelagoMW#20) * Account for excluded and missable * These are behaviors now * This is singular, apparently * Oops * Fleshing out the priority process * Missable Titanite Lizards and excluded locations (ArchipelagoMW#22) * Small style/efficiency changes * Final passthrough fixes (ArchipelagoMW#24) * Use rich option formatting * Make the behavior option values actual behaviors (ArchipelagoMW#25) * Use != * Remove unused flatten utility * Some changes from review (ArchipelagoMW#28) * Fixing determinism and making smooth faster (ArchipelagoMW#29) * Style change * PyCharm and Mypy fixes (ArchipelagoMW#26) Co-authored-by: Scipio Wright <scipiowright@gmail.com> * Change yhorm default (ArchipelagoMW#30) * Add indirect condition (ArchipelagoMW#27) * Update worlds/dark_souls_3/docs/locations_en.md Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * Ship all item IDs to the client This avoids issues where items might get skipped if, for instance, they're only in the starting inventory. * Make sure to send AP IDs for infused/upgraded weapons * Make `RandomEnemyPresetOption` compatible with ArchipelagoMW#3280 (ArchipelagoMW#31) * Fix cast * More typing and small fixes (ArchipelagoMW#32) --------- Co-authored-by: Scipio Wright <scipiowright@gmail.com> Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Co-authored-by: Exempt-Medic <ExemptMedic@Gmail.com> Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com> Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
1 parent 78f0ed0 commit 8341b6d

12 files changed

+9354
-2388
lines changed

‎worlds/dark_souls_3/Bosses.py

+264
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,264 @@
1+
# In almost all cases, we leave boss and enemy randomization up to the static randomizer. But for
2+
# Yhorm specifically we need to know where he ends up in order to ensure that the Storm Ruler is
3+
# available before his fight.
4+
5+
from dataclasses import dataclass, field
6+
from typing import Set
7+
8+
9+
@dataclass
10+
class DS3BossInfo:
11+
"""The set of locations a given boss location blocks access to."""
12+
13+
name: str
14+
"""The boss's name."""
15+
16+
id: int
17+
"""The game's ID for this particular boss."""
18+
19+
dlc: bool = False
20+
"""This boss appears in one of the game's DLCs."""
21+
22+
before_storm_ruler: bool = False
23+
"""Whether this location appears before it's possible to get Storm Ruler in vanilla.
24+
25+
This is used to determine whether it's safe to place Yhorm here if weapons
26+
aren't randomized.
27+
"""
28+
29+
locations: Set[str] = field(default_factory=set)
30+
"""Additional individual locations that can't be accessed until the boss is dead."""
31+
32+
33+
# Note: the static randomizer splits up some bosses into separate fights for separate phases, each
34+
# of which can be individually replaced by Yhorm.
35+
all_bosses = [
36+
DS3BossInfo("Iudex Gundyr", 4000800, before_storm_ruler = True, locations = {
37+
"CA: Coiled Sword - boss drop"
38+
}),
39+
DS3BossInfo("Vordt of the Boreal Valley", 3000800, before_storm_ruler = True, locations = {
40+
"HWL: Soul of Boreal Valley Vordt"
41+
}),
42+
DS3BossInfo("Curse-rotted Greatwood", 3100800, locations = {
43+
"US: Soul of the Rotted Greatwood",
44+
"US: Transposing Kiln - boss drop",
45+
"US: Wargod Wooden Shield - Pit of Hollows",
46+
"FS: Hawkwood's Shield - gravestone after Hawkwood leaves",
47+
"FS: Sunset Shield - by grave after killing Hodrick w/Sirris",
48+
"US: Sunset Helm - Pit of Hollows after killing Hodrick w/Sirris",
49+
"US: Sunset Armor - pit of hollows after killing Hodrick w/Sirris",
50+
"US: Sunset Gauntlets - pit of hollows after killing Hodrick w/Sirris",
51+
"US: Sunset Leggings - pit of hollows after killing Hodrick w/Sirris",
52+
"FS: Sunless Talisman - Sirris, kill GA boss",
53+
"FS: Sunless Veil - shop, Sirris quest, kill GA boss",
54+
"FS: Sunless Armor - shop, Sirris quest, kill GA boss",
55+
"FS: Sunless Gauntlets - shop, Sirris quest, kill GA boss",
56+
"FS: Sunless Leggings - shop, Sirris quest, kill GA boss",
57+
}),
58+
DS3BossInfo("Crystal Sage", 3300850, locations = {
59+
"RS: Soul of a Crystal Sage",
60+
"FS: Sage's Big Hat - shop after killing RS boss",
61+
"FS: Hawkwood's Shield - gravestone after Hawkwood leaves",
62+
}),
63+
DS3BossInfo("Deacons of the Deep", 3500800, locations = {
64+
"CD: Soul of the Deacons of the Deep",
65+
"CD: Small Doll - boss drop",
66+
"FS: Hawkwood's Shield - gravestone after Hawkwood leaves",
67+
}),
68+
DS3BossInfo("Abyss Watchers", 3300801, before_storm_ruler = True, locations = {
69+
"FK: Soul of the Blood of the Wolf",
70+
"FK: Cinders of a Lord - Abyss Watcher",
71+
"FS: Undead Legion Helm - shop after killing FK boss",
72+
"FS: Undead Legion Armor - shop after killing FK boss",
73+
"FS: Undead Legion Gauntlet - shop after killing FK boss",
74+
"FS: Undead Legion Leggings - shop after killing FK boss",
75+
"FS: Farron Ring - Hawkwood",
76+
"FS: Hawkwood's Shield - gravestone after Hawkwood leaves",
77+
}),
78+
DS3BossInfo("High Lord Wolnir", 3800800, before_storm_ruler = True, locations = {
79+
"CC: Soul of High Lord Wolnir",
80+
"FS: Wolnir's Crown - shop after killing CC boss",
81+
"CC: Homeward Bone - Irithyll bridge",
82+
"CC: Pontiff's Right Eye - Irithyll bridge, miniboss drop",
83+
}),
84+
DS3BossInfo("Pontiff Sulyvahn", 3700850, locations = {
85+
"IBV: Soul of Pontiff Sulyvahn",
86+
}),
87+
DS3BossInfo("Old Demon King", 3800830, locations = {
88+
"SL: Soul of the Old Demon King",
89+
}),
90+
DS3BossInfo("Aldrich, Devourer of Gods", 3700800, locations = {
91+
"AL: Soul of Aldrich",
92+
"AL: Cinders of a Lord - Aldrich",
93+
"FS: Smough's Helm - shop after killing AL boss",
94+
"FS: Smough's Armor - shop after killing AL boss",
95+
"FS: Smough's Gauntlets - shop after killing AL boss",
96+
"FS: Smough's Leggings - shop after killing AL boss",
97+
"AL: Sun Princess Ring - dark cathedral, after boss",
98+
"FS: Leonhard's Garb - shop after killing Leonhard",
99+
"FS: Leonhard's Gauntlets - shop after killing Leonhard",
100+
"FS: Leonhard's Trousers - shop after killing Leonhard",
101+
}),
102+
DS3BossInfo("Dancer of the Boreal Valley", 3000899, locations = {
103+
"HWL: Soul of the Dancer",
104+
"FS: Dancer's Crown - shop after killing LC entry boss",
105+
"FS: Dancer's Armor - shop after killing LC entry boss",
106+
"FS: Dancer's Gauntlets - shop after killing LC entry boss",
107+
"FS: Dancer's Leggings - shop after killing LC entry boss",
108+
}),
109+
DS3BossInfo("Dragonslayer Armour", 3010800, locations = {
110+
"LC: Soul of Dragonslayer Armour",
111+
"FS: Morne's Helm - shop after killing Eygon or LC boss",
112+
"FS: Morne's Armor - shop after killing Eygon or LC boss",
113+
"FS: Morne's Gauntlets - shop after killing Eygon or LC boss",
114+
"FS: Morne's Leggings - shop after killing Eygon or LC boss",
115+
"LC: Titanite Chunk - down stairs after boss",
116+
}),
117+
DS3BossInfo("Consumed King Oceiros", 3000830, locations = {
118+
"CKG: Soul of Consumed Oceiros",
119+
"CKG: Titanite Scale - tomb, chest #1",
120+
"CKG: Titanite Scale - tomb, chest #2",
121+
"CKG: Drakeblood Helm - tomb, after killing AP mausoleum NPC",
122+
"CKG: Drakeblood Armor - tomb, after killing AP mausoleum NPC",
123+
"CKG: Drakeblood Gauntlets - tomb, after killing AP mausoleum NPC",
124+
"CKG: Drakeblood Leggings - tomb, after killing AP mausoleum NPC",
125+
}),
126+
DS3BossInfo("Champion Gundyr", 4000830, locations = {
127+
"UG: Soul of Champion Gundyr",
128+
"FS: Gundyr's Helm - shop after killing UG boss",
129+
"FS: Gundyr's Armor - shop after killing UG boss",
130+
"FS: Gundyr's Gauntlets - shop after killing UG boss",
131+
"FS: Gundyr's Leggings - shop after killing UG boss",
132+
"UG: Hornet Ring - environs, right of main path after killing FK boss",
133+
"UG: Chaos Blade - environs, left of shrine",
134+
"UG: Blacksmith Hammer - shrine, Andre's room",
135+
"UG: Eyes of a Fire Keeper - shrine, Irina's room",
136+
"UG: Coiled Sword Fragment - shrine, dead bonfire",
137+
"UG: Soul of a Crestfallen Knight - environs, above shrine entrance",
138+
"UG: Life Ring+3 - shrine, behind big throne",
139+
"UG: Ring of Steel Protection+1 - environs, behind bell tower",
140+
"FS: Ring of Sacrifice - Yuria shop",
141+
"UG: Ember - shop",
142+
"UG: Priestess Ring - shop",
143+
"UG: Wolf Knight Helm - shop after killing FK boss",
144+
"UG: Wolf Knight Armor - shop after killing FK boss",
145+
"UG: Wolf Knight Gauntlets - shop after killing FK boss",
146+
"UG: Wolf Knight Leggings - shop after killing FK boss",
147+
}),
148+
DS3BossInfo("Ancient Wyvern", 3200800),
149+
DS3BossInfo("King of the Storm", 3200850, locations = {
150+
"AP: Soul of the Nameless King",
151+
"FS: Golden Crown - shop after killing AP boss",
152+
"FS: Dragonscale Armor - shop after killing AP boss",
153+
"FS: Golden Bracelets - shop after killing AP boss",
154+
"FS: Dragonscale Waistcloth - shop after killing AP boss",
155+
"AP: Titanite Slab - plaza",
156+
"AP: Covetous Gold Serpent Ring+2 - plaza",
157+
"AP: Dragonslayer Helm - plaza",
158+
"AP: Dragonslayer Armor - plaza",
159+
"AP: Dragonslayer Gauntlets - plaza",
160+
"AP: Dragonslayer Leggings - plaza",
161+
}),
162+
DS3BossInfo("Nameless King", 3200851, locations = {
163+
"AP: Soul of the Nameless King",
164+
"FS: Golden Crown - shop after killing AP boss",
165+
"FS: Dragonscale Armor - shop after killing AP boss",
166+
"FS: Golden Bracelets - shop after killing AP boss",
167+
"FS: Dragonscale Waistcloth - shop after killing AP boss",
168+
"AP: Titanite Slab - plaza",
169+
"AP: Covetous Gold Serpent Ring+2 - plaza",
170+
"AP: Dragonslayer Helm - plaza",
171+
"AP: Dragonslayer Armor - plaza",
172+
"AP: Dragonslayer Gauntlets - plaza",
173+
"AP: Dragonslayer Leggings - plaza",
174+
}),
175+
DS3BossInfo("Lothric, Younger Prince", 3410830, locations = {
176+
"GA: Soul of the Twin Princes",
177+
"GA: Cinders of a Lord - Lothric Prince",
178+
}),
179+
DS3BossInfo("Lorian, Elder Prince", 3410832, locations = {
180+
"GA: Soul of the Twin Princes",
181+
"GA: Cinders of a Lord - Lothric Prince",
182+
"FS: Lorian's Helm - shop after killing GA boss",
183+
"FS: Lorian's Armor - shop after killing GA boss",
184+
"FS: Lorian's Gauntlets - shop after killing GA boss",
185+
"FS: Lorian's Leggings - shop after killing GA boss",
186+
}),
187+
DS3BossInfo("Champion's Gravetender and Gravetender Greatwolf", 4500860, dlc = True,
188+
locations = {"PW1: Valorheart - boss drop"}),
189+
DS3BossInfo("Sister Friede", 4500801, dlc = True, locations = {
190+
"PW2: Soul of Sister Friede",
191+
"PW2: Titanite Slab - boss drop",
192+
"PW1: Titanite Slab - Corvian",
193+
"FS: Ordained Hood - shop after killing PW2 boss",
194+
"FS: Ordained Dress - shop after killing PW2 boss",
195+
"FS: Ordained Trousers - shop after killing PW2 boss",
196+
}),
197+
DS3BossInfo("Blackflame Friede", 4500800, dlc = True, locations = {
198+
"PW2: Soul of Sister Friede",
199+
"PW1: Titanite Slab - Corvian",
200+
"FS: Ordained Hood - shop after killing PW2 boss",
201+
"FS: Ordained Dress - shop after killing PW2 boss",
202+
"FS: Ordained Trousers - shop after killing PW2 boss",
203+
}),
204+
DS3BossInfo("Demon Prince", 5000801, dlc = True, locations = {
205+
"DH: Soul of the Demon Prince",
206+
"DH: Small Envoy Banner - boss drop",
207+
}),
208+
DS3BossInfo("Halflight, Spear of the Church", 5100800, dlc = True, locations = {
209+
"RC: Titanite Slab - mid boss drop",
210+
"RC: Titanite Slab - ashes, NPC drop",
211+
"RC: Titanite Slab - ashes, mob drop",
212+
"RC: Filianore's Spear Ornament - mid boss drop",
213+
"RC: Crucifix of the Mad King - ashes, NPC drop",
214+
"RC: Shira's Crown - Shira's room after killing ashes NPC",
215+
"RC: Shira's Armor - Shira's room after killing ashes NPC",
216+
"RC: Shira's Gloves - Shira's room after killing ashes NPC",
217+
"RC: Shira's Trousers - Shira's room after killing ashes NPC",
218+
}),
219+
DS3BossInfo("Darkeater Midir", 5100850, dlc = True, locations = {
220+
"RC: Soul of Darkeater Midir",
221+
"RC: Spears of the Church - hidden boss drop",
222+
}),
223+
DS3BossInfo("Slave Knight Gael 1", 5110801, dlc = True, locations = {
224+
"RC: Soul of Slave Knight Gael",
225+
"RC: Blood of the Dark Soul - end boss drop",
226+
# These are accessible before you trigger the boss, but once you do you
227+
# have to beat it before getting them.
228+
"RC: Titanite Slab - ashes, mob drop",
229+
"RC: Titanite Slab - ashes, NPC drop",
230+
"RC: Sacred Chime of Filianore - ashes, NPC drop",
231+
"RC: Crucifix of the Mad King - ashes, NPC drop",
232+
"RC: Shira's Crown - Shira's room after killing ashes NPC",
233+
"RC: Shira's Armor - Shira's room after killing ashes NPC",
234+
"RC: Shira's Gloves - Shira's room after killing ashes NPC",
235+
"RC: Shira's Trousers - Shira's room after killing ashes NPC",
236+
}),
237+
DS3BossInfo("Slave Knight Gael 2", 5110800, dlc = True, locations = {
238+
"RC: Soul of Slave Knight Gael",
239+
"RC: Blood of the Dark Soul - end boss drop",
240+
# These are accessible before you trigger the boss, but once you do you
241+
# have to beat it before getting them.
242+
"RC: Titanite Slab - ashes, mob drop",
243+
"RC: Titanite Slab - ashes, NPC drop",
244+
"RC: Sacred Chime of Filianore - ashes, NPC drop",
245+
"RC: Crucifix of the Mad King - ashes, NPC drop",
246+
"RC: Shira's Crown - Shira's room after killing ashes NPC",
247+
"RC: Shira's Armor - Shira's room after killing ashes NPC",
248+
"RC: Shira's Gloves - Shira's room after killing ashes NPC",
249+
"RC: Shira's Trousers - Shira's room after killing ashes NPC",
250+
}),
251+
DS3BossInfo("Lords of Cinder", 4100800, locations = {
252+
"KFF: Soul of the Lords",
253+
"FS: Billed Mask - Yuria after killing KFF boss",
254+
"FS: Black Dress - Yuria after killing KFF boss",
255+
"FS: Black Gauntlets - Yuria after killing KFF boss",
256+
"FS: Black Leggings - Yuria after killing KFF boss"
257+
}),
258+
]
259+
260+
default_yhorm_location = DS3BossInfo("Yhorm the Giant", 3900800, locations = {
261+
"PC: Soul of Yhorm the Giant",
262+
"PC: Cinders of a Lord - Yhorm the Giant",
263+
"PC: Siegbräu - Siegward after killing boss",
264+
})

0 commit comments

Comments
 (0)