From 45776d57da393506eacbe61bb4819be9ab70de0b Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Thu, 19 Sep 2024 00:09:54 +0900 Subject: [PATCH] . --- PHI-CL/.luacheckrc | 1597 -------------------------------- PHI-CL/changelog.txt | 7 + PHI-CL/config.lua | 405 ++++---- PHI-CL/data-final-fixes.lua | 54 ++ PHI-CL/data-updates.lua | 90 +- PHI-CL/data.lua | 94 +- PHI-CL/locale/en/locale.cfg | 1 + PHI-CL/locale/ja/locale.cfg | 19 +- PHI-CL/locale/zh-CN/locale.cfg | 1 + PHI-CL/locale/zh-TW/locale.cfg | 1 + PHI-CL/main.lua | 5 + PHI-CL/settings.lua | 6 + 12 files changed, 323 insertions(+), 1957 deletions(-) delete mode 100644 PHI-CL/.luacheckrc diff --git a/PHI-CL/.luacheckrc b/PHI-CL/.luacheckrc deleted file mode 100644 index 0da1ad4..0000000 --- a/PHI-CL/.luacheckrc +++ /dev/null @@ -1,1597 +0,0 @@ -------------------------------------------------------------------------------- ---[LICENSE]-- -------------------------------------------------------------------------------- --- .luacheckrc --- This file is free and unencumbered software released into the public domain. --- --- Anyone is free to copy, modify, publish, use, compile, sell, or --- distribute this file, either in source code form or as a compiled --- binary, for any purpose, commercial or non-commercial, and by any --- means. --- --- In jurisdictions that recognize copyright laws, the author or authors --- of this file dedicate any and all copyright interest in the --- software to the public domain. We make this dedication for the benefit --- of the public at large and to the detriment of our heirs and --- successors. We intend this dedication to be an overt act of --- relinquishment in perpetuity of all present and future rights to this --- software under copyright law. --- --- THE FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, --- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. --- IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR --- OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, --- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR --- OTHER DEALINGS IN THE SOFTWARE. --- --- For more information, please refer to --- ]] - --- Current Factorio Version 0.17.0, luacheck version 0.23.0 - -------------------------------------------------------------------------------- ---[Set Defaults]-- -------------------------------------------------------------------------------- -local LINE_LENGTH = false -- It is 2017 limits on length are a waste -local IGNORE = {'21./%w+_$', '21./^_%w+$', '213/[ijk]', '213/index', '213/key'} -local NOT_GLOBALS = {'coroutine', 'io', 'socket', 'dofile', 'loadfile'} -- These globals are not available to the factorio API - -local STD_CONTROL = 'lua52c+factorio+factorio_control+stdlib+factorio_defines' -local STD_DATA = 'lua52c+factorio+factorio_data+stdlib+stdlib_data+factorio_defines' -local STD_LOVE = 'luajit+love+love_extra+stdlib+stdlib_data' - --- In a perfect world these would be STD_DATA and STD_CONTROL (mostly) -local STD_BASE_DATA = 'lua52c+factorio+factorio_data+factorio_defines+factorio_base_data' -local STD_BASE_CONTROL = 'lua52c+factorio+factorio_control+factorio_defines+factorio_base_control' - -------------------------------------------------------------------------------- ---[Assume Factorio Control stage as default]-- -------------------------------------------------------------------------------- -std = STD_CONTROL -max_line_length = LINE_LENGTH - -not_globals = NOT_GLOBALS -ignore = IGNORE -quiet = 1 -- pass -q option -max_cyclomatic_complexity = 75 -codes = true - ---List of files and directories to exclude -exclude_files = { - --Ignore special folders - '**/.*/*', --Ignore if path starts with . - '**/stdlib/vendor/', - '**/*WIP/', - - --Ignore development mods - '**/combat-tester/', - '**/test-maker/', - '**/trailer/', - - --Ignore love Includes - '**/love/includes/' -} - -------------------------------------------------------------------------------- ---[Mod Prototypes]-- -------------------------------------------------------------------------------- ---Set default prototype files -files['**/data.lua'].std = STD_DATA -files['**/data-updates.lua'].std = STD_DATA -files['**/data-final-fixes.lua'].std = STD_DATA -files['**/settings.lua'].std = STD_DATA -files['**/settings-updates.lua'].std = STD_DATA -files['**/settings-final-fixes.lua'].std = STD_DATA -files['**/prototypes/'].std = STD_DATA -files['**/settings/'].std = STD_DATA -files['**/love/'] = {std = STD_LOVE, globals = {'coroutine', 'io', 'socket', 'dofile', 'loadfile'}} - -------------------------------------------------------------------------------- ---[Base]-- -------------------------------------------------------------------------------- ---Find and replace ignores *.cfg, migrations, *.txt, control.lua, *.json, trailer, scenarios, campaigns, *.glsl - -local base_scenarios = { - std = STD_BASE_CONTROL .. '+factorio_base_scenarios+factorio_base_story', - --ignore = {'212/event', '111', '112', '113', '211', '212', '213', '311', '411', '412', '421', '422', '423', '431', '432', '512'} - ignore = {'...'} -} -files['**/base/scenarios/'] = base_scenarios -files['**/base/tutorials/'] = base_scenarios -files['**/base/campaigns/'] = base_scenarios -files['**/wip-scenario/'] = base_scenarios - -files['**/base/migrations/'] = {std = STD_BASE_CONTROL} - -files['**/core/lualib/'] = {std = STD_BASE_CONTROL} -files['**/core/lualib/util.lua'] = {globals = {'util', 'table'}, ignore = {'432/object'}} -files['**/core/lualib/silo-script.lua'] = {globals = {'silo_script'}, ignore = {'4../player'}} -files['**/core/lualib/production-score.lua'] = {globals = {'production_score', 'get_price_recursive'}, ignore = {'4../player'}} -files['**/core/lualib/story*'] = {std = '+factorio_base_story', ignore = {'42./k', '42./filter'}} -files['**/core/lualib/mod-gui.lua'] = {globals = {'mod_gui'}} -files['**/core/lualib/camera.lua'] = {globals = {'camera'}} -files['**/core/lualib/builder.lua'] = {globals = {'Builder', 'builder', 'action', 'down', 'right'}} - -files['**/core/lualib/bonus-gui-ordering/'] = {std = STD_BASE_DATA} -files['**/core/lualib/dataloader.lua'] = {globals = {'data'}} -files['**/core/lualib/circuit-connector-*'] = {std = STD_BASE_DATA..'+factorio_circuit_connector_generated'} -files['**/core/lualib/bonus-gui-ordering.lua'] = {globals = {'bonus_gui_ordering'}} - -files['**/base/prototypes/'] = {std = STD_BASE_DATA} -files['**/core/prototypes/'] = {std = STD_BASE_DATA} -files['**/core/prototypes/noise-programs.lua'] = {ignore = {'212/x', '212/y', '212/tile', '212/map'}} - ---(( stdlib ))-- -local stdlib_control = { - std = 'lua52c+factorio+factorio_control+stdlib+factorio_defines', - max_line_length = LINE_LENGTH -} - -local stdlib_data = { - std = 'lua52c+factorio+factorio_data+stdlib+factorio_defines', - max_line_length = LINE_LENGTH -} - --- Assume control stage for stdlib -files['**/stdlib/'] = stdlib_control - --- Assume generic content for stdlib utils -files['**/stdlib/utils/**'].std = 'lua52c+stdlib' - --- STDLIB data files -files['**/stdlib/data/'] = stdlib_data - --- STDLIB Busted Spec -files['**/spec/**'] = { - globals = {'serpent', 'log', 'SLOG', 'RESET'}, - std = 'lua52c+busted+factorio_defines+factorio_control+stdlib' -} --)) - ---(( Factorio ))-- -stds.factorio = { - --Set the read only variables - read_globals = { - -- @log@: Gives writing access to Factorio's logger instance. - "log", - -- @serpent@: Lua serializer and pretty printer. (https://github.com/pkulchenko/serpent) - "serpent", - -- @table_size@: Returns the number of elements inside an LUA table - "table_size", - util = { - fields = { - "by_pixel", "distance", "findfirstentity", "positiontostr", "formattime", "moveposition", "oppositedirection", - "ismoduleavailable", "multiplystripes", "format_number", "increment", "color", "conditional_return", - "add_shift", "merge", "premul_color", "encode", "decode", "insert_safe", - table = { - fields = { - "compare", "deepcopy" - }, - }, - }, - }, - table = { - fields = { - "compare", "deepcopy" - }, - }, - }, -} - -stds.factorio_control = { - read_globals = { - - -- @commands@: - commands = { - fields = { - "add_command", "commands", "game_commands", "remove_command" - }, - }, - - -- @settings@: - settings = { - fields = { - "get_player_settings", - startup = {read_only = false, other_fields = true}, - global = {read_only = false, other_fields = true}, - player = {read_only = false, other_fields = true}, - }, - }, - - -- @script@: Provides an interface for registering event handlers. - -- (http://lua-api.factorio.com/latest/LuaBootstrap.html) - script = { - fields = { - "on_event", "on_nth_tick", "on_configuration_changed", "on_init", "on_load", "generate_event_name", - "raise_event", "get_event_handler", "mod_name", "get_event_order" - }, - other_fields = false, - }, - - -- @remote@: Allows inter-mod communication by providing a repository of interfaces that is shared by all mods. - -- (http://lua-api.factorio.com/latest/LuaRemote.html) - remote = { - fields = { - interfaces = {read_only = false, other_fields = true}, - "add_interface", "remove_interface", "call" - }, - read_only = true, - other_fields = false, - }, - - rcon = { - fields = {'print'} - }, - - rendering = { - other_fields = false, - read_only = true, - fields = { - 'draw_animation', - 'draw_line', - 'draw_text', - 'draw_circle', - 'draw_rectangle', - 'draw_arc', - 'draw_polygon', - 'draw_sprite', - 'draw_light', - 'destroy', - 'is_font_valid', - 'is_valid', - 'get_all_ids', - 'clear', - 'get_type', - 'get_surface', - 'get_time_to_live', - 'set_time_to_live', - 'get_forces', - 'set_forces', - 'get_players', - 'set_players', - 'get_color', - 'set_color', - 'get_width', - 'set_width', - 'get_from', - 'set_from', - 'get_to', - 'set_to', - 'get_gap_amount', - 'set_gap_amount', - 'get_gap_length', - 'set_gap_length', - 'get_target', - 'set_target', - 'get_orientation', - 'set_orientation', - 'get_scale', - 'set_scale', - 'get_text', - 'set_text', - 'get_font', - 'set_font', - 'get_alignment', - 'set_alignment', - 'get_scale_with_zoom', - 'set_scale_with_zoom', - 'get_filled', - 'set_filled', - 'get_radius', - 'set_radius', - 'get_left_top', - 'set_left_top', - 'get_right_bottom', - 'set_right_bottom', - 'get_max_radius', - 'set_max_radius', - 'get_min_radius', - 'set_min_radius', - 'get_start_angle', - 'set_start_angle', - 'get_angle', - 'set_angle', - 'get_vertices', - 'set_vertices', - 'get_sprite', - 'set_sprite', - 'get_x_scale', - 'set_x_scale', - 'get_y_scale', - 'set_y_scale', - 'get_render_layer', - 'set_render_layer', - 'get_orientation_target', - 'set_orientation_target', - 'get_oriented_offset', - 'set_oriented_offset', - 'get_intensity', - 'set_intensity', - 'get_minimum_darkness', - 'set_minimum_darkness' - } - }, - - -- @game@: Main object through which most of the API is accessed. - -- It is, however, not available inside handlers registered with @script.on_load@. - -- (http://lua-api.factorio.com/latest/LuaGameScript.html) - game ={ - other_fields = false, - read_only = false, - fields = { - "auto_save", - "ban_player", - "check_consistency", - "check_prototype_translations", - "count_pipe_groups", - "create_force", - "create_profiler", - "create_random_generator", - "get_surface", - "create_surface", - "delete_surface", - "desync_players", - "direction_to_string", - "disable_replay", - "disable_tips_and_tricks", - "draw_resource_selection", - "force_crc", - "get_active_entities_count", - "get_entity_by_tag", - "get_map_exchange_string", - "get_player", - "help", - "is_demo", - "is_multiplayer", - "is_valid_sound_path", - "json_to_table", - "kick_player", - "merge_forces", - "mute_player", - "play_sound", - "print", - "print_stack_size", - "purge_player", - "regenerate_entity", - "reload_mods", - "reload_script", - "remove_offline_players", - "remove_path", - "save_atlas", - "server_save", - "set_game_state", - "show_message_dialog", - "table_to_json", - "take_screenshot", - "take_technology_screenshot", - "unban_player", - "unmute_player", - "write_file", - "get_filtered_entity_prototypes", - "get_filtered_item_prototypes", - "get_filtered_equipment_prototypes", - "get_filtered_mod_setting_prototypes", - "get_filtered_achievement_prototypes", - - active_mods = {read_only = true, other_fields = true}, - ammo_category_prototypes = {read_only = true, other_fields = true}, - autoplace_control_prototypes = {read_only = true, other_fields = true}, - backer_names = {read_only = true, other_fields = true}, - connected_players = {read_only = true, other_fields = true}, - custom_input_prototypes = {read_only = true, other_fields = true}, - damage_prototypes = {read_only = true, other_fields = true}, - decorative_prototypes = {read_only = true, other_fields = true}, - default_map_gen_settings = {read_only = true, other_fields = true}, - difficulty = {read_only = true, other_fields = true}, - difficulty_settings = {read_only = true, other_fields = true}, - enemy_has_vision_on_land_mines = {read_only = false, other_fields = false}, - entity_prototypes = {read_only = true, other_fields = true}, - equipment_grid_prototypes = {read_only = true, other_fields = true}, - equipment_prototypes = {read_only = true, other_fields = true}, - finished = {read_only = true, other_fields = true}, - fluid_prototypes = {read_only = true, other_fields = true}, - forces = {read_only = true, other_fields = true}, - item_prototypes = {read_only = true, other_fields = true}, - map_settings = {read_only = true, other_fields = true}, - mod_setting_prototypes = {read_only = true, other_fields = true}, - noise_layer_prototypes = {read_only = true, other_fields = true}, - permissions = {read_only = true, other_fields = true}, - player = {read_only = true, other_fields = true}, - players = {read_only = true, other_fields = true}, - recipe_prototypes = {read_only = true, other_fields = true}, - speed = {read_only = false, other_fields = false}, - styles = {read_only = true, other_fields = true}, - surfaces = {read_only = true, other_fields = true}, - technology_prototypes = {read_only = true, other_fields = true}, - tick = {read_only = true, other_fields = true}, - tick_paused = {read_only = false, other_fields = false}, - ticks_played = {read_only = true, other_fields = true}, - ticks_to_run = {read_only = false, other_fields = false}, - tile_prototypes = {read_only = true, other_fields = true}, - virtual_signal_prototypes = {read_only = true, other_fields = true}, - pollution_statistics = {read_only = true, other_fields = true} - }, - }, - }, - - globals = { - -- @global@: The global dictionary, useful for storing data persistent across a save-load cycle. - -- Writing access is given to the mod-id field (for mod-wise saved data). - -- (http://lua-api.factorio.com/latest/Global.html) - "global", - - -- @MOD@: Keep it organized, use this variable for anything that "NEEDS" to be global for some reason. - "MOD" - }, -} - -stds.factorio_data = { - - read_globals = { - data = { - fields = { - raw = { - other_fields = true, - read_only = false - }, - "extend", "is_demo" - }, - }, - - settings = { - fields = { - "startup", "global", "player", - }, - }, - - --Popular mods - angelsmods = { - other_fields = true - }, - - bobmods = { - other_fields = true - }, - - mods = { - other_fields = true - } - } -} --)) - ---(( Factorio Globals are bad mkay ))-- -stds.factorio_base_control = { - read_globals = {"silo_script", "mod_gui", "camera"} -} - -stds.factorio_base_scenarios = { - globals = { - "check_automate_science_packs_advice", "check_research_hints", "check_supplies", "manage_attacks", "all_dead", - "on_win", "difficulty_number", "init_attack_data", "handle_attacks", "count_items_in_container", "progress", "scanned", - "check_light", "check_machine_gun", "level", "story_table", - - "tightspot_prices", "tightspot_make_offer", "tightspot_init", "tightspot_get_required_balance", - "tightspot_init_level", "tightspot_init_spending_frame", "tightspot_init_progress_frame", "tightspot_update_progress", "tightspot_update_spending", - "tightspot_get_missing_to_win", "tightspot_sell_back", "tightspot_start_level", "tightspot_show_level_description", "tightspot_update_speed_label", - "map_ignore", "tightspot_check_level", "land_price", - - "transport_belt_madness_init", "transport_belt_madness_init_level", "transport_belt_madness_create_chests", "transport_belt_madness_fill_chests", - "transport_belt_madness_start_level", "map_ignore", "map_clear", "map_load", "map_save", "transport_belt_madness_show_level_description", - "transport_belt_madness_check_level", "transport_belt_madness_next_level", "transport_belt_madness_clear_level", "transport_belt_madness_contains_next_level", - - "restricted", "check_built_items", "result", "disable_combat_technologies", "apply_character_modifiers", "apply_combat_modifiers", "apply_balance", - "load_config", "starting_area_constant", "create_next_surface", "end_round", "prepare_next_round", "silo_died","choose_joining_gui", - "destroy_joining_guis", "create_random_join_gui", "create_auto_assign_gui", "create_pick_join_gui", "create_config_gui", "make_config_table", "default", - "make_team_gui", "make_team_gui_config", "add_team_button_press", "trash_team_button_press", "remove_team_from_team_table", "add_team_to_team_table", - "set_teams_from_gui", "on_team_button_press", "make_color_dropdown", "create_balance_option", "create_disable_frame", "disable_frame", "parse_disabled_items", - "set_balance_settings", "config_confirm", "parse_config_from_gui", "get_color", "roll_starting_area", "delete_roll_surfaces", "auto_assign", - "destroy_config_for_all", "prepare_map", "set_evolution_factor", "update_players_on_team_count", "random_join", "init_player_gui", - "destroy_player_gui", "objective_button_press", "admin_button_press", "admin_frame_button_press", "diplomacy_button_press", "update_diplomacy_frame", - "diplomacy_frame_button_press", "team_changed_diplomacy", "diplomacy_check_press", "get_stance", "give_inventory", "setup_teams", "disable_items_for_all", - "set_random_team", "set_diplomacy", "create_spawn_positions", "set_spawn_position", "set_team_together_spawns", "chart_starting_area_for_force_spawns", - "check_starting_area_chunks_are_generated", "check_player_color", "check_round_start", "clear_starting_area_enemies", "check_no_rush_end", "check_no_rush_players", - "finish_setup", "chart_area_for_force", "setup_start_area_copy", "update_copy_progress", "update_progress_bar", "copy_paste_starting_area_tiles", - "copy_paste_starting_area_entities", "create_silo_for_force", "setup_research", "on_chunk_generated", "get_distance_to_nearest_spawn", - "create_wall_for_force", "fpn", "give_items", "create_item_frame", "create_technologies_frame", "create_cheat_frame", "create_day_frame", - "time_modifier", "points_per_second_start", "points_per_second_level_subtract", "levels", "update_info", "get_time_left", "update_time_left", - "on_joined", "make_frame", "update_frame", "update_table", "calculate_task_item_multiplayer", "setup_config", "select_from_probability_table", - "select_inventory", "select_equipment", "select_challange_type", "save_round_statistics", "start_challenge", "create_teams", "set_areas", - "decide_player_team", "set_teams", "refresh_leaderboard", "set_player", "generate_technology_list", "generate_research_task","setup_unlocks", - "check_technology_progress", "generate_production_task", "generate_shopping_list_task", "set_gui_flow_table", "create_visibility_button", - "check_item_lists", "update_task_gui", "check_end_of_round", "end_round_gui_update", "try_to_check_victory", "update_gui", "check_start_round", - "check_start_set_areas", "check_start_setting_entities", "check_set_areas", "check_clear_areas", "check_chests", "check_chests_shopping_list", - "check_chests_production", "check_input_chests", "fill_input_chests", "check_victory", "shopping_task_finished", "calculate_force_points", - "update_research_task_table", "update_production_task_table", "update_shopping_list_task_table", "create_joined_game_gui", "pre_ending_round", - "player_ending_prompt", "update_end_timer", "update_begin_timer", "team_finished", "save_points_list", "give_force_players_points", - "update_winners_list", "set_spectator", "set_character", "give_starting_inventory", "give_equipment", "shuffle_table", "format_time", - "spairs", "fill_leaderboard", "create_grid", "simple_entities", "save_map_data", "clear_map", "create_tiles", "recreate_entities", - "map_sets", "give_points", "init_forces", "init_globals", "init_unit_settings", "check_next_wave", "next_wave", "calculate_wave_power", - "wave_end", "make_next_spawn_tick", "check_spawn_units", "get_wave_units", "spawn_units", "randomize_ore", "set_command", "command_straglers", - "unit_config", "make_next_wave_tick", "time_to_next_wave", "time_to_wave_end", "rocket_died", "unit_died", "get_bounty_price", "setup_waypoints", - "insert_items", "give_starting_equipment", "give_spawn_equipment", "next_round_button_visible", "gui_init", "create_wave_frame", "create_money_frame", - "create_upgrade_gui", "update_upgrade_listing", "upgrade_research", "get_upgrades", "get_money", "update_connected_players", "update_round_number", - "set_research", "set_recipes", "check_deconstruction", "check_blueprint_placement", "loop_entities", "experiment_items", - "setup", "story_gui_click", "clear_surface", "add_run_trains_button", "puzzle_condition", "basic_signals", - "loop_trains", "Y_offset", "ghosts_1", "ghosts_2", "required_path", "through_wall_path", "count", "check_built_real_rail", - "current_ghosts_count", "other", "rails", "set_rails", "straight_section", "late_entities", "entities", "stop", - "get_spawn_coordinate", - - --tutorials - "intermission", "create_entities_on_tick", "on_player_created", "required_count", "non_player_entities", "clear_rails", - "chest", "damage", "furnace", "init_prototypes", "build_infi_table", "junk", "update_player_tags", "time_left", "team_production", - "create_task_frame", "create_visibilty_buttons", "update_leaderboard", "in_in_area" - } -} - -stds.factorio_base_data = { - globals = { - --Style - "make_cursor_box", "make_full_cursor_box", - "default_container_padding", "default_orange_color", "default_light_orange_color", "warning_red_color", - "achievement_green_color", "achievement_tan_color", "orangebuttongraphcialset", "bluebuttongraphcialset", - "bonus_gui_ordering", "trivial_smoke", "technology_slot_base_width", "technology_slot_base_height", "default_frame_font_vertical_compensation", - - --Belts - "transport_belt_connector_frame_sprites", "transport_belt_circuit_wire_connection_point", "transport_belt_circuit_wire_max_distance", - "transport_belt_circuit_connector_sprites", "ending_patch_prototype", "basic_belt_horizontal", "basic_belt_vertical", - "basic_belt_ending_top", "basic_belt_ending_bottom", "basic_belt_ending_side", "basic_belt_starting_top", "basic_belt_starting_bottom", - "basic_belt_starting_side", "fast_belt_horizontal", "fast_belt_vertical", "fast_belt_ending_top", "fast_belt_ending_bottom", - "fast_belt_ending_side", "fast_belt_starting_top", "fast_belt_starting_bottom", "fast_belt_starting_side", "express_belt_horizontal", - "express_belt_vertical", "express_belt_ending_top", "express_belt_ending_bottom", "express_belt_ending_side", "express_belt_starting_top", - "express_belt_starting_bottom", "express_belt_starting_side", - - --Circuit Connectors - "circuit_connector_definitions", "default_circuit_wire_max_distance", "inserter_circuit_wire_max_distance", - "universal_connector_template", "belt_connector_template", "belt_frame_connector_template", "inserter_connector_template", - - --Inserter Circuit Connectors - "inserter_circuit_wire_max_distance", "inserter_default_stack_control_input_signal", - - --Sounds/beams - "make_heavy_gunshot_sounds", "make_light_gunshot_sounds", "make_laser_sounds", - - --Gun/Laser - "gun_turret_extension", "gun_turret_extension_shadow", "gun_turret_extension_mask", "gun_turret_attack", - "laser_turret_extension", "laser_turret_extension_shadow", "laser_turret_extension_mask", - - --Pipes - "pipecoverspictures", "pipepictures", "assembler2pipepictures", "assembler3pipepictures", "make_heat_pipe_pictures", - - --Combinators - "generate_arithmetic_combinator", "generate_decider_combinator", "generate_constant_combinator", - - --Rail - "destroyed_rail_pictures", "rail_pictures", "rail_pictures_internal", "standard_train_wheels", "drive_over_tie", - "rolling_stock_back_light", "rolling_stock_stand_by_light", - - --Enemies - "make_enemy_autoplace", "make_enemy_spawner_autoplace", "make_enemy_worm_autoplace", - "make_spitter_attack_animation", "make_spitter_run_animation", "make_spitter_dying_animation", - "make_spitter_attack_parameters", "make_spitter_roars", "make_spitter_dying_sounds", - "make_spawner_idle_animation", "make_spawner_die_animation", - "make_biter_run_animation", "make_biter_attack_animation", "make_biter_die_animation", - "make_biter_roars", "make_biter_dying_sounds", "make_biter_calls", - "make_worm_roars", "make_worm_dying_sounds", "make_worm_folded_animation", "make_worm_preparing_animation", - "make_worm_prepared_animation", "make_worm_attack_animation", "make_worm_die_animation", - - --Other - "tile_variations_template", "make_water_autoplace_settings", - "make_unit_melee_ammo_type", "make_trivial_smoke", "make_4way_animation_from_spritesheet", "flying_robot_sounds", - "productivitymodulelimitation", "crash_trigger", "capsule_smoke", "make_beam", "playeranimations", - "make_blood_tint", "make_shadow_tint", - - --tiles - "water_transition_template", "make_water_transition_template", "water_autoplace_settings", "water_tile_type_names", - "patch_for_inner_corner_of_transition_between_transition", - } -} - -stds.factorio_base_story = { - globals = { - "story_init_helpers", "story_update_table", "story_init", "story_update", "story_on_tick", "story_add_update", - "story_remove_update", "story_jump_to", "story_elapsed", "story_elapsed_check", "story_show_message_dialog", - "set_goal", "player_set_goal", "on_player_joined", "flash_goal", "set_info", "player_set_info", "export_entities", - "list", "recreate_entities", "entity_to_connect", "limit_camera", "find_gui_recursive", "enable_entity_export", - "add_button", "on_gui_click", "set_continue_button_style", "add_message_log", "story_add_message_log", - "player_add_message_log", "message_log_frame", "message_log_scrollpane", "message_log_close_button", - "message_log_table", "toggle_message_log_button", "toggle_objective_button", "message_log_init", - "add_gui_recursive", "add_toggle_message_log_button", "add_toggle_objective_button", "mod_gui", - "flash_message_log_button", "flash_message_log_on_tick", "story_gui_click", "story_points_by_name", "story_branches", - "player", "surface", "deconstruct_on_tick", "recreate_entities_on_tick", "flying_congrats", "story_table" - } -} - -stds.factorio_circuit_connector_generated = { - globals = { - 'default_circuit_wire_max_distance', 'circuit_connector_definitions', 'universal_connector_template', - 'belt_connector_template', 'belt_frame_connector_template', 'inserter_connector_template', 'inserter_connector_template', - 'inserter_circuit_wire_max_distance', 'inserter_default_stack_control_input_signal', 'transport_belt_connector_frame_sprites', - 'transport_belt_circuit_wire_max_distance', - } -} --)) - ---(( STDLIB ))-- -stds.stdlib = { - read_globals = { - }, - globals = { - "STDLIB", - "prequire", "rawtostring", "traceback", "inspect", "serpent", "inline_if", "install", "log", - "concat", - "GAME", "AREA", "POSITION", "TILE", "SURFACE", "CHUNK", "COLOR", "ENTITY", "INVENTORY", - "RESOURCE", "CONFIG", "LOGGER", "QUEUE", "EVENT", "GUI", "PLAYER", "FORCE", - "MATH", "STRING", "TABLE", - } -} - -stds.stdlib_control = { -} - -stds.stdlib_data = { - globals = { - 'DATA', 'RECIPE', 'ITEM', 'FLUID', 'ENTITY', 'TECHNOLOGY', 'CATEGORY' - } -} --)) - ---(( FACTORIO DEFINES ))-- -stds.factorio_defines = { - read_globals = { - defines = { - fields = { - alert_type = { - fields = { - 'custom', - 'entity_destroyed', - 'entity_under_attack', - 'no_material_for_construction', - 'no_storage', - 'not_enough_construction_robots', - 'not_enough_repair_packs', - 'train_out_of_fuel', - 'turret_fire', - 'fluid_mixing' - } - }, - behavior_result = { - fields = { - 'deleted', - 'fail', - 'in_progress', - 'success' - } - }, - build_check_type = { - fields = { - 'ghost_place', - 'ghost_revive', - 'manual', - 'script' - } - }, - chain_signal_state = { - fields = { - 'all_open', - 'none', - 'none_open', - 'partially_open' - } - }, - chunk_generated_status = { - fields = { - 'basic_tiles', - 'corrected_tiles', - 'custom_tiles', - 'entities', - 'nothing', - 'tiles' - } - }, - circuit_condition_index = { - fields = { - 'arithmetic_combinator', - 'constant_combinator', - 'decider_combinator', - 'inserter_circuit', - 'inserter_logistic', - 'lamp', - 'offshore_pump', - 'pump' - } - }, - circuit_connector_id = { - fields = { - 'accumulator', - 'combinator_input', - 'combinator_output', - 'constant_combinator', - 'container', - 'electric_pole', - 'inserter', - 'lamp', - 'offshore_pump', - 'programmable_speaker', - 'pump', - 'rail_chain_signal', - 'rail_signal', - 'roboport', - 'storage_tank', - 'wall' - } - }, - command = { - fields = { - 'attack', - 'attack_area', - 'build_base', - 'compound', - 'flee', - 'go_to_location', - 'group', - 'stop', - 'wander' - } - }, - compound_command = { - fields = { - 'logical_and', - 'logical_or', - 'return_last' - } - }, - control_behavior = { - fields = { - inserter = { - fields = { - circuit_mode_of_operation = { - fields = { - 'enable_disable', - 'none', - 'read_hand_contents', - 'set_filters', - 'set_stack_size' - } - }, - hand_read_mode = { - fields = { - 'hold', - 'pulse' - } - } - } - }, - lamp = { - fields = { - circuit_mode_of_operation = { - fields = { - 'use_colors' - } - } - } - }, - logistic_container = { - fields = { - circuit_mode_of_operation = { - fields = { - 'send_contents', - 'set_requests' - } - } - } - }, - mining_drill = { - fields = { - resource_read_mode = { - fields = { - 'entire_patch', - 'this_miner' - } - } - } - }, - roboport = { - fields = { - circuit_mode_of_operation = { - fields = { - 'read_logistics', - 'read_robot_stats' - } - } - } - }, - train_stop = { - fields = { - circuit_mode_of_operation = { - fields = { - 'enable_disable', - 'read_from_train', - 'read_stopped_train', - 'send_to_train' - } - } - } - }, - transport_belt = { - fields = { - content_read_mode = { - fields = { - 'hold', - 'pulse' - } - } - } - }, - type = { - fields = { - 'accumulator', - 'arithmetic_combinator', - 'constant_combinator', - 'container', - 'decider_combinator', - 'generic_on_off', - 'inserter', - 'lamp', - 'logistic_container', - 'mining_drill', - 'programmable_speaker', - 'rail_chain_signal', - 'rail_signal', - 'roboport', - 'storage_tank', - 'train_stop', - 'transport_belt', - 'wall' - } - } - } - }, - controllers = { - fields = { - 'character', - 'cutscene', - 'editor', - 'ghost', - 'god', - 'spectator' - } - }, - deconstruction_item = { - fields = { - entity_filter_mode = { - fields = { - 'blacklist', - 'whitelist' - } - }, - tile_filter_mode = { - fields = { - 'blacklist', - 'whitelist' - } - }, - tile_selection_mode = { - fields = { - 'always', - 'never', - 'normal', - 'only' - } - } - } - }, - difficulty = { - fields = { - 'easy', - 'hard', - 'normal' - } - }, - difficulty_settings = { - fields = { - recipe_difficulty = { - fields = { - 'expensive', - 'normal' - } - }, - technology_difficulty = { - fields = { - 'expensive', - 'normal' - } - } - } - }, - direction = { - fields = { - 'east', - 'north', - 'northeast', - 'northwest', - 'south', - 'southeast', - 'southwest', - 'west' - } - }, - distraction = { - fields = { - 'by_anything', - 'by_damage', - 'by_enemy', - 'none' - } - }, - entity_status = { - fields = { - 'working', - 'no_power', - 'no_fuel', - 'no_recipe', - 'no_input_fluid', - 'no_research_in_progress', - 'no_minable_resources', - 'low_input_fluid', - 'low_power', - 'disabled_by_control_behavior', - 'disabled_by_script', - 'fluid_ingredient_shortage', - 'fluid_production_overload', - 'item_ingredient_shortage', - 'item_production_overload', - 'marked_for_deconstruction', - 'missing_required_fluid', - 'missing_science_packs', - 'waiting_for_source_items', - 'waiting_for_space_in_destination', - } - }, - render_mode = { - fields = { - 'game', - 'chart', - 'chart_zoomed_in' - } - }, - events = { - fields = { - 'on_ai_command_completed', - 'on_area_cloned', - 'on_biter_base_built', - 'on_built_entity', - 'on_cancelled_deconstruction', - 'on_cancelled_upgrade', - 'on_character_corpse_expired', - 'on_chart_tag_added', - 'on_chart_tag_modified', - 'on_chart_tag_removed', - 'on_chunk_charted', - 'on_chunk_deleted', - 'on_chunk_generated', - 'on_combat_robot_expired', - 'on_console_chat', - 'on_console_command', - 'on_cutscene_waypoint_reached', - 'on_difficulty_settings_changed', - 'on_entity_cloned', - 'on_entity_damaged', - 'on_entity_died', - 'on_entity_renamed', - 'on_entity_settings_pasted', - 'on_entity_spawned', - 'on_force_created', - 'on_forces_merged', - 'on_forces_merging', - 'on_game_created_from_scenario', - 'on_gui_checked_state_changed', - 'on_gui_click', - 'on_gui_closed', - 'on_gui_confirmed', - 'on_gui_elem_changed', - 'on_gui_location_changed', - 'on_gui_opened', - 'on_gui_selected_tab_changed', - 'on_gui_selection_state_changed', - 'on_gui_switch_state_changed', - 'on_gui_text_changed', - 'on_gui_value_changed', - 'on_land_mine_armed', - 'on_lua_shortcut', - 'on_marked_for_deconstruction', - 'on_marked_for_upgrade', - 'on_market_item_purchased', - 'on_mod_item_opened', - 'on_picked_up_item', - 'on_player_alt_selected_area', - 'on_player_ammo_inventory_changed', - 'on_player_armor_inventory_changed', - 'on_player_banned', - 'on_player_built_tile', - 'on_player_cancelled_crafting', - 'on_player_changed_force', - 'on_player_changed_position', - 'on_player_changed_surface', - 'on_player_cheat_mode_disabled', - 'on_player_cheat_mode_enabled', - 'on_player_configured_blueprint', - 'on_player_crafted_item', - 'on_player_created', - 'on_player_cursor_stack_changed', - 'on_player_deconstructed_area', - 'on_player_demoted', - 'on_player_died', - 'on_player_display_resolution_changed', - 'on_player_display_scale_changed', - 'on_player_driving_changed_state', - 'on_player_dropped_item', - 'on_player_fast_transferred', - 'on_player_gun_inventory_changed', - 'on_player_joined_game', - 'on_player_kicked', - 'on_player_left_game', - 'on_player_main_inventory_changed', - 'on_player_mined_entity', - 'on_player_mined_item', - 'on_player_mined_tile', - 'on_player_muted', - 'on_player_pipette', - 'on_player_placed_equipment', - 'on_player_promoted', - 'on_player_removed', - 'on_player_removed_equipment', - 'on_player_repaired_entity', - 'on_player_respawned', - 'on_player_rotated_entity', - 'on_player_selected_area', - 'on_player_setup_blueprint', - 'on_player_toggled_alt_mode', - 'on_player_toggled_map_editor', - 'on_player_tool_inventory_changed', - 'on_player_trash_inventory_changed', - 'on_player_unbanned', - 'on_player_unmuted', - 'on_player_used_capsule', - 'on_post_entity_died', - 'on_pre_chunk_deleted', - 'on_pre_entity_settings_pasted', - 'on_pre_ghost_deconstructed', - 'on_pre_player_crafted_item', - 'on_pre_player_died', - 'on_pre_player_left_game', - 'on_pre_player_mined_item', - 'on_pre_player_removed', - 'on_pre_robot_exploded_cliff', - 'on_pre_surface_cleared', - 'on_pre_surface_deleted', - 'on_put_item', - 'on_research_finished', - 'on_research_started', - 'on_resource_depleted', - 'on_robot_built_entity', - 'on_robot_built_tile', - 'on_robot_exploded_cliff', - 'on_robot_mined', - 'on_robot_mined_entity', - 'on_robot_mined_tile', - 'on_robot_pre_mined', - 'on_rocket_launch_ordered', - 'on_rocket_launched', - 'on_runtime_mod_setting_changed', - 'on_script_path_request_finished', - 'on_sector_scanned', - 'on_selected_entity_changed', - 'on_surface_cleared', - 'on_surface_created', - 'on_surface_deleted', - 'on_surface_imported', - 'on_surface_renamed', - 'on_technology_effects_reset', - 'on_tick', - 'on_train_changed_state', - 'on_train_created', - 'on_train_schedule_changed', - 'on_trigger_created_entity', - 'on_trigger_fired_artillery', - 'on_unit_added_to_group', - 'on_unit_group_created', - 'on_unit_removed_from_group', - 'script_raised_built', - 'script_raised_destroy', - 'script_raised_revive' - } - }, - flow_precision_index = { - fields = { - 'fifty_hours', - 'one_hour', - 'one_minute', - 'one_second', - 'one_thousand_hours', - 'ten_hours', - 'ten_minutes', - 'two_hundred_fifty_hours' - } - }, - group_state = { - fields = { - 'attacking_distraction', - 'attacking_target', - 'finished', - 'gathering', - 'moving' - } - }, - gui_type = { - fields = { - 'achievement', - 'blueprint_library', - 'bonus', - 'controller', - 'custom', - 'entity', - 'equipment', - 'item', - 'kills', - 'logistic', - 'none', - 'other_player', - 'permissions', - 'player_management', - 'production', - 'research', - 'server_management', - 'trains', - 'tutorials' - } - }, - input_action = { - fields = { - 'activate_copy', - 'activate_cut', - 'activate_paste', - 'add_permission_group', - 'add_train_station', - 'admin_action', - 'alt_select_area', - 'alt_select_blueprint_entities', - 'alternative_copy', - 'begin_mining', - 'begin_mining_terrain', - 'build_item', - 'build_rail', - 'build_terrain', - 'cancel_craft', - 'cancel_deconstruct', - 'cancel_new_blueprint', - 'cancel_research', - 'cancel_upgrade', - 'change_active_item_group_for_crafting', - 'change_active_item_group_for_filters', - 'change_active_quick_bar', - 'change_arithmetic_combinator_parameters', - 'change_blueprint_book_record_label', - 'change_decider_combinator_parameters', - 'change_item_label', - 'change_multiplayer_config', - 'change_picking_state', - 'change_programmable_speaker_alert_parameters', - 'change_programmable_speaker_circuit_parameters', - 'change_programmable_speaker_parameters', - 'change_riding_state', - 'change_shooting_state', - 'change_single_blueprint_record_label', - 'change_train_stop_station', - 'change_train_wait_condition', - 'change_train_wait_condition_data', - 'clean_cursor_stack', - 'clear_selected_blueprint', - 'clear_selected_deconstruction_item', - 'clear_selected_upgrade_item', - 'connect_rolling_stock', - 'copy', - 'copy_entity_settings', - 'craft', - 'create_blueprint_like', - 'cursor_split', - 'cursor_transfer', - 'custom_input', - 'cycle_blueprint_book_backwards', - 'cycle_blueprint_book_forwards', - 'deconstruct', - 'delete_blueprint_library', - 'delete_blueprint_record', - 'delete_custom_tag', - 'delete_permission_group', - 'destroy_opened_item', - 'disconnect_rolling_stock', - 'drag_train_schedule', - 'drag_train_wait_condition', - 'drop_blueprint_record', - 'drop_item', - 'drop_to_blueprint_book', - 'edit_custom_tag', - 'edit_permission_group', - 'export_blueprint', - 'fast_entity_split', - 'fast_entity_transfer', - 'go_to_train_station', - 'grab_blueprint_record', - 'gui_checked_state_changed', - 'gui_click', - 'gui_confirmed', - 'gui_elem_changed', - 'gui_location_changed', - 'gui_selected_tab_changed', - 'gui_selection_state_changed', - 'gui_switch_state_changed', - 'gui_text_changed', - 'gui_value_changed', - 'import_blueprint', - 'import_blueprint_string', - 'import_permissions_string', - 'inventory_split', - 'inventory_transfer', - 'launch_rocket', - 'map_editor_action', - 'market_offer', - 'mod_settings_changed', - 'open_achievements_gui', - 'open_blueprint_library_gui', - 'open_blueprint_record', - 'open_bonus_gui', - 'open_character_gui', - 'open_equipment', - 'open_gui', - 'open_item', - 'open_kills_gui', - 'open_logistic_gui', - 'open_mod_item', - 'open_production_gui', - 'open_technology_gui', - 'open_train_gui', - 'open_train_station_gui', - 'open_trains_gui', - 'open_tutorials_gui', - 'paste_entity_settings', - 'place_equipment', - 'quick_bar_pick_slot', - 'quick_bar_set_selected_page', - 'quick_bar_set_slot', - 'remove_cables', - 'remove_train_station', - 'reset_assembling_machine', - 'rotate_entity', - 'select_area', - 'select_blueprint_entities', - 'select_entity_slot', - 'select_item', - 'select_mapper_slot', - 'select_next_valid_gun', - 'select_tile_slot', - 'set_auto_launch_rocket', - 'set_autosort_inventory', - 'set_behavior_mode', - 'set_car_weapons_control', - 'set_circuit_condition', - 'set_circuit_mode_of_operation', - 'set_deconstruction_item_tile_selection_mode', - 'set_deconstruction_item_trees_and_rocks_only', - 'set_entity_color', - 'set_entity_energy_property', - 'set_filter', - 'set_heat_interface_mode', - 'set_heat_interface_temperature', - 'set_infinity_container_filter_item', - 'set_infinity_container_remove_unfiltered_items', - 'set_infinity_pipe_filter', - 'set_inserter_max_stack_size', - 'set_inventory_bar', - 'set_logistic_filter_item', - 'set_logistic_filter_signal', - 'set_logistic_trash_filter_item', - 'set_request_from_buffers', - 'set_research_finished_stops_game', - 'set_signal', - 'set_single_blueprint_record_icon', - 'set_splitter_priority', - 'set_train_stopped', - 'setup_assembling_machine', - 'setup_blueprint', - 'setup_single_blueprint_record', - 'smart_pipette', - 'stack_split', - 'stack_transfer', - 'start_repair', - 'start_research', - 'start_walking', - 'switch_connect_to_logistic_network', - 'switch_constant_combinator_state', - 'switch_inserter_filter_mode_state', - 'switch_power_switch_state', - 'switch_to_rename_stop_gui', - 'take_equipment', - 'toggle_deconstruction_item_entity_filter_mode', - 'toggle_deconstruction_item_tile_filter_mode', - 'toggle_driving', - 'toggle_enable_vehicle_logistics_while_moving', - 'toggle_equipment_movement_bonus', - 'toggle_map_editor', - 'toggle_personal_roboport', - 'toggle_show_entity_info', - 'undo', - 'upgrade', - 'upgrade_opened_blueprint', - 'use_artillery_remote', - 'use_item', - 'wire_dragging', - 'write_to_console' - } - }, - inventory = { - fields = { - 'artillery_turret_ammo', - 'artillery_wagon_ammo', - 'assembling_machine_input', - 'assembling_machine_modules', - 'assembling_machine_output', - 'beacon_modules', - 'burnt_result', - 'car_ammo', - 'car_trunk', - 'cargo_wagon', - 'character_corpse', - 'chest', - 'editor_main', - 'editor_guns', - 'editor_ammo', - 'editor_armor', - 'fuel', - 'furnace_modules', - 'furnace_result', - 'furnace_source', - 'god_main', - 'item_main', - 'lab_input', - 'lab_modules', - 'mining_drill_modules', - 'character_ammo', - 'character_armor', - 'character_guns', - 'character_main', - 'character_trash', - 'character_vehicle', - 'roboport_material', - 'roboport_robot', - 'robot_cargo', - 'robot_repair', - 'rocket', - 'rocket_silo_result', - 'rocket_silo_rocket', - 'turret_ammo' - } - }, - logistic_member_index = { - fields = { - 'character_provider', - 'character_requester', - 'character_storage', - 'generic_on_off_behavior', - 'logistic_container', - 'vehicle_storage' - } - }, - logistic_mode = { - fields = { - 'active_provider', - 'buffer', - 'none', - 'passive_provider', - 'requester', - 'storage' - } - }, - mouse_button_type = { - fields = { - 'left', - 'middle', - 'none', - 'right' - } - }, - rail_connection_direction = { - fields = { - 'left', - 'none', - 'right', - 'straight' - } - }, - rail_direction = { - fields = { - 'back', - 'front' - } - }, - riding = { - fields = { - acceleration = { - fields = { - 'accelerating', - 'braking', - 'nothing', - 'reversing' - } - }, - direction = { - fields = { - 'left', - 'right', - 'straight' - } - } - } - }, - shooting = { - fields = { - 'not_shooting', - 'shooting_enemies', - 'shooting_selected' - } - }, - signal_state = { - fields = { - 'closed', - 'open', - 'reserved', - 'reserved_by_circuit_network' - } - }, - train_state = { - fields = { - 'arrive_signal', - 'arrive_station', - 'manual_control', - 'manual_control_stop', - 'no_path', - 'no_schedule', - 'on_the_path', - 'path_lost', - 'wait_signal', - 'wait_station' - } - }, - transport_line = { - fields = { - 'left_line', - 'left_split_line', - 'left_underground_line', - 'right_line', - 'right_split_line', - 'right_underground_line', - 'secondary_left_line', - 'secondary_left_split_line', - 'secondary_right_line', - 'secondary_right_split_line' - } - }, - wire_connection_id = { - fields = { - 'electric_pole', - 'power_switch_left', - 'power_switch_right' - } - }, - wire_type = { - fields = { - 'copper', - 'green', - 'red' - } - }, - -- Defines additional modules - color = { - other_fields = true - }, - anticolor = { - other_fields = true - }, - lightcolor = { - other_fields = true - }, - time = { - fields = { - 'second', - 'minute', - 'hour', - 'day', - 'week', - 'month', - 'year' - } - } - } - } - } -}--)) - -stds.love_extra = { - read_globals = { - love = { - fields = { - arg = { - fields = { - 'parseGameArguments', 'parseOption', 'getLow', 'optionIndices', 'options' - } - } - } - } - }, - globals = { - --'coroutine', 'io', 'socket', 'dofile', 'loadfile', - love = { - fields = { - 'handlers' - } - } - } -} - ---[[ Options - "ignore", "std", "globals", "unused_args", "self", "compat", "global", "unused", "redefined", - "unused_secondaries", "allow_defined", "allow_defined_top", "module", - "read_globals", "new_globals", "new_read_globals", "enable", "only", "not_globals", - "max_line_length", "max_code_line_length", "max_string_line_length", "max_comment_line_length", - "max_cyclomatic_complexity" ---]] - ---[[ Warnings list - -- 011 A syntax error. - -- 021 An invalid inline option. - -- 022 An unpaired inline push directive. - -- 023 An unpaired inline pop directive. - -- 111 Setting an undefined global variable. - -- 112 Mutating an undefined global variable. - -- 113 Accessing an undefined global variable. - -- 121 Setting a read-only global variable. - -- 122 Setting a read-only field of a global variable. - -- 131 Unused implicitly defined global variable. - -- 142 Setting an undefined field of a global variable. - -- 143 Accessing an undefined field of a global variable. - -- 211 Unused local variable. - -- 212 Unused argument. - -- 213 Unused loop variable. - -- 221 Local variable is accessed but never set. - -- 231 Local variable is set but never accessed. - -- 232 An argument is set but never accessed. - -- 233 Loop variable is set but never accessed. - -- 241 Local variable is mutated but never accessed. - -- 311 Value assigned to a local variable is unused. - -- 312 Value of an argument is unused. - -- 313 Value of a loop variable is unused. - -- 314 Value of a field in a table literal is unused. - -- 321 Accessing uninitialized local variable. - -- 331 Value assigned to a local variable is mutated but never accessed. - -- 341 Mutating uninitialized local variable. - -- 411 Redefining a local variable. - -- 412 Redefining an argument. - -- 413 Redefining a loop variable. - -- 421 Shadowing a local variable. - -- 422 Shadowing an argument. - -- 423 Shadowing a loop variable. - -- 431 Shadowing an upvalue. - -- 432 Shadowing an upvalue argument. - -- 433 Shadowing an upvalue loop variable. - -- 511 Unreachable code. - -- 512 Loop can be executed at most once. - -- 521 Unused label. - -- 531 Left-hand side of an assignment is too short. - -- 532 Left-hand side of an assignment is too long. - -- 541 An empty do end block. - -- 542 An empty if branch. - -- 551 An empty statement. - -- 611 A line consists of nothing but whitespace. - -- 612 A line contains trailing whitespace. - -- 613 Trailing whitespace in a string. - -- 614 Trailing whitespace in a comment. - -- 621 Inconsistent indentation (SPACE followed by TAB). - -- 631 Line is too long. ---]] \ No newline at end of file diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt index 68bf4b1..70a5047 100644 --- a/PHI-CL/changelog.txt +++ b/PHI-CL/changelog.txt @@ -32,3 +32,10 @@ Date: 2022-12-01 Added: - Compound Solar Panel and Accumulator + +--------------------------------------------------------------------------------------------------- +Version: 1.0.0 +Date: 2021-08-12 + +Added: + - Initial diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua index 9c4f9e7..7487c7b 100644 --- a/PHI-CL/config.lua +++ b/PHI-CL/config.lua @@ -1,146 +1,4 @@ local items = { - ['setting'] = { - ['PHI-EN-SOLAR-TIER'] = { - type = 'max', - effect = { - 'solar-panel', - 'accumulator' - } - }, - ['PHI-EN-STEAM-TIER'] = { - type = 'max', - effect = { - 'boiler', - 'steam-engine' - } - }, - ['PHI-EN-NUCLEAR-TIER'] = { - type = 'max', - effect = { - 'nuclear-reactor', - 'heat-pipe', - 'heat-exchanger', - 'steam-turbine' - } - }, - ['PHI-MB-ASSEMBLING-TIER'] = { - type = 'max', - effect = { - 'assembling-machine' - } - }, - ['PHI-MB-FURNACE-TIER'] = { - type = 'max', - effect = { - 'electric-furnace', - 'electric-filter-furnace', - 'industrial-furnace' - } - }, - ['PHI-MB-OIL-TIER'] = { - type = 'max', - effect = { - 'oil-refinery', - 'chemical-plant', - 'fuel-processor', - 'se-fuel-refinery' - } - }, - ['PHI-MB-CENTRIFUGE-TIER'] = { - type = 'max', - effect = { - 'centrifuge' - } - }, - ['PHI-MB-LAB-TIER'] = { - type = 'max', - effect = { - 'lab', - 'se-space-science-lab' - } - }, - ['PHI-MB-MINING-TIER'] = { - type = 'max', - effect = { - 'electric-mining-drill', - 'pumpjack', - 'area-mining-drill', - 'se-core-miner' - } - }, - ['PHI-WE-LASER-TIER'] = { - type = 'max', - effect = { - 'laser-turret' - } - }, - ['PHI-WE-FLAME-TIER'] = { - type = 'max', - effect = { - 'flamethrower-turret' - } - }, - ['PHI-WE-GUN-TIER'] = { - type = 'max', - effect = { - 'gun-turret' - } - }, - ['PHI-WE-RADAR-TIER'] = { - type = 'max', - effect = { - 'radar' - } - }, - ['PHI-EQ-SOLAR-TIER'] = { - type = 'max', - effect = { - 'solar-panel' - } - }, - ['PHI-EQ-BATTERY-TIER'] = { - type = 'max', - effect = { - 'battery' - } - }, - ['PHI-EQ-REACTOR-TIER'] = { - type = 'max', - effect = { - 'fusion-reactor' - } - }, - ['PHI-EQ-LASER-TIER'] = { - type = 'max', - effect = { - 'personal-laser-defense' - } - }, - ['PHI-EQ-ROBOPORT-TIER'] = { - type = 'max', - effect = { - 'personal-roboport' - } - }, - ['PHI-EQ-SHIELD-TIER'] = { - type = 'max', - effect = { - 'energy-shield' - } - }, - ['PHI-EQ-NIGHT-TIER'] = { - type = 'max', - effect = { - 'night-vision' - } - }, - ['PHI-EQ-EXO-TIER'] = { - type = 'max', - effect = { - 'exoskeleton' - } - } - }, ['research_modifier'] = { --[[ ['electric-turret'] = { @@ -191,7 +49,8 @@ local items = { tech = 'compound-energy', min = 2, max = 8, - base = 60 + base = 60, + setting = 'PHI-EN-SOLAR-TIER' }, ['accumulator'] = { enabled = settings.startup['PHI-EN'].value, @@ -202,7 +61,8 @@ local items = { tech = 'compound-energy', min = 2, max = 8, - base = 5 + base = 5, + setting = 'PHI-EN-SOLAR-TIER' }, ['boiler'] = { enabled = settings.startup['PHI-EN'].value, @@ -215,7 +75,8 @@ local items = { max = 5, base = 1800, temp = 150, - fluid = 1 + fluid = 1, + setting = 'PHI-EN-STEAM-TIER' }, ['steam-engine'] = { enabled = settings.startup['PHI-EN'].value, @@ -227,7 +88,8 @@ local items = { min = 2, max = 5, base = 150, - fluid = 1 / 2 + fluid = 1 / 2, + setting = 'PHI-EN-STEAM-TIER' }, ['nuclear-reactor'] = { enabled = settings.startup['PHI-EN'].value, @@ -240,7 +102,8 @@ local items = { max = 5, base = 40, bonus = 1, - temp = 500 + temp = 500, + setting = 'PHI-EN-NUCLEAR-TIER' }, ['heat-pipe'] = { enabled = settings.startup['PHI-EN'].value, @@ -251,7 +114,8 @@ local items = { tech = 'compound-energy', min = 2, max = 5, - temp = 500 + temp = 500, + setting = 'PHI-EN-NUCLEAR-TIER' }, ['heat-exchanger'] = { enabled = settings.startup['PHI-EN'].value, @@ -264,7 +128,8 @@ local items = { max = 5, base = 10000, temp = 485, - fluid = 103 / 60 + fluid = 103 / 60, + setting = 'PHI-EN-NUCLEAR-TIER' }, ['steam-turbine'] = { enabled = settings.startup['PHI-EN'].value, @@ -276,7 +141,8 @@ local items = { min = 2, max = 5, base = 485, - fluid = 1 + fluid = 1, + setting = 'PHI-EN-NUCLEAR-TIER' }, ['assembling-machine'] = { enabled = settings.startup['PHI-MB'].value, @@ -286,7 +152,8 @@ local items = { ref_name = 'assembling-machine-3', tech = 'automation-3', min = 4, - max = 5 + max = 5, + setting = 'PHI-MB-ASSEMBLING-TIER' }, ['electric-furnace'] = { enabled = settings.startup['PHI-MB'].value, @@ -296,7 +163,8 @@ local items = { ref_name = 'electric-furnace', tech = 'advanced-material-processing-2', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-FURNACE-TIER' }, ['oil-refinery'] = { enabled = settings.startup['PHI-MB'].value, @@ -306,7 +174,8 @@ local items = { ref_name = 'oil-refinery', tech = 'oil-processing', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-OIL-TIER' }, ['chemical-plant'] = { enabled = settings.startup['PHI-MB'].value, @@ -316,7 +185,8 @@ local items = { ref_name = 'chemical-plant', tech = 'oil-processing', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-OIL-TIER' }, ['centrifuge'] = { enabled = settings.startup['PHI-MB'].value, @@ -326,7 +196,8 @@ local items = { ref_name = 'centrifuge', tech = 'uranium-processing', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-CENTRIFUGE-TIER' }, ['lab'] = { enabled = settings.startup['PHI-MB'].value, @@ -336,7 +207,8 @@ local items = { ref_name = 'lab', tech = 'automation', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-LAB-TIER' }, ['electric-mining-drill'] = { enabled = settings.startup['PHI-MB'].value, @@ -346,7 +218,8 @@ local items = { ref_name = 'electric-mining-drill', tech = 'automation', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-MINING-TIER' }, ['pumpjack'] = { enabled = settings.startup['PHI-MB'].value, @@ -356,7 +229,8 @@ local items = { ref_name = 'pumpjack', tech = 'automation', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-MINING-TIER' }, ['electric-filter-furnace'] = { enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-RS'].value, @@ -366,7 +240,8 @@ local items = { ref_name = 'electric-filter-furnace', tech = 'advanced-material-processing-2', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-FURNACE-TIER' }, ['laser-turret'] = { enabled = settings.startup['PHI-WE'].value, @@ -377,18 +252,8 @@ local items = { tech = 'laser-turret', min = 2, max = 3, - range = 24 - }, - ['gun-turret'] = { - enabled = settings.startup['PHI-WE'].value, - stage = 1, - type = 'ammo-turret', - name = 'gun-turret', - ref_name = 'gun-turret', - tech = 'gun-turret', - min = 2, - max = 3, - range = 18 + range = 24, + setting = 'PHI-WE-LASER-TIER' }, ['flamethrower-turret'] = { enabled = settings.startup['PHI-WE'].value, @@ -399,7 +264,20 @@ local items = { tech = 'flamethrower', min = 2, max = 3, - range = 30 + range = 30, + setting = 'PHI-WE-FLAME-TIER' + }, + ['gun-turret'] = { + enabled = settings.startup['PHI-WE'].value, + stage = 1, + type = 'ammo-turret', + name = 'gun-turret', + ref_name = 'gun-turret', + tech = 'gun-turret', + min = 2, + max = 3, + range = 18, + setting = 'PHI-WE-GUN-TIER' }, ['radar'] = { enabled = settings.startup['PHI-WE'].value, @@ -409,7 +287,8 @@ local items = { ref_name = 'radar', tech = 'automation', min = 2, - max = 3 + max = 3, + setting = 'PHI-WE-RADAR-TIER' } }, ['equipment'] = { @@ -423,7 +302,8 @@ local items = { min = 2, max = 8, base = 30, - graphics_name = 'solar-panel-equipment' + graphics_name = 'solar-panel-equipment', + setting = 'PHI-EQ-SOLAR-TIER' }, ['fusion-reactor-equipment'] = { enabled = settings.startup['PHI-EQ'].value, @@ -435,7 +315,8 @@ local items = { min = 2, max = 8, base = 750, - graphics_name = 'fusion-reactor-equipment' + graphics_name = 'fusion-reactor-equipment', + setting = 'PHI-EQ-REACTOR-TIER' }, ['battery-equipment'] = { enabled = settings.startup['PHI-EQ'].value, @@ -447,7 +328,8 @@ local items = { min = 3, max = 8, base = 100, - graphics_name = 'battery-mk2-equipment' + graphics_name = 'battery-mk2-equipment', + setting = 'PHI-EQ-BATTERY-TIER' }, ['personal-laser-defense-equipment'] = { enabled = settings.startup['PHI-EQ'].value, @@ -459,7 +341,8 @@ local items = { min = 2, max = 8, base = 3, - graphics_name = 'personal-laser-defense-equipment' + graphics_name = 'personal-laser-defense-equipment', + setting = 'PHI-EQ-LASER-TIER' }, ['energy-shield-equipment'] = { enabled = settings.startup['PHI-EQ'].value, @@ -471,7 +354,8 @@ local items = { min = 3, max = 8, base = 150, - graphics_name = 'energy-shield-mk2-equipment' + graphics_name = 'energy-shield-mk2-equipment', + setting = 'PHI-EQ-SHIELD-TIER' }, ['personal-roboport-equipment'] = { enabled = settings.startup['PHI-EQ'].value, @@ -483,7 +367,8 @@ local items = { min = 3, max = 8, base = 0.5, - graphics_name = 'personal-roboport-mk2-equipment' + graphics_name = 'personal-roboport-mk2-equipment', + setting = 'PHI-EQ-ROBOPORT-TIER' }, ['night-vision-equipment'] = { enabled = settings.startup['PHI-EQ'].value, @@ -494,7 +379,8 @@ local items = { tech = 'night-vision-equipment', min = 2, max = 2, - graphics_name = 'night-vision-equipment' + graphics_name = 'night-vision-equipment', + setting = 'PHI-EQ-NIGHT-TIER' }, ['exoskeleton-equipment'] = { enabled = settings.startup['PHI-EQ'].value, @@ -506,7 +392,8 @@ local items = { min = 2, max = 2, base = 0.6, - graphics_name = 'exoskeleton-equipment' + graphics_name = 'exoskeleton-equipment', + setting = 'PHI-EQ-EXO-TIER' } }, ['bonus'] = { @@ -849,7 +736,8 @@ if mods then ref_name = 'industrial-furnace', tech = 'industrial-furnace', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-FURNACE-TIER' } items['item']['fuel-processor'] = { @@ -860,7 +748,8 @@ if mods then ref_name = 'fuel-processor', tech = 'fuel-processing', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-OIL-TIER' } end @@ -873,7 +762,8 @@ if mods then ref_name = 'area-mining-drill', tech = 'area-mining-drill', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-MINING-TIER' } end @@ -908,7 +798,8 @@ if mods then tech = 'compound-energy', min = 2, max = 5, - base = 0.1 + base = 0.1, + setting = 'PHI-EN-STEAM-TIER' } items['item']['kr-crusher'] = { @@ -919,7 +810,8 @@ if mods then ref_name = 'kr-crusher', tech = 'kr-crusher', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['kr-fluid-burner'] = { @@ -930,7 +822,8 @@ if mods then ref_name = 'kr-fluid-burner', tech = 'kr-fluid-excess-handling', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['kr-air-purifier'] = { @@ -941,7 +834,8 @@ if mods then ref_name = 'kr-air-purifier', tech = 'kr-air-purification', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['kr-advanced-furnace'] = { @@ -952,7 +846,8 @@ if mods then ref_name = 'kr-advanced-furnace', tech = 'kr-advanced-furnace', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-FURNACE-TIER' } items['item']['kr-advanced-chemical-plant'] = { @@ -963,7 +858,8 @@ if mods then ref_name = 'kr-advanced-chemical-plant', tech = 'kr-advanced-chemical-plant', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-OIL-TIER' } items['item']['kr-advanced-assembling-machine'] = { @@ -974,7 +870,8 @@ if mods then ref_name = 'kr-advanced-assembling-machine', tech = 'kr-automation', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['kr-greenhouse'] = { @@ -985,7 +882,8 @@ if mods then ref_name = 'kr-greenhouse', tech = 'kr-greenhouse', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['kr-bio-lab'] = { @@ -996,7 +894,8 @@ if mods then ref_name = 'kr-bio-lab', tech = 'kr-bio-processing', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['kr-electrolysis-plant'] = { @@ -1007,7 +906,8 @@ if mods then ref_name = 'kr-electrolysis-plant', tech = 'kr-fluids-chemistry', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['kr-filtration-plant'] = { @@ -1018,7 +918,8 @@ if mods then ref_name = 'kr-filtration-plant', tech = 'kr-fluids-chemistry', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['kr-fuel-refinery'] = { @@ -1029,7 +930,8 @@ if mods then ref_name = 'kr-fuel-refinery', tech = 'kr-fuel', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['kr-atmospheric-condenser'] = { @@ -1040,7 +942,8 @@ if mods then ref_name = 'kr-atmospheric-condenser', tech = 'kr-atmosphere-condensation', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['kr-advanced-lab'] = { @@ -1051,7 +954,8 @@ if mods then ref_name = 'biusart-lab', tech = 'kr-advanced-lab', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-LAB-TIER' } items['item']['kr-singularity-lab'] = { @@ -1062,7 +966,8 @@ if mods then ref_name = 'kr-singularity-lab', tech = 'kr-singularity-lab', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-LAB-TIER' } items['item']['kr-research-server'] = { @@ -1073,7 +978,8 @@ if mods then ref_name = 'kr-research-server', tech = 'kr-research-server', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['kr-quantum-computer'] = { @@ -1084,7 +990,8 @@ if mods then ref_name = 'kr-quantum-computer', tech = 'kr-quantum-computer', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['kr-matter-plant'] = { @@ -1095,7 +1002,8 @@ if mods then ref_name = 'kr-matter-plant', tech = 'kr-matter-processing', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['kr-matter-assembler'] = { @@ -1106,7 +1014,8 @@ if mods then ref_name = 'kr-matter-assembler', tech = 'kr-matter-processing', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['kr-quarry-drill'] = { @@ -1117,7 +1026,8 @@ if mods then ref_name = 'kr-quarry-drill', tech = 'kr-quarry-minerals-extraction', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-MINING-TIER' } end @@ -1136,7 +1046,8 @@ if mods then tech = 'compound-energy', min = 4, max = 8, - base = 400 + base = 400, + setting = 'PHI-EN-SOLAR-TIER' } items['item']['se-space-assembling-machine'] = { @@ -1147,7 +1058,8 @@ if mods then ref_name = 'se-space-assembling-machine', tech = 'se-space-assembling', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-manufactory'] = { @@ -1158,7 +1070,8 @@ if mods then ref_name = 'se-space-manufactory', tech = 'se-space-manufactory', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-casting-machine'] = { @@ -1169,7 +1082,8 @@ if mods then ref_name = 'se-casting-machine', tech = 'se-pyroflux-smelting', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-pulveriser'] = { @@ -1180,7 +1094,8 @@ if mods then ref_name = 'se-pulveriser', tech = 'se-pulveriser', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-lifesupport-facility'] = { @@ -1191,7 +1106,8 @@ if mods then ref_name = 'se-lifesupport-facility', tech = 'se-lifesupport-facility', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-fuel-refinery'] = { @@ -1202,7 +1118,8 @@ if mods then ref_name = 'se-fuel-refinery', tech = 'se-fuel-refining', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-OIL-TIER' } items['item']['se-space-decontamination-facility'] = { @@ -1213,7 +1130,8 @@ if mods then ref_name = 'se-space-decontamination-facility', tech = 'se-space-decontamination-facility', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-genetics-laboratory'] = { @@ -1224,7 +1142,8 @@ if mods then ref_name = 'se-space-genetics-laboratory', tech = 'se-space-genetics-laboratory', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-growth-facility'] = { @@ -1235,7 +1154,8 @@ if mods then ref_name = 'se-space-growth-facility', tech = 'se-space-growth-facility', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-biochemical-laboratory'] = { @@ -1246,7 +1166,8 @@ if mods then ref_name = 'se-space-biochemical-laboratory', tech = 'se-space-biochemical-laboratory', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-radiation-laboratory'] = { @@ -1257,7 +1178,8 @@ if mods then ref_name = 'se-space-radiation-laboratory', tech = 'se-space-radiation-laboratory', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-electromagnetics-laboratory'] = { @@ -1268,7 +1190,8 @@ if mods then ref_name = 'se-space-electromagnetics-laboratory', tech = 'se-space-electromagnetics-laboratory', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-laser-laboratory'] = { @@ -1279,7 +1202,8 @@ if mods then ref_name = 'se-space-laser-laboratory', tech = 'se-space-laser-laboratory', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-astrometrics-laboratory'] = { @@ -1290,7 +1214,8 @@ if mods then ref_name = 'se-space-astrometrics-laboratory', tech = 'se-space-astrometrics-laboratory', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-gravimetrics-laboratory'] = { @@ -1301,7 +1226,8 @@ if mods then ref_name = 'se-space-gravimetrics-laboratory', tech = 'se-space-gravimetrics-laboratory', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-mechanical-laboratory'] = { @@ -1312,7 +1238,8 @@ if mods then ref_name = 'se-space-mechanical-laboratory', tech = 'se-space-mechanical-laboratory', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-material-fabricator'] = { @@ -1323,7 +1250,8 @@ if mods then ref_name = 'se-space-material-fabricator', tech = 'se-space-material-fabricator', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-particle-accelerator'] = { @@ -1334,7 +1262,8 @@ if mods then ref_name = 'se-space-particle-accelerator', tech = 'se-space-particle-accelerator', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-particle-collider'] = { @@ -1345,7 +1274,8 @@ if mods then ref_name = 'se-space-particle-collider', tech = 'se-space-particle-collider', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-plasma-generator'] = { @@ -1356,7 +1286,8 @@ if mods then ref_name = 'se-space-plasma-generator', tech = 'se-space-plasma-generator', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-hypercooler'] = { @@ -1367,7 +1298,8 @@ if mods then ref_name = 'se-space-hypercooler', tech = 'se-space-hypercooling-1', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-radiator'] = { @@ -1378,7 +1310,8 @@ if mods then ref_name = 'se-space-radiator-2', tech = 'se-space-radiator-2', min = 3, - max = 4 + max = 4, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-telescope'] = { @@ -1389,7 +1322,8 @@ if mods then ref_name = 'se-space-telescope', tech = 'se-space-telescope', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-telescope-gammaray'] = { @@ -1400,7 +1334,8 @@ if mods then ref_name = 'se-space-telescope-gammaray', tech = 'se-space-telescope-gammaray', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-telescope-microwave'] = { @@ -1411,7 +1346,8 @@ if mods then ref_name = 'se-space-telescope-microwave', tech = 'se-space-telescope-microwave', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-telescope-radio'] = { @@ -1422,7 +1358,8 @@ if mods then ref_name = 'se-space-telescope-radio', tech = 'se-space-telescope-radio', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-telescope-xray'] = { @@ -1433,7 +1370,8 @@ if mods then ref_name = 'se-space-telescope-xray', tech = 'se-space-telescope-xray', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-ASSEMBLING-TIER' } items['item']['se-space-science-lab'] = { @@ -1444,7 +1382,8 @@ if mods then ref_name = 'se-space-science-lab', tech = 'se-space-science-lab', min = 2, - max = 3 + max = 3, + setting = 'PHI-MB-LAB-TIER' } items['equipment']['solar-panel-equipment'].base = 30 diff --git a/PHI-CL/data-final-fixes.lua b/PHI-CL/data-final-fixes.lua index da6f96d..b8a9241 100644 --- a/PHI-CL/data-final-fixes.lua +++ b/PHI-CL/data-final-fixes.lua @@ -20,6 +20,60 @@ for _,name in pairs({'furnace', 'lab', 'beacon'}) do end end +if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-ARTILLERY'].value then + for _, v in pairs(data.raw['artillery-turret']) do + for _, v2 in pairs(v) do + v.manual_range_modifier = 1 + end + end + + for _, v in pairs(data.raw['artillery-wagon']) do + for _, v2 in pairs(v) do + v.manual_range_modifier = 1 + end + end +end + +if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value then + for k, _ in pairs(data.raw) do + if data.raw[k] then + if data.raw[k].fluid_box then + if data.raw[k].fluid_box.height < settings.startup['PHI-MI-PIPE'].value then + data.raw[k].fluid_box.height = settings.startup['PHI-MI-PIPE'].value + end + + if data.raw[k].fluid_box.base_level < (1 + settings.startup['PHI-MI-PIPE'].value) then + data.raw[k].fluid_box.base_level = 1 + settings.startup['PHI-MI-PIPE'].value + end + end + + if data.raw[k].output_fluid_box then + if data.raw[k].output_fluid_box.height < settings.startup['PHI-MI-PIPE'].value then + data.raw[k].output_fluid_box.height = settings.startup['PHI-MI-PIPE'].value + end + + if data.raw[k].output_fluid_box.base_level > (-1 - settings.startup['PHI-MI-PIPE'].value) then + data.raw[k].output_fluid_box.base_level = (-1 - settings.startup['PHI-MI-PIPE'].value) + end + end + + if data.raw[k].fluid_boxes then + for k1, _ in pairs(data.raw[k].fluid_boxes) do + if data.raw[k].fluid_boxes[k1] ~= false and data.raw[k].fluid_boxes[k1] ~= true then + if data.raw[k].fluid_boxes[k1].production_type then + data.raw[k].fluid_boxes[k1].height = settings.startup['PHI-MI-PIPE'].value + + if data.raw[k].fluid_boxes[k1].base_level then + data.raw[k].fluid_boxes[k1].base_level = 1 + settings.startup['PHI-MI-PIPE'].value + end + end + end + end + end + end + end +end + if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TILE'].value then for _, tile in pairs (data.raw.tile) do tile.autoplace = nil diff --git a/PHI-CL/data-updates.lua b/PHI-CL/data-updates.lua index 25e69d3..e33d964 100644 --- a/PHI-CL/data-updates.lua +++ b/PHI-CL/data-updates.lua @@ -8,9 +8,7 @@ end if settings.startup['PHI-XW-WATER'].value > 0 then if mods['angelsrefining'] then - data.raw['offshore-pump']['seafloor-pump'].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20 - data.raw['offshore-pump']['seafloor-pump'].fluid_box.height = 4 - data.raw['offshore-pump']['seafloor-pump'].fluid_box.level = 5 + data.raw['offshore-pump']['seafloor-pump'].pumping_speed = settings.startup['PHI-XW-WATER'].value * 2 data.raw['offshore-pump']['seafloor-pump'].flags = {'placeable-neutral', 'player-creation', 'filter-directions'} data.raw['offshore-pump']['seafloor-pump'].adjacent_tile_collision_box = {{-2, -3}, {2, -2}} data.raw['offshore-pump']['seafloor-pump'].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'} @@ -20,8 +18,6 @@ if settings.startup['PHI-XW-WATER'].value > 0 then if mods['exotic-industries'] then data.raw['offshore-pump']['ei_gaia-pump'].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20 - data.raw['offshore-pump']['ei_gaia-pump'].fluid_box.height = 4 - data.raw['offshore-pump']['ei_gaia-pump'].fluid_box.level = 5 data.raw['offshore-pump']['ei_gaia-pump'].flags = {'placeable-neutral', 'player-creation'} data.raw['offshore-pump']['ei_gaia-pump'].adjacent_tile_collision_box = {{-0.5, -0.25}, {0.5, 0.25}} data.raw['offshore-pump']['ei_gaia-pump'].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'} @@ -331,46 +327,6 @@ if settings.startup['PHI-RS'].value then end end -if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value then - for k, _ in pairs(data.raw) do - if data.raw[k] then - if data.raw[k].fluid_box then - if data.raw[k].fluid_box.height < settings.startup['PHI-MI-PIPE'].value then - data.raw[k].fluid_box.height = settings.startup['PHI-MI-PIPE'].value - end - - if data.raw[k].fluid_box.base_level < (1 + settings.startup['PHI-MI-PIPE'].value) then - data.raw[k].fluid_box.base_level = 1 + settings.startup['PHI-MI-PIPE'].value - end - end - - if data.raw[k].output_fluid_box then - if data.raw[k].output_fluid_box.height < settings.startup['PHI-MI-PIPE'].value then - data.raw[k].output_fluid_box.height = settings.startup['PHI-MI-PIPE'].value - end - - if data.raw[k].output_fluid_box.base_level > (-1 - settings.startup['PHI-MI-PIPE'].value) then - data.raw[k].output_fluid_box.base_level = (-1 - settings.startup['PHI-MI-PIPE'].value) - end - end - - if data.raw[k].fluid_boxes then - for k1, _ in pairs(data.raw[k].fluid_boxes) do - if data.raw[k].fluid_boxes[k1] ~= false and data.raw[k].fluid_boxes[k1] ~= true then - if data.raw[k].fluid_boxes[k1].production_type then - data.raw[k].fluid_boxes[k1].height = settings.startup['PHI-MI-PIPE'].value - - if data.raw[k].fluid_boxes[k1].base_level then - data.raw[k].fluid_boxes[k1].base_level = 1 + settings.startup['PHI-MI-PIPE'].value - end - end - end - end - end - end - end -end - if settings.startup['PHI-MB'].value and mods['space-exploration'] and settings.startup['PHI-MB-MINING-TIER'].value > 1 then data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group = 'se-core-miner-drill' @@ -435,32 +391,40 @@ if settings.startup['PHI-MB'].value and mods['space-exploration'] and settings.s end for _, v in pairs(items['item']) do - if v.enabled then - if v.stage == file_stage then - v.category = 'item' + if v.stage == file_stage then + if items['item']['setting'] then + local v2 = settings.startup[items['item']['setting']].value - for j=v.min, v.max, 1 do - main.EEE(v, j) - main.EI(v, j) - main.ER(v, j) - main.ET(v, j) + if v2 >= v.min then + v.category = 'item' + + for j=v.min, v2, 1 do + main.EEE(v, j) + main.EI(v, j) + main.ER(v, j) + main.ET(v, j) + end + + main.EL(v) end - - main.EL(v) end end end for _, v in pairs(items['equipment']) do - if v.enabled then - if v.stage == file_stage then - v.category = 'equipment' + if v.stage == file_stage then + if items['item']['setting'] then + local v2 = settings.startup[items['item']['setting']].value - for j=v.min, v.max, 1 do - main.EEQ(v, j) - main.EI(v, j) - main.ER(v, j) - main.ET(v, j) + if v2 >= v.min then + v.category = 'equipment' + + for j=v.min, v2, 1 do + main.EEQ(v, j) + main.EI(v, j) + main.ER(v, j) + main.ET(v, j) + end end end end diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 1df1e57..b360ddd 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -4,8 +4,6 @@ local file_stage = 1 if settings.startup['PHI-XW-WATER'].value > 0 then data.raw['offshore-pump']['offshore-pump'].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20 - data.raw['offshore-pump']['offshore-pump'].fluid_box.height = 4 - data.raw['offshore-pump']['offshore-pump'].fluid_box.level = 5 data.raw['offshore-pump']['offshore-pump'].flags = {'placeable-neutral', 'player-creation'} data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_box = {{-0.5, -0.25}, {0.5, 0.25}} data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'} @@ -456,12 +454,8 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-NUCLEAR'].value end if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value then - data.raw['pipe']['pipe'].fluid_box.height = settings.startup['PHI-MI-PIPE'].value - data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.height = settings.startup['PHI-MI-PIPE'].value - data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.pipe_connections = {{position = {0, -1}}, {position = {0, 1}, max_underground_distance = 10}} data.raw['pump']['pump'].fluid_box.height = 4 * settings.startup['PHI-MI-PIPE'].value data.raw['pump']['pump'].pumping_speed = 200 * settings.startup['PHI-MI-PIPE'].value - data.raw['storage-tank']['storage-tank'].fluid_box.height = settings.startup['PHI-MI-PIPE'].value end if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-ROBOT'].value then @@ -496,33 +490,33 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-ROBOT'].value t end if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value then - data.raw['locomotive']['locomotive'].max_health = 500 * (1 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['locomotive']['locomotive'].max_speed = 0.6 * (1 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['locomotive']['locomotive'].max_power = (600 * settings.startup['PHI-MI-TRAIN'].value) .. 'kW' + data.raw['locomotive']['locomotive'].max_health = 250 * (3 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].max_speed = 0.3 * (3 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].max_power = 300 * (1 + settings.startup['PHI-MI-TRAIN'].value) .. 'kW' data.raw['locomotive']['locomotive'].reversing_power_modifier = 1 - data.raw['locomotive']['locomotive'].energy_per_hit_point = 4 + settings.startup['PHI-MI-TRAIN'].value - data.raw['locomotive']['locomotive'].braking_force = 5 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].energy_per_hit_point = 2.5 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].braking_force = 1.25 * (7 + settings.startup['PHI-MI-TRAIN'].value) data.raw['locomotive']['locomotive'].friction_force = 0.50 - (0.05 * settings.startup['PHI-MI-TRAIN'].value) data.raw['locomotive']['locomotive'].air_resistance = 0.0075 - (0.0007 * settings.startup['PHI-MI-TRAIN'].value) - data.raw['locomotive']['locomotive'].burner.effectivity = 0.5 + (0.5 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].burner.effectivity = 0.10 * (9 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['cargo-wagon']['cargo-wagon'].max_health = 300 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['cargo-wagon']['cargo-wagon'].max_health = 200 * (2 + settings.startup['PHI-MI-TRAIN'].value) data.raw['cargo-wagon']['cargo-wagon'].max_speed = 0.6 * (2 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['cargo-wagon']['cargo-wagon'].braking_force = 1.5 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['cargo-wagon']['cargo-wagon'].braking_force = 1 * (2 + settings.startup['PHI-MI-TRAIN'].value) data.raw['cargo-wagon']['cargo-wagon'].friction_force = 0.50 - (0.05 * settings.startup['PHI-MI-TRAIN'].value) data.raw['cargo-wagon']['cargo-wagon'].air_resistance = 0.01 - (0.001 * settings.startup['PHI-MI-TRAIN'].value) data.raw['cargo-wagon']['cargo-wagon'].inventory_size = 5 * (7 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['fluid-wagon']['fluid-wagon'].max_health = 300 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['fluid-wagon']['fluid-wagon'].max_health = 200 * (2 + settings.startup['PHI-MI-TRAIN'].value) data.raw['fluid-wagon']['fluid-wagon'].max_speed = 0.6 * (2 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['fluid-wagon']['fluid-wagon'].braking_force = 1.5 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['fluid-wagon']['fluid-wagon'].braking_force = 1 * (2 + settings.startup['PHI-MI-TRAIN'].value) data.raw['fluid-wagon']['fluid-wagon'].friction_force = 0.50 - (0.05 * settings.startup['PHI-MI-TRAIN'].value) data.raw['fluid-wagon']['fluid-wagon'].air_resistance = 0.01 - (0.001 * settings.startup['PHI-MI-TRAIN'].value) data.raw['fluid-wagon']['fluid-wagon'].capacity = 3125 * (7 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['artillery-wagon']['artillery-wagon'].max_health = 300 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['artillery-wagon']['artillery-wagon'].max_health = 200 * (2 + settings.startup['PHI-MI-TRAIN'].value) data.raw['artillery-wagon']['artillery-wagon'].max_speed = 0.6 * (2 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['artillery-wagon']['artillery-wagon'].braking_force = 1.5 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['artillery-wagon']['artillery-wagon'].braking_force = 1 * (2 + settings.startup['PHI-MI-TRAIN'].value) data.raw['artillery-wagon']['artillery-wagon'].friction_force = 0.50 - (0.05 * settings.startup['PHI-MI-TRAIN'].value) data.raw['artillery-wagon']['artillery-wagon'].air_resistance = 0.015 - (0.0015 * settings.startup['PHI-MI-TRAIN'].value) data.raw['artillery-wagon']['artillery-wagon'].turret_rotation_speed = 0.0005 * (1 + settings.startup['PHI-MI-TRAIN'].value) @@ -540,12 +534,6 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value th entity.energy_consumption = '7200kW' entity.target_temperature = 165 - if settings.startup['PHI-MI-PIPE'].value then - entity.fluid_box.height = settings.startup['PHI-MI-PIPE'].value - entity.output_fluid_box.height = settings.startup['PHI-MI-PIPE'].value - entity.output_fluid_box.base_level = entity.output_fluid_box.base_level + settings.startup['PHI-MI-PIPE'].value - end - entity.minable = {hardness = 0.2, mining_time = 0.5, result = 'electric-boiler'} entity.emissions_per_minute = 0 entity.energy_source.type = 'electric' @@ -597,7 +585,7 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-CHEST'].value t item.name = 'basic-' .. chests[i] item.place_result = 'basic-' .. chests[i] - item.order = 'b[storage]-d[basic-' .. item.order .. ']' + item.order = 'b[storage]-e[basic-' .. chests[i] .. ']' data:extend({item}) entity.inventory_type = 'with_filters_and_bar' @@ -626,45 +614,41 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-CHEST'].value t table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-requester'}) end -for k, v in pairs(items['setting']) do - for k2=1, #v.effect do - if items[v.effect[k2]] then - if settings.startup[k].value < items[v.effect[k2]].min then - items[v.effect[k2]].enabled = false - end - - items[v.effect[k2]][v.type] = settings.startup[k].value - end - end -end - for _, v in pairs(items['item']) do - if v.enabled then - if v.stage == file_stage then - v.category = 'item' + if v.stage == file_stage then + if items['item']['setting'] then + local v2 = settings.startup[items['item']['setting']].value - for j=v.min, v.max, 1 do - main.EEE(v, j) - main.EI(v, j) - main.ER(v, j) - main.ET(v, j) + if v2 >= v.min then + v.category = 'item' + + for j=v.min, v2, 1 do + main.EEE(v, j) + main.EI(v, j) + main.ER(v, j) + main.ET(v, j) + end + + main.EL(v) end - - main.EL(v) end end end for _, v in pairs(items['equipment']) do - if v.enabled then - if v.stage == file_stage then - v.category = 'equipment' + if v.stage == file_stage then + if items['item']['setting'] then + local v2 = settings.startup[items['item']['setting']].value - for j=v.min, v.max, 1 do - main.EEQ(v, j) - main.EI(v, j) - main.ER(v, j) - main.ET(v, j) + if v2 >= v.min then + v.category = 'equipment' + + for j=v.min, v2, 1 do + main.EEQ(v, j) + main.EI(v, j) + main.ER(v, j) + main.ET(v, j) + end end end end diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index e801d8c..b162a09 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -1076,6 +1076,7 @@ PHI-MI-REPAIR=MI6 Repair efficiency PHI-MI-PIPE=MI7 Pipe efficiency PHI-MI-ROBOT=MI8 Robot efficiency PHI-MI-TRAIN=MI9 Train efficiency +PHI-MI-ARTILLERY=MI10 Artillery range PHI-RS=RS Recipe scaling PHI-RS-RECIPE-1=RS1 Recipe scale 1 diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index af47ce5..c2441ec 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -1067,15 +1067,16 @@ PHI-EQ-EXO-TIER=EQ8 強化外骨格モジュールの最高等級 PHI-EQ-ARMOR=EQ9 パワーアーマー3代を有効にする PHI-MI=MI その他の変更 -PHI-MI-LANDFILL=MI2 埋立地要件 -PHI-MI-EFFCY=MI3 エネルギー効率モジュール効率 -PHI-MI-NUCLEAR=MI4 原子炉出力の調整可能 -PHI-MI-BOILER=MI5 電気ボイラー -PHI-MI-CHEST=MI6 基本的な貯蔵チェスト -PHI-MI-REPAIR=MI7 リペア効率 -PHI-MI-PIPE=MI8 パイプ効率 -PHI-MI-ROBOT=MI9 ロボット効率 -PHI-MI-TRAIN=MI10 列車効率 +PHI-MI-LANDFILL=MI1 埋立地要件 +PHI-MI-EFFCY=MI2 エネルギー効率モジュール効率 +PHI-MI-NUCLEAR=MI3 原子炉出力の調整可能 +PHI-MI-BOILER=MI4 電気ボイラー +PHI-MI-CHEST=MI5 基本的な貯蔵チェスト +PHI-MI-REPAIR=MI6 リペア効率 +PHI-MI-PIPE=MI7 パイプ効率 +PHI-MI-ROBOT=MI8 ロボット効率 +PHI-MI-TRAIN=MI9 列車効率 +PHI-MI-ARTILLERY=MI10 長距離砲射程 PHI-RS=RS レシピ スケーリング PHI-RS-RECIPE-1=RS1 レシピ規模 1 diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index 3fa8188..9bf1d64 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -1076,6 +1076,7 @@ PHI-MI-REPAIR=MI6 維修效率 PHI-MI-PIPE=MI7 水管效率 PHI-MI-ROBOT=MI8 無人機效率 PHI-MI-TRAIN=MI9 火車效率 +PHI-MI-ARTILLERY=MI10 火炮炮彈射程 PHI-RS=RS 配方規模 PHI-RS-RECIPE-1=RS1 配方規模 1 diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index 3fa8188..9bf1d64 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -1076,6 +1076,7 @@ PHI-MI-REPAIR=MI6 維修效率 PHI-MI-PIPE=MI7 水管效率 PHI-MI-ROBOT=MI8 無人機效率 PHI-MI-TRAIN=MI9 火車效率 +PHI-MI-ARTILLERY=MI10 火炮炮彈射程 PHI-RS=RS 配方規模 PHI-RS-RECIPE-1=RS1 配方規模 1 diff --git a/PHI-CL/main.lua b/PHI-CL/main.lua index e4c6c7a..9354862 100644 --- a/PHI-CL/main.lua +++ b/PHI-CL/main.lua @@ -7,9 +7,14 @@ local entity_tint = { 'picture', 'pictures', 'animation', + 'horizontal_animation', 'vertical_animation', 'structure', + 'connection_sprites', 'heat_glow_sprites', + 'heat_connection_patches_connected', + 'heat_connection_patches_disconnected', + 'lower_layer_picture', 'integration_patch' } diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index 49db4c0..92eaa62 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -242,6 +242,12 @@ data:extend({ default_value = 1, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, order = 'E09' + }, { + type = 'bool-setting', + name = 'PHI-MI-ARTILLERY', + setting_type = 'startup', + default_value = true, + order = 'E10' }, { type = 'bool-setting', name = 'PHI-RS',