diff --git a/worlds/civ_6/Container.py b/worlds/civ_6/Container.py index f920781b..0c5340d9 100644 --- a/worlds/civ_6/Container.py +++ b/worlds/civ_6/Container.py @@ -48,6 +48,10 @@ class CivVIContainer(APContainer, metaclass=AutoPatchRegister): opened_zipfile.writestr(filename, yml) super().write_contents(opened_zipfile) +def sanitize_value(value: str) -> str: + """Removes values that can cause issues in XML""" + return value.replace('"', "'").replace('&', 'and') + def get_cost(world: 'CivVIWorld', location: CivVILocationData) -> int: """ @@ -63,7 +67,7 @@ def get_formatted_player_name(world: 'CivVIWorld', player: int) -> str: Returns the name of the player in the world """ if player != world.player: - return f"{world.multiworld.player_name[player]}{apo}s" + return sanitize_value(f"{world.multiworld.player_name[player]}{apo}s") return "Your" @@ -106,7 +110,7 @@ def generate_new_items(world: 'CivVIWorld') -> str: {"".join([f'{tab} str: {"".join([f'{tab}