Skip to content

Commit

Permalink
Client Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamesbrq
jamesbrq committed Jun 25, 2024
1 parent 37ebc75 commit 47921e8
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 20 deletions.
33 changes: 15 additions & 18 deletions GauntletLegendsClient.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,14 +410,10 @@ async def write_inv(self, item: InventoryEntry):
+ item.type
+ int.to_bytes(item.count, 4, "little")
+ int.to_bytes(item.p_addr, 3, "little")
+ int.to_bytes(0xE0) if item.p_addr != 0 else int.to_bytes(0xE0)
+ int.to_bytes(item.n_addr, 3, "little")
+ int.to_bytes(0xE0) if item.n_addr != 0 else bytes()
)
if item.p_addr != 0:
b += int.to_bytes(0xE0)
else:
b += int.to_bytes(0x0)
b += int.to_bytes(item.n_addr, 3, "little")
if item.n_addr != 0:
b += int.to_bytes(0xE0)
await self.socket.write(message_format(WRITE, param_format(item.addr, b)))

async def server_auth(self, password_requested: bool = False):
Expand Down Expand Up @@ -467,9 +463,9 @@ async def handle_items(self):
await self.inv_update("Key", 9000)
temp = await self.item_from_name("Speed Boots")
if temp is None and self.glslotdata["speed"] == 1:
await self.inv_update("Speed Boots", 200)
await self.inv_update("Speed Boots", 2000)
i = compass.count
if i - 1 != len(self.items_received):
if i - 1 < len(self.items_received):
for index in range(i - 1, len(self.items_received)):
item = self.items_received[index].item
await self.inv_update(items_by_id[item].item_name, base_count[items_by_id[item].item_name])
Expand All @@ -479,18 +475,16 @@ async def handle_items(self):
async def read_time(self) -> int:
return int.from_bytes(await self.socket.read(message_format(READ, f"0x{format(TIME, 'x')} 2")), "little")

# Read player input values in RAM
async def read_input(self) -> int:
return int.from_bytes(await self.socket.read(message_format(READ, f"0x{format(INPUT, 'x')} 1")))

# Read currently loaded level in RAM
async def read_level(self) -> bytes:
return await self.socket.read(message_format(READ, f"0x{format(ACTIVE_LEVEL, 'x')} 2"))
level = await self.socket.read(message_format(READ, f"0x{format(ACTIVE_LEVEL, 'x')} 2"))
return level

# Read value that is 1 while a level is currently loading
async def check_loading(self) -> bool:
if self.in_portal or self.level_loading:
return await self.read_time() == 0
time = await self.read_time()
return time == 0
return False

# Read number of loaded players in RAM
Expand All @@ -515,7 +509,7 @@ async def scale(self):
scale_value = min(max(((player_level - difficulty_convert[level[1]]) // 5), 0), 3)
if self.glslotdata["instant_max"] == 1:
scale_value = max_value
mountain_value = min(player_level // 10, 3) if level[1] == 2 and self.clear_counts.get(str(level), 0) != 0 else 0
mountain_value = min(player_level // 10, 3)
await self.socket.write(
message_format(WRITE, f"0x{format(PLAYER_COUNT, 'x')} 0x{format(min(players + scale_value, max_value) - mountain_value, 'x')}"),
)
Expand Down Expand Up @@ -605,7 +599,8 @@ async def location_loop(self) -> List[int]:
self.locations_checked += [self.item_locations[i].id]
acquired += [self.item_locations[i].id]
for j in range(len(self.obelisk_locations)):
if await self.inv_bitwise("Obelisk", base_count[items_by_id[self.obelisks[j].item].item_name]):
ob = await self.inv_bitwise("Obelisk", base_count[items_by_id[self.obelisks[j].item].item_name])
if ob:
self.locations_checked += [self.obelisk_locations[j].id]
acquired += [self.obelisk_locations[j].id]
for k, obj in enumerate(self.chest_objects):
Expand Down Expand Up @@ -816,8 +811,10 @@ async def gl_sync_task(ctx: GauntletLegendsContext):
checking = await ctx.location_loop()
if checking:
await ctx.send_msgs([{"cmd": "LocationChecks", "locations": checking}])
if not ctx.finished_game and await ctx.inv_bitwise("Hell", 0x100):
bitwise = await ctx.inv_bitwise("Hell", 0x100)
if not ctx.finished_game and bitwise:
await ctx.send_msgs([{"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}])
ctx.finished_game = True
except Exception:
logger.info(traceback.format_exc())
await asyncio.sleep(0.1)
Expand Down
20 changes: 18 additions & 2 deletions worlds/gl/GauntletLegendsClient.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ async def item_from_name(self, name: str) -> InventoryEntry | None:
async def inv_bitwise(self, name: str, bit: int) -> bool:
item = await self.item_from_name(name)
if item is None:
logger.info("NONE")
return False
return (item.count & bit) != 0

Expand Down Expand Up @@ -599,7 +598,6 @@ async def location_loop(self) -> List[int]:
acquired += [self.item_locations[i].id]
for j in range(len(self.obelisk_locations)):
ob = await self.inv_bitwise("Obelisk", base_count[items_by_id[self.obelisks[j].item].item_name])
logger.info(ob)
if ob:
self.locations_checked += [self.obelisk_locations[j].id]
acquired += [self.obelisk_locations[j].id]
Expand Down Expand Up @@ -715,13 +713,31 @@ async def gl_sync_task(ctx: GauntletLegendsContext):
while not ctx.exit_event.is_set():
if ctx.retro_connected:
cc_str: str = f"gl_cc_T{ctx.team}_P{ctx.slot}"
pl_str: str = f"gl_pl_T{ctx.team}_P{ctx.slot}"
try:
ctx.set_notify(cc_str)
if not ctx.auth:
ctx.retro_connected = False
continue
except Exception:
logger.info(traceback.format_exc())
player_level = await ctx.player_level()
await ctx.send_msgs(
[
{
"cmd": "Set",
"key": pl_str,
"default": {},
"want_reply": True,
"operations": [
{
"operation": "replace",
"value": player_level,
},
],
},
],
)
if ctx.limbo:
try:
limbo = await ctx.limbo_check(0x78)
Expand Down

0 comments on commit 47921e8

Please sign in to comment.