morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Factorio: fix energylink type back to int (#4768)

Browse Source
This commit is contained in:
Fabian Dill
2025-03-28 00:28:10 +01:00
committed by GitHub
parent 5e5383b399
commit 193faa00ce
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
worlds/factorio/Client.py
View File

@@ -255,7 +255,8 @@ async def game_watcher(ctx: FactorioContext):
if "DeathLink" in ctx.tags: if "DeathLink" in ctx.tags:
async_start(ctx.send_death()) async_start(ctx.send_death())
if ctx.energy_link_increment: if ctx.energy_link_increment:
in_world_bridges = data["energy_bridges"] # 1 + quality * 0.3 for each bridge
in_world_bridges: float = data["energy_bridges"]
if in_world_bridges: if in_world_bridges:
in_world_energy = data["energy"] in_world_energy = data["energy"]
if in_world_energy < (ctx.energy_link_increment * in_world_bridges): if in_world_energy < (ctx.energy_link_increment * in_world_bridges):
@@ -263,14 +264,14 @@ async def game_watcher(ctx: FactorioContext):
ctx.last_deplete = time.time() ctx.last_deplete = time.time()
async_start(ctx.send_msgs([{ async_start(ctx.send_msgs([{
"cmd": "Set", "key": ctx.energylink_key, "operations": "cmd": "Set", "key": ctx.energylink_key, "operations":
[{"operation": "add", "value": -ctx.energy_link_increment * in_world_bridges}, [{"operation": "add", "value": int(-ctx.energy_link_increment * in_world_bridges)},
{"operation": "max", "value": 0}], {"operation": "max", "value": 0}],
"last_deplete": ctx.last_deplete "last_deplete": ctx.last_deplete
}])) }]))
# Above Capacity - (len(Bridges) * ENERGY_INCREMENT) # Above Capacity - (len(Bridges) * ENERGY_INCREMENT)
elif in_world_energy > (in_world_bridges * ctx.energy_link_increment * 5) - \ elif in_world_energy > (in_world_bridges * ctx.energy_link_increment * 5) - \
ctx.energy_link_increment * in_world_bridges: ctx.energy_link_increment * in_world_bridges:
value = ctx.energy_link_increment * in_world_bridges value = int(ctx.energy_link_increment * in_world_bridges)
async_start(ctx.send_msgs([{ async_start(ctx.send_msgs([{
"cmd": "Set", "key": ctx.energylink_key, "operations": "cmd": "Set", "key": ctx.energylink_key, "operations":
[{"operation": "add", "value": value}] [{"operation": "add", "value": value}]
@@ -406,7 +407,7 @@ async def get_info(ctx: FactorioContext, rcon_client: factorio_rcon.RCONClient):
ctx.auth = info["slot_name"] ctx.auth = info["slot_name"]
ctx.seed_name = info["seed_name"] ctx.seed_name = info["seed_name"]
death_link = info["death_link"] death_link = info["death_link"]
ctx.energy_link_increment = info.get("energy_link", 0) ctx.energy_link_increment = int(info.get("energy_link", 0))
logger.debug(f"Energy Link Increment: {ctx.energy_link_increment}") logger.debug(f"Energy Link Increment: {ctx.energy_link_increment}")
if ctx.energy_link_increment and ctx.ui: if ctx.energy_link_increment and ctx.ui:
ctx.ui.enable_energy_link() ctx.ui.enable_energy_link()

2
worlds/factorio/__init__.py
View File

@@ -102,7 +102,7 @@ class Factorio(World):
item_name_groups = { item_name_groups = {
"Progressive": set(progressive_tech_table.keys()), "Progressive": set(progressive_tech_table.keys()),
} }
required_client_version = (0, 5, 1) required_client_version = (0, 6, 0)
if Utils.version_tuple < required_client_version: if Utils.version_tuple < required_client_version:
raise Exception(f"Update Archipelago to use this world ({game}).") raise Exception(f"Update Archipelago to use this world ({game}).")
ordered_science_packs: typing.List[str] = MaxSciencePack.get_ordered_science_packs() ordered_science_packs: typing.List[str] = MaxSciencePack.get_ordered_science_packs()