Skip to content

Commit

Permalink
Experimental
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamesbrq
jamesbrq committed Jul 23, 2024
1 parent edb4002 commit f41c150
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
4 changes: 2 additions & 2 deletions worlds/gl/GauntletLegendsClient.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ async def location_loop(self) -> List[int]:
await self.obj_read(1)
acquired = []
for i, obj in enumerate(self.item_objects):
if obj.raw[:2] == bytes([0xAD, 0xB]):
if obj.raw[24] != 0x0:
if self.item_locations[i].id not in self.locations_checked:
self.locations_checked += [self.item_locations[i].id]
acquired += [self.item_locations[i].id]
Expand All @@ -675,7 +675,7 @@ async def location_loop(self) -> List[int]:
acquired += [self.obelisk_locations[j].id]
for k, obj in enumerate(self.chest_objects):
if "Chest" in self.chest_locations[k].name:
if obj.raw[:2] == bytes([0xAD, 0xB]):
if obj.raw[24] != 0x0:
if self.chest_locations[k].id not in self.locations_checked:
self.locations_checked += [self.chest_locations[k].id]
acquired += [self.chest_locations[k].id]
Expand Down
62 changes: 31 additions & 31 deletions worlds/gl/Locations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1327,12 +1327,12 @@ class GLLocation(Location):
LocationData("Crystal Mine - Shrink (Dif. 3)", 88870511, 3),
LocationData("Crystal Mine Barrel - Reflective Shot 1 (Dif. 3)", 8887180, 3),
LocationData("Crystal Mine Barrel - Speed Boots 1 (Dif. 4)", 8887181, 4),
LocationData("Crystal Mine Barrel - Unknown 1 (Dif. 2)", 8887182, 2),
LocationData("Crystal Mine Barrel - Unknown 2", 8887183, 1),
LocationData("Crystal Mine Barrel - Unknown 3 (Dif. 3)", 8887184, 3),
LocationData("Crystal Mine Barrel - Unknown 4 (Dif. 2)", 8887185, 2),
LocationData("Crystal Mine Barrel - Unknown 5", 8887186, 1),
LocationData("Crystal Mine Barrel - Unknown 6", 8887187, 1),
LocationData("Crystal Mine Barrel - Meat 1 (Dif. 2)", 8887182, 2),
LocationData("Crystal Mine Barrel - Meat 2", 8887183, 1),
LocationData("Crystal Mine Barrel - Meat 3 (Dif. 3)", 8887184, 3),
LocationData("Crystal Mine Barrel - Meat 4 (Dif. 2)", 8887185, 2),
LocationData("Crystal Mine Barrel - Meat 5", 8887186, 1),
LocationData("Crystal Mine Barrel - Scroll 1", 8887187, 1),
LocationData("Crystal Mine Chest - Growth 1 (Dif. 2)", 8887188, 2),
LocationData("Crystal Mine Barrel - Key 1", 8887189, 1),
LocationData("Crystal Mine Barrel - Key 2", 88871810, 1),
Expand Down Expand Up @@ -1383,7 +1383,7 @@ class GLLocation(Location):
LocationData("Crystal Mine Barrel - Potion 4", 88871855, 1),
LocationData("Crystal Mine Barrel - Key 15", 88871856, 1),
LocationData("Crystal Mine Chest - 3-Way Shot 1", 88871857, 1),
LocationData("Crystal Mine Barrel - Scroll 1", 88871858, 1),
LocationData("Crystal Mine Barrel - Scroll 2", 88871858, 1),
LocationData("Crystal Mine Chest - Gold 8", 88871859, 1),
LocationData("Crystal Mine Barrel - Fire Amulet 1", 88871860, 1),
LocationData("Crystal Mine Barrel - Key 16", 88871861, 1),
Expand Down Expand Up @@ -1415,21 +1415,21 @@ class GLLocation(Location):
LocationData("Erupting Fissure - Speed Boots (Dif. 4)", 88870527, 4),
LocationData("Erupting Fissure - Key 9", 88870528, 1),
LocationData("Erupting Fissure - Key 10 (Dif. 2)", 88870529, 2),
LocationData("Erupting Fissure Barrel - Unknown 1", 8887190, 1),
LocationData("Erupting Fissure Barrel - Unknown 2 (Dif. 4)", 8887191, 4),
LocationData("Erupting Fissure Barrel - Meat 1", 8887190, 1),
LocationData("Erupting Fissure Barrel - Potion 1 (Dif. 4)", 8887191, 4),
LocationData("Erupting Fissure Barrel - Thunder Hammer 1 (Dif. 2)", 8887192, 2),
LocationData("Erupting Fissure Barrel - Unknown 3 (Dif. 4)", 8887193, 4),
LocationData("Erupting Fissure Barrel - Unknown 4", 8887194, 1),
LocationData("Erupting Fissure Barrel - Unknown 5 (Dif. 4)", 8887195, 4),
LocationData("Erupting Fissure Barrel - Unknown 6", 8887196, 1),
LocationData("Erupting Fissure Barrel - Unknown 7 (Dif. 2)", 8887197, 2),
LocationData("Erupting Fissure Barrel - Unknown 8", 8887198, 1),
LocationData("Erupting Fissure Barrel - Unknown 9", 8887199, 1),
LocationData("Erupting Fissure Barrel - Unknown 10", 88871910, 1),
LocationData("Erupting Fissure Barrel - Unknown 11 (Dif. 3)", 88871911, 3),
LocationData("Erupting Fissure Barrel - Unknown 12 (Dif. 2)", 88871912, 2),
LocationData("Erupting Fissure Barrel - Unknown 13", 88871913, 1),
LocationData("Erupting Fissure Barrel - Unknown 14", 88871914, 1),
LocationData("Erupting Fissure Barrel - Fruit 1 (Dif. 4)", 8887193, 4),
LocationData("Erupting Fissure Barrel - Scroll 1", 8887194, 1),
LocationData("Erupting Fissure Barrel - Meat 2 (Dif. 4)", 8887195, 4),
LocationData("Erupting Fissure Barrel - Fruit 2", 8887196, 1),
LocationData("Erupting Fissure Barrel - Meat 3 (Dif. 2)", 8887197, 2),
LocationData("Erupting Fissure Barrel - Scroll 2", 8887198, 1),
LocationData("Erupting Fissure Barrel - Scroll 3", 8887199, 1),
LocationData("Erupting Fissure Barrel - Fruit 3", 88871910, 1),
LocationData("Erupting Fissure Barrel - Meat 4 (Dif. 3)", 88871911, 3),
LocationData("Erupting Fissure Barrel - Fruit 4 (Dif. 2)", 88871912, 2),
LocationData("Erupting Fissure Barrel - Meat 5", 88871913, 1),
LocationData("Erupting Fissure Barrel - Scroll 4", 88871914, 1),
LocationData("Erupting Fissure Barrel - Key 1", 88871915, 1),
LocationData("Erupting Fissure Barrel - Key 2 (Dif. 2)", 88871916, 2),
LocationData("Erupting Fissure Barrel - Key 3 (Dif. 2)", 88871917, 2),
Expand All @@ -1438,7 +1438,7 @@ class GLLocation(Location):
LocationData("Erupting Fissure Barrel - Nothing 2", 88871920, 1),
LocationData("Erupting Fissure Barrel - Nothing 3", 88871921, 1),
LocationData("Erupting Fissure Barrel - Nothing 4", 88871922, 1),
LocationData("Erupting Fissure Barrel - Fruit 1 (Dif. 3)", 88871923, 3),
LocationData("Erupting Fissure Barrel - Fruit 5 (Dif. 3)", 88871923, 3),
LocationData("Erupting Fissure Barrel - Acid Amulet 1 (Dif. 4)", 88871924, 4),
LocationData("Erupting Fissure Barrel - Nothing 5", 88871925, 1),
LocationData("Erupting Fissure Barrel - Nothing 6", 88871926, 1),
Expand All @@ -1451,7 +1451,7 @@ class GLLocation(Location):
LocationData("Erupting Fissure Barrel - Key 7 (Dif. 3)", 88871933, 3),
LocationData("Erupting Fissure Barrel - Key 8 (Dif. 4)", 88871934, 4),
LocationData("Erupting Fissure Barrel - Key 9 (Dif. 3)", 88871935, 3),
LocationData("Erupting Fissure Barrel - Fruit 2 (Dif. 2)", 88871936, 2),
LocationData("Erupting Fissure Barrel - Fruit 6 (Dif. 2)", 88871936, 2),
LocationData("Erupting Fissure Barrel - Death 1", 88871937, 1),
LocationData("Erupting Fissure Chest - Gold 2 (Dif. 3)", 88871938, 3),
LocationData("Erupting Fissure Chest - Meat 1 (Dif. 2)", 88871939, 2),
Expand All @@ -1469,13 +1469,13 @@ class GLLocation(Location):
LocationData("Erupting Fissure Barrel - Key 19", 88871951, 1),
LocationData("Erupting Fissure Barrel - Key 20 (Dif. 2)", 88871952, 2),
LocationData("Erupting Fissure Chest - Gold 4 (Dif. 2)", 88871953, 2),
LocationData("Erupting Fissure Barrel - Scroll 1", 88871954, 1),
LocationData("Erupting Fissure Barrel - Scroll 5", 88871954, 1),
LocationData("Erupting Fissure Chest - Potion 2", 88871955, 1),
LocationData("Erupting Fissure Chest - Light Amulet 1 (Dif. 2)", 88871956, 2),
LocationData("Erupting Fissure Barrel - Gold 1 (Dif. 4)", 88871957, 4),
LocationData("Erupting Fissure Barrel - Key 21 (Dif. 2)", 88871958, 2),
LocationData("Erupting Fissure Barrel - Fruit 3 (Dif. 4)", 88871959, 4),
LocationData("Erupting Fissure Barrel - Fruit 4 (Dif. 3)", 88871960, 3),
LocationData("Erupting Fissure Barrel - Fruit 7 (Dif. 4)", 88871959, 4),
LocationData("Erupting Fissure Barrel - Fruit 8 (Dif. 3)", 88871960, 3),
LocationData("Erupting Fissure Barrel - Gold 2", 88871961, 1),
LocationData("Erupting Fissure Barrel - Key 22", 88871962, 1),
LocationData("Erupting Fissure Barrel - Gold 3 (Dif. 3)", 88871963, 3),
Expand All @@ -1489,7 +1489,7 @@ class GLLocation(Location):
LocationData("Erupting Fissure Chest - Gold 7", 88871971, 1),
LocationData("Erupting Fissure Chest - Super Shot 1 (Dif. 3)", 88871972, 3),
LocationData("Erupting Fissure Chest - Timestop 1", 88871973, 1),
LocationData("Erupting Fissure Barrel - Potion 1", 88871974, 1),
LocationData("Erupting Fissure Barrel - Potion 2", 88871974, 1),
LocationData("Erupting Fissure Barrel - Death 3 (Dif. 2)", 88871975, 2),
LocationData("Erupting Fissure Chest - Levitate 1", 88871976, 1),
LocationData("Erupting Fissure Chest - Gold 8 (Dif. 2)", 88871977, 2),
Expand Down Expand Up @@ -1631,7 +1631,7 @@ class GLLocation(Location):
LocationData("Battle Towers - Key 2", 88870565, 1),
LocationData("Battle Towers - Soul Savior", 88870566, 1),
LocationData("Battle Towers Barrel - Fire Breath 1 (Dif. 4)", 8887220, 4),
LocationData("Battle Towers Barrel - Unknown 1", 8887221, 1),
LocationData("Battle Towers Barrel - Scroll 1", 8887221, 1),
LocationData("Battle Towers Chest - Invulnerability 1", 8887222, 1),
LocationData("Battle Towers Barrel - Thunder Hammer 1 (Dif. 2)", 8887223, 2),
LocationData("Battle Towers Barrel - Reflective Shield 1", 8887224, 1),
Expand All @@ -1641,12 +1641,12 @@ class GLLocation(Location):
LocationData("Battle Towers Barrel - Potion 2 (Dif. 2)", 8887228, 2),
LocationData("Battle Towers Dark Chest - Random 1 (Dif. 3)", 8887229, 3),
LocationData("Battle Towers Barrel - Fruit 1", 88872210, 1),
LocationData("Battle Towers Barrel - Scroll 1", 88872211, 1),
LocationData("Battle Towers Barrel - Scroll 2", 88872211, 1),
LocationData("Battle Towers Barrel - Gold 1 (Dif. 4)", 88872212, 4),
LocationData("Battle Towers Barrel - Scroll 2", 88872213, 1),
LocationData("Battle Towers Barrel - Scroll 3", 88872213, 1),
LocationData("Battle Towers Barrel - Key 3", 88872214, 1),
LocationData("Battle Towers Barrel - Key 4", 88872215, 1),
LocationData("Battle Towers Barrel - Scroll 3", 88872216, 1),
LocationData("Battle Towers Barrel - Scroll 4", 88872216, 1),
LocationData("Battle Towers Barrel - Key 5", 88872217, 1),
LocationData("Battle Towers Barrel - Fruit 2 (Dif. 3)", 88872218, 3),
LocationData("Battle Towers Barrel - Gold 2", 88872219, 1),
Expand Down

0 comments on commit f41c150

Please sign in to comment.