 5f73c245fc
			
		
	
	5f73c245fc
	
	
	
		
			
			* Init * remove submodule * Init * Update docs * Fix tests * Update to use apcivvi * Update Readme and codeowners * Minor changes * Remove .value from options (except starting hint) * Minor updates * remove unnecessary property * Cleanup Rules and Region * Fix output file generation * Implement feedback * Remove 'AP' tag and fix issue with format strings and using same quotes * Update worlds/civ_6/__init__.py Co-authored-by: Scipio Wright <scipiowright@gmail.com> * Minor docs changes * minor updates * Small rework of create items * Minor updates * Remove unused variable * Move client to Launcher Components with rest of similar clients * Revert "Move client to Launcher Components with rest of similar clients" This reverts commit f9fd5df9fdf19eaf4f1de54e21e3c33a74f02364. * modify component * Fix generation issues * Fix tests * Minor change * Add improvement and test case * Minor options changes * . * Preliminary Review * Fix failing test due to slot data serialization * Format json * Remove exclude missable boosts * Update options (update goody hut text, make research multiplier a range) * Update docs punctuation and slot data init * Move priority/excluded locations into options * Implement docs PR feedback * PR Feedback for options * PR feedback misc * Update location classification and fix client type * Fix typings * Update research cost multiplier * Remove unnecessary location priority code * Remove extrenous use of items() * WIP PR Feedback * WIP PR Feedback * Add victory event * Add option set for death link effect * PR improvements * Update post fill hint to support items with multiple classifications * remove unnecessary len * Move location exclusion logic * Update test to use set instead of accidental dict * Update docs around progressive eras and boost locations * Update docs for options to be more readable * Fix issue with filler items and prehints * Update filler_data to be static * Update links in docs * Minor updates and PR feedback * Update boosts data * Update era required items * Update existing techs * Update existing techs * move boost data class * Update reward data * Update prereq data * Update new items and progressive districts * Remove unused code * Make filler item name func more efficient * Update death link text * Move Civ6 to the end of readme * Fix bug with hidden locations and location.name * Partial PR Feedback Implementation * Format changes * Minor review feedback * Modify access rules to use list created in generate_early * Modify boost rules to precalculate requirements * Remove option checks from access rules * Fix issue with pre initialized dicts * Add inno setup for civ6 client * Update inno_setup.iss --------- Co-authored-by: Scipio Wright <scipiowright@gmail.com> Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Co-authored-by: Exempt-Medic <ExemptMedic@Gmail.com> Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
		
			
				
	
	
		
			106 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			106 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| import asyncio
 | |
| from logging import Logger
 | |
| import socket
 | |
| from typing import Any
 | |
| 
 | |
| ADDRESS = "127.0.0.1"
 | |
| PORT = 4318
 | |
| 
 | |
| CLIENT_PREFIX = "APSTART:"
 | |
| CLIENT_POSTFIX = ":APEND"
 | |
| 
 | |
| 
 | |
| def decode_mixed_string(data: bytes) -> str:
 | |
|     return "".join(chr(b) if 32 <= b < 127 else "?" for b in data)
 | |
| 
 | |
| 
 | |
| class TunerException(Exception):
 | |
|     pass
 | |
| 
 | |
| 
 | |
| class TunerTimeoutException(TunerException):
 | |
|     pass
 | |
| 
 | |
| 
 | |
| class TunerErrorException(TunerException):
 | |
|     pass
 | |
| 
 | |
| 
 | |
| class TunerConnectionException(TunerException):
 | |
|     pass
 | |
| 
 | |
| 
 | |
| class TunerClient:
 | |
|     """Interfaces with Civilization via the tuner socket"""
 | |
|     logger: Logger
 | |
| 
 | |
|     def __init__(self, logger: Logger):
 | |
|         self.logger = logger
 | |
| 
 | |
|     def __parse_response(self, response: str) -> str:
 | |
|         """Parses the response from the tuner socket"""
 | |
|         split = response.split(CLIENT_PREFIX)
 | |
|         if len(split) > 1:
 | |
|             start = split[1]
 | |
|             end = start.split(CLIENT_POSTFIX)[0]
 | |
|             return end
 | |
|         elif "ERR:" in response:
 | |
|             raise TunerErrorException(response.replace("?", ""))
 | |
|         else:
 | |
|             return ""
 | |
| 
 | |
|     async def send_game_command(self, command_string: str, size: int = 64):
 | |
|         """Small helper that prefixes a command with GameCore.Game."""
 | |
|         return await self.send_command("GameCore.Game." + command_string, size)
 | |
| 
 | |
|     async def send_command(self, command_string: str, size: int = 64):
 | |
|         """Send a raw commannd"""
 | |
|         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 | |
|         sock.setblocking(False)
 | |
| 
 | |
|         b_command_string = command_string.encode("utf-8")
 | |
| 
 | |
|         # Send data to the server
 | |
|         command_prefix = b"CMD:0:"
 | |
|         delimiter = b"\x00"
 | |
|         full_command = b_command_string
 | |
|         message = command_prefix + full_command + delimiter
 | |
|         message_length = len(message).to_bytes(1, byteorder="little")
 | |
| 
 | |
|         # game expects this to be added before any command that is sent, indicates payload size
 | |
|         message_header = message_length + b"\x00\x00\x00\x03\x00\x00\x00"
 | |
|         data = message_header + command_prefix + full_command + delimiter
 | |
| 
 | |
|         server_address = (ADDRESS, PORT)
 | |
|         loop = asyncio.get_event_loop()
 | |
|         try:
 | |
|             await loop.sock_connect(sock, server_address)
 | |
|             await loop.sock_sendall(sock, data)
 | |
| 
 | |
|             # Add a delay before receiving data
 | |
|             await asyncio.sleep(.02)
 | |
| 
 | |
|             received_data = await self.async_recv(sock)
 | |
|             response = decode_mixed_string(received_data)
 | |
|             return self.__parse_response(response)
 | |
| 
 | |
|         except socket.timeout:
 | |
|             self.logger.debug("Timeout occurred while receiving data")
 | |
|             raise TunerTimeoutException()
 | |
|         except Exception as e:
 | |
|             self.logger.debug(f"Error occurred while receiving data: {str(e)}")
 | |
|             # check if No connection could be made is present in the error message
 | |
|             connection_errors = [
 | |
|                 "The remote computer refused the network connection",
 | |
|             ]
 | |
|             if any(error in str(e) for error in connection_errors):
 | |
|                 raise TunerConnectionException(e)
 | |
|             else:
 | |
|                 raise TunerErrorException(e)
 | |
|         finally:
 | |
|             sock.close()
 | |
| 
 | |
|     async def async_recv(self, sock: Any, timeout: float = 2.0, size: int = 4096):
 | |
|         response = await asyncio.wait_for(asyncio.get_event_loop().sock_recv(sock, size), timeout)
 | |
|         return response
 |