diff --git a/generate_locations.py b/generate_locations.py index 33640eb..0c49e83 100755 --- a/generate_locations.py +++ b/generate_locations.py @@ -48,13 +48,19 @@ def process_location(location, prefix): prefix += '/' + location.name for section in location.sections: # Skip the final boss location; it doesn't have an ID. - if section.name == 'Kill Dracula': + if section.location_id is None: continue code = prefix + '/' + section.name zone = prefix.split('/')[0].strip('@') LOCATIONS_MAPPING.setdefault(zone, {}) - LOCATIONS_MAPPING[zone][section.location_id] = code + + ids = section.location_id + if not isinstance(ids, (list, tuple)): + ids = [ids] + + for loc_id in ids: + LOCATIONS_MAPPING[zone][loc_id] = code # If section has a hosted item, record that as well. if section.hosted_item: @@ -72,17 +78,16 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): # Entrance entrance = Area('Castle Entrance', children=[ normal.simple_location('Heart Vessel (Above Death)', 17, 34, location_id=127110000), - normal.simple_location('Life Vessel (Bellow shield potion)', 18, 32, access_rules=['$canJump'], location_id=127110001), + normal.simple_location('Life Vessel (Below Shield Potion)', 18, 32, access_rules=['$canJump'], location_id=127110001), Location('Hidden Room', map_locations=[normal.location(8, 36)], access_rules=['soulofbat,soulofwolf'], sections=[ - Section('Life Apple (Hidden room)', location_id=127110002), + Section('Life Apple', location_id=127110002), Section('Jewel sword', location_id=127110009), ]), normal.simple_location('Shield Potion', 17, 31, location_id=127110004), normal.simple_location('Holy mail', 3, 33, access_rules=['$canFly'], location_id=127110005), - normal.simple_location('Life Vessel (UC exit)', 12, 36, access_rules=['@Underground Caverns/Lower Caverns'], location_id=127110006), normal.simple_location('Heart Vessel (Teleport exit)', 15, 33, location_id=127110007), Location('Above Entrance', map_locations=[normal.location(0.5, 33)], access_rules=['$canFly'], sections=[ - Section('Life Vessel (Above entry)', location_id=127110008), + Section('Life Vessel', location_id=127110008), Section('Power of Wolf', location_id=127113113), ]), normal.simple_location('Pot Roast', 10, 35, location_id=127113110), @@ -92,54 +97,54 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): # Alchemy Laboratory alchemy_lab = Area('Alchemy Laboratory', children=[ - normal.simple_location('Hide cuirass', 12, 31, location_id=127140000), + normal.simple_location('Hide Cuirass', 12, 31, location_id=127140000), normal.simple_location('Heart Vessel', 9, 29, location_id=127140001), - normal.simple_location('Cloth cape', 8, 24, location_id=127140002), + normal.simple_location('Cloth Cape', 8, 24, location_id=127140002), normal.simple_location('Life Vessel', 10, 31, location_id=127140003), normal.simple_location('Sunglasses', 14, 26, location_id=127140006), - normal.simple_location('Resist thunder', 9, 27, location_id=127140007), - normal.simple_location('Leather shield', 11, 30, location_id=127140008), + normal.simple_location('Resist Thunder', 9, 27, location_id=127140007), + normal.simple_location('Leather Shield', 11, 30, location_id=127140008), normal.simple_location('Basilard', 14, 29, location_id=127140009), normal.simple_location('Potion', 17, 22, location_id=127140010), - boss_location('Slogra and Gaibon', 'slogragaibon', normal, 8.5, 22.5, location_id=127143140), + boss_location('Slogra & Gaibon', 'slogragaibon', normal, 8.5, 22.5, location_id=127143140), normal.simple_location('Skill of Wolf', 13, 28, access_rules=['$canHighJump'], location_id=127143141), normal.simple_location('Bat Card', 11, 22, access_rules=['$canFly'], location_id=127143142), ]) # Marble Gallery marble_gallery = Area('Marble Gallery', children=[ - normal.simple_location('Life Vessel(Left clock)', 29, 20, access_rules=['$canJump', 'opened_are,jewelofopen'], location_id=127080000), + normal.simple_location('Life Vessel (Left Clock)', 29, 20, access_rules=['$canJump', 'opened_are,jewelofopen'], location_id=127080000), Location('Right Clock', map_locations=[normal.location(31.5, 20)], access_rules=['$canJump'], sections=[ - Section('Heart Vessel(Right clock)', location_id=127080002), + Section('Heart Vessel', location_id=127080002), Section('Alucart shield', location_id=127080001), Section('Alucart mail', location_id=127080006), Section('Alucart sword', location_id=127080007), ]), Location('Middle Clock', map_locations=[normal.location(28.5, 18)], access_rules=['$canFly'], sections=[ - Section('Life apple(Middle clock)', location_id=127080003), - Section('Hammer(Middle clock)', location_id=127080004), - Section('Potion(Middle clock)', location_id=127080005), + Section('Life apple', location_id=127080003), + Section('Hammer', location_id=127080004), + Section('Potion', location_id=127080005), ]), Location('Inside Clock', map_locations=[normal.location(31, 22)], access_rules=['silverring,goldring'], sections=[ - Section('Life Vessel(Inside)', location_id=127080008), - Section('Heart Vessel(Inside)', location_id=127080009), + Section('Life Vessel', location_id=127080008), + Section('Heart Vessel', location_id=127080009), ]), Location('Under Floor', map_locations=[normal.location(42, 21)], access_rules=['jewelofopen'], sections=[ - Section('Library card(Jewel)', location_id=127080010), - Section('Attack potion(Jewel)', location_id=127080011), + Section('Library Card', location_id=127080010), + Section('Attack Potion', location_id=127080011), ]), normal.simple_location('Hammer(Spirit)', 24, 25, access_rules=['$canHighJump'], location_id=127080012), - normal.simple_location('Str. potion', 24, 23, access_rules=['$canHighJump'], location_id=127080013), - normal.simple_location('Holy glasses', 30, 26, access_rules=['silverring,goldring'], location_id=127083080), + normal.simple_location('Str. Potion', 24, 23, access_rules=['$canHighJump'], location_id=127080013), + normal.simple_location('Holy Glasses', 30, 26, access_rules=['silverring,goldring'], location_id=127083080), normal.simple_location('Spirit Orb', 23, 26, location_id=127083081), normal.simple_location('Gravity Boots', 32, 18, access_rules=['$canFly'], location_id=127083082), ]) # Outer Wall outer_wall = Area('Outer Wall', children=[ - Location('Secret Elevator', map_locations=[normal.location(57, 22)], sections=[ - Section('Jewel knuckles', location_id=127090000), - Section('Mirror cuirass', location_id=127090001), + Location('Behind Grate', map_locations=[normal.location(57, 22)], sections=[ + Section('Jewel Knuckles', location_id=127090000), + Section('Mirror Cuirass', location_id=127090001), ]), normal.simple_location('Heart Vessel', 58, 10, location_id=127090002), normal.simple_location('Garnet', 59, 19, access_rules=['$canJump'], location_id=127090003), @@ -153,7 +158,7 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): # Long Library library = Area('Long Library', children=[ - normal.simple_location('Bronze cuirass', 47, 16, location_id=127070004), + normal.simple_location('Bronze Cuirass', 47, 16, location_id=127070004), Location('Top Level', map_locations=[normal.location(50, 13)], access_rules=['$canJump'], sections=[ Section('Potion', location_id=127070008), Section('Antivenom', location_id=127070009), @@ -162,10 +167,10 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): normal.simple_location('Faerie Scroll', 57, 13, access_rules=['$canJump'], location_id=127073073), normal.simple_location('Jewel of Open', 47, 15, location_id=127073074), Area('Back of Library', access_rules=['$canJump'], children=[ - normal.simple_location('Stone mask', 47, 13, location_id=127070001), + normal.simple_location('Stone Mask', 47, 13, location_id=127070001), Location('Behind Bookcase', map_locations=[normal.location(48, 13)], sections=[ - Section('Holy rod', location_id=127070002), - Section('Topaz circlet', location_id=127070010), + Section('Holy Rod', location_id=127070002), + Section('Topaz Circlet', location_id=127070010), ]), Location('Dead End', map_locations=[normal.location(44, 16)], sections=[ Section('Takemitsu', location_id=127070005), @@ -180,25 +185,27 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): # Royal Chapel chapel = Area('Royal Chapel', access_rules=['jewelofopen', '$canJump'], children=[ Location('Middle of Stairs', map_locations=[normal.location(4, 18)], access_rules=['$canJump'], sections=[ - Section('Ankh of life(Stairs)', location_id=127050000), - Section('TNT(Stairs)', location_id=127050007), + Section('Ankh of Life', location_id=127050000), + Section('TNT', location_id=127050007), ]), normal.simple_location('Morningstar', 7, 16, access_rules=['$canJump'], location_id=127050001), - normal.simple_location('Silver ring', 6, 10, access_rules=['jewelofopen,formofmist,spikebreaker'], location_id=127050002), - normal.simple_location('Aquamarine(Stairs)', 0, 22, location_id=127050003), + normal.simple_location('Silver Ring', 6, 10, access_rules=['jewelofopen,formofmist,spikebreaker'], location_id=127050002), + normal.simple_location('Aquamarine', 0, 22, location_id=127050003), Location('Bottom of Stairs', map_locations=[normal.location(2, 20)], access_rules=['$canJump'], sections=[ - Section('Mystic pendant', location_id=127050004), - Section('Magic missile(Stairs)', location_id=127050005), + Section('Mystic Pendant', location_id=127050004), + Section('Magic Missile', location_id=127050005), ]), - normal.simple_location('Shuriken(Stairs)', 3, 19, access_rules=['$canJump'], location_id=127050006), - normal.simple_location('Boomerang(Stairs)', 5, 17, access_rules=['$canJump'], location_id=127050008), + normal.simple_location('Shuriken', 3, 19, access_rules=['$canJump'], location_id=127050006), + normal.simple_location('Boomerang', 5, 17, access_rules=['$canJump'], location_id=127050008), normal.simple_location('Goggles', 8, 16, location_id=127050009), - normal.simple_location('Silver plate', 12, 7, location_id=127050010), - normal.simple_location('Str. potion(Bell)', 13, 8, location_id=127050011), - normal.simple_location('Life Vessel(Bell)', 12, 8, location_id=127050012), + normal.simple_location('Silver Plate', 12, 7, location_id=127050010), + normal.simple_location('Str. Potion', 13, 8, location_id=127050011), + normal.simple_location('Life Vessel', 12, 8, location_id=127050012), normal.simple_location('Zircon', 17, 6, location_id=127050013), normal.simple_location('Cutlass', 25, 5, location_id=127050014), normal.simple_location('Potion', 25, 6, location_id=127050015), + # Technically in Colosseum but on the other side of the back door from Chapel! + normal.simple_location('Knight Shield', 12, 17, location_id=127010004), boss_location('Hippogryph', 'hippogryph', normal, 21.5, 8, location_id=127053050), ]) @@ -207,56 +214,55 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): # Upper Caverns needs flight if entering from the back door from the start. Area('Upper Caverns', access_rules=['jewelofopen', 'opened_no4,$canFly'], children=[ normal.simple_location('Zircon', 37, 21, access_rules=['$canJump'], location_id=127130009), - normal.simple_location('Heart Vessel(0)', 34, 22, location_id=127130000), - normal.simple_location('Life Vessel(1)', 35, 27, location_id=127130001), - normal.simple_location('Bandanna', 33, 22, location_id=127130011), - normal.simple_location('Shiitake(12)', 36, 31, location_id=127130012), + normal.simple_location('Heart Vessel', 34, 22, location_id=127130000), + normal.simple_location('Life Vessel', 35, 27, location_id=127130001), + normal.simple_location('Bandana', 33, 22, location_id=127130011), + normal.simple_location('Shiitake (Shaft)', 36, 31, location_id=127130012), + normal.simple_location('Shiitake (Cavern)', 35, 32, location_id=127130027), Location('Caverns Entrance', map_locations=[normal.location(36, 32)], sections=[ - Section('Toadstool(26)', location_id=127130026), + Section('Toadstool', location_id=127130026), Section('Nunchaku', location_id=127130036), ]), - normal.simple_location('Shiitake(27)', 35, 32, location_id=127130027), Location('Underwater', map_locations=[normal.location(28, 33)], access_rules=['holysymbol'], sections=[ - Section('Antivenom(Underwater)', location_id=127130004), - Section('Life Vessel(Underwater)', location_id=127130005), + Section('Antivenom', location_id=127130004), + Section('Life Vessel', location_id=127130005), ]), normal.simple_location('Pentagram', 23, 32, location_id=127130030), normal.simple_location('Herald Shield', 20, 32, access_rules=['$canJump', '$canDash'], location_id=127130007), Location('Below Bridge', map_locations=[normal.location(27, 32)], access_rules=['$canJump', '$canDash'], sections=[ - Section('Life Vessel(Bellow bridge)', location_id=127130028), - Section('Heart Vessel(Bellow bridge)', location_id=127130029), + Section('Life Vessel', location_id=127130028), + Section('Heart Vessel', location_id=127130029), ]), Area('Side Section', access_rules=['$canJump'], children=[ normal.simple_location('Claymore', 41, 24, location_id=127130013), Location('Succubus Approach', map_locations=[normal.location(42, 27.5)], sections=[ - Section('Meal ticket 1(Succubus)', location_id=127130014), - Section('Meal ticket 2(Succubus)', location_id=127130015), - Section('Meal ticket 3(Succubus)', location_id=127130016), - Section('Meal ticket 4(Succubus)', location_id=127130017), + Section('Meal Ticket', location_id=[127130014, 127130015, 127130016, 127130017]), Section('Moonstone', location_id=127130018), ]), Location('Succubus', map_locations=[normal.location(43, 28)], sections=[ Section('Gold Ring', location_id=127130010), - Section('Succubus kill', hosted_item='succubus', location_id=127133131), + Section('Succubus Kill', hosted_item='succubus', location_id=127133131), ]), ]), - normal.simple_location('Crystal cloak', 38, 33, location_id=127130002), + normal.simple_location('Crystal Cloak', 38, 33, location_id=127130002), normal.simple_location('Scimitar', 43, 34, location_id=127130019), - normal.simple_location('Resist ice', 41, 34, location_id=127130020), - normal.simple_location('Pot roast', 43, 33, location_id=127130021), + normal.simple_location('Resist Ice', 41, 34, location_id=127130020), + normal.simple_location('Pot Roast', 43, 33, location_id=127130021), boss_location("Scylla", "scylla", normal, 39, 33, location_id=127133130), - normal.simple_location('Knuckle duster(Holy)', 38, 37, location_id=127130023), - normal.simple_location('Life Vessel(Holy)', 40, 37, location_id=127130024), - normal.simple_location('Onyx(Holy)', 43, 36, access_rules=['mermanstatue', '$canJump'], location_id=127130022), - normal.simple_location('Elixir(Holy)', 50, 37, access_rules=['mermanstatue'], location_id=127130025), + normal.simple_location('Knuckle Duster', 38, 37, location_id=127130023), + normal.simple_location('Life Vessel (Holy Symbol)', 40, 37, location_id=127130024), + normal.simple_location('Onyx', 43, 36, access_rules=['mermanstatue', '$canJump'], location_id=127130022), + normal.simple_location('Elixir', 50, 37, access_rules=['mermanstatue'], location_id=127130025), normal.simple_location('Holy Symbol', 53, 36, access_rules=['mermanstatue'], location_id=127133132), - normal.simple_location('Secret boots', 22, 34, access_rules=['$canJump'], location_id=127130031), - normal.simple_location('Shiitake(Waterfall)', 21, 35, access_rules=['$canJump'], location_id=127130032), + normal.simple_location('Secret Boots', 22, 34, access_rules=['$canJump'], location_id=127130031), + normal.simple_location('Shiitake (Waterfall)', 21, 35, access_rules=['$canJump'], location_id=127130032), ]), Area('Lower Caverns', access_rules=['jewelofopen', 'opened_no4'], children=[ - normal.simple_location('Toadstool(Waterfall)', 21, 37, access_rules=['$canJump'], location_id=127130033), - normal.simple_location('Life Vessel(Behind waterfall)', 23, 37, location_id=127130006), - normal.simple_location('Shiitake(Near entrance passage)', 15, 36, location_id=127130035), + normal.simple_location('Toadstool (Waterfall)', 21, 37, access_rules=['$canJump'], location_id=127130033), + normal.simple_location('Life Vessel (Behind Waterfall)', 23, 37, location_id=127130006), + normal.simple_location('Shiitake (Near Entrance Passage)', 15, 36, location_id=127130035), + # Technically in Entrance but on the other side of the back door from Caverns! + normal.simple_location('Life Vessel (Entrance Passage)', 12, 36, location_id=127110006), normal.simple_location('Merman Statue', 6, 37, location_id=127133133), ]), ]) @@ -268,65 +274,56 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): ], children=[ Area('Behind Demon Button', access_rules=['demoncard'], children=[ Location('Demon Button Room', map_locations=[normal.location(34, 36)], sections=[ - Section('Power of sire(Demon)', location_id=127040000), - Section('Barley tea(Demon)', location_id=127040008), - Section('Peanuts 1(Demon)', location_id=127040009), - Section('Peanuts 2(Demon)', location_id=127040010), - Section('Peanuts 3(Demon)', location_id=127040011), - Section('Peanuts 4(Demon)', location_id=127040012), + Section('Power of Sire', location_id=127040000), + Section('Barley Tea', location_id=127040008), + Section('Peanuts', location_id=[127040009, 127040010, 127040011, 127040012]), ]), Location('Demon Button Shaft', map_locations=[normal.location(35, 36)], sections=[ - Section('Ring of ares', location_id=127040004), - Section('Turkey(Demon)', location_id=127043040), + Section('Ring of Ares', location_id=127040004), + Section('Turkey', location_id=127043040), ]), ]), Location('Mine Shaft Bottom', map_locations=[normal.location(29, 43)], sections=[ - Section('Karma coin', location_id=127040001), - Section('Combat knife', location_id=127040005), + Section('Karma Coin', location_id=127040001), + Section('Combat Knife', location_id=127040005), ]), Location('Mine Shaft Middle', map_locations=[normal.location(30, 41)], sections=[ - Section('Shiitake 1', location_id=127040006), - Section('Shiitake 2', location_id=127040007), + Section('Shiitake', location_id=[127040006, 127040007]), ]), - boss_location('Cerberos', 'cerberos', normal, 28.5, 35, location_id=127043041), + boss_location('Cerberus', 'cerberus', normal, 28.5, 35, location_id=127043041), normal.simple_location('Demon Card', 27, 39, location_id=127043042), ]) # Catacombs catacombs = Area('Catacombs', access_rules=['@Abandoned Mine'], children=[ Location('Catacombs Entrance', map_locations=[normal.location(26, 45)], sections=[ - Section('Cat-eye circl.', location_id=127020000), + Section('Cat-Eye Circlet', location_id=127020000), Section('Bloodstone', location_id=127020008), ]), normal.simple_location('Icebrand', 22, 45, access_rules=['$canHighJump'], location_id=127020001), - normal.simple_location('Walk armor', 21, 45, location_id=127020002), + normal.simple_location('Walk Armor', 21, 45, location_id=127020002), normal.simple_location('Mormegil', 15, 45, location_id=127020003), Location('Lava Bridge', map_locations=[normal.location(24, 45)], access_rules=['$canHighJump'], sections=[ - Section('Heart Vessel(Ballroom mask)', location_id=127020006), + Section('Heart Vessel', location_id=127020006), Section('Ballroom mask', location_id=127020007), ]), Location('Crypt', map_locations=[normal.location(30, 46)], sections=[ - Section('Life Vessel(Crypt)', location_id=127020009), - Section('Heart Vessel(Crypt)', location_id=127020010), + Section('Life Vessel', location_id=127020009), + Section('Heart Vessel', location_id=127020010), ]), Location('Sarcophagus', map_locations=[normal.location(31.5, 46)], sections=[ - Section('Monster vial 3 1(Sarcophagus)', location_id=127020017), - Section('Monster vial 3 2(Sarcophagus)', location_id=127020018), - Section('Monster vial 3 3(Sarcophagus)', location_id=127020019), - Section('Monster vial 3 4(Sarcophagus)', location_id=127020020), + Section('Monster Vial 3', location_id=[127020017, 127020018, 127020019, 127020020]), ]), - boss_location('Legion', 'legion', normal, 16.5, 45.5, location_id=127023020), + boss_location('Granfaloon', 'granfaloon', normal, 16.5, 45.5, location_id=127023020), Area('Beyond Spike Maze', access_rules=['soulofbat,echoofbat', 'spikebreaker,$canJump'], children=[ Location('Spike Hallway', map_locations=[normal.location(46, 45)], sections=[ - Section('Cross shuriken 1(Spike breaker)', location_id=127020011), - Section('Cross shuriken 2(Spike breaker)', location_id=127020012), - Section('Karma coin 1(Spike breaker)', location_id=127020013), - Section('Karma coin 2(Spike breaker)', location_id=127020014), + Section('Cross Shuriken', location_id=[127020011, 127020012]), + Section('Karma Coin', location_id=[127020013, 127020014]), ]), - normal.simple_location('Pork bun', 46, 46, location_id=127020015), + normal.simple_location('Pork Bun', 46, 46, location_id=127020015), Location('Spike Breaker Room', map_locations=[normal.location(39, 46)], sections=[ - Section('Library card(Spike breaker)', location_id=127020004), - Section('Spike breaker', location_id=127020016), + Section('Library Card', location_id=127020004), + Section('Spike Breaker', location_id=127020016), ]), ]), ]) @@ -343,9 +340,9 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): Section('Onyx', location_id=127100005), Section('Cheese', location_id=127100006), ]), - normal.simple_location('Manna prism', 33, 15, access_rules=['$canFly'], location_id=127100007), - normal.simple_location('Resist fire', 33, 14, access_rules=['$canFly'], location_id=127100008), - normal.simple_location('Luck potion', 33, 12, access_rules=['$canFly'], location_id=127100009), + normal.simple_location('Manna Prism', 33, 15, access_rules=['$canFly'], location_id=127100007), + normal.simple_location('Resist Fire', 33, 14, access_rules=['$canFly'], location_id=127100008), + normal.simple_location('Luck Potion', 33, 12, access_rules=['$canFly'], location_id=127100009), normal.simple_location('Estoc', 28, 10, access_rules=['$canFly'], location_id=127100010), ]), Area('Back Quarters', access_rules=[ @@ -353,23 +350,30 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): 'opened_no2,jewelofopen', ], children=[ normal.simple_location('Heart Vessel', 19, 14, location_id=127100001), - normal.simple_location('Iron ball', 20, 11, access_rules=['$canFly'], location_id=127100011), + normal.simple_location('Iron Ball', 20, 11, access_rules=['$canFly'], location_id=127100011), normal.simple_location('Garnet', 31, 13, access_rules=['$canFly'], location_id=127100012), - normal.simple_location('Echo of Bat', 14, 11, access_rules=['$canFly'], location_id=127103101), + normal.simple_location('Echo of Bat', 14, 11, access_rules=[ + '$canFly,soulofbat', + '$canFly,soulofwolf', + '$canFly,formofmist', + ], location_id=127103101), normal.simple_location('Sword Card', 18, 13, access_rules=['$canFly'], location_id=127103102), - boss_location('Olrox', 'olrox', normal, 17.5, 11.5, access_rules=['$canFly'], location_id=127103100), + boss_location('Olrox', 'olrox', normal, 17.5, 11.5, access_rules=[ + '$canFly,soulofbat', + '$canFly,soulofwolf', + '$canFly,formofmist', + ], location_id=127103100), ]), ]) # Colosseum colosseum = Area('Colosseum', access_rules=['opened_are,jewelofopen', '$canJump'], children=[ normal.simple_location('Heart Vessel', 24, 19, location_id=127010000), - normal.simple_location('Shield rod', 11, 19, location_id=127010001), - normal.simple_location('Blood cloak', 18, 19, location_id=127010003), - normal.simple_location('Knight shield(Chapel passage)', 12, 17, location_id=127010004), - normal.simple_location('Library card', 16, 17, location_id=127010005), - normal.simple_location('Green tea', 17, 19, location_id=127010006), - normal.simple_location('Holy sword(Hidden attic)', 17, 15, access_rules=['$canHighJump'], location_id=127010007), + normal.simple_location('Shield Rod', 11, 19, location_id=127010001), + normal.simple_location('Blood Cloak', 18, 19, location_id=127010003), + normal.simple_location('Library Card', 16, 17, location_id=127010005), + normal.simple_location('Green Tea', 17, 19, location_id=127010006), + normal.simple_location('Holy Sword', 17, 15, access_rules=['$canHighJump'], location_id=127010007), boss_location('Minotaurus & Werewolf', 'minotauruswerewolf', normal, 17.5, 17, location_id=127013010), normal.simple_location('Form of Mist', 19, 17, location_id=127013011), ]) @@ -377,25 +381,25 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): # Clock Tower clock_tower = Area('Clock Tower', access_rules=['$canJump'], children=[ Location('Below Bridge', map_locations=[normal.location(53, 9)], sections=[ - Section('Magic missile', location_id=127150000), + Section('Magic Missile', location_id=127150000), Section('Pentagram', location_id=127150001), ]), Location('Pillars', map_locations=[normal.location(52, 8)], access_rules=['$canHighJump'], sections=[ Section('Bekatowa', location_id=127150007), - Section('Shaman shield', location_id=127150008), - Section('Ice mail', location_id=127150009), + Section('Shaman Shield', location_id=127150008), + Section('Ice Mail', location_id=127150009), ]), Location('Hidden Room', map_locations=[normal.location(47, 9)], sections=[ - Section('Star flail', location_id=127150003), - Section('Gold plate', location_id=127150004), - Section('Steel helm', location_id=127150005), - ]), - normal.simple_location('Healing mail', 40, 6, location_id=127150006), - normal.simple_location('Life Vessel(Gear train)', 48, 4, location_id=127150010), - normal.simple_location('Heart Vessel(Gear train)', 50, 4, location_id=127150011), - normal.simple_location('Pot roast', 46, 5, location_id=127153151), + Section('Star Flail', location_id=127150003), + Section('Gold Plate', location_id=127150004), + Section('Steel Helm', location_id=127150005), + ]), + normal.simple_location('Healing Mail', 40, 6, location_id=127150006), + normal.simple_location('Life Vessel', 48, 4, location_id=127150010), + normal.simple_location('Heart Vessel', 50, 4, location_id=127150011), + normal.simple_location('Pot Roast', 46, 5, location_id=127153151), Location('Keep Approach', map_locations=[normal.location(40, 5)], sections=[ - Section('Bwaka knife', location_id=127153150), + Section('Bwaka Knife', location_id=127153150), Section('Shuriken', location_id=127153152), Section('TNT', location_id=127153153), ]), @@ -407,32 +411,30 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): keep = Area('Castle Keep', children=[ Location('Keep Bottom', map_locations=[normal.location(29, 6)], access_rules=['$canJump', 'jewelofopen'], sections=[ Section('Turquoise', location_id=127160000), - Section('Turkey(Behind wall)', location_id=127160001), + Section('Turkey', location_id=127160001), Section('Leap Stone', location_id=127163160), ]), Area('Main Keep', access_rules=['$canJump'], children=[ Location('Below Throne', map_locations=[normal.location(29, 4)], access_rules=['$canFly'], sections=[ - Section('Fire mail(Behind wall)', location_id=127160002), + Section('Fire Mail', location_id=127160002), Section('Power of Mist', location_id=127163161), ]), normal.simple_location('Tyrfing', 37, 6, location_id=127160003), normal.simple_location('Falchion', 37, 3, location_id=127160012), - normal.simple_location('Heart Vessel(Before Richter)', 33, 3, access_rules=['$canFly'], location_id=127160018), + normal.simple_location('Heart Vessel', 33, 3, access_rules=['$canFly'], location_id=127160018), Location('Above Throne', map_locations=[normal.location(32, 1)], access_rules=['$canFly'], sections=[ - Section('Sirloin(Above Richter)', location_id=127160004), - Section('Turkey(Above Richter)', location_id=127160005), - Section('Pot roast(Above Richter)', location_id=127160006), - Section('Frankfurter(Above Richter)', location_id=127160007), - Section('Resist stone(Above Richter)', location_id=127160008), - Section('Resist dark(Above Richter)', location_id=127160009), - Section('Resist holy(Above Richter)', location_id=127160010), - Section('Platinum mail(Above Richter)', location_id=127160011), + Section('Sirloin', location_id=127160004), + Section('Turkey', location_id=127160005), + Section('Pot Roast', location_id=127160006), + Section('Frankfurter', location_id=127160007), + Section('Resist Stone', location_id=127160008), + Section('Resist Dark', location_id=127160009), + Section('Resist Holy', location_id=127160010), + Section('Platinum Mail', location_id=127160011), ]), Location('Viewing Room', map_locations=[normal.location(36.5, 1)], access_rules=['$canFly'], sections=[ - Section('Life Vessel 1(Viewing room)', location_id=127160013), - Section('Life Vessel 2(Viewing room)', location_id=127160014), - Section('Heart Vessel 1(Viewing room)', location_id=127160015), - Section('Heart Vessel 2(Viewing room)', location_id=127160016), + Section('Life Vessel', location_id=[127160013, 127160014]), + Section('Heart Vessel', location_id=[127160015, 127160016]), Section('Ghost Card', location_id=127163162), ]), ]), @@ -447,46 +449,46 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): Location("Hidden Room", map_locations=[inverted.location(51, 10)], access_rules=['soulofbat,soulofwolf'], sections=[ Section("Zircon", location_id=127270004), Section("Opal", location_id=127270005), - Section("Beryl circlet", location_id=127270006), + Section("Beryl Circlet", location_id=127270006), ]), inverted.simple_location("Heart Vessel", 42, 15, location_id=127270003), - inverted.simple_location("Fire boomerang", 56, 13, location_id=127270007), + inverted.simple_location("Fire Boomerang", 56, 13, location_id=127270007), Location("Below Entrance", map_locations=[inverted.location(58.5, 13)], sections=[ Section("Hammer", location_id=127270000), Section("Antivenom", location_id=127270001), ]), - inverted.simple_location("Pot roast", 49, 11, location_id=127273270), - inverted.simple_location("High potion", 42, 11, location_id=127270002), + inverted.simple_location("Pot Roast", 49, 11, location_id=127273270), + inverted.simple_location("High Potion", 42, 11, location_id=127270002), ]) # Necromancy Laboratory necromancy_lab = Area("Necromancy Laboratory", access_rules=['$canAccessInvertedCastle'], children=[ - inverted.simple_location("Resist dark", 47, 15, location_id=127290009), + inverted.simple_location("Resist Dark", 47, 15, location_id=127290009), inverted.simple_location("Heart Vessel", 50, 17, location_id=127290001), inverted.simple_location("Life Vessel", 51, 22, location_id=127290002), inverted.simple_location("Katana", 49, 15, location_id=127290005), - inverted.simple_location("Goddess shield", 45, 20, location_id=127290003), - inverted.simple_location("Manna prism", 48, 16, location_id=127290004), + inverted.simple_location("Goddess Shield", 45, 20, location_id=127290003), + inverted.simple_location("Manna Prism", 48, 16, location_id=127290004), inverted.simple_location("Turquoise", 42, 24, location_id=127290007), - inverted.simple_location("High potion", 46, 18, location_id=127290006), + inverted.simple_location("High Potion", 46, 18, location_id=127290006), inverted.simple_location("Ring of Arcana", 48, 24, location_id=127290008), - boss_location('Beezelbub', 'beezelbub', inverted, 50.5, 23.5, location_id=127293290), + boss_location('Beelzebub', 'beelzebub', inverted, 50.5, 23.5, location_id=127293290), ]) # Black Marble Gallery black_marble_gallery = Area("Black Marble Gallery", access_rules=['$canAccessInvertedCastle'], children=[ - inverted.simple_location("Library card", 35, 17, location_id=127240000), + inverted.simple_location("Library Card", 35, 17, location_id=127240000), Location("Left Clock", map_locations=[inverted.location(27.5, 26)], sections=[ - Section("Resist dark(Left clock)", location_id=127240005), - Section("Resist holy(Left clock)", location_id=127240006), - Section("Resist thunder(Left clock)", location_id=127240007), - Section("Resist fire(Left clock)", location_id=127240008), - ]), - inverted.simple_location("Life Vessel(Middle clock)", 31, 28, location_id=127240003), - inverted.simple_location("Heart Vessel(Middle clock)", 27, 28, location_id=127240004), - inverted.simple_location("Heart Refresh(Inside clock)", 28, 24, location_id=127240011), - inverted.simple_location("Iron ball", 17, 25, location_id=127240010), - inverted.simple_location("Meal ticket", 15, 27, location_id=127240009), + Section("Resist Dark", location_id=127240005), + Section("Resist Holy", location_id=127240006), + Section("Resist Thunder", location_id=127240007), + Section("Resist Fire", location_id=127240008), + ]), + inverted.simple_location("Life Vessel", 31, 28, location_id=127240003), + inverted.simple_location("Heart Vessel", 27, 28, location_id=127240004), + inverted.simple_location("Heart Refresh", 28, 24, location_id=127240011), + inverted.simple_location("Iron Ball", 17, 25, location_id=127240010), + inverted.simple_location("Meal Ticket", 15, 27, access_rules=['jewelofopen'], location_id=127240009), inverted.simple_location("Antivenom", 36, 22, location_id=127240002), inverted.simple_location("Potion", 36, 20, location_id=127240001), inverted.simple_location("Kill Dracula", 29, 20, access_rules=['$canFightDracula']), @@ -499,11 +501,11 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): Section("Hammer", location_id=127250002), ]), inverted.simple_location("Garnet", 1, 36, location_id=127250007), - inverted.simple_location("Luck potion", 0, 27, location_id=127250004), - inverted.simple_location("Shield potion", 2, 28, location_id=127250005), - inverted.simple_location("High potion", 0, 28, location_id=127250006), + inverted.simple_location("Luck Potion", 0, 27, location_id=127250004), + inverted.simple_location("Shield Potion", 2, 28, location_id=127250005), + inverted.simple_location("High Potion", 0, 28, location_id=127250006), inverted.simple_location("Life Vessel", 0, 26, location_id=127250003), - inverted.simple_location("Dim Sum set", 2, 25, location_id=127253240), + inverted.simple_location("Dim Sum Set", 2, 25, location_id=127253240), Location("The Creature", map_locations=[inverted.location(3.5, 28)], sections=[ Section('Creature kill', hosted_item='creature', location_id=127253241), Section('Tooth of Vlad', location_id=127253242), @@ -513,18 +515,18 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): # Forbidden Library reverse_library = Area("Forbidden Library", access_rules=['$canAccessInvertedCastle'], children=[ - inverted.simple_location("Neutron bomb", 12, 33, location_id=127230006), + inverted.simple_location("Neutron Bomb", 12, 33, location_id=127230006), inverted.simple_location("Badelaire", 11, 33, location_id=127230007), Location("Side Room", map_locations=[inverted.location(9, 33)], sections=[ - Section("Resist fire", location_id=127230003), - Section("Resist ice", location_id=127230004), - Section("Resist stone", location_id=127230005), + Section("Resist Fire", location_id=127230003), + Section("Resist Ice", location_id=127230004), + Section("Resist Stone", location_id=127230005), ]), inverted.simple_location("Staurolite", 13, 30, access_rules=['formofmist'], location_id=127230008), Location("Reverse Librarian", map_locations=[inverted.location(12, 31)], sections=[ Section('Turquoise', location_id=127230000), Section('Opal', location_id=127230001), - Section('Library card', location_id=127230002), + Section('Library Card', location_id=127230002), ]), ]) @@ -532,23 +534,23 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): anti_chapel = Area("Anti-Chapel", access_rules=['$canAccessInvertedCastle'], children=[ inverted.simple_location("Boomerang", 55, 28, location_id=127220008), inverted.simple_location("Diamond", 55, 27, location_id=127220003), - inverted.simple_location("Fire boomerang", 52, 30, location_id=127220002), - inverted.simple_location("Twilight cloak", 52, 36, access_rules=[ + inverted.simple_location("Fire Boomerang", 52, 30, location_id=127220002), + inverted.simple_location("Twilight Cloak", 52, 36, access_rules=[ 'formofmist,spikebreaker', 'formofmist,powerofmist', ], location_id=127220016), inverted.simple_location("Zircon", 59, 24, location_id=127220004), inverted.simple_location("Shuriken", 57, 26, location_id=127220006), - inverted.simple_location("Heart Vessel(5)", 57, 25, location_id=127220005), - inverted.simple_location("Heart Vessel(17)", 58, 23, location_id=127220017), + inverted.simple_location("Heart Vessel (Stairs)", 57, 25, location_id=127220005), + inverted.simple_location("Heart Vessel (Next to Stairs)", 58, 23, location_id=127220017), inverted.simple_location("TNT", 56, 27, location_id=127220007), inverted.simple_location("Javelin", 54, 29, location_id=127220009), - inverted.simple_location("Manna prism", 47, 39, location_id=127220010), - inverted.simple_location("Smart potion", 46, 38, location_id=127220011), + inverted.simple_location("Manna Prism", 47, 39, location_id=127220010), + inverted.simple_location("Smart Potion", 46, 38, location_id=127220011), inverted.simple_location("Life Vessel", 47, 37, location_id=127220012), inverted.simple_location("Talwar", 42, 40, location_id=127220013), - inverted.simple_location("Bwaka knife", 34, 41, location_id=127220014), - inverted.simple_location("Magic missile", 34, 40, location_id=127220015), + inverted.simple_location("Bwaka Knife", 34, 41, location_id=127220014), + inverted.simple_location("Magic Missile", 34, 40, location_id=127220015), Location("Medusa", map_locations=[inverted.location(37.5, 38)], sections=[ Section('Medusa kill', location_id=127223220), Section('Heart of Vlad', location_id=127223221), @@ -561,56 +563,50 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): inverted.simple_location("Opal", 24, 19, location_id=127280011), inverted.simple_location("Dark Blade", 21, 13, location_id=127280023), Location("Underwater", map_locations=[inverted.location(31, 13)], access_rules=['gravityboots'], sections=[ - Section('Life Vessel(Underwater)', location_id=127280006), - Section('Potion(Underwater)', location_id=127280008), + Section('Life Vessel', location_id=127280006), + Section('Potion', location_id=127280008), ]), - inverted.simple_location("Osafune katana", 36, 9, access_rules=[ + inverted.simple_location("Osafune Katana", 36, 9, access_rules=[ 'soulofbat', 'gravityboots,leapstone', 'gravityboots,soulofwolf', ], location_id=127280026), inverted.simple_location("Garnet", 39, 14, location_id=127280004), - inverted.simple_location("Zircon(Vase)", 22, 25, location_id=127280014), + inverted.simple_location("Zircon (Vase)", 22, 25, location_id=127280014), inverted.simple_location("Diamond", 26, 24, location_id=127280013), - inverted.simple_location("Heart Vessel(Air pocket)", 23, 13, access_rules=['gravityboots,holysymbol'], location_id=127280007), - inverted.simple_location("Heart Vessel(Succubus side)", 18, 22, location_id=127280015), + inverted.simple_location("Heart Vessel (Air Pocket)", 23, 13, access_rules=['gravityboots,holysymbol'], location_id=127280007), + inverted.simple_location("Heart Vessel (Succubus Side)", 18, 22, location_id=127280015), Location("Succubus Side", map_locations=[inverted.location(17, 18.5)], sections=[ - Section("Meal ticket 1(Succubus side)", location_id=127280016), - Section("Meal ticket 2(Succubus side)", location_id=127280017), - Section("Meal ticket 3(Succubus side)", location_id=127280018), - Section("Meal ticket 4(Succubus side)", location_id=127280019), - Section("Meal ticket 5(Succubus side)", location_id=127280020), - ]), - inverted.simple_location("Zircon(Doppleganger)", 18, 12, location_id=127280021), - inverted.simple_location("Pot roast(Doppleganger)", 16, 13, location_id=127280022), + Section("Meal Ticket", location_id=[127280016, 127280017, 127280018, 127280019, 127280020]), + ]), + inverted.simple_location("Zircon (Doppleganger)", 18, 12, location_id=127280021), + inverted.simple_location("Pot Roast", 16, 13, location_id=127280022), inverted.simple_location("Elixir", 16, 10, location_id=127280025), - inverted.simple_location("Manna prism", 19, 9, location_id=127280024), - inverted.simple_location("Shiitake 3(Near air pocket)", 23, 14, location_id=127280009), - inverted.simple_location("Shiitake 4(Near air pocket)", 24, 14, location_id=127280010), + inverted.simple_location("Manna Prism", 19, 9, location_id=127280024), + inverted.simple_location("Shiitake (Near Air Pocket)", 23.5, 14, location_id=[127280009, 127280010]), inverted.simple_location("Bat Pentagram", 36, 14, access_rules=['leapstone', 'soulofbat'], location_id=127280005), - inverted.simple_location("Shiitake 2(Waterfall)", 38, 11, location_id=127280003), - inverted.simple_location("Toadstool(Waterfall)", 38, 10, location_id=127280002), - inverted.simple_location("Shiitake 1(Near entrance passage)", 44, 10, location_id=127280001), + inverted.simple_location("Shiitake (Waterfall)", 38, 11, location_id=127280003), + inverted.simple_location("Toadstool", 38, 10, location_id=127280002), + inverted.simple_location("Shiitake (Near Entrance Passage)", 44, 10, location_id=127280001), boss_location('Doppleganger40', 'doppleganger40', inverted, 21, 12, location_id=127283280), inverted.simple_location("Force of Echo", 6, 10, location_id=127283281), - inverted.simple_location("Alucard shield", 53, 9, location_id=127280000), + inverted.simple_location("Alucard Shield", 53, 9, location_id=127280000), ]) # Cave cave = Area("Cave", access_rules=['$canAccessInvertedCastle'], children=[ Location("Demon Button Room", map_locations=[inverted.location(25, 10)], access_rules=['demoncard'], sections=[ - Section("Power of Sire(Demon)", location_id=127210000), - Section("Life apple(Demon)", location_id=127210001), + Section("Power of Sire", location_id=127210000), + Section("Life Apple", location_id=127210001), ]), Location("Cave Top", map_locations=[inverted.location(30, 3)], sections=[ - Section("Green tea(Demon)", location_id=127210003), + Section("Green Tea", location_id=127210003), Section("Power of Sire", location_id=127210004), ]), Location("Cave Middle", map_locations=[inverted.location(29, 5)], sections=[ - Section("Shiitake 1(6)", location_id=127210006), - Section("Shiitake 2(7)", location_id=127210007), + Section("Shiitake", location_id=[127210006, 127210007]), ]), - inverted.simple_location("Alucard sword", 32, 7, location_id=127210002), + inverted.simple_location("Alucard Sword", 32, 7, location_id=127210002), Location("Death", map_locations=[inverted.location(30.5, 11)], sections=[ Section("Death kill", hosted_item='death', location_id=127213210), Section("Eye of Vlad", location_id=127213211), @@ -620,26 +616,26 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): # Floating Catacombs floating_catacombs = Area("Floating Catacombs", access_rules=['$canAccessInvertedCastle'], children=[ Location("Catacombs Entrance", map_locations=[inverted.location(33, 1)], sections=[ - Section("Magic missile", location_id=127190000), - Section("Buffalo star", location_id=127190001), + Section("Magic Missile", location_id=127190000), + Section("Buffalo Star", location_id=127190001), ]), - inverted.simple_location("Necklace of j", 37, 1, location_id=127190013), + inverted.simple_location("Necklace of J", 37, 1, location_id=127190013), inverted.simple_location("Diamond", 38, 1, location_id=127190014), Location("After Galamoth", map_locations=[inverted.location(44, 0)], sections=[ - Section("Heart Vessel(After Galamoth)", location_id=127190015), - Section("Life Vessel(After Galamoth)", location_id=127190016), + Section("Heart Vessel", location_id=127190015), + Section("Life Vessel", location_id=127190016), ]), Location("Gas Cloud Room", map_locations=[inverted.location(44, 1)], sections=[ - Section("Ruby circlet", location_id=127190017), + Section("Ruby Circlet", location_id=127190017), Section("Gas Cloud", location_id=127193191), ]), Location("Lava Bridge", map_locations=[inverted.location(35, 1)], sections=[ - Section("Shield potion", location_id=127190011), - Section("Attack potion", location_id=127190012), + Section("Shield Potion", location_id=127190011), + Section("Attack Potion", location_id=127190012), ]), Location("Crypt", map_locations=[inverted.location(29, 0)], sections=[ - Section("Life Vessel(9)", location_id=127190009), - Section("Heart Vessel(10)", location_id=127190010), + Section("Life Vessel", location_id=127190009), + Section("Heart Vessel)", location_id=127190010), ]), Area('Beyond Spike Maze', access_rules=[ 'soulofbat', @@ -648,15 +644,14 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): 'spikebreaker,gravityboots', ], children=[ Location("Spike Hallway", map_locations=[inverted.location(13, 1)], sections=[ - Section("Resist thunder", location_id=127190002), - Section("Resist fire", location_id=127190003), - Section("Karma coin(4)(Spike breaker)", location_id=127190004), - Section("Karma coin(5)(Spike breaker)", location_id=127190005), + Section("Resist Thunder", location_id=127190002), + Section("Resist Fire", location_id=127190003), + Section("Karma Coin", location_id=[127190004, 127190005]), ]), - inverted.simple_location("Red bean bun", 13, 0, location_id=127190006), + inverted.simple_location("Red Bean Bun", 13, 0, location_id=127190006), Location("Spike Breaker Room", map_locations=[inverted.location(20, 0)], sections=[ Section("Elixir", location_id=127190007), - Section("Library card", location_id=127190008), + Section("Library Card", location_id=127190008), ]), ]), boss_location("Galamoth", "galamoth", inverted, 42.5, 0.5, location_id=127193190), @@ -667,17 +662,17 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): inverted.simple_location("Life Vessel", 40, 32, location_id=127260008), Location("Secret Hallway", map_locations=[inverted.location(29, 29)], sections=[ Section("Opal", location_id=127260000), - Section("Sword of hador", location_id=127260001), - Section("High potion", location_id=127260002), + Section("Sword of Hador", location_id=127260001), + Section("High Potion", location_id=127260002), ]), Location("Middle Shaft", map_locations=[inverted.location(26, 32)], sections=[ - Section("Shield potion", location_id=127260003), - Section("Luck potion", location_id=127260004), + Section("Shield Potion", location_id=127260003), + Section("Luck Potion", location_id=127260004), ]), - inverted.simple_location("Manna prism", 26, 34, location_id=127260005), + inverted.simple_location("Manna Prism", 26, 34, location_id=127260005), inverted.simple_location("Aquamarine", 31, 36, location_id=127260006), inverted.simple_location("Shuriken", 39, 35, location_id=127260010), - inverted.simple_location("Alucard mail", 28, 33, location_id=127260007), + inverted.simple_location("Alucard Mail", 28, 33, location_id=127260007), inverted.simple_location("Heart Vessel", 45, 35, access_rules=['soulofbat', 'soulofwolf', 'formofmist'], location_id=127260011), inverted.simple_location("Heart Refresh", 41, 33, location_id=127260009), Location("Akmodan II", map_locations=[inverted.location(41.5, 34.5)], access_rules=['soulofbat', 'soulofwolf', 'formofmist'], sections=[ @@ -688,15 +683,14 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): # Reverse Colosseum reverse_colosseum = Area("Reverse Colosseum", access_rules=['$canAccessInvertedCastle'], children=[ - inverted.simple_location("Fury plate(Hidden floor)", 42, 31, location_id=127180000), + inverted.simple_location("Fury Plate", 42, 31, location_id=127180000), inverted.simple_location("Zircon", 48, 27, location_id=127180001), - inverted.simple_location("Buffalo star", 42, 27, location_id=127180002), + inverted.simple_location("Buffalo Star", 42, 27, location_id=127180002), inverted.simple_location("Gram", 41, 27, location_id=127180003), inverted.simple_location("Aquamarine", 35, 27, location_id=127180004), Location("Passage", map_locations=[inverted.location(38, 28)], sections=[ - Section('Heart Vessel(5)', location_id=127180005), + Section('Heart Vessel', location_id=[127180005, 127180007]), Section('Life Vessel', location_id=127180006), - Section('Heart Vessel(7)', location_id=127180007), ]), boss_location('Fake Trevor & Grant & Sypha', 'faketrio', inverted, 41.5, 29, location_id=127183180), ]) @@ -704,31 +698,31 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): # Reverse Clock Tower reverse_clock_tower = Area("Reverse Clock Tower", access_rules=['$canAccessInvertedCastle'], children=[ Location("Above Bridge", map_locations=[inverted.location(6, 37)], sections=[ - Section("Magic missile", location_id=127300000), - Section("Karma coin", location_id=127300001), + Section("Magic Missile", location_id=127300000), + Section("Karma Coin", location_id=127300001), ]), Location("Pillars", map_locations=[inverted.location(7, 38)], sections=[ - Section("Str. potion", location_id=127300002), + Section("Str. Potion", location_id=127300002), Section("Luminus", location_id=127300003), - Section("Smart potion", location_id=127300004), + Section("Smart Potion", location_id=127300004), ]), - inverted.simple_location("Dragon helm", 2, 40, location_id=127300005), + inverted.simple_location("Dragon Helm", 2, 40, location_id=127300005), Location("Hidden Room", map_locations=[inverted.location(12, 37)], sections=[ - Section("Diamond(Hidden room)", location_id=127300006), - Section("Life apple(Hidden room)", location_id=127300007), - Section("Sunstone(Hidden room)", location_id=127300008), + Section("Diamond", location_id=127300006), + Section("Life Apple", location_id=127300007), + Section("Sunstone", location_id=127300008), ]), - inverted.simple_location("Moon rod", 19, 40, location_id=127300011), + inverted.simple_location("Moon Rod", 19, 40, location_id=127300011), inverted.simple_location("Heart Vessel", 11, 42, location_id=127300010), inverted.simple_location("Life Vessel", 9, 42, location_id=127300009), inverted.simple_location("Turkey", 13, 40, location_id=127303301), Location("Keep Approach", map_locations=[inverted.location(19, 41)], sections=[ - Section("Bwaka knife", location_id=127303300), + Section("Bwaka Knife", location_id=127303300), Section("Shuriken", location_id=127303302), Section("TNT", location_id=127303303), ]), Location("Darkwing Bat", map_locations=[inverted.location(21, 41)], sections=[ - Section("Darkwing bat kill", hosted_item='darkwingbat', location_id=127303304), + Section("Darkwing Bat kill", hosted_item='darkwingbat', location_id=127303304), Section("Ring of Vlad", location_id=127303305), ]), ]) @@ -736,28 +730,24 @@ def boss_location(name, code, map, x, y, location_id, **kwargs): # Reverse Castle Keep reverse_keep = Area("Reverse Castle Keep", access_rules=['$canAccessInvertedCastle'], children=[ Location("Keep Top", map_locations=[inverted.location(30, 40)], sections=[ - Section("Sword of dawn", location_id=127310000), + Section("Sword of Dawn", location_id=127310000), Section("Garnet", location_id=127310022), ]), - inverted.simple_location("Iron ball(Above Richter)", 30, 42, location_id=127310001), - inverted.simple_location("Lightning mail", 22, 40, location_id=127310023), + inverted.simple_location("Iron Ball", 30, 42, location_id=127310001), + inverted.simple_location("Lightning Mail", 22, 40, location_id=127310023), Location("Below Throne", map_locations=[inverted.location(27, 45)], sections=[ - Section("Bastard sword", location_id=127310004), - Section("Life Vessel 1", location_id=127310005), - Section("Heart Vessel 1", location_id=127310006), - Section("Life Vessel 2", location_id=127310007), - Section("Heart Vessel 2", location_id=127310008), - Section("Life Vessel 3", location_id=127310009), - Section("Heart Vessel 4", location_id=127310010), - Section("Royal cloak", location_id=127310011), - ]), - inverted.simple_location("Library card", 22, 43, location_id=127310024), + Section("Bastard Sword", location_id=127310004), + Section("Life Vessel", location_id=[127310005, 127310007, 127310009]), + Section("Heart Vessel", location_id=[127310006, 127310008, 127310010]), + Section("Royal Cloak", location_id=127310011), + ]), + inverted.simple_location("Library Card", 22, 43, location_id=127310024), Location("Viewing Room", map_locations=[inverted.location(22.5, 45)], sections=[ - Section("Resist fire(Viewing room)", location_id=127310017), - Section("Resist ice(Viewing room)", location_id=127310018), - Section("Resist thunder(Viewing room)", location_id=127310019), - Section("Resist stone(Viewing room)", location_id=127310020), - Section("High potion(Viewing room)", location_id=127310021), + Section("Resist Fire", location_id=127310017), + Section("Resist Ice", location_id=127310018), + Section("Resist Thunder", location_id=127310019), + Section("Resist Stone", location_id=127310020), + Section("High Potion", location_id=127310021), ]), inverted.simple_location("Zircon", 27, 43, location_id=127310002), ]) diff --git a/items/bosses.json b/items/bosses.json index b09cdc8..8c088bc 100644 --- a/items/bosses.json +++ b/items/bosses.json @@ -36,16 +36,16 @@ "codes": "boss,scylla" }, { - "name": "Cerberos", + "name": "Cerberus", "type": "toggle", "img": "images/items/bosses_killed.png", - "codes": "boss,cerberos" + "codes": "boss,cerberus" }, { - "name": "Legion", + "name": "Granfaloon", "type": "toggle", "img": "images/items/bosses_killed.png", - "codes": "boss,legion" + "codes": "boss,granfaloon" }, { "name": "Minotaurus & Werewolf", @@ -66,10 +66,10 @@ "codes": "boss,karasuman" }, { - "name": "Beezelbub", + "name": "Beelzebub", "type": "toggle", "img": "images/items/bosses_killed.png", - "codes": "boss,beezelbub" + "codes": "boss,beelzebub" }, { "name": "The Creature", diff --git a/locations/inverted/anti_chapel.json b/locations/inverted/anti_chapel.json index 0e48f0c..be00423 100644 --- a/locations/inverted/anti_chapel.json +++ b/locations/inverted/anti_chapel.json @@ -38,10 +38,10 @@ ] }, { - "name": "Fire boomerang", + "name": "Fire Boomerang", "sections": [ { - "name": "Fire boomerang", + "name": "Fire Boomerang", "item_count": 1 } ], @@ -54,14 +54,14 @@ ] }, { - "name": "Twilight cloak", + "name": "Twilight Cloak", "access_rules": [ "formofmist,spikebreaker", "formofmist,powerofmist" ], "sections": [ { - "name": "Twilight cloak", + "name": "Twilight Cloak", "item_count": 1 } ], @@ -106,10 +106,10 @@ ] }, { - "name": "Heart Vessel(5)", + "name": "Heart Vessel (Stairs)", "sections": [ { - "name": "Heart Vessel(5)", + "name": "Heart Vessel (Stairs)", "item_count": 1 } ], @@ -122,10 +122,10 @@ ] }, { - "name": "Heart Vessel(17)", + "name": "Heart Vessel (Next to Stairs)", "sections": [ { - "name": "Heart Vessel(17)", + "name": "Heart Vessel (Next to Stairs)", "item_count": 1 } ], @@ -170,10 +170,10 @@ ] }, { - "name": "Manna prism", + "name": "Manna Prism", "sections": [ { - "name": "Manna prism", + "name": "Manna Prism", "item_count": 1 } ], @@ -186,10 +186,10 @@ ] }, { - "name": "Smart potion", + "name": "Smart Potion", "sections": [ { - "name": "Smart potion", + "name": "Smart Potion", "item_count": 1 } ], @@ -234,10 +234,10 @@ ] }, { - "name": "Bwaka knife", + "name": "Bwaka Knife", "sections": [ { - "name": "Bwaka knife", + "name": "Bwaka Knife", "item_count": 1 } ], @@ -250,10 +250,10 @@ ] }, { - "name": "Magic missile", + "name": "Magic Missile", "sections": [ { - "name": "Magic missile", + "name": "Magic Missile", "item_count": 1 } ], diff --git a/locations/inverted/black_marble_gallery.json b/locations/inverted/black_marble_gallery.json index be10ea3..5e297cd 100644 --- a/locations/inverted/black_marble_gallery.json +++ b/locations/inverted/black_marble_gallery.json @@ -6,10 +6,10 @@ ], "children": [ { - "name": "Library card", + "name": "Library Card", "sections": [ { - "name": "Library card", + "name": "Library Card", "item_count": 1 } ], @@ -25,19 +25,19 @@ "name": "Left Clock", "sections": [ { - "name": "Resist dark(Left clock)", + "name": "Resist Dark", "item_count": 1 }, { - "name": "Resist holy(Left clock)", + "name": "Resist Holy", "item_count": 1 }, { - "name": "Resist thunder(Left clock)", + "name": "Resist Thunder", "item_count": 1 }, { - "name": "Resist fire(Left clock)", + "name": "Resist Fire", "item_count": 1 } ], @@ -50,10 +50,10 @@ ] }, { - "name": "Life Vessel(Middle clock)", + "name": "Life Vessel", "sections": [ { - "name": "Life Vessel(Middle clock)", + "name": "Life Vessel", "item_count": 1 } ], @@ -66,10 +66,10 @@ ] }, { - "name": "Heart Vessel(Middle clock)", + "name": "Heart Vessel", "sections": [ { - "name": "Heart Vessel(Middle clock)", + "name": "Heart Vessel", "item_count": 1 } ], @@ -82,10 +82,10 @@ ] }, { - "name": "Heart Refresh(Inside clock)", + "name": "Heart Refresh", "sections": [ { - "name": "Heart Refresh(Inside clock)", + "name": "Heart Refresh", "item_count": 1 } ], @@ -98,10 +98,10 @@ ] }, { - "name": "Iron ball", + "name": "Iron Ball", "sections": [ { - "name": "Iron ball", + "name": "Iron Ball", "item_count": 1 } ], @@ -114,10 +114,13 @@ ] }, { - "name": "Meal ticket", + "name": "Meal Ticket", + "access_rules": [ + "jewelofopen" + ], "sections": [ { - "name": "Meal ticket", + "name": "Meal Ticket", "item_count": 1 } ], diff --git a/locations/inverted/cave.json b/locations/inverted/cave.json index 3d810c7..ff5cc24 100644 --- a/locations/inverted/cave.json +++ b/locations/inverted/cave.json @@ -12,11 +12,11 @@ ], "sections": [ { - "name": "Power of Sire(Demon)", + "name": "Power of Sire", "item_count": 1 }, { - "name": "Life apple(Demon)", + "name": "Life Apple", "item_count": 1 } ], @@ -32,7 +32,7 @@ "name": "Cave Top", "sections": [ { - "name": "Green tea(Demon)", + "name": "Green Tea", "item_count": 1 }, { @@ -52,12 +52,8 @@ "name": "Cave Middle", "sections": [ { - "name": "Shiitake 1(6)", - "item_count": 1 - }, - { - "name": "Shiitake 2(7)", - "item_count": 1 + "name": "Shiitake", + "item_count": 2 } ], "map_locations": [ @@ -69,10 +65,10 @@ ] }, { - "name": "Alucard sword", + "name": "Alucard Sword", "sections": [ { - "name": "Alucard sword", + "name": "Alucard Sword", "item_count": 1 } ], diff --git a/locations/inverted/caverns.json b/locations/inverted/caverns.json index aa34477..1cf5893 100644 --- a/locations/inverted/caverns.json +++ b/locations/inverted/caverns.json @@ -60,11 +60,11 @@ ], "sections": [ { - "name": "Life Vessel(Underwater)", + "name": "Life Vessel", "item_count": 1 }, { - "name": "Potion(Underwater)", + "name": "Potion", "item_count": 1 } ], @@ -77,7 +77,7 @@ ] }, { - "name": "Osafune katana", + "name": "Osafune Katana", "access_rules": [ "soulofbat", "gravityboots,leapstone", @@ -85,7 +85,7 @@ ], "sections": [ { - "name": "Osafune katana", + "name": "Osafune Katana", "item_count": 1 } ], @@ -114,10 +114,10 @@ ] }, { - "name": "Zircon(Vase)", + "name": "Zircon (Vase)", "sections": [ { - "name": "Zircon(Vase)", + "name": "Zircon (Vase)", "item_count": 1 } ], @@ -146,13 +146,13 @@ ] }, { - "name": "Heart Vessel(Air pocket)", + "name": "Heart Vessel (Air Pocket)", "access_rules": [ "gravityboots,holysymbol" ], "sections": [ { - "name": "Heart Vessel(Air pocket)", + "name": "Heart Vessel (Air Pocket)", "item_count": 1 } ], @@ -165,10 +165,10 @@ ] }, { - "name": "Heart Vessel(Succubus side)", + "name": "Heart Vessel (Succubus Side)", "sections": [ { - "name": "Heart Vessel(Succubus side)", + "name": "Heart Vessel (Succubus Side)", "item_count": 1 } ], @@ -184,24 +184,8 @@ "name": "Succubus Side", "sections": [ { - "name": "Meal ticket 1(Succubus side)", - "item_count": 1 - }, - { - "name": "Meal ticket 2(Succubus side)", - "item_count": 1 - }, - { - "name": "Meal ticket 3(Succubus side)", - "item_count": 1 - }, - { - "name": "Meal ticket 4(Succubus side)", - "item_count": 1 - }, - { - "name": "Meal ticket 5(Succubus side)", - "item_count": 1 + "name": "Meal Ticket", + "item_count": 5 } ], "map_locations": [ @@ -213,10 +197,10 @@ ] }, { - "name": "Zircon(Doppleganger)", + "name": "Zircon (Doppleganger)", "sections": [ { - "name": "Zircon(Doppleganger)", + "name": "Zircon (Doppleganger)", "item_count": 1 } ], @@ -229,10 +213,10 @@ ] }, { - "name": "Pot roast(Doppleganger)", + "name": "Pot Roast", "sections": [ { - "name": "Pot roast(Doppleganger)", + "name": "Pot Roast", "item_count": 1 } ], @@ -261,10 +245,10 @@ ] }, { - "name": "Manna prism", + "name": "Manna Prism", "sections": [ { - "name": "Manna prism", + "name": "Manna Prism", "item_count": 1 } ], @@ -277,33 +261,17 @@ ] }, { - "name": "Shiitake 3(Near air pocket)", - "sections": [ - { - "name": "Shiitake 3(Near air pocket)", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "inverted", - "x": 492, - "y": 312 - } - ] - }, - { - "name": "Shiitake 4(Near air pocket)", + "name": "Shiitake (Near Air Pocket)", "sections": [ { - "name": "Shiitake 4(Near air pocket)", - "item_count": 1 + "name": "Shiitake (Near Air Pocket)", + "item_count": 2 } ], "map_locations": [ { "map": "inverted", - "x": 512, + "x": 502, "y": 312 } ] @@ -329,10 +297,10 @@ ] }, { - "name": "Shiitake 2(Waterfall)", + "name": "Shiitake (Waterfall)", "sections": [ { - "name": "Shiitake 2(Waterfall)", + "name": "Shiitake (Waterfall)", "item_count": 1 } ], @@ -345,10 +313,10 @@ ] }, { - "name": "Toadstool(Waterfall)", + "name": "Toadstool", "sections": [ { - "name": "Toadstool(Waterfall)", + "name": "Toadstool", "item_count": 1 } ], @@ -361,10 +329,10 @@ ] }, { - "name": "Shiitake 1(Near entrance passage)", + "name": "Shiitake (Near Entrance Passage)", "sections": [ { - "name": "Shiitake 1(Near entrance passage)", + "name": "Shiitake (Near Entrance Passage)", "item_count": 1 } ], @@ -409,10 +377,10 @@ ] }, { - "name": "Alucard shield", + "name": "Alucard Shield", "sections": [ { - "name": "Alucard shield", + "name": "Alucard Shield", "item_count": 1 } ], diff --git a/locations/inverted/clock_tower.json b/locations/inverted/clock_tower.json index 85e81b3..18f3a83 100644 --- a/locations/inverted/clock_tower.json +++ b/locations/inverted/clock_tower.json @@ -9,11 +9,11 @@ "name": "Above Bridge", "sections": [ { - "name": "Magic missile", + "name": "Magic Missile", "item_count": 1 }, { - "name": "Karma coin", + "name": "Karma Coin", "item_count": 1 } ], @@ -29,7 +29,7 @@ "name": "Pillars", "sections": [ { - "name": "Str. potion", + "name": "Str. Potion", "item_count": 1 }, { @@ -37,7 +37,7 @@ "item_count": 1 }, { - "name": "Smart potion", + "name": "Smart Potion", "item_count": 1 } ], @@ -50,10 +50,10 @@ ] }, { - "name": "Dragon helm", + "name": "Dragon Helm", "sections": [ { - "name": "Dragon helm", + "name": "Dragon Helm", "item_count": 1 } ], @@ -69,15 +69,15 @@ "name": "Hidden Room", "sections": [ { - "name": "Diamond(Hidden room)", + "name": "Diamond", "item_count": 1 }, { - "name": "Life apple(Hidden room)", + "name": "Life Apple", "item_count": 1 }, { - "name": "Sunstone(Hidden room)", + "name": "Sunstone", "item_count": 1 } ], @@ -90,10 +90,10 @@ ] }, { - "name": "Moon rod", + "name": "Moon Rod", "sections": [ { - "name": "Moon rod", + "name": "Moon Rod", "item_count": 1 } ], @@ -157,7 +157,7 @@ "name": "Keep Approach", "sections": [ { - "name": "Bwaka knife", + "name": "Bwaka Knife", "item_count": 1 }, { @@ -181,7 +181,7 @@ "name": "Darkwing Bat", "sections": [ { - "name": "Darkwing bat kill", + "name": "Darkwing Bat kill", "hosted_item": "darkwingbat" }, { diff --git a/locations/inverted/colosseum.json b/locations/inverted/colosseum.json index 02ac8ee..717e3c8 100644 --- a/locations/inverted/colosseum.json +++ b/locations/inverted/colosseum.json @@ -6,10 +6,10 @@ ], "children": [ { - "name": "Fury plate(Hidden floor)", + "name": "Fury Plate", "sections": [ { - "name": "Fury plate(Hidden floor)", + "name": "Fury Plate", "item_count": 1 } ], @@ -38,10 +38,10 @@ ] }, { - "name": "Buffalo star", + "name": "Buffalo Star", "sections": [ { - "name": "Buffalo star", + "name": "Buffalo Star", "item_count": 1 } ], @@ -89,16 +89,12 @@ "name": "Passage", "sections": [ { - "name": "Heart Vessel(5)", - "item_count": 1 + "name": "Heart Vessel", + "item_count": 2 }, { "name": "Life Vessel", "item_count": 1 - }, - { - "name": "Heart Vessel(7)", - "item_count": 1 } ], "map_locations": [ diff --git a/locations/inverted/death_wing.json b/locations/inverted/death_wing.json index a10de4f..d6f2637 100644 --- a/locations/inverted/death_wing.json +++ b/locations/inverted/death_wing.json @@ -29,11 +29,11 @@ "item_count": 1 }, { - "name": "Sword of hador", + "name": "Sword of Hador", "item_count": 1 }, { - "name": "High potion", + "name": "High Potion", "item_count": 1 } ], @@ -49,11 +49,11 @@ "name": "Middle Shaft", "sections": [ { - "name": "Shield potion", + "name": "Shield Potion", "item_count": 1 }, { - "name": "Luck potion", + "name": "Luck Potion", "item_count": 1 } ], @@ -66,10 +66,10 @@ ] }, { - "name": "Manna prism", + "name": "Manna Prism", "sections": [ { - "name": "Manna prism", + "name": "Manna Prism", "item_count": 1 } ], @@ -114,10 +114,10 @@ ] }, { - "name": "Alucard mail", + "name": "Alucard Mail", "sections": [ { - "name": "Alucard mail", + "name": "Alucard Mail", "item_count": 1 } ], diff --git a/locations/inverted/entrance.json b/locations/inverted/entrance.json index 62dca60..93d53dd 100644 --- a/locations/inverted/entrance.json +++ b/locations/inverted/entrance.json @@ -52,7 +52,7 @@ "item_count": 1 }, { - "name": "Beryl circlet", + "name": "Beryl Circlet", "item_count": 1 } ], @@ -81,10 +81,10 @@ ] }, { - "name": "Fire boomerang", + "name": "Fire Boomerang", "sections": [ { - "name": "Fire boomerang", + "name": "Fire Boomerang", "item_count": 1 } ], @@ -117,10 +117,10 @@ ] }, { - "name": "Pot roast", + "name": "Pot Roast", "sections": [ { - "name": "Pot roast", + "name": "Pot Roast", "item_count": 1 } ], @@ -133,10 +133,10 @@ ] }, { - "name": "High potion", + "name": "High Potion", "sections": [ { - "name": "High potion", + "name": "High Potion", "item_count": 1 } ], diff --git a/locations/inverted/floating_catacombs.json b/locations/inverted/floating_catacombs.json index 6466142..f1234f5 100644 --- a/locations/inverted/floating_catacombs.json +++ b/locations/inverted/floating_catacombs.json @@ -9,11 +9,11 @@ "name": "Catacombs Entrance", "sections": [ { - "name": "Magic missile", + "name": "Magic Missile", "item_count": 1 }, { - "name": "Buffalo star", + "name": "Buffalo Star", "item_count": 1 } ], @@ -26,10 +26,10 @@ ] }, { - "name": "Necklace of j", + "name": "Necklace of J", "sections": [ { - "name": "Necklace of j", + "name": "Necklace of J", "item_count": 1 } ], @@ -61,11 +61,11 @@ "name": "After Galamoth", "sections": [ { - "name": "Heart Vessel(After Galamoth)", + "name": "Heart Vessel", "item_count": 1 }, { - "name": "Life Vessel(After Galamoth)", + "name": "Life Vessel", "item_count": 1 } ], @@ -81,7 +81,7 @@ "name": "Gas Cloud Room", "sections": [ { - "name": "Ruby circlet", + "name": "Ruby Circlet", "item_count": 1 }, { @@ -101,11 +101,11 @@ "name": "Lava Bridge", "sections": [ { - "name": "Shield potion", + "name": "Shield Potion", "item_count": 1 }, { - "name": "Attack potion", + "name": "Attack Potion", "item_count": 1 } ], @@ -121,11 +121,11 @@ "name": "Crypt", "sections": [ { - "name": "Life Vessel(9)", + "name": "Life Vessel", "item_count": 1 }, { - "name": "Heart Vessel(10)", + "name": "Heart Vessel)", "item_count": 1 } ], @@ -150,20 +150,16 @@ "name": "Spike Hallway", "sections": [ { - "name": "Resist thunder", + "name": "Resist Thunder", "item_count": 1 }, { - "name": "Resist fire", + "name": "Resist Fire", "item_count": 1 }, { - "name": "Karma coin(4)(Spike breaker)", - "item_count": 1 - }, - { - "name": "Karma coin(5)(Spike breaker)", - "item_count": 1 + "name": "Karma Coin", + "item_count": 2 } ], "map_locations": [ @@ -175,10 +171,10 @@ ] }, { - "name": "Red bean bun", + "name": "Red Bean Bun", "sections": [ { - "name": "Red bean bun", + "name": "Red Bean Bun", "item_count": 1 } ], @@ -198,7 +194,7 @@ "item_count": 1 }, { - "name": "Library card", + "name": "Library Card", "item_count": 1 } ], diff --git a/locations/inverted/keep.json b/locations/inverted/keep.json index df0dc09..7b6365f 100644 --- a/locations/inverted/keep.json +++ b/locations/inverted/keep.json @@ -9,7 +9,7 @@ "name": "Keep Top", "sections": [ { - "name": "Sword of dawn", + "name": "Sword of Dawn", "item_count": 1 }, { @@ -26,10 +26,10 @@ ] }, { - "name": "Iron ball(Above Richter)", + "name": "Iron Ball", "sections": [ { - "name": "Iron ball(Above Richter)", + "name": "Iron Ball", "item_count": 1 } ], @@ -42,10 +42,10 @@ ] }, { - "name": "Lightning mail", + "name": "Lightning Mail", "sections": [ { - "name": "Lightning mail", + "name": "Lightning Mail", "item_count": 1 } ], @@ -61,35 +61,19 @@ "name": "Below Throne", "sections": [ { - "name": "Bastard sword", + "name": "Bastard Sword", "item_count": 1 }, { - "name": "Life Vessel 1", - "item_count": 1 - }, - { - "name": "Heart Vessel 1", - "item_count": 1 - }, - { - "name": "Life Vessel 2", - "item_count": 1 + "name": "Life Vessel", + "item_count": 3 }, { - "name": "Heart Vessel 2", - "item_count": 1 - }, - { - "name": "Life Vessel 3", - "item_count": 1 - }, - { - "name": "Heart Vessel 4", - "item_count": 1 + "name": "Heart Vessel", + "item_count": 3 }, { - "name": "Royal cloak", + "name": "Royal Cloak", "item_count": 1 } ], @@ -102,10 +86,10 @@ ] }, { - "name": "Library card", + "name": "Library Card", "sections": [ { - "name": "Library card", + "name": "Library Card", "item_count": 1 } ], @@ -121,23 +105,23 @@ "name": "Viewing Room", "sections": [ { - "name": "Resist fire(Viewing room)", + "name": "Resist Fire", "item_count": 1 }, { - "name": "Resist ice(Viewing room)", + "name": "Resist Ice", "item_count": 1 }, { - "name": "Resist thunder(Viewing room)", + "name": "Resist Thunder", "item_count": 1 }, { - "name": "Resist stone(Viewing room)", + "name": "Resist Stone", "item_count": 1 }, { - "name": "High potion(Viewing room)", + "name": "High Potion", "item_count": 1 } ], diff --git a/locations/inverted/library.json b/locations/inverted/library.json index 67983e1..3d088ae 100644 --- a/locations/inverted/library.json +++ b/locations/inverted/library.json @@ -6,10 +6,10 @@ ], "children": [ { - "name": "Neutron bomb", + "name": "Neutron Bomb", "sections": [ { - "name": "Neutron bomb", + "name": "Neutron Bomb", "item_count": 1 } ], @@ -41,15 +41,15 @@ "name": "Side Room", "sections": [ { - "name": "Resist fire", + "name": "Resist Fire", "item_count": 1 }, { - "name": "Resist ice", + "name": "Resist Ice", "item_count": 1 }, { - "name": "Resist stone", + "name": "Resist Stone", "item_count": 1 } ], @@ -92,7 +92,7 @@ "item_count": 1 }, { - "name": "Library card", + "name": "Library Card", "item_count": 1 } ], diff --git a/locations/inverted/necromancy_lab.json b/locations/inverted/necromancy_lab.json index 3080861..c21d50d 100644 --- a/locations/inverted/necromancy_lab.json +++ b/locations/inverted/necromancy_lab.json @@ -6,10 +6,10 @@ ], "children": [ { - "name": "Resist dark", + "name": "Resist Dark", "sections": [ { - "name": "Resist dark", + "name": "Resist Dark", "item_count": 1 } ], @@ -70,10 +70,10 @@ ] }, { - "name": "Goddess shield", + "name": "Goddess Shield", "sections": [ { - "name": "Goddess shield", + "name": "Goddess Shield", "item_count": 1 } ], @@ -86,10 +86,10 @@ ] }, { - "name": "Manna prism", + "name": "Manna Prism", "sections": [ { - "name": "Manna prism", + "name": "Manna Prism", "item_count": 1 } ], @@ -118,10 +118,10 @@ ] }, { - "name": "High potion", + "name": "High Potion", "sections": [ { - "name": "High potion", + "name": "High Potion", "item_count": 1 } ], @@ -150,11 +150,11 @@ ] }, { - "name": "Beezelbub", + "name": "Beelzebub", "sections": [ { - "name": "Beezelbub kill", - "hosted_item": "beezelbub" + "name": "Beelzebub kill", + "hosted_item": "beelzebub" } ], "map_locations": [ diff --git a/locations/inverted/outer_wall.json b/locations/inverted/outer_wall.json index 1320eb8..476db2f 100644 --- a/locations/inverted/outer_wall.json +++ b/locations/inverted/outer_wall.json @@ -45,10 +45,10 @@ ] }, { - "name": "Luck potion", + "name": "Luck Potion", "sections": [ { - "name": "Luck potion", + "name": "Luck Potion", "item_count": 1 } ], @@ -61,10 +61,10 @@ ] }, { - "name": "Shield potion", + "name": "Shield Potion", "sections": [ { - "name": "Shield potion", + "name": "Shield Potion", "item_count": 1 } ], @@ -77,10 +77,10 @@ ] }, { - "name": "High potion", + "name": "High Potion", "sections": [ { - "name": "High potion", + "name": "High Potion", "item_count": 1 } ], @@ -109,10 +109,10 @@ ] }, { - "name": "Dim Sum set", + "name": "Dim Sum Set", "sections": [ { - "name": "Dim Sum set", + "name": "Dim Sum Set", "item_count": 1 } ], diff --git a/locations/normal/alchemy_lab.json b/locations/normal/alchemy_lab.json index 4a2dc57..b3c8abe 100644 --- a/locations/normal/alchemy_lab.json +++ b/locations/normal/alchemy_lab.json @@ -3,10 +3,10 @@ "name": "Alchemy Laboratory", "children": [ { - "name": "Hide cuirass", + "name": "Hide Cuirass", "sections": [ { - "name": "Hide cuirass", + "name": "Hide Cuirass", "item_count": 1 } ], @@ -35,10 +35,10 @@ ] }, { - "name": "Cloth cape", + "name": "Cloth Cape", "sections": [ { - "name": "Cloth cape", + "name": "Cloth Cape", "item_count": 1 } ], @@ -83,10 +83,10 @@ ] }, { - "name": "Resist thunder", + "name": "Resist Thunder", "sections": [ { - "name": "Resist thunder", + "name": "Resist Thunder", "item_count": 1 } ], @@ -99,10 +99,10 @@ ] }, { - "name": "Leather shield", + "name": "Leather Shield", "sections": [ { - "name": "Leather shield", + "name": "Leather Shield", "item_count": 1 } ], @@ -147,10 +147,10 @@ ] }, { - "name": "Slogra and Gaibon", + "name": "Slogra & Gaibon", "sections": [ { - "name": "Slogra and Gaibon kill", + "name": "Slogra & Gaibon kill", "hosted_item": "slogragaibon" } ], diff --git a/locations/normal/catacombs.json b/locations/normal/catacombs.json index 090a15e..a86fca5 100644 --- a/locations/normal/catacombs.json +++ b/locations/normal/catacombs.json @@ -9,7 +9,7 @@ "name": "Catacombs Entrance", "sections": [ { - "name": "Cat-eye circl.", + "name": "Cat-Eye Circlet", "item_count": 1 }, { @@ -45,10 +45,10 @@ ] }, { - "name": "Walk armor", + "name": "Walk Armor", "sections": [ { - "name": "Walk armor", + "name": "Walk Armor", "item_count": 1 } ], @@ -83,7 +83,7 @@ ], "sections": [ { - "name": "Heart Vessel(Ballroom mask)", + "name": "Heart Vessel", "item_count": 1 }, { @@ -103,11 +103,11 @@ "name": "Crypt", "sections": [ { - "name": "Life Vessel(Crypt)", + "name": "Life Vessel", "item_count": 1 }, { - "name": "Heart Vessel(Crypt)", + "name": "Heart Vessel", "item_count": 1 } ], @@ -123,20 +123,8 @@ "name": "Sarcophagus", "sections": [ { - "name": "Monster vial 3 1(Sarcophagus)", - "item_count": 1 - }, - { - "name": "Monster vial 3 2(Sarcophagus)", - "item_count": 1 - }, - { - "name": "Monster vial 3 3(Sarcophagus)", - "item_count": 1 - }, - { - "name": "Monster vial 3 4(Sarcophagus)", - "item_count": 1 + "name": "Monster Vial 3", + "item_count": 4 } ], "map_locations": [ @@ -148,11 +136,11 @@ ] }, { - "name": "Legion", + "name": "Granfaloon", "sections": [ { - "name": "Legion kill", - "hosted_item": "legion" + "name": "Granfaloon kill", + "hosted_item": "granfaloon" } ], "map_locations": [ @@ -174,20 +162,12 @@ "name": "Spike Hallway", "sections": [ { - "name": "Cross shuriken 1(Spike breaker)", - "item_count": 1 - }, - { - "name": "Cross shuriken 2(Spike breaker)", - "item_count": 1 + "name": "Cross Shuriken", + "item_count": 2 }, { - "name": "Karma coin 1(Spike breaker)", - "item_count": 1 - }, - { - "name": "Karma coin 2(Spike breaker)", - "item_count": 1 + "name": "Karma Coin", + "item_count": 2 } ], "map_locations": [ @@ -199,10 +179,10 @@ ] }, { - "name": "Pork bun", + "name": "Pork Bun", "sections": [ { - "name": "Pork bun", + "name": "Pork Bun", "item_count": 1 } ], @@ -218,11 +198,11 @@ "name": "Spike Breaker Room", "sections": [ { - "name": "Library card(Spike breaker)", + "name": "Library Card", "item_count": 1 }, { - "name": "Spike breaker", + "name": "Spike Breaker", "item_count": 1 } ], diff --git a/locations/normal/caverns.json b/locations/normal/caverns.json index 274bd9a..d3f8a32 100644 --- a/locations/normal/caverns.json +++ b/locations/normal/caverns.json @@ -29,10 +29,10 @@ ] }, { - "name": "Heart Vessel(0)", + "name": "Heart Vessel", "sections": [ { - "name": "Heart Vessel(0)", + "name": "Heart Vessel", "item_count": 1 } ], @@ -45,10 +45,10 @@ ] }, { - "name": "Life Vessel(1)", + "name": "Life Vessel", "sections": [ { - "name": "Life Vessel(1)", + "name": "Life Vessel", "item_count": 1 } ], @@ -61,10 +61,10 @@ ] }, { - "name": "Bandanna", + "name": "Bandana", "sections": [ { - "name": "Bandanna", + "name": "Bandana", "item_count": 1 } ], @@ -77,10 +77,10 @@ ] }, { - "name": "Shiitake(12)", + "name": "Shiitake (Shaft)", "sections": [ { - "name": "Shiitake(12)", + "name": "Shiitake (Shaft)", "item_count": 1 } ], @@ -93,37 +93,37 @@ ] }, { - "name": "Caverns Entrance", + "name": "Shiitake (Cavern)", "sections": [ { - "name": "Toadstool(26)", - "item_count": 1 - }, - { - "name": "Nunchaku", + "name": "Shiitake (Cavern)", "item_count": 1 } ], "map_locations": [ { "map": "normal", - "x": 752, + "x": 732, "y": 672 } ] }, { - "name": "Shiitake(27)", + "name": "Caverns Entrance", "sections": [ { - "name": "Shiitake(27)", + "name": "Toadstool", + "item_count": 1 + }, + { + "name": "Nunchaku", "item_count": 1 } ], "map_locations": [ { "map": "normal", - "x": 732, + "x": 752, "y": 672 } ] @@ -135,11 +135,11 @@ ], "sections": [ { - "name": "Antivenom(Underwater)", + "name": "Antivenom", "item_count": 1 }, { - "name": "Life Vessel(Underwater)", + "name": "Life Vessel", "item_count": 1 } ], @@ -195,11 +195,11 @@ ], "sections": [ { - "name": "Life Vessel(Bellow bridge)", + "name": "Life Vessel", "item_count": 1 }, { - "name": "Heart Vessel(Bellow bridge)", + "name": "Heart Vessel", "item_count": 1 } ], @@ -237,20 +237,8 @@ "name": "Succubus Approach", "sections": [ { - "name": "Meal ticket 1(Succubus)", - "item_count": 1 - }, - { - "name": "Meal ticket 2(Succubus)", - "item_count": 1 - }, - { - "name": "Meal ticket 3(Succubus)", - "item_count": 1 - }, - { - "name": "Meal ticket 4(Succubus)", - "item_count": 1 + "name": "Meal Ticket", + "item_count": 4 }, { "name": "Moonstone", @@ -273,7 +261,7 @@ "item_count": 1 }, { - "name": "Succubus kill", + "name": "Succubus Kill", "hosted_item": "succubus" } ], @@ -288,10 +276,10 @@ ] }, { - "name": "Crystal cloak", + "name": "Crystal Cloak", "sections": [ { - "name": "Crystal cloak", + "name": "Crystal Cloak", "item_count": 1 } ], @@ -320,10 +308,10 @@ ] }, { - "name": "Resist ice", + "name": "Resist Ice", "sections": [ { - "name": "Resist ice", + "name": "Resist Ice", "item_count": 1 } ], @@ -336,10 +324,10 @@ ] }, { - "name": "Pot roast", + "name": "Pot Roast", "sections": [ { - "name": "Pot roast", + "name": "Pot Roast", "item_count": 1 } ], @@ -368,10 +356,10 @@ ] }, { - "name": "Knuckle duster(Holy)", + "name": "Knuckle Duster", "sections": [ { - "name": "Knuckle duster(Holy)", + "name": "Knuckle Duster", "item_count": 1 } ], @@ -384,10 +372,10 @@ ] }, { - "name": "Life Vessel(Holy)", + "name": "Life Vessel (Holy Symbol)", "sections": [ { - "name": "Life Vessel(Holy)", + "name": "Life Vessel (Holy Symbol)", "item_count": 1 } ], @@ -400,14 +388,14 @@ ] }, { - "name": "Onyx(Holy)", + "name": "Onyx", "access_rules": [ "mermanstatue", "$canJump" ], "sections": [ { - "name": "Onyx(Holy)", + "name": "Onyx", "item_count": 1 } ], @@ -420,13 +408,13 @@ ] }, { - "name": "Elixir(Holy)", + "name": "Elixir", "access_rules": [ "mermanstatue" ], "sections": [ { - "name": "Elixir(Holy)", + "name": "Elixir", "item_count": 1 } ], @@ -458,13 +446,13 @@ ] }, { - "name": "Secret boots", + "name": "Secret Boots", "access_rules": [ "$canJump" ], "sections": [ { - "name": "Secret boots", + "name": "Secret Boots", "item_count": 1 } ], @@ -477,13 +465,13 @@ ] }, { - "name": "Shiitake(Waterfall)", + "name": "Shiitake (Waterfall)", "access_rules": [ "$canJump" ], "sections": [ { - "name": "Shiitake(Waterfall)", + "name": "Shiitake (Waterfall)", "item_count": 1 } ], @@ -505,13 +493,13 @@ ], "children": [ { - "name": "Toadstool(Waterfall)", + "name": "Toadstool (Waterfall)", "access_rules": [ "$canJump" ], "sections": [ { - "name": "Toadstool(Waterfall)", + "name": "Toadstool (Waterfall)", "item_count": 1 } ], @@ -524,10 +512,10 @@ ] }, { - "name": "Life Vessel(Behind waterfall)", + "name": "Life Vessel (Behind Waterfall)", "sections": [ { - "name": "Life Vessel(Behind waterfall)", + "name": "Life Vessel (Behind Waterfall)", "item_count": 1 } ], @@ -540,10 +528,10 @@ ] }, { - "name": "Shiitake(Near entrance passage)", + "name": "Shiitake (Near Entrance Passage)", "sections": [ { - "name": "Shiitake(Near entrance passage)", + "name": "Shiitake (Near Entrance Passage)", "item_count": 1 } ], @@ -555,6 +543,22 @@ } ] }, + { + "name": "Life Vessel (Entrance Passage)", + "sections": [ + { + "name": "Life Vessel (Entrance Passage)", + "item_count": 1 + } + ], + "map_locations": [ + { + "map": "normal", + "x": 272, + "y": 752 + } + ] + }, { "name": "Merman Statue", "sections": [ diff --git a/locations/normal/chapel.json b/locations/normal/chapel.json index 57ceb64..58fe9f3 100644 --- a/locations/normal/chapel.json +++ b/locations/normal/chapel.json @@ -13,11 +13,11 @@ ], "sections": [ { - "name": "Ankh of life(Stairs)", + "name": "Ankh of Life", "item_count": 1 }, { - "name": "TNT(Stairs)", + "name": "TNT", "item_count": 1 } ], @@ -49,13 +49,13 @@ ] }, { - "name": "Silver ring", + "name": "Silver Ring", "access_rules": [ "jewelofopen,formofmist,spikebreaker" ], "sections": [ { - "name": "Silver ring", + "name": "Silver Ring", "item_count": 1 } ], @@ -68,10 +68,10 @@ ] }, { - "name": "Aquamarine(Stairs)", + "name": "Aquamarine", "sections": [ { - "name": "Aquamarine(Stairs)", + "name": "Aquamarine", "item_count": 1 } ], @@ -90,11 +90,11 @@ ], "sections": [ { - "name": "Mystic pendant", + "name": "Mystic Pendant", "item_count": 1 }, { - "name": "Magic missile(Stairs)", + "name": "Magic Missile", "item_count": 1 } ], @@ -107,13 +107,13 @@ ] }, { - "name": "Shuriken(Stairs)", + "name": "Shuriken", "access_rules": [ "$canJump" ], "sections": [ { - "name": "Shuriken(Stairs)", + "name": "Shuriken", "item_count": 1 } ], @@ -126,13 +126,13 @@ ] }, { - "name": "Boomerang(Stairs)", + "name": "Boomerang", "access_rules": [ "$canJump" ], "sections": [ { - "name": "Boomerang(Stairs)", + "name": "Boomerang", "item_count": 1 } ], @@ -161,10 +161,10 @@ ] }, { - "name": "Silver plate", + "name": "Silver Plate", "sections": [ { - "name": "Silver plate", + "name": "Silver Plate", "item_count": 1 } ], @@ -177,10 +177,10 @@ ] }, { - "name": "Str. potion(Bell)", + "name": "Str. Potion", "sections": [ { - "name": "Str. potion(Bell)", + "name": "Str. Potion", "item_count": 1 } ], @@ -193,10 +193,10 @@ ] }, { - "name": "Life Vessel(Bell)", + "name": "Life Vessel", "sections": [ { - "name": "Life Vessel(Bell)", + "name": "Life Vessel", "item_count": 1 } ], @@ -256,6 +256,22 @@ } ] }, + { + "name": "Knight Shield", + "sections": [ + { + "name": "Knight Shield", + "item_count": 1 + } + ], + "map_locations": [ + { + "map": "normal", + "x": 272, + "y": 372 + } + ] + }, { "name": "Hippogryph", "sections": [ diff --git a/locations/normal/clock_tower.json b/locations/normal/clock_tower.json index 71b03af..bfc96da 100644 --- a/locations/normal/clock_tower.json +++ b/locations/normal/clock_tower.json @@ -9,7 +9,7 @@ "name": "Below Bridge", "sections": [ { - "name": "Magic missile", + "name": "Magic Missile", "item_count": 1 }, { @@ -36,11 +36,11 @@ "item_count": 1 }, { - "name": "Shaman shield", + "name": "Shaman Shield", "item_count": 1 }, { - "name": "Ice mail", + "name": "Ice Mail", "item_count": 1 } ], @@ -56,15 +56,15 @@ "name": "Hidden Room", "sections": [ { - "name": "Star flail", + "name": "Star Flail", "item_count": 1 }, { - "name": "Gold plate", + "name": "Gold Plate", "item_count": 1 }, { - "name": "Steel helm", + "name": "Steel Helm", "item_count": 1 } ], @@ -77,10 +77,10 @@ ] }, { - "name": "Healing mail", + "name": "Healing Mail", "sections": [ { - "name": "Healing mail", + "name": "Healing Mail", "item_count": 1 } ], @@ -93,10 +93,10 @@ ] }, { - "name": "Life Vessel(Gear train)", + "name": "Life Vessel", "sections": [ { - "name": "Life Vessel(Gear train)", + "name": "Life Vessel", "item_count": 1 } ], @@ -109,10 +109,10 @@ ] }, { - "name": "Heart Vessel(Gear train)", + "name": "Heart Vessel", "sections": [ { - "name": "Heart Vessel(Gear train)", + "name": "Heart Vessel", "item_count": 1 } ], @@ -125,10 +125,10 @@ ] }, { - "name": "Pot roast", + "name": "Pot Roast", "sections": [ { - "name": "Pot roast", + "name": "Pot Roast", "item_count": 1 } ], @@ -144,7 +144,7 @@ "name": "Keep Approach", "sections": [ { - "name": "Bwaka knife", + "name": "Bwaka Knife", "item_count": 1 }, { diff --git a/locations/normal/colosseum.json b/locations/normal/colosseum.json index 2f7c3c3..5e269d6 100644 --- a/locations/normal/colosseum.json +++ b/locations/normal/colosseum.json @@ -23,10 +23,10 @@ ] }, { - "name": "Shield rod", + "name": "Shield Rod", "sections": [ { - "name": "Shield rod", + "name": "Shield Rod", "item_count": 1 } ], @@ -39,10 +39,10 @@ ] }, { - "name": "Blood cloak", + "name": "Blood Cloak", "sections": [ { - "name": "Blood cloak", + "name": "Blood Cloak", "item_count": 1 } ], @@ -55,26 +55,10 @@ ] }, { - "name": "Knight shield(Chapel passage)", + "name": "Library Card", "sections": [ { - "name": "Knight shield(Chapel passage)", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "normal", - "x": 272, - "y": 372 - } - ] - }, - { - "name": "Library card", - "sections": [ - { - "name": "Library card", + "name": "Library Card", "item_count": 1 } ], @@ -87,10 +71,10 @@ ] }, { - "name": "Green tea", + "name": "Green Tea", "sections": [ { - "name": "Green tea", + "name": "Green Tea", "item_count": 1 } ], @@ -103,13 +87,13 @@ ] }, { - "name": "Holy sword(Hidden attic)", + "name": "Holy Sword", "access_rules": [ "$canHighJump" ], "sections": [ { - "name": "Holy sword(Hidden attic)", + "name": "Holy Sword", "item_count": 1 } ], diff --git a/locations/normal/entrance.json b/locations/normal/entrance.json index 7e6f316..efe21c5 100644 --- a/locations/normal/entrance.json +++ b/locations/normal/entrance.json @@ -19,13 +19,13 @@ ] }, { - "name": "Life Vessel (Bellow shield potion)", + "name": "Life Vessel (Below Shield Potion)", "access_rules": [ "$canJump" ], "sections": [ { - "name": "Life Vessel (Bellow shield potion)", + "name": "Life Vessel (Below Shield Potion)", "item_count": 1 } ], @@ -44,7 +44,7 @@ ], "sections": [ { - "name": "Life Apple (Hidden room)", + "name": "Life Apple", "item_count": 1 }, { @@ -95,25 +95,6 @@ } ] }, - { - "name": "Life Vessel (UC exit)", - "access_rules": [ - "@Underground Caverns/Lower Caverns" - ], - "sections": [ - { - "name": "Life Vessel (UC exit)", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "normal", - "x": 272, - "y": 752 - } - ] - }, { "name": "Heart Vessel (Teleport exit)", "sections": [ @@ -137,7 +118,7 @@ ], "sections": [ { - "name": "Life Vessel (Above entry)", + "name": "Life Vessel", "item_count": 1 }, { diff --git a/locations/normal/keep.json b/locations/normal/keep.json index a6cc191..fb36c68 100644 --- a/locations/normal/keep.json +++ b/locations/normal/keep.json @@ -14,7 +14,7 @@ "item_count": 1 }, { - "name": "Turkey(Behind wall)", + "name": "Turkey", "item_count": 1 }, { @@ -43,7 +43,7 @@ ], "sections": [ { - "name": "Fire mail(Behind wall)", + "name": "Fire Mail", "item_count": 1 }, { @@ -92,13 +92,13 @@ ] }, { - "name": "Heart Vessel(Before Richter)", + "name": "Heart Vessel", "access_rules": [ "$canFly" ], "sections": [ { - "name": "Heart Vessel(Before Richter)", + "name": "Heart Vessel", "item_count": 1 } ], @@ -117,35 +117,35 @@ ], "sections": [ { - "name": "Sirloin(Above Richter)", + "name": "Sirloin", "item_count": 1 }, { - "name": "Turkey(Above Richter)", + "name": "Turkey", "item_count": 1 }, { - "name": "Pot roast(Above Richter)", + "name": "Pot Roast", "item_count": 1 }, { - "name": "Frankfurter(Above Richter)", + "name": "Frankfurter", "item_count": 1 }, { - "name": "Resist stone(Above Richter)", + "name": "Resist Stone", "item_count": 1 }, { - "name": "Resist dark(Above Richter)", + "name": "Resist Dark", "item_count": 1 }, { - "name": "Resist holy(Above Richter)", + "name": "Resist Holy", "item_count": 1 }, { - "name": "Platinum mail(Above Richter)", + "name": "Platinum Mail", "item_count": 1 } ], @@ -164,20 +164,12 @@ ], "sections": [ { - "name": "Life Vessel 1(Viewing room)", - "item_count": 1 - }, - { - "name": "Life Vessel 2(Viewing room)", - "item_count": 1 + "name": "Life Vessel", + "item_count": 2 }, { - "name": "Heart Vessel 1(Viewing room)", - "item_count": 1 - }, - { - "name": "Heart Vessel 2(Viewing room)", - "item_count": 1 + "name": "Heart Vessel", + "item_count": 2 }, { "name": "Ghost Card", diff --git a/locations/normal/library.json b/locations/normal/library.json index b997e79..0104939 100644 --- a/locations/normal/library.json +++ b/locations/normal/library.json @@ -3,10 +3,10 @@ "name": "Long Library", "children": [ { - "name": "Bronze cuirass", + "name": "Bronze Cuirass", "sections": [ { - "name": "Bronze cuirass", + "name": "Bronze Cuirass", "item_count": 1 } ], @@ -87,10 +87,10 @@ ], "children": [ { - "name": "Stone mask", + "name": "Stone Mask", "sections": [ { - "name": "Stone mask", + "name": "Stone Mask", "item_count": 1 } ], @@ -106,11 +106,11 @@ "name": "Behind Bookcase", "sections": [ { - "name": "Holy rod", + "name": "Holy Rod", "item_count": 1 }, { - "name": "Topaz circlet", + "name": "Topaz Circlet", "item_count": 1 } ], diff --git a/locations/normal/marble_gallery.json b/locations/normal/marble_gallery.json index 3f86043..cda114d 100644 --- a/locations/normal/marble_gallery.json +++ b/locations/normal/marble_gallery.json @@ -3,14 +3,14 @@ "name": "Marble Gallery", "children": [ { - "name": "Life Vessel(Left clock)", + "name": "Life Vessel (Left Clock)", "access_rules": [ "$canJump", "opened_are,jewelofopen" ], "sections": [ { - "name": "Life Vessel(Left clock)", + "name": "Life Vessel (Left Clock)", "item_count": 1 } ], @@ -29,7 +29,7 @@ ], "sections": [ { - "name": "Heart Vessel(Right clock)", + "name": "Heart Vessel", "item_count": 1 }, { @@ -60,15 +60,15 @@ ], "sections": [ { - "name": "Life apple(Middle clock)", + "name": "Life apple", "item_count": 1 }, { - "name": "Hammer(Middle clock)", + "name": "Hammer", "item_count": 1 }, { - "name": "Potion(Middle clock)", + "name": "Potion", "item_count": 1 } ], @@ -87,11 +87,11 @@ ], "sections": [ { - "name": "Life Vessel(Inside)", + "name": "Life Vessel", "item_count": 1 }, { - "name": "Heart Vessel(Inside)", + "name": "Heart Vessel", "item_count": 1 } ], @@ -110,11 +110,11 @@ ], "sections": [ { - "name": "Library card(Jewel)", + "name": "Library Card", "item_count": 1 }, { - "name": "Attack potion(Jewel)", + "name": "Attack Potion", "item_count": 1 } ], @@ -146,13 +146,13 @@ ] }, { - "name": "Str. potion", + "name": "Str. Potion", "access_rules": [ "$canHighJump" ], "sections": [ { - "name": "Str. potion", + "name": "Str. Potion", "item_count": 1 } ], @@ -165,13 +165,13 @@ ] }, { - "name": "Holy glasses", + "name": "Holy Glasses", "access_rules": [ "silverring,goldring" ], "sections": [ { - "name": "Holy glasses", + "name": "Holy Glasses", "item_count": 1 } ], diff --git a/locations/normal/mine.json b/locations/normal/mine.json index c12ad41..224b79e 100644 --- a/locations/normal/mine.json +++ b/locations/normal/mine.json @@ -16,28 +16,16 @@ "name": "Demon Button Room", "sections": [ { - "name": "Power of sire(Demon)", + "name": "Power of Sire", "item_count": 1 }, { - "name": "Barley tea(Demon)", + "name": "Barley Tea", "item_count": 1 }, { - "name": "Peanuts 1(Demon)", - "item_count": 1 - }, - { - "name": "Peanuts 2(Demon)", - "item_count": 1 - }, - { - "name": "Peanuts 3(Demon)", - "item_count": 1 - }, - { - "name": "Peanuts 4(Demon)", - "item_count": 1 + "name": "Peanuts", + "item_count": 4 } ], "map_locations": [ @@ -52,11 +40,11 @@ "name": "Demon Button Shaft", "sections": [ { - "name": "Ring of ares", + "name": "Ring of Ares", "item_count": 1 }, { - "name": "Turkey(Demon)", + "name": "Turkey", "item_count": 1 } ], @@ -74,11 +62,11 @@ "name": "Mine Shaft Bottom", "sections": [ { - "name": "Karma coin", + "name": "Karma Coin", "item_count": 1 }, { - "name": "Combat knife", + "name": "Combat Knife", "item_count": 1 } ], @@ -94,12 +82,8 @@ "name": "Mine Shaft Middle", "sections": [ { - "name": "Shiitake 1", - "item_count": 1 - }, - { - "name": "Shiitake 2", - "item_count": 1 + "name": "Shiitake", + "item_count": 2 } ], "map_locations": [ @@ -111,11 +95,11 @@ ] }, { - "name": "Cerberos", + "name": "Cerberus", "sections": [ { - "name": "Cerberos kill", - "hosted_item": "cerberos" + "name": "Cerberus kill", + "hosted_item": "cerberus" } ], "map_locations": [ diff --git a/locations/normal/olrox.json b/locations/normal/olrox.json index 93b6c2d..41dc17c 100644 --- a/locations/normal/olrox.json +++ b/locations/normal/olrox.json @@ -40,13 +40,13 @@ ] }, { - "name": "Manna prism", + "name": "Manna Prism", "access_rules": [ "$canFly" ], "sections": [ { - "name": "Manna prism", + "name": "Manna Prism", "item_count": 1 } ], @@ -59,13 +59,13 @@ ] }, { - "name": "Resist fire", + "name": "Resist Fire", "access_rules": [ "$canFly" ], "sections": [ { - "name": "Resist fire", + "name": "Resist Fire", "item_count": 1 } ], @@ -78,13 +78,13 @@ ] }, { - "name": "Luck potion", + "name": "Luck Potion", "access_rules": [ "$canFly" ], "sections": [ { - "name": "Luck potion", + "name": "Luck Potion", "item_count": 1 } ], @@ -141,13 +141,13 @@ ] }, { - "name": "Iron ball", + "name": "Iron Ball", "access_rules": [ "$canFly" ], "sections": [ { - "name": "Iron ball", + "name": "Iron Ball", "item_count": 1 } ], @@ -181,7 +181,9 @@ { "name": "Echo of Bat", "access_rules": [ - "$canFly" + "$canFly,soulofbat", + "$canFly,soulofwolf", + "$canFly,formofmist" ], "sections": [ { @@ -219,7 +221,9 @@ { "name": "Olrox", "access_rules": [ - "$canFly" + "$canFly,soulofbat", + "$canFly,soulofwolf", + "$canFly,formofmist" ], "sections": [ { diff --git a/locations/normal/outer_wall.json b/locations/normal/outer_wall.json index ad888e0..11c60ff 100644 --- a/locations/normal/outer_wall.json +++ b/locations/normal/outer_wall.json @@ -3,14 +3,14 @@ "name": "Outer Wall", "children": [ { - "name": "Secret Elevator", + "name": "Behind Grate", "sections": [ { - "name": "Jewel knuckles", + "name": "Jewel Knuckles", "item_count": 1 }, { - "name": "Mirror cuirass", + "name": "Mirror Cuirass", "item_count": 1 } ], diff --git a/scripts/autotracking/location_mapping.lua b/scripts/autotracking/location_mapping.lua index e9d5add..bc01cf2 100644 --- a/scripts/autotracking/location_mapping.lua +++ b/scripts/autotracking/location_mapping.lua @@ -3,78 +3,77 @@ -- Main locations mapping. LOCATIONS_MAPPING = { -- Abandoned Mine - [127040000] = "@Abandoned Mine/Behind Demon Button/Demon Button Room/Power of sire(Demon)", - [127040001] = "@Abandoned Mine/Mine Shaft Bottom/Karma coin", - [127040004] = "@Abandoned Mine/Behind Demon Button/Demon Button Shaft/Ring of ares", - [127040005] = "@Abandoned Mine/Mine Shaft Bottom/Combat knife", - [127040006] = "@Abandoned Mine/Mine Shaft Middle/Shiitake 1", - [127040007] = "@Abandoned Mine/Mine Shaft Middle/Shiitake 2", - [127040008] = "@Abandoned Mine/Behind Demon Button/Demon Button Room/Barley tea(Demon)", - [127040009] = "@Abandoned Mine/Behind Demon Button/Demon Button Room/Peanuts 1(Demon)", - [127040010] = "@Abandoned Mine/Behind Demon Button/Demon Button Room/Peanuts 2(Demon)", - [127040011] = "@Abandoned Mine/Behind Demon Button/Demon Button Room/Peanuts 3(Demon)", - [127040012] = "@Abandoned Mine/Behind Demon Button/Demon Button Room/Peanuts 4(Demon)", - [127043040] = "@Abandoned Mine/Behind Demon Button/Demon Button Shaft/Turkey(Demon)", - [127043041] = "@Abandoned Mine/Cerberos/Cerberos kill", + [127040000] = "@Abandoned Mine/Behind Demon Button/Demon Button Room/Power of Sire", + [127040001] = "@Abandoned Mine/Mine Shaft Bottom/Karma Coin", + [127040004] = "@Abandoned Mine/Behind Demon Button/Demon Button Shaft/Ring of Ares", + [127040005] = "@Abandoned Mine/Mine Shaft Bottom/Combat Knife", + [127040006] = "@Abandoned Mine/Mine Shaft Middle/Shiitake", + [127040007] = "@Abandoned Mine/Mine Shaft Middle/Shiitake", + [127040008] = "@Abandoned Mine/Behind Demon Button/Demon Button Room/Barley Tea", + [127040009] = "@Abandoned Mine/Behind Demon Button/Demon Button Room/Peanuts", + [127040010] = "@Abandoned Mine/Behind Demon Button/Demon Button Room/Peanuts", + [127040011] = "@Abandoned Mine/Behind Demon Button/Demon Button Room/Peanuts", + [127040012] = "@Abandoned Mine/Behind Demon Button/Demon Button Room/Peanuts", + [127043040] = "@Abandoned Mine/Behind Demon Button/Demon Button Shaft/Turkey", + [127043041] = "@Abandoned Mine/Cerberus/Cerberus kill", [127043042] = "@Abandoned Mine/Demon Card/Demon Card", -- Alchemy Laboratory - [127140000] = "@Alchemy Laboratory/Hide cuirass/Hide cuirass", + [127140000] = "@Alchemy Laboratory/Hide Cuirass/Hide Cuirass", [127140001] = "@Alchemy Laboratory/Heart Vessel/Heart Vessel", - [127140002] = "@Alchemy Laboratory/Cloth cape/Cloth cape", + [127140002] = "@Alchemy Laboratory/Cloth Cape/Cloth Cape", [127140003] = "@Alchemy Laboratory/Life Vessel/Life Vessel", [127140006] = "@Alchemy Laboratory/Sunglasses/Sunglasses", - [127140007] = "@Alchemy Laboratory/Resist thunder/Resist thunder", - [127140008] = "@Alchemy Laboratory/Leather shield/Leather shield", + [127140007] = "@Alchemy Laboratory/Resist Thunder/Resist Thunder", + [127140008] = "@Alchemy Laboratory/Leather Shield/Leather Shield", [127140009] = "@Alchemy Laboratory/Basilard/Basilard", [127140010] = "@Alchemy Laboratory/Potion/Potion", - [127143140] = "@Alchemy Laboratory/Slogra and Gaibon/Slogra and Gaibon kill", + [127143140] = "@Alchemy Laboratory/Slogra & Gaibon/Slogra & Gaibon kill", [127143141] = "@Alchemy Laboratory/Skill of Wolf/Skill of Wolf", [127143142] = "@Alchemy Laboratory/Bat Card/Bat Card", -- Anti-Chapel - [127220002] = "@Anti-Chapel/Fire boomerang/Fire boomerang", + [127220002] = "@Anti-Chapel/Fire Boomerang/Fire Boomerang", [127220003] = "@Anti-Chapel/Diamond/Diamond", [127220004] = "@Anti-Chapel/Zircon/Zircon", - [127220005] = "@Anti-Chapel/Heart Vessel(5)/Heart Vessel(5)", + [127220005] = "@Anti-Chapel/Heart Vessel (Stairs)/Heart Vessel (Stairs)", [127220006] = "@Anti-Chapel/Shuriken/Shuriken", [127220007] = "@Anti-Chapel/TNT/TNT", [127220008] = "@Anti-Chapel/Boomerang/Boomerang", [127220009] = "@Anti-Chapel/Javelin/Javelin", - [127220010] = "@Anti-Chapel/Manna prism/Manna prism", - [127220011] = "@Anti-Chapel/Smart potion/Smart potion", + [127220010] = "@Anti-Chapel/Manna Prism/Manna Prism", + [127220011] = "@Anti-Chapel/Smart Potion/Smart Potion", [127220012] = "@Anti-Chapel/Life Vessel/Life Vessel", [127220013] = "@Anti-Chapel/Talwar/Talwar", - [127220014] = "@Anti-Chapel/Bwaka knife/Bwaka knife", - [127220015] = "@Anti-Chapel/Magic missile/Magic missile", - [127220016] = "@Anti-Chapel/Twilight cloak/Twilight cloak", - [127220017] = "@Anti-Chapel/Heart Vessel(17)/Heart Vessel(17)", + [127220014] = "@Anti-Chapel/Bwaka Knife/Bwaka Knife", + [127220015] = "@Anti-Chapel/Magic Missile/Magic Missile", + [127220016] = "@Anti-Chapel/Twilight Cloak/Twilight Cloak", + [127220017] = "@Anti-Chapel/Heart Vessel (Next to Stairs)/Heart Vessel (Next to Stairs)", [127223220] = "@Anti-Chapel/Medusa/Medusa kill", [127223221] = "@Anti-Chapel/Medusa/Heart of Vlad", -- Black Marble Gallery - [127240000] = "@Black Marble Gallery/Library card/Library card", + [127240000] = "@Black Marble Gallery/Library Card/Library Card", [127240001] = "@Black Marble Gallery/Potion/Potion", [127240002] = "@Black Marble Gallery/Antivenom/Antivenom", - [127240003] = "@Black Marble Gallery/Life Vessel(Middle clock)/Life Vessel(Middle clock)", - [127240004] = "@Black Marble Gallery/Heart Vessel(Middle clock)/Heart Vessel(Middle clock)", - [127240005] = "@Black Marble Gallery/Left Clock/Resist dark(Left clock)", - [127240006] = "@Black Marble Gallery/Left Clock/Resist holy(Left clock)", - [127240007] = "@Black Marble Gallery/Left Clock/Resist thunder(Left clock)", - [127240008] = "@Black Marble Gallery/Left Clock/Resist fire(Left clock)", - [127240009] = "@Black Marble Gallery/Meal ticket/Meal ticket", - [127240010] = "@Black Marble Gallery/Iron ball/Iron ball", - [127240011] = "@Black Marble Gallery/Heart Refresh(Inside clock)/Heart Refresh(Inside clock)", + [127240003] = "@Black Marble Gallery/Life Vessel/Life Vessel", + [127240004] = "@Black Marble Gallery/Heart Vessel/Heart Vessel", + [127240005] = "@Black Marble Gallery/Left Clock/Resist Dark", + [127240006] = "@Black Marble Gallery/Left Clock/Resist Holy", + [127240007] = "@Black Marble Gallery/Left Clock/Resist Thunder", + [127240008] = "@Black Marble Gallery/Left Clock/Resist Fire", + [127240009] = "@Black Marble Gallery/Meal Ticket/Meal Ticket", + [127240010] = "@Black Marble Gallery/Iron Ball/Iron Ball", + [127240011] = "@Black Marble Gallery/Heart Refresh/Heart Refresh", -- Castle Entrance [127110000] = "@Castle Entrance/Heart Vessel (Above Death)/Heart Vessel (Above Death)", - [127110001] = "@Castle Entrance/Life Vessel (Bellow shield potion)/Life Vessel (Bellow shield potion)", - [127110002] = "@Castle Entrance/Hidden Room/Life Apple (Hidden room)", + [127110001] = "@Castle Entrance/Life Vessel (Below Shield Potion)/Life Vessel (Below Shield Potion)", + [127110002] = "@Castle Entrance/Hidden Room/Life Apple", [127110004] = "@Castle Entrance/Shield Potion/Shield Potion", [127110005] = "@Castle Entrance/Holy mail/Holy mail", - [127110006] = "@Castle Entrance/Life Vessel (UC exit)/Life Vessel (UC exit)", [127110007] = "@Castle Entrance/Heart Vessel (Teleport exit)/Heart Vessel (Teleport exit)", - [127110008] = "@Castle Entrance/Above Entrance/Life Vessel (Above entry)", + [127110008] = "@Castle Entrance/Above Entrance/Life Vessel", [127110009] = "@Castle Entrance/Hidden Room/Jewel sword", [127113110] = "@Castle Entrance/Pot Roast/Pot Roast", [127113111] = "@Castle Entrance/Turkey/Turkey", @@ -83,75 +82,75 @@ LOCATIONS_MAPPING = { -- Castle Keep [127160000] = "@Castle Keep/Keep Bottom/Turquoise", - [127160001] = "@Castle Keep/Keep Bottom/Turkey(Behind wall)", - [127160002] = "@Castle Keep/Main Keep/Below Throne/Fire mail(Behind wall)", + [127160001] = "@Castle Keep/Keep Bottom/Turkey", + [127160002] = "@Castle Keep/Main Keep/Below Throne/Fire Mail", [127160003] = "@Castle Keep/Main Keep/Tyrfing/Tyrfing", - [127160004] = "@Castle Keep/Main Keep/Above Throne/Sirloin(Above Richter)", - [127160005] = "@Castle Keep/Main Keep/Above Throne/Turkey(Above Richter)", - [127160006] = "@Castle Keep/Main Keep/Above Throne/Pot roast(Above Richter)", - [127160007] = "@Castle Keep/Main Keep/Above Throne/Frankfurter(Above Richter)", - [127160008] = "@Castle Keep/Main Keep/Above Throne/Resist stone(Above Richter)", - [127160009] = "@Castle Keep/Main Keep/Above Throne/Resist dark(Above Richter)", - [127160010] = "@Castle Keep/Main Keep/Above Throne/Resist holy(Above Richter)", - [127160011] = "@Castle Keep/Main Keep/Above Throne/Platinum mail(Above Richter)", + [127160004] = "@Castle Keep/Main Keep/Above Throne/Sirloin", + [127160005] = "@Castle Keep/Main Keep/Above Throne/Turkey", + [127160006] = "@Castle Keep/Main Keep/Above Throne/Pot Roast", + [127160007] = "@Castle Keep/Main Keep/Above Throne/Frankfurter", + [127160008] = "@Castle Keep/Main Keep/Above Throne/Resist Stone", + [127160009] = "@Castle Keep/Main Keep/Above Throne/Resist Dark", + [127160010] = "@Castle Keep/Main Keep/Above Throne/Resist Holy", + [127160011] = "@Castle Keep/Main Keep/Above Throne/Platinum Mail", [127160012] = "@Castle Keep/Main Keep/Falchion/Falchion", - [127160013] = "@Castle Keep/Main Keep/Viewing Room/Life Vessel 1(Viewing room)", - [127160014] = "@Castle Keep/Main Keep/Viewing Room/Life Vessel 2(Viewing room)", - [127160015] = "@Castle Keep/Main Keep/Viewing Room/Heart Vessel 1(Viewing room)", - [127160016] = "@Castle Keep/Main Keep/Viewing Room/Heart Vessel 2(Viewing room)", - [127160018] = "@Castle Keep/Main Keep/Heart Vessel(Before Richter)/Heart Vessel(Before Richter)", + [127160013] = "@Castle Keep/Main Keep/Viewing Room/Life Vessel", + [127160014] = "@Castle Keep/Main Keep/Viewing Room/Life Vessel", + [127160015] = "@Castle Keep/Main Keep/Viewing Room/Heart Vessel", + [127160016] = "@Castle Keep/Main Keep/Viewing Room/Heart Vessel", + [127160018] = "@Castle Keep/Main Keep/Heart Vessel/Heart Vessel", [127163160] = "@Castle Keep/Keep Bottom/Leap Stone", [127163161] = "@Castle Keep/Main Keep/Below Throne/Power of Mist", [127163162] = "@Castle Keep/Main Keep/Viewing Room/Ghost Card", -- Catacombs - [127020000] = "@Catacombs/Catacombs Entrance/Cat-eye circl.", + [127020000] = "@Catacombs/Catacombs Entrance/Cat-Eye Circlet", [127020001] = "@Catacombs/Icebrand/Icebrand", - [127020002] = "@Catacombs/Walk armor/Walk armor", + [127020002] = "@Catacombs/Walk Armor/Walk Armor", [127020003] = "@Catacombs/Mormegil/Mormegil", - [127020004] = "@Catacombs/Beyond Spike Maze/Spike Breaker Room/Library card(Spike breaker)", - [127020006] = "@Catacombs/Lava Bridge/Heart Vessel(Ballroom mask)", + [127020004] = "@Catacombs/Beyond Spike Maze/Spike Breaker Room/Library Card", + [127020006] = "@Catacombs/Lava Bridge/Heart Vessel", [127020007] = "@Catacombs/Lava Bridge/Ballroom mask", [127020008] = "@Catacombs/Catacombs Entrance/Bloodstone", - [127020009] = "@Catacombs/Crypt/Life Vessel(Crypt)", - [127020010] = "@Catacombs/Crypt/Heart Vessel(Crypt)", - [127020011] = "@Catacombs/Beyond Spike Maze/Spike Hallway/Cross shuriken 1(Spike breaker)", - [127020012] = "@Catacombs/Beyond Spike Maze/Spike Hallway/Cross shuriken 2(Spike breaker)", - [127020013] = "@Catacombs/Beyond Spike Maze/Spike Hallway/Karma coin 1(Spike breaker)", - [127020014] = "@Catacombs/Beyond Spike Maze/Spike Hallway/Karma coin 2(Spike breaker)", - [127020015] = "@Catacombs/Beyond Spike Maze/Pork bun/Pork bun", - [127020016] = "@Catacombs/Beyond Spike Maze/Spike Breaker Room/Spike breaker", - [127020017] = "@Catacombs/Sarcophagus/Monster vial 3 1(Sarcophagus)", - [127020018] = "@Catacombs/Sarcophagus/Monster vial 3 2(Sarcophagus)", - [127020019] = "@Catacombs/Sarcophagus/Monster vial 3 3(Sarcophagus)", - [127020020] = "@Catacombs/Sarcophagus/Monster vial 3 4(Sarcophagus)", - [127023020] = "@Catacombs/Legion/Legion kill", + [127020009] = "@Catacombs/Crypt/Life Vessel", + [127020010] = "@Catacombs/Crypt/Heart Vessel", + [127020011] = "@Catacombs/Beyond Spike Maze/Spike Hallway/Cross Shuriken", + [127020012] = "@Catacombs/Beyond Spike Maze/Spike Hallway/Cross Shuriken", + [127020013] = "@Catacombs/Beyond Spike Maze/Spike Hallway/Karma Coin", + [127020014] = "@Catacombs/Beyond Spike Maze/Spike Hallway/Karma Coin", + [127020015] = "@Catacombs/Beyond Spike Maze/Pork Bun/Pork Bun", + [127020016] = "@Catacombs/Beyond Spike Maze/Spike Breaker Room/Spike Breaker", + [127020017] = "@Catacombs/Sarcophagus/Monster Vial 3", + [127020018] = "@Catacombs/Sarcophagus/Monster Vial 3", + [127020019] = "@Catacombs/Sarcophagus/Monster Vial 3", + [127020020] = "@Catacombs/Sarcophagus/Monster Vial 3", + [127023020] = "@Catacombs/Granfaloon/Granfaloon kill", -- Cave - [127210000] = "@Cave/Demon Button Room/Power of Sire(Demon)", - [127210001] = "@Cave/Demon Button Room/Life apple(Demon)", - [127210002] = "@Cave/Alucard sword/Alucard sword", - [127210003] = "@Cave/Cave Top/Green tea(Demon)", + [127210000] = "@Cave/Demon Button Room/Power of Sire", + [127210001] = "@Cave/Demon Button Room/Life Apple", + [127210002] = "@Cave/Alucard Sword/Alucard Sword", + [127210003] = "@Cave/Cave Top/Green Tea", [127210004] = "@Cave/Cave Top/Power of Sire", - [127210006] = "@Cave/Cave Middle/Shiitake 1(6)", - [127210007] = "@Cave/Cave Middle/Shiitake 2(7)", + [127210006] = "@Cave/Cave Middle/Shiitake", + [127210007] = "@Cave/Cave Middle/Shiitake", [127213210] = "@Cave/Death/Death kill", [127213211] = "@Cave/Death/Eye of Vlad", -- Clock Tower - [127150000] = "@Clock Tower/Below Bridge/Magic missile", + [127150000] = "@Clock Tower/Below Bridge/Magic Missile", [127150001] = "@Clock Tower/Below Bridge/Pentagram", - [127150003] = "@Clock Tower/Hidden Room/Star flail", - [127150004] = "@Clock Tower/Hidden Room/Gold plate", - [127150005] = "@Clock Tower/Hidden Room/Steel helm", - [127150006] = "@Clock Tower/Healing mail/Healing mail", + [127150003] = "@Clock Tower/Hidden Room/Star Flail", + [127150004] = "@Clock Tower/Hidden Room/Gold Plate", + [127150005] = "@Clock Tower/Hidden Room/Steel Helm", + [127150006] = "@Clock Tower/Healing Mail/Healing Mail", [127150007] = "@Clock Tower/Pillars/Bekatowa", - [127150008] = "@Clock Tower/Pillars/Shaman shield", - [127150009] = "@Clock Tower/Pillars/Ice mail", - [127150010] = "@Clock Tower/Life Vessel(Gear train)/Life Vessel(Gear train)", - [127150011] = "@Clock Tower/Heart Vessel(Gear train)/Heart Vessel(Gear train)", - [127153150] = "@Clock Tower/Keep Approach/Bwaka knife", - [127153151] = "@Clock Tower/Pot roast/Pot roast", + [127150008] = "@Clock Tower/Pillars/Shaman Shield", + [127150009] = "@Clock Tower/Pillars/Ice Mail", + [127150010] = "@Clock Tower/Life Vessel/Life Vessel", + [127150011] = "@Clock Tower/Heart Vessel/Heart Vessel", + [127153150] = "@Clock Tower/Keep Approach/Bwaka Knife", + [127153151] = "@Clock Tower/Pot Roast/Pot Roast", [127153152] = "@Clock Tower/Keep Approach/Shuriken", [127153153] = "@Clock Tower/Keep Approach/TNT", [127153154] = "@Clock Tower/Karasuman/Karasuman kill", @@ -159,24 +158,23 @@ LOCATIONS_MAPPING = { -- Colosseum [127010000] = "@Colosseum/Heart Vessel/Heart Vessel", - [127010001] = "@Colosseum/Shield rod/Shield rod", - [127010003] = "@Colosseum/Blood cloak/Blood cloak", - [127010004] = "@Colosseum/Knight shield(Chapel passage)/Knight shield(Chapel passage)", - [127010005] = "@Colosseum/Library card/Library card", - [127010006] = "@Colosseum/Green tea/Green tea", - [127010007] = "@Colosseum/Holy sword(Hidden attic)/Holy sword(Hidden attic)", + [127010001] = "@Colosseum/Shield Rod/Shield Rod", + [127010003] = "@Colosseum/Blood Cloak/Blood Cloak", + [127010005] = "@Colosseum/Library Card/Library Card", + [127010006] = "@Colosseum/Green Tea/Green Tea", + [127010007] = "@Colosseum/Holy Sword/Holy Sword", [127013010] = "@Colosseum/Minotaurus & Werewolf/Minotaurus & Werewolf kill", [127013011] = "@Colosseum/Form of Mist/Form of Mist", -- Death Wing's Lair [127260000] = "@Death Wing's Lair/Secret Hallway/Opal", - [127260001] = "@Death Wing's Lair/Secret Hallway/Sword of hador", - [127260002] = "@Death Wing's Lair/Secret Hallway/High potion", - [127260003] = "@Death Wing's Lair/Middle Shaft/Shield potion", - [127260004] = "@Death Wing's Lair/Middle Shaft/Luck potion", - [127260005] = "@Death Wing's Lair/Manna prism/Manna prism", + [127260001] = "@Death Wing's Lair/Secret Hallway/Sword of Hador", + [127260002] = "@Death Wing's Lair/Secret Hallway/High Potion", + [127260003] = "@Death Wing's Lair/Middle Shaft/Shield Potion", + [127260004] = "@Death Wing's Lair/Middle Shaft/Luck Potion", + [127260005] = "@Death Wing's Lair/Manna Prism/Manna Prism", [127260006] = "@Death Wing's Lair/Aquamarine/Aquamarine", - [127260007] = "@Death Wing's Lair/Alucard mail/Alucard mail", + [127260007] = "@Death Wing's Lair/Alucard Mail/Alucard Mail", [127260008] = "@Death Wing's Lair/Life Vessel/Life Vessel", [127260009] = "@Death Wing's Lair/Heart Refresh/Heart Refresh", [127260010] = "@Death Wing's Lair/Shuriken/Shuriken", @@ -185,48 +183,48 @@ LOCATIONS_MAPPING = { [127263261] = "@Death Wing's Lair/Akmodan II/Rib of Vlad", -- Floating Catacombs - [127190000] = "@Floating Catacombs/Catacombs Entrance/Magic missile", - [127190001] = "@Floating Catacombs/Catacombs Entrance/Buffalo star", - [127190002] = "@Floating Catacombs/Beyond Spike Maze/Spike Hallway/Resist thunder", - [127190003] = "@Floating Catacombs/Beyond Spike Maze/Spike Hallway/Resist fire", - [127190004] = "@Floating Catacombs/Beyond Spike Maze/Spike Hallway/Karma coin(4)(Spike breaker)", - [127190005] = "@Floating Catacombs/Beyond Spike Maze/Spike Hallway/Karma coin(5)(Spike breaker)", - [127190006] = "@Floating Catacombs/Beyond Spike Maze/Red bean bun/Red bean bun", + [127190000] = "@Floating Catacombs/Catacombs Entrance/Magic Missile", + [127190001] = "@Floating Catacombs/Catacombs Entrance/Buffalo Star", + [127190002] = "@Floating Catacombs/Beyond Spike Maze/Spike Hallway/Resist Thunder", + [127190003] = "@Floating Catacombs/Beyond Spike Maze/Spike Hallway/Resist Fire", + [127190004] = "@Floating Catacombs/Beyond Spike Maze/Spike Hallway/Karma Coin", + [127190005] = "@Floating Catacombs/Beyond Spike Maze/Spike Hallway/Karma Coin", + [127190006] = "@Floating Catacombs/Beyond Spike Maze/Red Bean Bun/Red Bean Bun", [127190007] = "@Floating Catacombs/Beyond Spike Maze/Spike Breaker Room/Elixir", - [127190008] = "@Floating Catacombs/Beyond Spike Maze/Spike Breaker Room/Library card", - [127190009] = "@Floating Catacombs/Crypt/Life Vessel(9)", - [127190010] = "@Floating Catacombs/Crypt/Heart Vessel(10)", - [127190011] = "@Floating Catacombs/Lava Bridge/Shield potion", - [127190012] = "@Floating Catacombs/Lava Bridge/Attack potion", - [127190013] = "@Floating Catacombs/Necklace of j/Necklace of j", + [127190008] = "@Floating Catacombs/Beyond Spike Maze/Spike Breaker Room/Library Card", + [127190009] = "@Floating Catacombs/Crypt/Life Vessel", + [127190010] = "@Floating Catacombs/Crypt/Heart Vessel)", + [127190011] = "@Floating Catacombs/Lava Bridge/Shield Potion", + [127190012] = "@Floating Catacombs/Lava Bridge/Attack Potion", + [127190013] = "@Floating Catacombs/Necklace of J/Necklace of J", [127190014] = "@Floating Catacombs/Diamond/Diamond", - [127190015] = "@Floating Catacombs/After Galamoth/Heart Vessel(After Galamoth)", - [127190016] = "@Floating Catacombs/After Galamoth/Life Vessel(After Galamoth)", - [127190017] = "@Floating Catacombs/Gas Cloud Room/Ruby circlet", + [127190015] = "@Floating Catacombs/After Galamoth/Heart Vessel", + [127190016] = "@Floating Catacombs/After Galamoth/Life Vessel", + [127190017] = "@Floating Catacombs/Gas Cloud Room/Ruby Circlet", [127193190] = "@Floating Catacombs/Galamoth/Galamoth kill", [127193191] = "@Floating Catacombs/Gas Cloud Room/Gas Cloud", -- Forbidden Library [127230000] = "@Forbidden Library/Reverse Librarian/Turquoise", [127230001] = "@Forbidden Library/Reverse Librarian/Opal", - [127230002] = "@Forbidden Library/Reverse Librarian/Library card", - [127230003] = "@Forbidden Library/Side Room/Resist fire", - [127230004] = "@Forbidden Library/Side Room/Resist ice", - [127230005] = "@Forbidden Library/Side Room/Resist stone", - [127230006] = "@Forbidden Library/Neutron bomb/Neutron bomb", + [127230002] = "@Forbidden Library/Reverse Librarian/Library Card", + [127230003] = "@Forbidden Library/Side Room/Resist Fire", + [127230004] = "@Forbidden Library/Side Room/Resist Ice", + [127230005] = "@Forbidden Library/Side Room/Resist Stone", + [127230006] = "@Forbidden Library/Neutron Bomb/Neutron Bomb", [127230007] = "@Forbidden Library/Badelaire/Badelaire", [127230008] = "@Forbidden Library/Staurolite/Staurolite", -- Long Library - [127070001] = "@Long Library/Back of Library/Stone mask/Stone mask", - [127070002] = "@Long Library/Back of Library/Behind Bookcase/Holy rod", - [127070004] = "@Long Library/Bronze cuirass/Bronze cuirass", + [127070001] = "@Long Library/Back of Library/Stone Mask/Stone Mask", + [127070002] = "@Long Library/Back of Library/Behind Bookcase/Holy Rod", + [127070004] = "@Long Library/Bronze Cuirass/Bronze Cuirass", [127070005] = "@Long Library/Back of Library/Dead End/Takemitsu", [127070006] = "@Long Library/Back of Library/Dead End/Onyx", [127070007] = "@Long Library/Back of Library/Dead End/Frankfurter", [127070008] = "@Long Library/Top Level/Potion", [127070009] = "@Long Library/Top Level/Antivenom", - [127070010] = "@Long Library/Back of Library/Behind Bookcase/Topaz circlet", + [127070010] = "@Long Library/Back of Library/Behind Bookcase/Topaz Circlet", [127073070] = "@Long Library/Back of Library/Lesser Demon/Lesser Demon kill", [127073072] = "@Long Library/Back of Library/Soul of Bat/Soul of Bat", [127073073] = "@Long Library/Faerie Scroll/Faerie Scroll", @@ -234,54 +232,54 @@ LOCATIONS_MAPPING = { [127073075] = "@Long Library/Top Level/Faerie Card", -- Marble Gallery - [127080000] = "@Marble Gallery/Life Vessel(Left clock)/Life Vessel(Left clock)", + [127080000] = "@Marble Gallery/Life Vessel (Left Clock)/Life Vessel (Left Clock)", [127080001] = "@Marble Gallery/Right Clock/Alucart shield", - [127080002] = "@Marble Gallery/Right Clock/Heart Vessel(Right clock)", - [127080003] = "@Marble Gallery/Middle Clock/Life apple(Middle clock)", - [127080004] = "@Marble Gallery/Middle Clock/Hammer(Middle clock)", - [127080005] = "@Marble Gallery/Middle Clock/Potion(Middle clock)", + [127080002] = "@Marble Gallery/Right Clock/Heart Vessel", + [127080003] = "@Marble Gallery/Middle Clock/Life apple", + [127080004] = "@Marble Gallery/Middle Clock/Hammer", + [127080005] = "@Marble Gallery/Middle Clock/Potion", [127080006] = "@Marble Gallery/Right Clock/Alucart mail", [127080007] = "@Marble Gallery/Right Clock/Alucart sword", - [127080008] = "@Marble Gallery/Inside Clock/Life Vessel(Inside)", - [127080009] = "@Marble Gallery/Inside Clock/Heart Vessel(Inside)", - [127080010] = "@Marble Gallery/Under Floor/Library card(Jewel)", - [127080011] = "@Marble Gallery/Under Floor/Attack potion(Jewel)", + [127080008] = "@Marble Gallery/Inside Clock/Life Vessel", + [127080009] = "@Marble Gallery/Inside Clock/Heart Vessel", + [127080010] = "@Marble Gallery/Under Floor/Library Card", + [127080011] = "@Marble Gallery/Under Floor/Attack Potion", [127080012] = "@Marble Gallery/Hammer(Spirit)/Hammer(Spirit)", - [127080013] = "@Marble Gallery/Str. potion/Str. potion", - [127083080] = "@Marble Gallery/Holy glasses/Holy glasses", + [127080013] = "@Marble Gallery/Str. Potion/Str. Potion", + [127083080] = "@Marble Gallery/Holy Glasses/Holy Glasses", [127083081] = "@Marble Gallery/Spirit Orb/Spirit Orb", [127083082] = "@Marble Gallery/Gravity Boots/Gravity Boots", -- Necromancy Laboratory [127290001] = "@Necromancy Laboratory/Heart Vessel/Heart Vessel", [127290002] = "@Necromancy Laboratory/Life Vessel/Life Vessel", - [127290003] = "@Necromancy Laboratory/Goddess shield/Goddess shield", - [127290004] = "@Necromancy Laboratory/Manna prism/Manna prism", + [127290003] = "@Necromancy Laboratory/Goddess Shield/Goddess Shield", + [127290004] = "@Necromancy Laboratory/Manna Prism/Manna Prism", [127290005] = "@Necromancy Laboratory/Katana/Katana", - [127290006] = "@Necromancy Laboratory/High potion/High potion", + [127290006] = "@Necromancy Laboratory/High Potion/High Potion", [127290007] = "@Necromancy Laboratory/Turquoise/Turquoise", [127290008] = "@Necromancy Laboratory/Ring of Arcana/Ring of Arcana", - [127290009] = "@Necromancy Laboratory/Resist dark/Resist dark", - [127293290] = "@Necromancy Laboratory/Beezelbub/Beezelbub kill", + [127290009] = "@Necromancy Laboratory/Resist Dark/Resist Dark", + [127293290] = "@Necromancy Laboratory/Beelzebub/Beelzebub kill", -- Olrox's Quarters [127100001] = "@Olrox's Quarters/Back Quarters/Heart Vessel/Heart Vessel", [127100004] = "@Olrox's Quarters/Front Quarters/Secret Hallway/Broadsword", [127100005] = "@Olrox's Quarters/Front Quarters/Secret Hallway/Onyx", [127100006] = "@Olrox's Quarters/Front Quarters/Secret Hallway/Cheese", - [127100007] = "@Olrox's Quarters/Front Quarters/Manna prism/Manna prism", - [127100008] = "@Olrox's Quarters/Front Quarters/Resist fire/Resist fire", - [127100009] = "@Olrox's Quarters/Front Quarters/Luck potion/Luck potion", + [127100007] = "@Olrox's Quarters/Front Quarters/Manna Prism/Manna Prism", + [127100008] = "@Olrox's Quarters/Front Quarters/Resist Fire/Resist Fire", + [127100009] = "@Olrox's Quarters/Front Quarters/Luck Potion/Luck Potion", [127100010] = "@Olrox's Quarters/Front Quarters/Estoc/Estoc", - [127100011] = "@Olrox's Quarters/Back Quarters/Iron ball/Iron ball", + [127100011] = "@Olrox's Quarters/Back Quarters/Iron Ball/Iron Ball", [127100012] = "@Olrox's Quarters/Back Quarters/Garnet/Garnet", [127103100] = "@Olrox's Quarters/Back Quarters/Olrox/Olrox kill", [127103101] = "@Olrox's Quarters/Back Quarters/Echo of Bat/Echo of Bat", [127103102] = "@Olrox's Quarters/Back Quarters/Sword Card/Sword Card", -- Outer Wall - [127090000] = "@Outer Wall/Secret Elevator/Jewel knuckles", - [127090001] = "@Outer Wall/Secret Elevator/Mirror cuirass", + [127090000] = "@Outer Wall/Behind Grate/Jewel Knuckles", + [127090001] = "@Outer Wall/Behind Grate/Mirror Cuirass", [127090002] = "@Outer Wall/Heart Vessel/Heart Vessel", [127090003] = "@Outer Wall/Garnet/Garnet", [127090004] = "@Outer Wall/Gladius/Gladius", @@ -292,170 +290,172 @@ LOCATIONS_MAPPING = { [127093092] = "@Outer Wall/Soul of Wolf/Soul of Wolf", -- Reverse Castle Keep - [127310000] = "@Reverse Castle Keep/Keep Top/Sword of dawn", - [127310001] = "@Reverse Castle Keep/Iron ball(Above Richter)/Iron ball(Above Richter)", + [127310000] = "@Reverse Castle Keep/Keep Top/Sword of Dawn", + [127310001] = "@Reverse Castle Keep/Iron Ball/Iron Ball", [127310002] = "@Reverse Castle Keep/Zircon/Zircon", - [127310004] = "@Reverse Castle Keep/Below Throne/Bastard sword", - [127310005] = "@Reverse Castle Keep/Below Throne/Life Vessel 1", - [127310006] = "@Reverse Castle Keep/Below Throne/Heart Vessel 1", - [127310007] = "@Reverse Castle Keep/Below Throne/Life Vessel 2", - [127310008] = "@Reverse Castle Keep/Below Throne/Heart Vessel 2", - [127310009] = "@Reverse Castle Keep/Below Throne/Life Vessel 3", - [127310010] = "@Reverse Castle Keep/Below Throne/Heart Vessel 4", - [127310011] = "@Reverse Castle Keep/Below Throne/Royal cloak", - [127310017] = "@Reverse Castle Keep/Viewing Room/Resist fire(Viewing room)", - [127310018] = "@Reverse Castle Keep/Viewing Room/Resist ice(Viewing room)", - [127310019] = "@Reverse Castle Keep/Viewing Room/Resist thunder(Viewing room)", - [127310020] = "@Reverse Castle Keep/Viewing Room/Resist stone(Viewing room)", - [127310021] = "@Reverse Castle Keep/Viewing Room/High potion(Viewing room)", + [127310004] = "@Reverse Castle Keep/Below Throne/Bastard Sword", + [127310005] = "@Reverse Castle Keep/Below Throne/Life Vessel", + [127310006] = "@Reverse Castle Keep/Below Throne/Heart Vessel", + [127310007] = "@Reverse Castle Keep/Below Throne/Life Vessel", + [127310008] = "@Reverse Castle Keep/Below Throne/Heart Vessel", + [127310009] = "@Reverse Castle Keep/Below Throne/Life Vessel", + [127310010] = "@Reverse Castle Keep/Below Throne/Heart Vessel", + [127310011] = "@Reverse Castle Keep/Below Throne/Royal Cloak", + [127310017] = "@Reverse Castle Keep/Viewing Room/Resist Fire", + [127310018] = "@Reverse Castle Keep/Viewing Room/Resist Ice", + [127310019] = "@Reverse Castle Keep/Viewing Room/Resist Thunder", + [127310020] = "@Reverse Castle Keep/Viewing Room/Resist Stone", + [127310021] = "@Reverse Castle Keep/Viewing Room/High Potion", [127310022] = "@Reverse Castle Keep/Keep Top/Garnet", - [127310023] = "@Reverse Castle Keep/Lightning mail/Lightning mail", - [127310024] = "@Reverse Castle Keep/Library card/Library card", + [127310023] = "@Reverse Castle Keep/Lightning Mail/Lightning Mail", + [127310024] = "@Reverse Castle Keep/Library Card/Library Card", -- Reverse Caverns - [127280000] = "@Reverse Caverns/Alucard shield/Alucard shield", - [127280001] = "@Reverse Caverns/Shiitake 1(Near entrance passage)/Shiitake 1(Near entrance passage)", - [127280002] = "@Reverse Caverns/Toadstool(Waterfall)/Toadstool(Waterfall)", - [127280003] = "@Reverse Caverns/Shiitake 2(Waterfall)/Shiitake 2(Waterfall)", + [127280000] = "@Reverse Caverns/Alucard Shield/Alucard Shield", + [127280001] = "@Reverse Caverns/Shiitake (Near Entrance Passage)/Shiitake (Near Entrance Passage)", + [127280002] = "@Reverse Caverns/Toadstool/Toadstool", + [127280003] = "@Reverse Caverns/Shiitake (Waterfall)/Shiitake (Waterfall)", [127280004] = "@Reverse Caverns/Garnet/Garnet", [127280005] = "@Reverse Caverns/Bat Pentagram/Bat Pentagram", - [127280006] = "@Reverse Caverns/Underwater/Life Vessel(Underwater)", - [127280007] = "@Reverse Caverns/Heart Vessel(Air pocket)/Heart Vessel(Air pocket)", - [127280008] = "@Reverse Caverns/Underwater/Potion(Underwater)", - [127280009] = "@Reverse Caverns/Shiitake 3(Near air pocket)/Shiitake 3(Near air pocket)", - [127280010] = "@Reverse Caverns/Shiitake 4(Near air pocket)/Shiitake 4(Near air pocket)", + [127280006] = "@Reverse Caverns/Underwater/Life Vessel", + [127280007] = "@Reverse Caverns/Heart Vessel (Air Pocket)/Heart Vessel (Air Pocket)", + [127280008] = "@Reverse Caverns/Underwater/Potion", + [127280009] = "@Reverse Caverns/Shiitake (Near Air Pocket)/Shiitake (Near Air Pocket)", + [127280010] = "@Reverse Caverns/Shiitake (Near Air Pocket)/Shiitake (Near Air Pocket)", [127280011] = "@Reverse Caverns/Opal/Opal", [127280012] = "@Reverse Caverns/Life Vessel/Life Vessel", [127280013] = "@Reverse Caverns/Diamond/Diamond", - [127280014] = "@Reverse Caverns/Zircon(Vase)/Zircon(Vase)", - [127280015] = "@Reverse Caverns/Heart Vessel(Succubus side)/Heart Vessel(Succubus side)", - [127280016] = "@Reverse Caverns/Succubus Side/Meal ticket 1(Succubus side)", - [127280017] = "@Reverse Caverns/Succubus Side/Meal ticket 2(Succubus side)", - [127280018] = "@Reverse Caverns/Succubus Side/Meal ticket 3(Succubus side)", - [127280019] = "@Reverse Caverns/Succubus Side/Meal ticket 4(Succubus side)", - [127280020] = "@Reverse Caverns/Succubus Side/Meal ticket 5(Succubus side)", - [127280021] = "@Reverse Caverns/Zircon(Doppleganger)/Zircon(Doppleganger)", - [127280022] = "@Reverse Caverns/Pot roast(Doppleganger)/Pot roast(Doppleganger)", + [127280014] = "@Reverse Caverns/Zircon (Vase)/Zircon (Vase)", + [127280015] = "@Reverse Caverns/Heart Vessel (Succubus Side)/Heart Vessel (Succubus Side)", + [127280016] = "@Reverse Caverns/Succubus Side/Meal Ticket", + [127280017] = "@Reverse Caverns/Succubus Side/Meal Ticket", + [127280018] = "@Reverse Caverns/Succubus Side/Meal Ticket", + [127280019] = "@Reverse Caverns/Succubus Side/Meal Ticket", + [127280020] = "@Reverse Caverns/Succubus Side/Meal Ticket", + [127280021] = "@Reverse Caverns/Zircon (Doppleganger)/Zircon (Doppleganger)", + [127280022] = "@Reverse Caverns/Pot Roast/Pot Roast", [127280023] = "@Reverse Caverns/Dark Blade/Dark Blade", - [127280024] = "@Reverse Caverns/Manna prism/Manna prism", + [127280024] = "@Reverse Caverns/Manna Prism/Manna Prism", [127280025] = "@Reverse Caverns/Elixir/Elixir", - [127280026] = "@Reverse Caverns/Osafune katana/Osafune katana", + [127280026] = "@Reverse Caverns/Osafune Katana/Osafune Katana", [127283280] = "@Reverse Caverns/Doppleganger40/Doppleganger40 kill", [127283281] = "@Reverse Caverns/Force of Echo/Force of Echo", -- Reverse Clock Tower - [127300000] = "@Reverse Clock Tower/Above Bridge/Magic missile", - [127300001] = "@Reverse Clock Tower/Above Bridge/Karma coin", - [127300002] = "@Reverse Clock Tower/Pillars/Str. potion", + [127300000] = "@Reverse Clock Tower/Above Bridge/Magic Missile", + [127300001] = "@Reverse Clock Tower/Above Bridge/Karma Coin", + [127300002] = "@Reverse Clock Tower/Pillars/Str. Potion", [127300003] = "@Reverse Clock Tower/Pillars/Luminus", - [127300004] = "@Reverse Clock Tower/Pillars/Smart potion", - [127300005] = "@Reverse Clock Tower/Dragon helm/Dragon helm", - [127300006] = "@Reverse Clock Tower/Hidden Room/Diamond(Hidden room)", - [127300007] = "@Reverse Clock Tower/Hidden Room/Life apple(Hidden room)", - [127300008] = "@Reverse Clock Tower/Hidden Room/Sunstone(Hidden room)", + [127300004] = "@Reverse Clock Tower/Pillars/Smart Potion", + [127300005] = "@Reverse Clock Tower/Dragon Helm/Dragon Helm", + [127300006] = "@Reverse Clock Tower/Hidden Room/Diamond", + [127300007] = "@Reverse Clock Tower/Hidden Room/Life Apple", + [127300008] = "@Reverse Clock Tower/Hidden Room/Sunstone", [127300009] = "@Reverse Clock Tower/Life Vessel/Life Vessel", [127300010] = "@Reverse Clock Tower/Heart Vessel/Heart Vessel", - [127300011] = "@Reverse Clock Tower/Moon rod/Moon rod", - [127303300] = "@Reverse Clock Tower/Keep Approach/Bwaka knife", + [127300011] = "@Reverse Clock Tower/Moon Rod/Moon Rod", + [127303300] = "@Reverse Clock Tower/Keep Approach/Bwaka Knife", [127303301] = "@Reverse Clock Tower/Turkey/Turkey", [127303302] = "@Reverse Clock Tower/Keep Approach/Shuriken", [127303303] = "@Reverse Clock Tower/Keep Approach/TNT", - [127303304] = "@Reverse Clock Tower/Darkwing Bat/Darkwing bat kill", + [127303304] = "@Reverse Clock Tower/Darkwing Bat/Darkwing Bat kill", [127303305] = "@Reverse Clock Tower/Darkwing Bat/Ring of Vlad", -- Reverse Colosseum - [127180000] = "@Reverse Colosseum/Fury plate(Hidden floor)/Fury plate(Hidden floor)", + [127180000] = "@Reverse Colosseum/Fury Plate/Fury Plate", [127180001] = "@Reverse Colosseum/Zircon/Zircon", - [127180002] = "@Reverse Colosseum/Buffalo star/Buffalo star", + [127180002] = "@Reverse Colosseum/Buffalo Star/Buffalo Star", [127180003] = "@Reverse Colosseum/Gram/Gram", [127180004] = "@Reverse Colosseum/Aquamarine/Aquamarine", - [127180005] = "@Reverse Colosseum/Passage/Heart Vessel(5)", + [127180005] = "@Reverse Colosseum/Passage/Heart Vessel", [127180006] = "@Reverse Colosseum/Passage/Life Vessel", - [127180007] = "@Reverse Colosseum/Passage/Heart Vessel(7)", + [127180007] = "@Reverse Colosseum/Passage/Heart Vessel", [127183180] = "@Reverse Colosseum/Fake Trevor & Grant & Sypha/Fake Trevor & Grant & Sypha kill", -- Reverse Entrance [127270000] = "@Reverse Entrance/Below Entrance/Hammer", [127270001] = "@Reverse Entrance/Below Entrance/Antivenom", - [127270002] = "@Reverse Entrance/High potion/High potion", + [127270002] = "@Reverse Entrance/High Potion/High Potion", [127270003] = "@Reverse Entrance/Heart Vessel/Heart Vessel", [127270004] = "@Reverse Entrance/Hidden Room/Zircon", [127270005] = "@Reverse Entrance/Hidden Room/Opal", - [127270006] = "@Reverse Entrance/Hidden Room/Beryl circlet", - [127270007] = "@Reverse Entrance/Fire boomerang/Fire boomerang", + [127270006] = "@Reverse Entrance/Hidden Room/Beryl Circlet", + [127270007] = "@Reverse Entrance/Fire Boomerang/Fire Boomerang", [127270008] = "@Reverse Entrance/Life Vessel/Life Vessel", [127270009] = "@Reverse Entrance/Talisman/Talisman", - [127273270] = "@Reverse Entrance/Pot roast/Pot roast", + [127273270] = "@Reverse Entrance/Pot Roast/Pot Roast", -- Reverse Outer Wall [127250000] = "@Reverse Outer Wall/Heart Vessel/Heart Vessel", [127250001] = "@Reverse Outer Wall/Behind Grate/Shotel", [127250002] = "@Reverse Outer Wall/Behind Grate/Hammer", [127250003] = "@Reverse Outer Wall/Life Vessel/Life Vessel", - [127250004] = "@Reverse Outer Wall/Luck potion/Luck potion", - [127250005] = "@Reverse Outer Wall/Shield potion/Shield potion", - [127250006] = "@Reverse Outer Wall/High potion/High potion", + [127250004] = "@Reverse Outer Wall/Luck Potion/Luck Potion", + [127250005] = "@Reverse Outer Wall/Shield Potion/Shield Potion", + [127250006] = "@Reverse Outer Wall/High Potion/High Potion", [127250007] = "@Reverse Outer Wall/Garnet/Garnet", - [127253240] = "@Reverse Outer Wall/Dim Sum set/Dim Sum set", + [127253240] = "@Reverse Outer Wall/Dim Sum Set/Dim Sum Set", [127253241] = "@Reverse Outer Wall/The Creature/Creature kill", [127253242] = "@Reverse Outer Wall/The Creature/Tooth of Vlad", -- Royal Chapel - [127050000] = "@Royal Chapel/Middle of Stairs/Ankh of life(Stairs)", + [127010004] = "@Royal Chapel/Knight Shield/Knight Shield", + [127050000] = "@Royal Chapel/Middle of Stairs/Ankh of Life", [127050001] = "@Royal Chapel/Morningstar/Morningstar", - [127050002] = "@Royal Chapel/Silver ring/Silver ring", - [127050003] = "@Royal Chapel/Aquamarine(Stairs)/Aquamarine(Stairs)", - [127050004] = "@Royal Chapel/Bottom of Stairs/Mystic pendant", - [127050005] = "@Royal Chapel/Bottom of Stairs/Magic missile(Stairs)", - [127050006] = "@Royal Chapel/Shuriken(Stairs)/Shuriken(Stairs)", - [127050007] = "@Royal Chapel/Middle of Stairs/TNT(Stairs)", - [127050008] = "@Royal Chapel/Boomerang(Stairs)/Boomerang(Stairs)", + [127050002] = "@Royal Chapel/Silver Ring/Silver Ring", + [127050003] = "@Royal Chapel/Aquamarine/Aquamarine", + [127050004] = "@Royal Chapel/Bottom of Stairs/Mystic Pendant", + [127050005] = "@Royal Chapel/Bottom of Stairs/Magic Missile", + [127050006] = "@Royal Chapel/Shuriken/Shuriken", + [127050007] = "@Royal Chapel/Middle of Stairs/TNT", + [127050008] = "@Royal Chapel/Boomerang/Boomerang", [127050009] = "@Royal Chapel/Goggles/Goggles", - [127050010] = "@Royal Chapel/Silver plate/Silver plate", - [127050011] = "@Royal Chapel/Str. potion(Bell)/Str. potion(Bell)", - [127050012] = "@Royal Chapel/Life Vessel(Bell)/Life Vessel(Bell)", + [127050010] = "@Royal Chapel/Silver Plate/Silver Plate", + [127050011] = "@Royal Chapel/Str. Potion/Str. Potion", + [127050012] = "@Royal Chapel/Life Vessel/Life Vessel", [127050013] = "@Royal Chapel/Zircon/Zircon", [127050014] = "@Royal Chapel/Cutlass/Cutlass", [127050015] = "@Royal Chapel/Potion/Potion", [127053050] = "@Royal Chapel/Hippogryph/Hippogryph kill", -- Underground Caverns - [127130000] = "@Underground Caverns/Upper Caverns/Heart Vessel(0)/Heart Vessel(0)", - [127130001] = "@Underground Caverns/Upper Caverns/Life Vessel(1)/Life Vessel(1)", - [127130002] = "@Underground Caverns/Upper Caverns/Crystal cloak/Crystal cloak", - [127130004] = "@Underground Caverns/Upper Caverns/Underwater/Antivenom(Underwater)", - [127130005] = "@Underground Caverns/Upper Caverns/Underwater/Life Vessel(Underwater)", - [127130006] = "@Underground Caverns/Lower Caverns/Life Vessel(Behind waterfall)/Life Vessel(Behind waterfall)", + [127110006] = "@Underground Caverns/Lower Caverns/Life Vessel (Entrance Passage)/Life Vessel (Entrance Passage)", + [127130000] = "@Underground Caverns/Upper Caverns/Heart Vessel/Heart Vessel", + [127130001] = "@Underground Caverns/Upper Caverns/Life Vessel/Life Vessel", + [127130002] = "@Underground Caverns/Upper Caverns/Crystal Cloak/Crystal Cloak", + [127130004] = "@Underground Caverns/Upper Caverns/Underwater/Antivenom", + [127130005] = "@Underground Caverns/Upper Caverns/Underwater/Life Vessel", + [127130006] = "@Underground Caverns/Lower Caverns/Life Vessel (Behind Waterfall)/Life Vessel (Behind Waterfall)", [127130007] = "@Underground Caverns/Upper Caverns/Herald Shield/Herald Shield", [127130009] = "@Underground Caverns/Upper Caverns/Zircon/Zircon", [127130010] = "@Underground Caverns/Upper Caverns/Side Section/Succubus/Gold Ring", - [127130011] = "@Underground Caverns/Upper Caverns/Bandanna/Bandanna", - [127130012] = "@Underground Caverns/Upper Caverns/Shiitake(12)/Shiitake(12)", + [127130011] = "@Underground Caverns/Upper Caverns/Bandana/Bandana", + [127130012] = "@Underground Caverns/Upper Caverns/Shiitake (Shaft)/Shiitake (Shaft)", [127130013] = "@Underground Caverns/Upper Caverns/Side Section/Claymore/Claymore", - [127130014] = "@Underground Caverns/Upper Caverns/Side Section/Succubus Approach/Meal ticket 1(Succubus)", - [127130015] = "@Underground Caverns/Upper Caverns/Side Section/Succubus Approach/Meal ticket 2(Succubus)", - [127130016] = "@Underground Caverns/Upper Caverns/Side Section/Succubus Approach/Meal ticket 3(Succubus)", - [127130017] = "@Underground Caverns/Upper Caverns/Side Section/Succubus Approach/Meal ticket 4(Succubus)", + [127130014] = "@Underground Caverns/Upper Caverns/Side Section/Succubus Approach/Meal Ticket", + [127130015] = "@Underground Caverns/Upper Caverns/Side Section/Succubus Approach/Meal Ticket", + [127130016] = "@Underground Caverns/Upper Caverns/Side Section/Succubus Approach/Meal Ticket", + [127130017] = "@Underground Caverns/Upper Caverns/Side Section/Succubus Approach/Meal Ticket", [127130018] = "@Underground Caverns/Upper Caverns/Side Section/Succubus Approach/Moonstone", [127130019] = "@Underground Caverns/Upper Caverns/Scimitar/Scimitar", - [127130020] = "@Underground Caverns/Upper Caverns/Resist ice/Resist ice", - [127130021] = "@Underground Caverns/Upper Caverns/Pot roast/Pot roast", - [127130022] = "@Underground Caverns/Upper Caverns/Onyx(Holy)/Onyx(Holy)", - [127130023] = "@Underground Caverns/Upper Caverns/Knuckle duster(Holy)/Knuckle duster(Holy)", - [127130024] = "@Underground Caverns/Upper Caverns/Life Vessel(Holy)/Life Vessel(Holy)", - [127130025] = "@Underground Caverns/Upper Caverns/Elixir(Holy)/Elixir(Holy)", - [127130026] = "@Underground Caverns/Upper Caverns/Caverns Entrance/Toadstool(26)", - [127130027] = "@Underground Caverns/Upper Caverns/Shiitake(27)/Shiitake(27)", - [127130028] = "@Underground Caverns/Upper Caverns/Below Bridge/Life Vessel(Bellow bridge)", - [127130029] = "@Underground Caverns/Upper Caverns/Below Bridge/Heart Vessel(Bellow bridge)", + [127130020] = "@Underground Caverns/Upper Caverns/Resist Ice/Resist Ice", + [127130021] = "@Underground Caverns/Upper Caverns/Pot Roast/Pot Roast", + [127130022] = "@Underground Caverns/Upper Caverns/Onyx/Onyx", + [127130023] = "@Underground Caverns/Upper Caverns/Knuckle Duster/Knuckle Duster", + [127130024] = "@Underground Caverns/Upper Caverns/Life Vessel (Holy Symbol)/Life Vessel (Holy Symbol)", + [127130025] = "@Underground Caverns/Upper Caverns/Elixir/Elixir", + [127130026] = "@Underground Caverns/Upper Caverns/Caverns Entrance/Toadstool", + [127130027] = "@Underground Caverns/Upper Caverns/Shiitake (Cavern)/Shiitake (Cavern)", + [127130028] = "@Underground Caverns/Upper Caverns/Below Bridge/Life Vessel", + [127130029] = "@Underground Caverns/Upper Caverns/Below Bridge/Heart Vessel", [127130030] = "@Underground Caverns/Upper Caverns/Pentagram/Pentagram", - [127130031] = "@Underground Caverns/Upper Caverns/Secret boots/Secret boots", - [127130032] = "@Underground Caverns/Upper Caverns/Shiitake(Waterfall)/Shiitake(Waterfall)", - [127130033] = "@Underground Caverns/Lower Caverns/Toadstool(Waterfall)/Toadstool(Waterfall)", - [127130035] = "@Underground Caverns/Lower Caverns/Shiitake(Near entrance passage)/Shiitake(Near entrance passage)", + [127130031] = "@Underground Caverns/Upper Caverns/Secret Boots/Secret Boots", + [127130032] = "@Underground Caverns/Upper Caverns/Shiitake (Waterfall)/Shiitake (Waterfall)", + [127130033] = "@Underground Caverns/Lower Caverns/Toadstool (Waterfall)/Toadstool (Waterfall)", + [127130035] = "@Underground Caverns/Lower Caverns/Shiitake (Near Entrance Passage)/Shiitake (Near Entrance Passage)", [127130036] = "@Underground Caverns/Upper Caverns/Caverns Entrance/Nunchaku", [127133130] = "@Underground Caverns/Upper Caverns/Scylla/Scylla kill", - [127133131] = "@Underground Caverns/Upper Caverns/Side Section/Succubus/Succubus kill", + [127133131] = "@Underground Caverns/Upper Caverns/Side Section/Succubus/Succubus Kill", [127133132] = "@Underground Caverns/Upper Caverns/Holy Symbol/Holy Symbol", [127133133] = "@Underground Caverns/Lower Caverns/Merman Statue/Merman Statue", @@ -464,8 +464,8 @@ LOCATIONS_MAPPING = { -- Hosted items mapping for boss kill items. HOSTED_ITEMS = { [127013010] = "minotauruswerewolf", - [127023020] = "legion", - [127043041] = "cerberos", + [127023020] = "granfaloon", + [127043041] = "cerberus", [127053050] = "hippogryph", [127073070] = "lesserdemon", [127093091] = "doppleganger10", @@ -480,6 +480,6 @@ HOSTED_ITEMS = { [127253241] = "creature", [127263260] = "akmodan", [127283280] = "doppleganger40", - [127293290] = "beezelbub", + [127293290] = "beelzebub", [127303304] = "darkwingbat", }