diff --git a/changelog.txt b/changelog.txt index cdee4a5e..2da75fe5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -8,7 +8,8 @@ Date: ??? - added a new recipe for cumene+nickel+arthropod blood into organic solvent - buffed bioprinting by removing primers from the pluripotent stem cells recipes - fixed that bioprinting stage 2 unlocked both mk1 and mk2 of brain printing. mk1 recipe moved down to bioprinting stage 1 - - moved native flora smart farming down to chemical science + - moved native flora smart farming down to chemical science + - standardized moss module speed bonuses to +100% +200% +300% +400% (final moss building speed uneffected) TURD: - added T.U.R.D unselect infinite tech to allow the indecisive to revert a single T.U.R.D selection - added a new T.U.R.D: the composter turd. why is it unlocked at military science? don't ask too many questions diff --git a/prototypes/buildings/moss-farm-mk02.lua b/prototypes/buildings/moss-farm-mk02.lua index 86a37fc6..6b54c848 100644 --- a/prototypes/buildings/moss-farm-mk02.lua +++ b/prototypes/buildings/moss-farm-mk02.lua @@ -1,3 +1,6 @@ +local FUN = require("__pycoalprocessing__/prototypes/functions/functions") +local MODULE_SLOTS = 30 + RECIPE { type = "recipe", name = "moss-farm-mk02", @@ -43,11 +46,11 @@ ENTITY { selection_box = {{-3.0, -3.0}, {3.0, 3.0}}, match_animation_speed_to_activity = false, module_specification = { - module_slots = 30 + module_slots = MODULE_SLOTS }, allowed_effects = {"consumption", "speed", "productivity", "pollution"}, crafting_categories = {"moss"}, - crafting_speed = 0.1, + crafting_speed = FUN.farm_speed_derived(MODULE_SLOTS, "moss-farm-mk01"), energy_source = { type = "electric", usage_priority = "secondary-input", diff --git a/prototypes/buildings/moss-farm-mk03.lua b/prototypes/buildings/moss-farm-mk03.lua index 0c8d2676..187bcd54 100644 --- a/prototypes/buildings/moss-farm-mk03.lua +++ b/prototypes/buildings/moss-farm-mk03.lua @@ -1,3 +1,6 @@ +local FUN = require("__pycoalprocessing__/prototypes/functions/functions") +local MODULE_SLOTS = 45 + RECIPE { type = "recipe", name = "moss-farm-mk03", @@ -43,11 +46,11 @@ ENTITY { selection_box = {{-3.0, -3.0}, {3.0, 3.0}}, match_animation_speed_to_activity = false, module_specification = { - module_slots = 45 + module_slots = MODULE_SLOTS }, allowed_effects = {"consumption", "speed", "productivity", "pollution"}, crafting_categories = {"moss"}, - crafting_speed = 0.1, + crafting_speed = FUN.farm_speed_derived(MODULE_SLOTS, "moss-farm-mk01"), energy_source = { type = "electric", usage_priority = "secondary-input", diff --git a/prototypes/buildings/moss-farm-mk04.lua b/prototypes/buildings/moss-farm-mk04.lua index a5f196ec..d4c7bb68 100644 --- a/prototypes/buildings/moss-farm-mk04.lua +++ b/prototypes/buildings/moss-farm-mk04.lua @@ -1,3 +1,6 @@ +local FUN = require("__pycoalprocessing__/prototypes/functions/functions") +local MODULE_SLOTS = 60 + RECIPE { type = "recipe", name = "moss-farm-mk04", @@ -43,11 +46,11 @@ ENTITY { selection_box = {{-3.0, -3.0}, {3.0, 3.0}}, match_animation_speed_to_activity = false, module_specification = { - module_slots = 60 + module_slots = MODULE_SLOTS }, allowed_effects = {"consumption", "speed", "productivity", "pollution"}, crafting_categories = {"moss"}, - crafting_speed = 0.1, + crafting_speed = FUN.farm_speed_derived(MODULE_SLOTS, "moss-farm-mk01"), energy_source = { type = "electric", usage_priority = "secondary-input", diff --git a/prototypes/buildings/moss-farm.lua b/prototypes/buildings/moss-farm.lua index 65f366fc..53871641 100644 --- a/prototypes/buildings/moss-farm.lua +++ b/prototypes/buildings/moss-farm.lua @@ -1,3 +1,7 @@ +local FUN = require("__pycoalprocessing__/prototypes/functions/functions") +local MODULE_SLOTS = 15 +local FULL_CRAFTING_SPEED = 1 + RECIPE { type = "recipe", name = "moss-farm-mk01", @@ -44,11 +48,11 @@ ENTITY { selection_box = {{-3.0, -3.0}, {3.0, 3.0}}, match_animation_speed_to_activity = false, module_specification = { - module_slots = 15 + module_slots = MODULE_SLOTS }, allowed_effects = {"consumption", "speed", "productivity", "pollution"}, crafting_categories = {"moss"}, - crafting_speed = 0.1, + crafting_speed = FUN.farm_speed(MODULE_SLOTS, FULL_CRAFTING_SPEED), energy_source = { type = "electric", usage_priority = "secondary-input", diff --git a/prototypes/items/items.lua b/prototypes/items/items.lua index 00a9897e..38460f4a 100644 --- a/prototypes/items/items.lua +++ b/prototypes/items/items.lua @@ -5698,7 +5698,7 @@ ITEM { subgroup = "py-alienlife-modules", order = "m-a", stack_size = 50, - effect = {pollution = {bonus = 1},speed = {bonus = 0.65}}, + effect = {pollution = {bonus = 1},speed = {bonus = 1}}, limitation = {}, limitation_message_key = "moss" } @@ -5727,7 +5727,7 @@ ITEM { subgroup = "py-alienlife-modules", order = "m-b", stack_size = 50, - effect = {pollution = {bonus = 1},speed = {bonus = 1.3}}, + effect = {pollution = {bonus = 1},speed = {bonus = 2}}, limitation = {}, limitation_message_key = "moss" } @@ -5756,7 +5756,7 @@ ITEM { subgroup = "py-alienlife-modules", order = "m-c", stack_size = 50, - effect = {pollution = {bonus = 1},speed = {bonus = 1.95}}, + effect = {pollution = {bonus = 1},speed = {bonus = 3}}, limitation = {}, limitation_message_key = "moss" } @@ -5785,7 +5785,7 @@ ITEM { subgroup = "py-alienlife-modules", order = "m-d", stack_size = 50, - effect = {pollution = {bonus = 1},speed = {bonus = 2.6}}, + effect = {pollution = {bonus = 1},speed = {bonus = 4}}, limitation = {}, limitation_message_key = "moss" }