diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 3997bea..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.db \ No newline at end of file diff --git a/changelog.txt b/changelog.txt index 8a082fb..7b12ff2 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,90 +1,138 @@ --------------------------------------------------------------------------------------------------- -Version: 2.0.0 -Date: 11/1/2020 +Version: 2.0.4 +Date: 2026/02/10 + By: @Fr_Dae Changes: - - Updated mod to be compatible with factorio 2.0 - - added additional green color for turbo transport belts + - Date format to ISO + - Change owner + - changlog update & improve + - change name in style.lua l12 & l30 + - add localisation francais + - add localisation italien + - add localisation portugaise + - add localisation espagnol + - add localisation russe + - add localisation chinoise + - add localisation japonaise +--------------------------------------------------------------------------------------------------- +Version: 1.5.9 +Date: 18/11/2024 + Changes: + - space age should not be a required dependency +--------------------------------------------------------------------------------------------------- +Version: 1.5.8 +Date: 14/11/2024 + Changes: + - space age compatibilty + - fix issues with pressing "n". genuinely no idea what the gui did in the past. +--------------------------------------------------------------------------------------------------- +Version: 1.5.7 +Date: 25/10/2024 + Changes: + - fix an oopsie and update a number +--------------------------------------------------------------------------------------------------- +Version: 1.5.6 +Date: 25/10/2024 + Changes: + - Update a number +--------------------------------------------------------------------------------------------------- +Version: 1.5.5 +Date: 2/18/2021 + Major Features: + - Added RandomFactorioThings/PlutoniumEnergy belts. + - Added Bob's basic belt. + - Added Krastorio2 Belts. + - Fixed 5Dim belts as they were renamed. + - Added the rest of 5Dim belts. + - Added Loaders +--------------------------------------------------------------------------------------------------- +Version: 1.5.4 +Date: 2020/11/24 + Changes: + - Update for Base v1.1. --------------------------------------------------------------------------------------------------- Version: 1.5.3 -Date: 04/30/2020 +Date: 2020/04/30 Changes: - Custom script using "none" instead of "script-only" - Updated on_configuration_changed function --------------------------------------------------------------------------------------------------- Version: 1.5.2 -Date: 02/07/2020 +Date: 2020/02/07 Major Features: - Added startup settings to switch between mod and game colors (breaks multi-player) --------------------------------------------------------------------------------------------------- Version: 1.5.1 -Date: 01/21/2020 +Date: 2020/01/21 Changes: - Game Version 0.18.x Update. --------------------------------------------------------------------------------------------------- Version: 1.5.0 -Date: 01/05/2020 +Date: 2020/01/05 Changes: - Added colors for all modded pipes, pumps, storage tanks, heatpipes and reactors. - Brought changelog upto standard format. --------------------------------------------------------------------------------------------------- Version: 1.4.9 -Date: +Date: 2019 Bugfixes: - Fixed crash due to bobs technology rename. --------------------------------------------------------------------------------------------------- Version: 1.4.8 -Date: +Date: 2019 Bugfixes: - Fixed controls hotkey locale. Changes: - Added changelog. --------------------------------------------------------------------------------------------------- Version: 1.4.7 -Date: +Date: 2019/02/28 Changes: - Update to 0.17.x - Added thumbnail. --------------------------------------------------------------------------------------------------- Version: 1.4.6 -Date: +Date: 2018/08/11 Changes: - Sdded colors for heatpipes and reactors. --------------------------------------------------------------------------------------------------- Version: 1.4.5 -Date: +Date: 2018/04/24 Bugfixes: - Fixed one require I missed removing in previous version. --------------------------------------------------------------------------------------------------- + Version: 1.4.4 -Date: +Date: 2018/04/23 Bugfixes: - (Broken, DO NOT USE) - Safer sprite checks will help prevent errors with future mod changes. --------------------------------------------------------------------------------------------------- Version: 1.4.3 -Date: +Date: 2017/05/02 Bugfixes: - Update for boblogistics belt name and tier changes. --------------------------------------------------------------------------------------------------- + Version: 1.4.2 -Date: +Date: 2017/05/01 Changes: - 0.16.x update. --------------------------------------------------------------------------------------------------- Version: 1.4.1 -Date: +Date: 2017/05/01 Changes: - Works in 0.15.x --------------------------------------------------------------------------------------------------- -Version: 1.4.0 -Date: +Version: 1.4.00 +Date: 2017/04/12 Bugfixes: - Fixes from 1.3.10 Changes: - Removing DyTech belts. --------------------------------------------------------------------------------------------------- Version: 1.3.10 -Date: +Date: 2016 Changes: - Changed colors for walls, turrets, accumulators, and solar panels as per 0.15. Try out the new colors before 0.15.x is released. :) - Added colors for underground belts and splitters for all tiers and mods. @@ -93,44 +141,44 @@ Date: - Added English locale file. --------------------------------------------------------------------------------------------------- Version: 1.3.9 -Date: +Date: 2016 Changes: - Removed main button. Open/close legend via custom key press "N"(default for now) changeable in settings. - *Legend now on gui.left - recommend using Mooncats Vertical left gui mod till 0.15 is released. --------------------------------------------------------------------------------------------------- Version: 1.3.8 -Date: +Date: 2016 Bugfixes: - Legend should no longer open for all players when any player opens legend or when a technology is researched. --------------------------------------------------------------------------------------------------- Version: 1.3.6 -Date: +Date: 2016 Bugfixes: - Fixed bad logic using on_configuration_changed. - Fixed gui legend height. --------------------------------------------------------------------------------------------------- Version: 1.3.5 -Date: +Date: 2016 Changes: - GUI update. - Update to factorio version 0.14.x with new colors --------------------------------------------------------------------------------------------------- Version: 1.3 -Date: +Date: 2015 Changes: - Update for factorio version 0.13.x --------------------------------------------------------------------------------------------------- Version: 1.2 -Date: +Date: 2015 Minor Features: - 5dim and DyTech belts are now colored. --------------------------------------------------------------------------------------------------- Version: 1.1 -Date: +Date: 2015 Minor Features: - Bobsmods support --------------------------------------------------------------------------------------------------- Version: 1.0 -Date: +Date: 2015 Features: - - Base release \ No newline at end of file + - Base release diff --git a/control.lua b/control.lua index 7d0d77e..72fb2b2 100644 --- a/control.lua +++ b/control.lua @@ -22,7 +22,9 @@ end local function rechart(msg) pprint(msg) - game.forces.player.rechart() + for _,force in pairs(game.forces) do + force.rechart() + end end local function destroyOldMainGuiButton() @@ -74,4 +76,5 @@ script.on_event(defines.events.on_research_finished, onResearchFinished) --redraws map to update colors when mod is installed on old save games. script.on_configuration_changed(modChange) -script.on_event("EMC-Hotkey", customInputForLegend) --open/close gui legend \ No newline at end of file +--fix later? +--script.on_event("EMC-Hotkey", customInputForLegend) --open/close gui legend \ No newline at end of file diff --git a/data-updates.lua b/data-updates.lua index 3153f03..4ed12af 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -1,51 +1,138 @@ --- changes color of base belts -data.raw["transport-belt"]["transport-belt"].friendly_map_color = {r = 0.98, g = 0.73, b = 0.0} -- 250, 186, 0 -data.raw["splitter"]["splitter"].friendly_map_color = {r = 0.78, g = 0.58, b = 0.0} -- 200, 149, 0 -data.raw["underground-belt"]["underground-belt"].friendly_map_color = {r = 0.74, g = 0.55, b = 0.0} -- 188, 140, 0 +local beltColorData = { + --base + ["transport-belt"] = {r = 0.98, g = 0.73, b = 0.0}, -- 250, 186, 0 + ["fast-transport-belt"] = {r = 0.98, g = 0.27, b = 0.06}, -- 250, 69, 15 + ["express-transport-belt"] = {r = 0.15, g = 0.67, b = 0.71}, -- 38, 171, 181 + --space-age + ["turbo-transport-belt"] = {r = .549, g = .635, b = .063}, + --K2 + ["kr-advanced-transport-belt"] = {r = 0.13, g = 0.92, b = 0.09}, -- 34, 235, 23 + ["kr-superior-transport-belt"] = {r = 0.82, g = 0.004, b = 0.97}, -- 210, 1, 247 + --5Dim + ["5d-transport-belt-04"] = {r = 1, g = 0.63, b = 0.97}, -- 255, 160, 247 + ["5d-transport-belt-05"] = {r = 0.18, g = 0.75, b = 0.16}, -- 47, 190, 40 + ["5d-transport-belt-06"] = {r = 0.42, g = 0.28, b = 0.18}, -- 107, 71, 478 + ["5d-transport-belt-07"] = {r = 0.45, g = 0.24, b = 0.61}, -- 116, 60, 155 + ["5d-transport-belt-08"] = {r = 0.87, g = 0.87, b = 0.87}, -- 222, 222, 222 + ["5d-transport-belt-09"] = {r = 0.98, g = 0.49, b = 0.06}, -- 250, 126, 16 + ["5d-transport-belt-10"] = {r = 0.44, g = 0.45, b = 1}, -- 111, 114, 255 + --Bob's + ["basic-transport-belt"] = {r = 0.46, g = 0.47, b = 0.47}, -- 118, 120, 120 + --["turbo-transport-belt"] = {r = 0.97, g = 0.07, b = 1.0}, -- 247, 18, 255 --someone will tell me if this is missing :D + ["ultimate-transport-belt"] = {r = 0.07, g = 1.0, b = 0.62}, -- 18, 255, 158 + --RandomFactorioThings/PlutoniumEnergy + ["nuclear-transport-belt"] = {r = 0.0, g = 1, b = 0.0}, -- 0, 255, 0 + ["plutonium-transport-belt"] = {r = 0.0, g = 1, b = 0.91}, -- 0, 255, 231 +} -data.raw["transport-belt"]["fast-transport-belt"].friendly_map_color = {r = 0.98, g = 0.27, b = 0.06} -- 250, 69, 15 -data.raw["splitter"]["fast-splitter"].friendly_map_color = {r = 0.78, g = 0.22, b = 0.05} -- 200, 55, 12 -data.raw["underground-belt"]["fast-underground-belt"].friendly_map_color = {r = 0.74, g = 0.20, b = 0.04} -- 188, 52, 11 - -data.raw["transport-belt"]["express-transport-belt"].friendly_map_color = {r = 0.15, g = 0.67, b = 0.71} -- 38, 171, 181 -data.raw["splitter"]["express-splitter"].friendly_map_color = {r = 0.12, g = 0.54, b = 0.57} -- 30, 137, 145 -data.raw["underground-belt"]["express-underground-belt"].friendly_map_color = {r = 0.11, g = 0.50, b = 0.53} -- 29, 128, 136 +local function changeColor(belt, percent) + return {belt.r * percent, belt.g * percent, belt.b * percent} +end -data.raw["transport-belt"]["turbo-transport-belt"].friendly_map_color = {r = 0.49, g = 0.58, b = 0.20} -- 125, 148, 51 -data.raw["splitter"]["turbo-splitter"].friendly_map_color = {r = 0.42, g = 0.55, b = 0.15} -- 103, 140, 38 -data.raw["underground-belt"]["turbo-underground-belt"].friendly_map_color = {r = 0.35, g = 0.52, b = 0.10} -- 89, 132, 25 +local loaderColorData = { + ["loader"] = changeColor(beltColorData["transport-belt"], .90), + ["fast-loader"] = changeColor(beltColorData["fast-transport-belt"], .90), + ["express-loader"] = changeColor(beltColorData["express-transport-belt"], .90), + ["5d-loader-04"] = changeColor(beltColorData["5d-transport-belt-04"], .90), + ["5d-loader-05"] = changeColor(beltColorData["5d-transport-belt-05"], .90), + ["5d-loader-06"] = changeColor(beltColorData["5d-transport-belt-06"], .90), + ["5d-loader-07"] = changeColor(beltColorData["5d-transport-belt-07"], .90), + ["5d-loader-08"] = changeColor(beltColorData["5d-transport-belt-08"], .90) +} ---changes color of pipes/storage tank --- data.raw["pipe"]["pipe"].friendly_map_color = {r = 0.29, g = 0.09, b = 0.56} -- 74, 23, 143 --- data.raw["pipe-to-ground"]["pipe-to-ground"].friendly_map_color = {r = 0.29, g = 0.09, b = 0.56} --- data.raw["storage-tank"]["storage-tank"].friendly_map_color = {r = 0.29, g = 0.09, b = 0.56} +local splitterColorData = { --80% + ["splitter"] = changeColor(beltColorData["transport-belt"], .80), + ["fast-splitter"] = changeColor(beltColorData["fast-transport-belt"], .80), + ["express-splitter"] = changeColor(beltColorData["express-transport-belt"], .80), + ["kr-advanced-splitter"] = changeColor(beltColorData["kr-advanced-transport-belt"], .80), + ["kr-superior-splitter"] = changeColor(beltColorData["kr-superior-transport-belt"], .80), + ["5d-splitter-04"] = changeColor(beltColorData["5d-transport-belt-04"], .80), + ["5d-splitter-05"] = changeColor(beltColorData["5d-transport-belt-05"], .80), + ["5d-splitter-06"] = changeColor(beltColorData["5d-transport-belt-06"], .80), + ["5d-splitter-07"] = changeColor(beltColorData["5d-transport-belt-07"], .80), + ["5d-splitter-08"] = changeColor(beltColorData["5d-transport-belt-08"], .80), + ["5d-splitter-09"] = changeColor(beltColorData["5d-transport-belt-09"], .80), + ["5d-splitter-10"] = changeColor(beltColorData["5d-transport-belt-10"], .80), + ["basic-splitter"] = changeColor(beltColorData["basic-transport-belt"], .80), + ["turbo-splitter"] = changeColor(beltColorData["turbo-transport-belt"], .80), + ["ultimate-splitter"] = changeColor(beltColorData["ultimate-transport-belt"], .80), + ["nuclear-splitter"] = changeColor(beltColorData["ultimate-transport-belt"], .80), + ["plutonium-splitter"] = changeColor(beltColorData["plutonium-transport-belt"], .80), +} --- data.raw["heat-pipe"]["heat-pipe"].friendly_map_color = {r = 0.56, g = 0.0, b = 0.0} -- 142, 0, 0 --- data.raw["reactor"]["nuclear-reactor"].friendly_map_color = {r = 0.16, g = 0.73, b = 0.15} -- 41, 186, 37 +local undergroundColorData = { --75% + ["underground-belt"] = changeColor(beltColorData["transport-belt"], .70), + ["fast-underground-belt"] = changeColor(beltColorData["fast-transport-belt"], .70), + ["express-underground-belt"] = changeColor(beltColorData["express-transport-belt"], .70), + ["kr-advanced-underground-belt"] = changeColor(beltColorData["kr-advanced-transport-belt"], .70), + ["kr-superior-underground-belt"] = changeColor(beltColorData["kr-superior-transport-belt"], .70), + ["5d-underground-belt-30-01"] = changeColor(beltColorData["transport-belt"], .70), + ["5d-underground-belt-50-01"] = changeColor(beltColorData["transport-belt"], .70), + ["5d-fast-underground-belt-30-02"] = changeColor(beltColorData["fast-transport-belt"], .70), + ["5d-fast-underground-belt-50-02"] = changeColor(beltColorData["fast-transport-belt"], .70), + ["5d-express-underground-belt-30-03"] = changeColor(beltColorData["express-transport-belt"], .70), + ["5d-express-underground-belt-50-03"] = changeColor(beltColorData["express-transport-belt"], .70), + ["5d-underground-belt-04"] = changeColor(beltColorData["5d-transport-belt-04"], .70), + ["5d-underground-belt-30-04"] = changeColor(beltColorData["5d-transport-belt-04"], .70), + ["5d-underground-belt-50-04"] = changeColor(beltColorData["5d-transport-belt-04"], .70), + ["5d-underground-belt-05"] = changeColor(beltColorData["5d-transport-belt-05"], .70), + ["5d-underground-belt-30-05"] = changeColor(beltColorData["5d-transport-belt-05"], .70), + ["5d-underground-belt-50-05"] = changeColor(beltColorData["5d-transport-belt-05"], .70), + ["5d-underground-belt-06"] = changeColor(beltColorData["5d-transport-belt-06"], .70), + ["5d-underground-belt-30-06"] = changeColor(beltColorData["5d-transport-belt-06"], .70), + ["5d-underground-belt-50-06"] = changeColor(beltColorData["5d-transport-belt-06"], .70), + ["5d-underground-belt-07"] = changeColor(beltColorData["5d-transport-belt-07"], .70), + ["5d-underground-belt-30-07"] = changeColor(beltColorData["5d-transport-belt-07"], .70), + ["5d-underground-belt-50-07"] = changeColor(beltColorData["5d-transport-belt-07"], .70), + ["5d-underground-belt-08"] = changeColor(beltColorData["5d-transport-belt-08"], .70), + ["5d-underground-belt-30-08"] = changeColor(beltColorData["5d-transport-belt-08"], .70), + ["5d-underground-belt-50-08"] = changeColor(beltColorData["5d-transport-belt-08"], .70), + ["5d-underground-belt-09"] = changeColor(beltColorData["5d-transport-belt-09"], .70), + ["5d-underground-belt-30-09"] = changeColor(beltColorData["5d-transport-belt-09"], .70), + ["5d-underground-belt-50-09"] = changeColor(beltColorData["5d-transport-belt-09"], .70), + ["5d-underground-belt-10"] = changeColor(beltColorData["5d-transport-belt-10"], .70), + ["5d-underground-belt-30-10"] = changeColor(beltColorData["5d-transport-belt-10"], .70), + ["5d-underground-belt-50-10"] = changeColor(beltColorData["5d-transport-belt-10"], .70), + ["basic-underground-belt"] = changeColor(beltColorData["basic-transport-belt"], .70), + ["turbo-underground-belt"] = changeColor(beltColorData["turbo-transport-belt"], .70), + ["ultimate-underground-belt"] = changeColor(beltColorData["ultimate-transport-belt"], .70), + ["nuclear-underground-belt"] = changeColor(beltColorData["ultimate-transport-belt"], .70), + ["plutonium-underground-belt"] = changeColor(beltColorData["plutonium-transport-belt"], .70) +} ---log("EMC mod settings test: "..tostring(settings.startup["Use-Mod-Color-for-pipes"].value)) +for k,v in pairs(data.raw["transport-belt"]) do + if beltColorData[k] then + data.raw["transport-belt"][k].friendly_map_color = beltColorData[k] + end +end +for k,v in pairs(data.raw["splitter"]) do + if splitterColorData[k] then + data.raw["splitter"][k].friendly_map_color = splitterColorData[k] + end +end +for k,v in pairs(data.raw["underground-belt"]) do + if undergroundColorData[k] then + data.raw["underground-belt"][k].friendly_map_color = undergroundColorData[k] + end +end +for k,v in pairs(data.raw.loader) do + if loaderColorData[k] then + data.raw.loader[k].friendly_map_color = loaderColorData[k] + end +end if settings.startup["Use-Mod-Color-for-pipes"].value then for _, v in pairs(data.raw["pipe"]) do v.friendly_map_color = {r = 0.35, g = 0.15, b = 0.62} -- 89, 38, 158 end -end - -if settings.startup["Use-Mod-Color-for-pipes"].value then - for _, v in pairs(data.raw["pipe-to-ground"]) do - v.friendly_map_color = {r = 0.35, g = 0.15, b = 0.62} -- 89, 38, 158 + for _, v in pairs(data.raw["storage-tank"]) do + v.friendly_map_color = {r = 0.22, g = 0.07, b = 0.45} -- 56, 18, 115 end -end - -if settings.startup["Use-Mod-Color-for-pipes"].value then for _, v in pairs(data.raw["pump"]) do v.friendly_map_color = {r = 0.20, g = 0.05, b = 0.40} -- 51, 13, 102 end -end - -if settings.startup["Use-Mod-Color-for-pipes"].value then - for _, v in pairs(data.raw["storage-tank"]) do - v.friendly_map_color = {r = 0.22, g = 0.07, b = 0.45} -- 56, 18, 115 + for _, v in pairs(data.raw["pipe-to-ground"]) do + v.friendly_map_color = {r = 0.35*.8, g = 0.15*.8, b = 0.62*.8} -- 89, 38, 158 end end @@ -61,59 +148,6 @@ end --data.raw["mining-drill"]["burner-mining-drill"].map_color = {r = 0.0, g = 0.37, b = 0.08} -- 0, 95, 20 --data.raw["mining-drill"]["electric-mining-drill"].map_color = {r = 0.0, g = 0.37, b = 0.08} -- 74, 23, 143 ---Bob's Belts -if data.raw["transport-belt"]["ultimate-transport-belt"] ~= nil then --green - data.raw["transport-belt"]["ultimate-transport-belt"].friendly_map_color = {r = 0.07, g = 1.0, b = 0.62} -- 18, 255, 158 - data.raw["splitter"]["ultimate-splitter"].friendly_map_color = {r = 0.06, g = 0.80, b = 0.50} -- 14, 205, 126 - data.raw["underground-belt"]["ultimate-underground-belt"].friendly_map_color = {r = 0.05, g = 0.75, b = 0.46} -- 14, 191, 119 -end - -if data.raw["transport-belt"]["turbo-transport-belt"] ~= nil and data.raw["transport-belt"]["ultimate-transport-belt"] ~= nil then --purple - data.raw["transport-belt"]["turbo-transport-belt"].friendly_map_color = {r = 0.97, g = 0.07, b = 1.0} -- 247, 18, 255 - data.raw["splitter"]["turbo-splitter"].friendly_map_color = {r = 0.77, g = 0.06, b = 0.80} -- 198, 14, 204 - data.raw["underground-belt"]["turbo-underground-belt"].friendly_map_color = {r = 0.73, g = 0.05, b = 0.75} -- 185, 14, 191 -end - ---5dim belts -if data.raw["underground-belt"]["5d-mk1-transport-belt-to-ground-30"] then - data.raw["underground-belt"]["5d-mk1-transport-belt-to-ground-30"].friendly_map_color = {r = 0.74, g = 0.55, b = 0.0} -- 188, 140, 0 - data.raw["underground-belt"]["5d-mk2-transport-belt-to-ground-30"].friendly_map_color = {r = 0.74, g = 0.20, b = 0.04} -- 188, 52, 11 - data.raw["underground-belt"]["5d-mk3-transport-belt-to-ground-30"].friendly_map_color = {r = 0.11, g = 0.50, b = 0.53} -- 29, 128, 136 - - data.raw["underground-belt"]["5d-mk1-transport-belt-to-ground-50"].friendly_map_color = {r = 0.74, g = 0.55, b = 0.0} -- 188, 140, 0 - data.raw["underground-belt"]["5d-mk2-transport-belt-to-ground-50"].friendly_map_color = {r = 0.74, g = 0.20, b = 0.04} -- 188, 52, 11 - data.raw["underground-belt"]["5d-mk3-transport-belt-to-ground-50"].friendly_map_color = {r = 0.11, g = 0.50, b = 0.53} -- 29, 128, 136 -end - -if data.raw["transport-belt"]["5d-mk4-transport-belt"] ~= nil then - data.raw["transport-belt"]["5d-mk4-transport-belt"].friendly_map_color = {r = 0.08, g = 0.66, b = 0.14} -- 20, 168, 36 - data.raw["splitter"]["5d-mk4-splitter"].friendly_map_color = {r = 0.06, g = 0.53, b = 0.11} -- 16, 134, 29 - - data.raw["underground-belt"]["5d-mk4-transport-belt-to-ground"].friendly_map_color = {r = 0.06, g = 0.49, b = 0.11} -- 15, 126, 27 - data.raw["underground-belt"]["5d-mk4-transport-belt-to-ground-30"].friendly_map_color = {r = 0.06, g = 0.49, b = 0.11} -- 15, 126, 27 - data.raw["underground-belt"]["5d-mk4-transport-belt-to-ground-50"].friendly_map_color = {r = 0.06, g = 0.49, b = 0.11} -- 15, 126, 27 -end - -if data.raw["transport-belt"]["5d-mk5-transport-belt"] ~= nil then - data.raw["transport-belt"]["5d-mk5-transport-belt"].friendly_map_color = {r = 0.89, g = 0.91, b = 0.96} -- 227, 232, 245 - data.raw["splitter"]["5d-mk5-splitter"].friendly_map_color = {r = 0.71, g = 0.73, b = 0.77} -- 182, 186, 196 - - data.raw["underground-belt"]["5d-mk5-transport-belt-to-ground"].friendly_map_color = {r = 0.67, g = 0.68, b = 0.72} -- 170, 174, 184 - data.raw["underground-belt"]["5d-mk5-transport-belt-to-ground-30"].friendly_map_color = {r = 0.67, g = 0.68, b = 0.72} -- 170, 174, 184 - data.raw["underground-belt"]["5d-mk5-transport-belt-to-ground-50"].friendly_map_color = {r = 0.67, g = 0.68, b = 0.72} -- 170, 174, 184 -end - ---[[ ---Better Belts mods -if data.raw["transport-belt"][""] ~= nil then - data.raw["transport-belt"][""].map_color = {r = 0.14, g = 0.94, b = 0.05} --36, 240, 13 - data.raw["transport-belt"][""].map_color - data.raw["transport-belt"][""].map_color - data.raw["transport-belt"][""].map_color - data.raw["transport-belt"][""].map_color - -end ---]] --Electric Poles including those in Bob's mods and 5dim for _, v in pairs(data.raw["electric-pole"]) do @@ -145,21 +179,45 @@ if settings.startup["Use-Mod-Color-for-roboports"].value then end end --- local n = 1 - - data.raw["unit-spawner"]["biter-spawner"].enemy_map_color = {r = 1.0, g = 0.10, b = 0.10} -- 255, 25, 25 --biters data.raw["unit-spawner"]["spitter-spawner"].enemy_map_color = {r = 0.76, g = 0.10, b = 0.16} -- 195, 25, 40 --spitters +if mods["space-age"] then + data.raw["unit-spawner"]["gleba-spawner"].enemy_map_color = {r = 0.76, g = 0.10, b = 0.16} -- 195, 25, 40 + data.raw["unit-spawner"]["gleba-spawner-small"].enemy_map_color = {r = 0.76, g = 0.10, b = 0.16} -- 195, 25, 40 + + for _, v in pairs(data.raw["fusion-reactor"]) do + v.friendly_map_color = {r = 0.16, g = 0.73, b = 0.15} -- 41, 186, 37 + end + + for k, v in pairs(data.raw["fusion-generator"]) do + v.friendly_map_color = {r = 0.0, g = 0.35, b = 0.15} -- 0, 89, 38 + end + + for k,v in pairs(data.raw["spider-unit"]) do + if k:find("strafer") then + v.enemy_map_color = {r = 0.76, g = 0.22, b = 0.16} -- 195, 55, 40 + end + end + +end + for k,v in pairs(data.raw["unit"]) do -log("k is "..k) if k:find("biter") then - v.enemy_map_color = {r = 1.0, g = 0.33, b = 0.22} -- 255, 85, 55 + v.enemy_map_color = {r = 1.0, g = 0.33, b = 0.22} -- 255, 85, 55 elseif k:find("spitter") then - v.enemy_map_color = {r = 0.76, g = 0.22, b = 0.16} -- 195, 55, 40 + v.enemy_map_color = {r = 0.76, g = 0.22, b = 0.16} -- 195, 55, 40 + elseif k:find("pentapod") then + v.enemy_map_color = {r = 0.76, g = 0.22, b = 0.16} -- 195, 55, 40 + end +end + +for k,v in pairs(data.raw["spider-leg"]) do + if k:find("strafer") then + v.enemy_map_color = {r = 0.76, g = 0.22, b = 0.16} -- 195, 55, 40 end end diff --git a/data.lua b/data.lua index 1143917..6c6ad64 100644 --- a/data.lua +++ b/data.lua @@ -1,3 +1,4 @@ +--[[ --fix later? require "styles" data:extend( @@ -12,4 +13,4 @@ data:extend( --"game-only": The associated script event will fire when satisfied and block game events that conflict with the key sequence. Actions that are processed regardless of game paused state cannot be blocked. }, } -) \ No newline at end of file +)]] \ No newline at end of file diff --git a/graphics/Thumbs.db b/graphics/Thumbs.db new file mode 100644 index 0000000..5a3d277 Binary files /dev/null and b/graphics/Thumbs.db differ diff --git a/graphics/colors1.png b/graphics/colors1.png index 62cebc9..618da69 100644 Binary files a/graphics/colors1.png and b/graphics/colors1.png differ diff --git a/gui.lua b/gui.lua index 3553646..3e26169 100644 --- a/gui.lua +++ b/gui.lua @@ -1,6 +1,7 @@ --GUI function spriteCheck(guiLeft, spritePath) + game.print(spritePath) if guiLeft.gui.is_valid_sprite_path(spritePath) then return spritePath else @@ -39,14 +40,7 @@ function legendDropdown(guiLeft) spriteCheck(guiLeft,"entity/express-transport-belt"), "map_color_graphic_express") end - if tech["logistics-4"] and tech["logistics-4"].researched then - addRow(table, - "belt4", - "All green belts, splitters and underground", - spriteCheck(guiLeft,"entity/turbo-transport-belt"), - "map_color_graphic_turbo") - end - for modName,_ in pairs(game.active_mods) do + for modName,_ in pairs(script.active_mods) do if modName == "Visible_Bots" then if tech["construction-robotics"] and tech["construction-robotics"].researched then addRow(table, diff --git a/info.json b/info.json index 60d487e..54a6134 100644 --- a/info.json +++ b/info.json @@ -1,10 +1,14 @@ { - "name":"Enhanced_Map_Colors", - "author":"osldgoth", - "version":"2.0.0", - "title":"Enhanced Map Colors", - "homepage":"https://github.com/osldgoth/Enhanced_Map_Colors/releases", - "description":"Adds color to items on map/minimap for contrast. Aids map readability.", - "factorio_version": "2.0", - "dependencies": ["base >= 0.13.00"] -} \ No newline at end of file + "name":"Enhanced_Map_Colors", + "title":"Enhanced Map Colors 2.0", + "version":"2.0.4", + + "author":"osldgoth, wretlaw120", + "homepage":"https://github.com/osldgoth/Enhanced_Map_Colors/releases", + "contact": "brooks.k.stephen@gmail.com", + + "description":"Changes the map/minimap color of Belts, Power sources, Pipes, Power Poles, Radar, Roboports and more for better contrast. /n Aids map readability. /n Mod originally by osldgoth. Reuploaded for 2.0.", + "factorio_version": "2.0", + "dependencies": ["base", + "? space-age"] +} diff --git a/locale/de/de.cfg b/locale/de/base.cfg similarity index 100% rename from locale/de/de.cfg rename to locale/de/base.cfg diff --git a/locale/en/en.cfg b/locale/en/base.cfg similarity index 77% rename from locale/en/en.cfg rename to locale/en/base.cfg index a43d718..6c9c2d1 100644 --- a/locale/en/en.cfg +++ b/locale/en/base.cfg @@ -1,14 +1,20 @@ -[controls] -EMC-Hotkey=EMC Hotkey - -[mod-setting-name] -Use-Mod-Color-for-pipes=Purple pipes. -Use-Mod-Color-for-heat-pipes=Deep Red heat pipes. -Use-Mod-Color-for-roboports=Grey Teal roboports. -Use-Mod-Color-for-steam-generators=Dark Green steam generators. - -[mod-setting-description] -Use-Mod-Color-for-pipes=Override boring vanilla factorio color for pipes, use color defined in mod. -Use-Mod-Color-for-heat-pipes=Override boring vanilla factorio color for heat pipes, use color defined in mod. -Use-Mod-Color-for-roboports=Override boring vanilla factorio color for roboports, use color defined in mod. -Use-Mod-Color-for-steam-generators=Override boring vanilla factorio color for generators, use color defined in mod. \ No newline at end of file +[mod-name] +Enhanced_Map_Color=Enhanced Map Colors + +[mod-description] +Enhanced_Map_Color=Adds color to items on map/minimap for contrast. + +[controls] +EMC-Hotkey=EMC Hotkey + +[mod-setting-name] +Use-Mod-Color-for-pipes=Purple pipes. +Use-Mod-Color-for-heat-pipes=Deep Red heat pipes. +Use-Mod-Color-for-roboports=Grey Teal roboports. +Use-Mod-Color-for-steam-generators=Dark Green steam generators. + +[mod-setting-description] +Use-Mod-Color-for-pipes=Override boring vanilla factorio color for pipes, use color defined in mod. +Use-Mod-Color-for-heat-pipes=Override boring vanilla factorio color for heat pipes, use color defined in mod. +Use-Mod-Color-for-roboports=Override boring vanilla factorio color for roboports, use color defined in mod. +Use-Mod-Color-for-steam-generators=Override boring vanilla factorio color for generators, use color defined in mod. diff --git a/locale/es/base.cfg b/locale/es/base.cfg new file mode 100644 index 0000000..0da0e82 --- /dev/null +++ b/locale/es/base.cfg @@ -0,0 +1,20 @@ +[mod-name] +Enhanced_Map_Color=Colores de mapa mejorados + +[mod-description] +Enhanced_Map_Color=Añade color a los elementos del mapa y minimapa para mejorar el contraste. + +[controls] +EMC-Hotkey=Tecla rápida EMC + +[mod-setting-name] +Use-Mod-Color-for-pipes=Tuberías moradas. +Use-Mod-Color-for-heat-pipes=Tuberías térmicas rojo oscuro. +Use-Mod-Color-for-roboports=Roboports gris verdoso. +Use-Mod-Color-for-steam-generators=Generadores de vapor verde oscuro. + +[mod-setting-description] +Use-Mod-Color-for-pipes=Reemplaza el aburrido color vanilla de las tuberías por el color definido por el mod. +Use-Mod-Color-for-heat-pipes=Reemplaza el aburrido color vanilla de las tuberías térmicas por el color definido por el mod. +Use-Mod-Color-for-roboports=Reemplaza el aburrido color vanilla de los roboports por el color definido por el mod. +Use-Mod-Color-for-steam-generators=Reemplaza el aburrido color vanilla de los generadores por el color definido por el mod. diff --git a/locale/fr/base.cfg b/locale/fr/base.cfg new file mode 100644 index 0000000..90654b2 --- /dev/null +++ b/locale/fr/base.cfg @@ -0,0 +1,20 @@ +[mod-name] +Enhanced_Map_Color=Couleurs de carte améliorées + +[mod-description] +Enhanced_Map_Color=Ajoute de la couleur aux éléments sur la carte et la mini-carte pour améliorer le contraste. + +[controls] +EMC-Hotkey=Raccourci EMC + +[mod-setting-name] +Use-Mod-Color-for-pipes=Tuyaux violets. +Use-Mod-Color-for-heat-pipes=Tuyaux thermiques rouge foncé. +Use-Mod-Color-for-roboports=Roboports gris-vert. +Use-Mod-Color-for-steam-generators=Générateurs à vapeur vert foncé. + +[mod-setting-description] +Use-Mod-Color-for-pipes=Remplace la couleur vanilla fade des tuyaux par la couleur définie par le mod. +Use-Mod-Color-for-heat-pipes=Remplace la couleur vanilla fade des tuyaux thermiques par la couleur définie par le mod. +Use-Mod-Color-for-roboports=Remplace la couleur vanilla fade des roboports par la couleur définie par le mod. +Use-Mod-Color-for-steam-generators=Remplace la couleur vanilla fade des générateurs par la couleur définie par le mod. diff --git a/locale/it/base.cfg b/locale/it/base.cfg new file mode 100644 index 0000000..34bb82e --- /dev/null +++ b/locale/it/base.cfg @@ -0,0 +1,20 @@ +[mod-name] +Enhanced_Map_Color=Colori mappa migliorati + +[mod-description] +Enhanced_Map_Color=Aggiunge colore agli elementi sulla mappa e sulla minimappa per migliorare il contrasto. + +[controls] +EMC-Hotkey=Tasto rapido EMC + +[mod-setting-name] +Use-Mod-Color-for-pipes=Tubi viola. +Use-Mod-Color-for-heat-pipes=Tubi termici rosso scuro. +Use-Mod-Color-for-roboports=Roboporti grigio-verde. +Use-Mod-Color-for-steam-generators=Generatori a vapore verde scuro. + +[mod-setting-description] +Use-Mod-Color-for-pipes=Sostituisce il colore vanilla noioso dei tubi con il colore definito dal mod. +Use-Mod-Color-for-heat-pipes=Sostituisce il colore vanilla noioso dei tubi termici con il colore definito dal mod. +Use-Mod-Color-for-roboports=Sostituisce il colore vanilla noioso dei roboporti con il colore definito dal mod. +Use-Mod-Color-for-steam-generators=Sostituisce il colore vanilla noioso dei generatori con il colore definito dal mod. diff --git a/locale/jp/base.cfg b/locale/jp/base.cfg new file mode 100644 index 0000000..81af01d --- /dev/null +++ b/locale/jp/base.cfg @@ -0,0 +1,20 @@ +[mod-name] +Enhanced_Map_Color=強化マップカラー (Enhanced Map Colors) + +[mod-description] +Enhanced_Map_Color=コントラストを向上させるため、マップおよびミニマップ上のアイテムに色を追加します。 + +[controls] +EMC-Hotkey=EMC ホットキー + +[mod-setting-name] +Use-Mod-Color-for-pipes=紫色のパイプ。 +Use-Mod-Color-for-heat-pipes=濃い赤色のヒートパイプ。 +Use-Mod-Color-for-roboports=灰緑色のロボットステーション。 +Use-Mod-Color-for-steam-generators=濃い緑色の蒸気発電機。 + +[mod-setting-description] +Use-Mod-Color-for-pipes=退屈なバニラのパイプ色を、MODで定義された色に置き換えます。 +Use-Mod-Color-for-heat-pipes=退屈なバニラのヒートパイプ色を、MODで定義された色に置き換えます。 +Use-Mod-Color-for-roboports=退屈なバニラのロボットステーション色を、MODで定義された色に置き換えます。 +Use-Mod-Color-for-steam-generators=退屈なバニラの発電機色を、MODで定義された色に置き換えます。 \ No newline at end of file diff --git a/locale/ru/base.cfg b/locale/ru/base.cfg new file mode 100644 index 0000000..7ae4c1b --- /dev/null +++ b/locale/ru/base.cfg @@ -0,0 +1,20 @@ +[mod-name] +Enhanced_Map_Color=Улучшенные цвета карты(Enhanced Map Colors) + +[mod-description] +Enhanced_Map_Color=Добавляет цвет объектам на карте и миникарте для лучшего контраста. + +[controls] +EMC-Hotkey=Горячая клавиша EMC + +[mod-setting-name] +Use-Mod-Color-for-pipes=Фиолетовые трубы. +Use-Mod-Color-for-heat-pipes=Тепловые трубы тёмно-красного цвета. +Use-Mod-Color-for-roboports=Робопорты серо-зелёного цвета. +Use-Mod-Color-for-steam-generators=Паровые генераторы тёмно-зелёного цвета. + +[mod-setting-description] +Use-Mod-Color-for-pipes=Заменяет скучный стандартный цвет труб на цвет, заданный модом. +Use-Mod-Color-for-heat-pipes=Заменяет скучный стандартный цвет тепловых труб на цвет, заданный модом. +Use-Mod-Color-for-roboports=Заменяет скучный стандартный цвет робопортов на цвет, заданный модом. +Use-Mod-Color-for-steam-generators=Заменяет скучный стандартный цвет генераторов на цвет, заданный модом. diff --git a/locale/zh-ch/base.cfg b/locale/zh-ch/base.cfg new file mode 100644 index 0000000..c6c4e5c --- /dev/null +++ b/locale/zh-ch/base.cfg @@ -0,0 +1,20 @@ +[mod-name] +Enhanced_Map_Color=增强地图颜色(Enhanced Map Colors) + +[mod-description] +Enhanced_Map_Color=为地图和小地图上的物品添加颜色以增强对比度。 + +[controls] +EMC-Hotkey=EMC 快捷键 + +[mod-setting-name] +Use-Mod-Color-for-pipes=紫色管道。 +Use-Mod-Color-for-heat-pipes=深红色热管。 +Use-Mod-Color-for-roboports=灰绿色机器人指令站。 +Use-Mod-Color-for-steam-generators=深绿色蒸汽发电机。 + +[mod-setting-description] +Use-Mod-Color-for-pipes=用模组定义的颜色替换原版单调的管道颜色。 +Use-Mod-Color-for-heat-pipes=用模组定义的颜色替换原版单调的热管颜色。 +Use-Mod-Color-for-roboports=用模组定义的颜色替换原版单调的机器人指令站颜色。 +Use-Mod-Color-for-steam-generators=用模组定义的颜色替换原版单调的发电机颜色。 diff --git a/settings.lua b/settings.lua index 04a2079..570aebd 100644 --- a/settings.lua +++ b/settings.lua @@ -2,31 +2,31 @@ data:extend({ { type = "bool-setting", name = "Use-Mod-Color-for-pipes", - setting_type = "startup", --"startup", "runtime-storage", "runtime-per-user" + setting_type = "startup", --"startup", "runtime-global", "runtime-per-user" default_value = true }, -- { -- type = "bool-setting", -- name = "Use-Mod-Color-for-beacons", - -- setting_type = "startup", --"startup", "runtime-storage", "runtime-per-user" + -- setting_type = "startup", --"startup", "runtime-global", "runtime-per-user" -- default_value = true -- }, { type = "bool-setting", name = "Use-Mod-Color-for-heat-pipes", - setting_type = "startup", --"startup", "runtime-storage", "runtime-per-user" + setting_type = "startup", --"startup", "runtime-global", "runtime-per-user" default_value = true }, { type = "bool-setting", name = "Use-Mod-Color-for-roboports", - setting_type = "startup", --"startup", "runtime-storage", "runtime-per-user" + setting_type = "startup", --"startup", "runtime-global", "runtime-per-user" default_value = true }, { type = "bool-setting", name = "Use-Mod-Color-for-steam-generators", - setting_type = "startup", --"startup", "runtime-storage", "runtime-per-user" + setting_type = "startup", --"startup", "runtime-global", "runtime-per-user" default_value = true } }) \ No newline at end of file diff --git a/styles.lua b/styles.lua index 580e568..35319b2 100644 --- a/styles.lua +++ b/styles.lua @@ -424,22 +424,3 @@ default_style.map_color_graphic_turrets = { hovered_graphical_set = color_graphics1(13, 0), clicked_graphical_set = color_graphics1(13, 0) } - -default_style.map_color_graphic_turbo = { - type = "button_style", - parent = "slot_button", - - scalable = true, - - top_padding = 1, - right_padding = 1, - bottom_padding = 1, - left_padding = 1, - - width = 48, - width = 38, - - default_graphical_set = color_graphics1(0, 9), - hovered_graphical_set = color_graphics1(0, 9), - clicked_graphical_set = color_graphics1(0, 9) -}