monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Factorio: always display static nodes with full info

This commit is contained in:
Fabian Dill 2021-06-24 23:51:42 +02:00
parent 6c1d164330
commit 9f2f343f76
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
LttPClient.py
View File

@ -852,10 +852,11 @@ async def game_watcher(ctx: Context):
if recv_index < len(ctx.items_received) and recv_item == 0: if recv_index < len(ctx.items_received) and recv_item == 0:
item = ctx.items_received[recv_index] item = ctx.items_received[recv_index]
recv_index += 1
logging.info('Received %s from %s (%s) (%d/%d in list)' % ( logging.info('Received %s from %s (%s) (%d/%d in list)' % (
color(ctx.item_name_getter(item.item), 'red', 'bold'), color(ctx.player_names[item.player], 'yellow'), color(ctx.item_name_getter(item.item), 'red', 'bold'), color(ctx.player_names[item.player], 'yellow'),
ctx.location_name_getter(item.location), recv_index + 1, len(ctx.items_received))) ctx.location_name_getter(item.location), recv_index, len(ctx.items_received)))
recv_index += 1
snes_buffered_write(ctx, RECV_PROGRESS_ADDR, bytes([recv_index & 0xFF, (recv_index >> 8) & 0xFF])) snes_buffered_write(ctx, RECV_PROGRESS_ADDR, bytes([recv_index & 0xFF, (recv_index >> 8) & 0xFF]))
snes_buffered_write(ctx, RECV_ITEM_ADDR, bytes([item.item])) snes_buffered_write(ctx, RECV_ITEM_ADDR, bytes([item.item]))
snes_buffered_write(ctx, RECV_ITEM_PLAYER_ADDR, bytes([item.player if item.player != ctx.slot else 0])) snes_buffered_write(ctx, RECV_ITEM_PLAYER_ADDR, bytes([item.player if item.player != ctx.slot else 0]))

2
data/factorio/mod_template/data-final-fixes.lua
View File

@ -69,7 +69,7 @@ prep_copy(new_tree_copy, original_tech)
{% if tech_cost_scale != 1 %} {% if tech_cost_scale != 1 %}
new_tree_copy.unit.count = math.max(1, math.floor(new_tree_copy.unit.count * {{ tech_cost_scale }})) new_tree_copy.unit.count = math.max(1, math.floor(new_tree_copy.unit.count * {{ tech_cost_scale }}))
{% endif %} {% endif %}
{%- if item_name in tech_table and tech_tree_information == 2 -%} {%- if item_name in tech_table and tech_tree_information == 2 or original_tech_name in static_nodes -%}
{#- copy Factorio Technology Icon -#} {#- copy Factorio Technology Icon -#}
copy_factorio_icon(new_tree_copy, "{{ item_name }}") copy_factorio_icon(new_tree_copy, "{{ item_name }}")
{%- else -%} {%- else -%}

8
data/factorio/mod_template/locale/en/locale.cfg
View File

@ -1,7 +1,7 @@
[technology-name] [technology-name]
{% for original_tech_name, item_name, receiving_player, advancement in locations %} {% for original_tech_name, item_name, receiving_player, advancement in locations %}
{%- if tech_tree_information == 2 -%} {%- if tech_tree_information == 2 or original_tech_name in static_nodes -%}
ap-{{ tech_table[original_tech_name] }}-={{ player_names[receiving_player] }}'s {{ item_name }} ap-{{ tech_table[original_tech_name] }}-={{ player_names[receiving_player] }}'s {{ item_name }}
{% else %} {% else %}
ap-{{ tech_table[original_tech_name] }}-=An Archipelago Sendable ap-{{ tech_table[original_tech_name] }}-=An Archipelago Sendable
@ -10,10 +10,10 @@ ap-{{ tech_table[original_tech_name] }}-=An Archipelago Sendable
[technology-description] [technology-description]
{% for original_tech_name, item_name, receiving_player, advancement in locations %} {% for original_tech_name, item_name, receiving_player, advancement in locations %}
{%- if tech_tree_information == 2 %} {%- if tech_tree_information == 2 or original_tech_name in static_nodes %}
ap-{{ tech_table[original_tech_name] }}-=Researching this technology sends {{ item_name }} to {{ player_names[receiving_player] }}{% if advancement %}, which is considered a logical advancement{% endif %}. ap-{{ tech_table[original_tech_name] }}-=Researching this technology sends {{ item_name }} to {{ player_names[receiving_player] }}{% if advancement %}, which is considered a logical advancement{% endif %}. For purposes of hints, this location is called "{{ original_tech_name }}".
{%- elif tech_tree_information == 1 and advancement %} {%- elif tech_tree_information == 1 and advancement %}
ap-{{ tech_table[original_tech_name] }}-=Researching this technology sends something to someone, which is considered a logical advancement. ap-{{ tech_table[original_tech_name] }}-=Researching this technology sends something to someone, which is considered a logical advancement. For purposes of hints, this location is called "{{ original_tech_name }}".
{%- else %} {%- else %}
ap-{{ tech_table[original_tech_name] }}-=Researching this technology sends something to someone. ap-{{ tech_table[original_tech_name] }}-=Researching this technology sends something to someone.
{%- endif -%} {%- endif -%}

2
worlds/factorio/Mod.py
View File

@ -75,7 +75,7 @@ def generate_mod(world: MultiWorld, player: int):
"rocket_recipe": rocket_recipes[world.max_science_pack[player].value], "rocket_recipe": rocket_recipes[world.max_science_pack[player].value],
"slot_name": world.player_names[player][0], "seed_name": world.seed_name, "slot_name": world.player_names[player][0], "seed_name": world.seed_name,
"starting_items": world.starting_items[player], "recipes": recipes, "starting_items": world.starting_items[player], "recipes": recipes,
"random": world.slot_seeds[player], "random": world.slot_seeds[player], "static_nodes": world.worlds[player].static_nodes,
"recipe_time_scale": recipe_time_scales[world.recipe_time[player].value]} "recipe_time_scale": recipe_time_scales[world.recipe_time[player].value]}
for factorio_option in Options.factorio_options: for factorio_option in Options.factorio_options: