From 3692b6750fad46fce8b31d7fc2acc623b9da25c1 Mon Sep 17 00:00:00 2001 From: Peter Date: Sat, 12 Jan 2019 14:33:03 +0800 Subject: [PATCH] added belt-immunity-eq. lds in high eq. fix axe --- 017_science/control.lua | 8 +- 017_science/data-updates.lua | 76 ++++++++++++++++++ .../graphics/belt-immunity-equipment.png | Bin 0 -> 29810 bytes 017_science/info.json | 2 +- 017_science/locale/en/base.cfg | 11 ++- 017_science/settings.lua | 20 +++++ 6 files changed, 113 insertions(+), 4 deletions(-) create mode 100644 017_science/graphics/belt-immunity-equipment.png diff --git a/017_science/control.lua b/017_science/control.lua index a2ea450..3fe6f3a 100644 --- a/017_science/control.lua +++ b/017_science/control.lua @@ -107,8 +107,12 @@ if settings.startup["017-axe"].value then if player.cursor_stack.valid_for_read then -- game.print(axe) -- game.print(player.cursor_stack.name) - if player.cursor_stack.name == highest_speed[player.force.name][1] then - player.clean_cursor() + if highest_speed == nil then + ax_gen() + else + if player.cursor_stack.name == highest_speed[player.force.name][1] then + player.clean_cursor() + end end end end) diff --git a/017_science/data-updates.lua b/017_science/data-updates.lua index 5d935e4..cf9b853 100644 --- a/017_science/data-updates.lua +++ b/017_science/data-updates.lua @@ -90,6 +90,82 @@ if settings.startup["017-axe"].value then end end +if settings.startup["017-equipment"].value and data.raw["recipe"]["belt-immunity-equipment"] == nil then + data:extend({ + { + type = "technology", + name = "belt-immunity-equipment", + icon_size = 128, + icon = "__017_science__/graphics/belt-immunity-equipment.png", + prerequisites = {"modular-armor"}, + effects = + { + { + type = "unlock-recipe", + recipe = "belt-immunity-equipment" + } + }, + unit = + { + count = 50, + ingredients = {{"science-pack-1", 1}, {"science-pack-2", 1}}, + time = 15 + }, + order = "g-ga" + }, + { + type = "recipe", + name = "belt-immunity-equipment", + enabled = false, + energy_required = 10, + ingredients = + { + {"advanced-circuit", 5}, + {"steel-plate", 10} + }, + result = "belt-immunity-equipment" + } + }) +end + +local lds_recipes = { + "energy-shield-mk2-equipment", + "battery-mk2-equipment", + "fusion-reactor-equipment", + "personal-laser-defense-equipment", + "discharge-defense-equipment", -- sorry for indirectly nerfing discharge-defense :( + "exoskeleton-equipment", + "personal-roboport-mk2-equipment", + "power-armor-mk2" +} + +if settings.startup["017-lds"].value then + local recipe = data.raw["recipe"] + for _, r in pairs(recipe) do + for _, l in pairs(lds_recipes) do + if r.name == l then + modified = false + for _=1, #r.ingredients do + if r.ingredients[_][1] == "steel-plate" then + local n = math.ceil(r.ingredients[_][2] / 2) + table.remove(r.ingredients, _) + r.ingredients[#r.ingredients+1] = {"low-density-structure", n} + modified = true + end + end + if modified == false then + for _=1, #r.ingredients do + if r.ingredients[_][1] == "processing-unit" then + local n = math.ceil(r.ingredients[_][2] / settings.startup["017-lds-num"].value) + r.ingredients[#r.ingredients+1] = {"low-density-structure", n} + end + end + end + end + end + end +end + --HUGE THANKS to Dimava for the following changes --Added options for some changes (for modded users) diff --git a/017_science/graphics/belt-immunity-equipment.png b/017_science/graphics/belt-immunity-equipment.png new file mode 100644 index 0000000000000000000000000000000000000000..6b3da81c3c761bcca1c1ecb844bf64302884e521 GIT binary patch literal 29810 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 literal 0 HcmV?d00001 diff --git a/017_science/info.json b/017_science/info.json index c152226..ca54dd7 100644 --- a/017_science/info.json +++ b/017_science/info.json @@ -1,6 +1,6 @@ { "name": "017_science", - "version": "0.0.10", + "version": "0.0.11", "factorio_version": "0.16", "title": "0.17 science conversion", "author": "npc_strider(morley376)", diff --git a/017_science/locale/en/base.cfg b/017_science/locale/en/base.cfg index f955ec2..e36735f 100644 --- a/017_science/locale/en/base.cfg +++ b/017_science/locale/en/base.cfg @@ -1,3 +1,6 @@ +[technology-name] +belt-immunity-equipment=Belt immunity equipment + [item-name] science-pack-1=Automation science pack science-pack-2=Logistics science pack @@ -13,6 +16,9 @@ high-tech-science-pack=Utility science pack 017-recipes-changes=Misc. recipe changes in 0.17 017-durability=Infinite armor/tool durability 017-axe=mining-tool (axe) removal +017-equipment=Belt immunity equipment +017-lds=low-density-structure in recipes +017-lds-num=low-density-structure factor [mod-setting-description] 017-drill=(Default enabled) Toggle FFF-266 mining changes (removed hardness). This mod makes all vanilla ore hardness = 1 and makes the burner-mining-drill mining_power = 3, which may break modded ore gating. @@ -21,4 +27,7 @@ high-tech-science-pack=Utility science pack 017-old-science=(Default disabled) Toggle the old science recipes (0.16), including LDS. When disabled it removes the ability to use the vanilla science and LDS recipes (except SP 1 & 2) but allows existing crafting machines to continue using the recipe until manually changed. 017-recipes-changes=(Default enabled) atomic-bomb and power-armor-mk2 recipe changes 017-durability=(Default enabled) All armor now have inf. durability (https://forums.factorio.com/viewtopic.php?p=384185#p384185). Axes also have inf. durability to reflect the removal of mining-tool items. -017-axe=(Default enabled) IMPORTANT NOTE: It is highly recomended that infinite durability is enabled when using this option to prevent duplicate items. Implements the FFF-266 changes as best as possible. Instead of mining-tools being crafted, they are inserted and locked to the player's tool slot when they're researched. The best mining-tool is used over lower speed ones. \ No newline at end of file +017-axe=(Default enabled) IMPORTANT NOTE: It is highly recomended that infinite durability is enabled when using this option to prevent duplicate items. Implements the FFF-266 changes as best as possible. Instead of mining-tools being crafted, they are inserted and locked to the player's tool slot when they're researched. The best mining-tool is used over lower speed ones. +017-equipment=(Default enabled) Adds belt-immunity-equipment tech and recipe (FFF-256). Note that if another mod that adds belt-immunity-equipment recipe is present, this mod's unlock will be disabled. Disabling this option in an existing game will NOT remove the item - only the recipe & tech. +017-lds=(Default enabled) low-density-structure is also used in multiple advanced personal equipment recipes (mk2 items, fusion reactor, laser defense) instead of steel (FFF-257). NOTE: the cost values in this mod are NOT official, and won't affect other mods (contact me if you want your modded recipe added.). Where possible the cost = math.ceil(n("steel-plate")/2) +017-lds-num=(Default 5) When steel-plate is not present in vanilla 'high tech' equipment recipes, the cost is determined by the number of "processing-unit"s. math.ceil(n("processing-unit")/thissetting) \ No newline at end of file diff --git a/017_science/settings.lua b/017_science/settings.lua index 6be1076..19f8328 100644 --- a/017_science/settings.lua +++ b/017_science/settings.lua @@ -41,5 +41,25 @@ data:extend( name = "017-durability", setting_type = "startup", default_value = true + }, + { + type = "bool-setting", + name = "017-lds", + setting_type = "startup", + default_value = true + }, + { + type = "int-setting", + name = "017-lds-num", + setting_type = "startup", + minimum_value = 1, + maximum_value = 32, + default_value = 5 + }, + { + type = "bool-setting", + name = "017-equipment", + setting_type = "startup", + default_value = true } }) \ No newline at end of file