use building speed functions on yaedols modules

pyanodon · Dec 13, 2023 · f4c503f · f4c503f
1 parent 866efd7
commit f4c503f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 13 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -9,7 +9,7 @@ Date: ???
     - 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
-    - standardized moss module speed bonuses to +100% +200% +300% +400% (final moss building speed uneffected)
+    - standardized moss+yaedols module speed bonuses to +100% +200% +300% +400%. no more weird floating point building crafting speeds
   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/yaedols-culture-mk01.lua b/prototypes/buildings/yaedols-culture-mk01.lua
@@ -1,3 +1,7 @@
+local FUN = require("__pycoalprocessing__/prototypes/functions/functions")
+local MODULE_SLOTS = 3
+local FULL_CRAFTING_SPEED = 1 -- crafting speed when full of mk01 modules
+
 RECIPE {
     type = "recipe",
     name = "yaedols-culture-mk01",
@@ -44,11 +48,11 @@ ENTITY {
     selection_box = {{-5.5, -5.5}, {5.5, 5.5}},
     match_animation_speed_to_activity = false,
     module_specification = {
-        module_slots = 3
+        module_slots = MODULE_SLOTS
     },
     allowed_effects = {"speed","productivity",'consumption','pollution'},
     crafting_categories = {"yaedols"},
-    crafting_speed = 0.02,
+    crafting_speed = FUN.farm_speed(MODULE_SLOTS, FULL_CRAFTING_SPEED),
     energy_source = {
         type = "electric",
         usage_priority = "secondary-input",

diff --git a/prototypes/buildings/yaedols-culture-mk02.lua b/prototypes/buildings/yaedols-culture-mk02.lua
@@ -1,3 +1,6 @@
+local FUN = require("__pycoalprocessing__/prototypes/functions/functions")
+local MODULE_SLOTS = 6
+
 RECIPE {
     type = "recipe",
     name = "yaedols-culture-mk02",
@@ -44,11 +47,11 @@ ENTITY {
     selection_box = {{-5.5, -5.5}, {5.5, 5.5}},
     match_animation_speed_to_activity = false,
     module_specification = {
-        module_slots = 5
+        module_slots = MODULE_SLOTS
     },
     allowed_effects = {"speed","productivity",'consumption','pollution'},
     crafting_categories = {"yaedols"},
-    crafting_speed = 0.02,
+    crafting_speed = FUN.farm_speed_derived(MODULE_SLOTS, "yaedols-culture-mk01"),
     energy_source = {
         type = "electric",
         usage_priority = "secondary-input",

diff --git a/prototypes/buildings/yaedols-culture-mk03.lua b/prototypes/buildings/yaedols-culture-mk03.lua
@@ -1,3 +1,6 @@
+local FUN = require("__pycoalprocessing__/prototypes/functions/functions")
+local MODULE_SLOTS = 9
+
 RECIPE {
     type = "recipe",
     name = "yaedols-culture-mk03",
@@ -44,11 +47,11 @@ ENTITY {
     selection_box = {{-5.5, -5.5}, {5.5, 5.5}},
     match_animation_speed_to_activity = false,
     module_specification = {
-        module_slots = 8
+        module_slots = MODULE_SLOTS
     },
     allowed_effects = {"speed","productivity",'consumption','pollution'},
     crafting_categories = {"yaedols"},
-    crafting_speed = 0.02,
+    crafting_speed = FUN.farm_speed_derived(MODULE_SLOTS, "yaedols-culture-mk01"),
     energy_source = {
         type = "electric",
         usage_priority = "secondary-input",

diff --git a/prototypes/buildings/yaedols-culture-mk04.lua b/prototypes/buildings/yaedols-culture-mk04.lua
@@ -1,3 +1,6 @@
+local FUN = require("__pycoalprocessing__/prototypes/functions/functions")
+local MODULE_SLOTS = 12
+
 RECIPE {
     type = "recipe",
     name = "yaedols-culture-mk04",
@@ -44,11 +47,11 @@ ENTITY {
     selection_box = {{-5.5, -5.5}, {5.5, 5.5}},
     match_animation_speed_to_activity = false,
     module_specification = {
-        module_slots = 10
+        module_slots = MODULE_SLOTS
     },
     allowed_effects = {"speed","productivity",'consumption','pollution'},
     crafting_categories = {"yaedols"},
-    crafting_speed = 0.02,
+    crafting_speed = FUN.farm_speed_derived(MODULE_SLOTS, "yaedols-culture-mk01"),
     energy_source = {
         type = "electric",
         usage_priority = "secondary-input",

diff --git a/prototypes/items/items.lua b/prototypes/items/items.lua
@@ -7257,7 +7257,7 @@ ITEM {
     subgroup = "py-alienlife-modules",
     order = "yaed-a",
     stack_size = 50,
-	effect = {pollution = {bonus = 1},speed = {bonus = 10}},
+	effect = {pollution = {bonus = 1},speed = {bonus = 1}},
 	limitation = {},
 	limitation_message_key = "yaedols"
 }
@@ -7277,7 +7277,7 @@ ITEM {
      subgroup = "py-alienlife-modules",
      order = "yaed-b",
      stack_size = 50,
- 	effect = {pollution = {bonus = 1},speed = {bonus = 12.5}},
+ 	effect = {pollution = {bonus = 1},speed = {bonus = 2}},
  	limitation = {},
  	limitation_message_key = "yaedols"
  }
@@ -7297,7 +7297,7 @@ ITEM {
      subgroup = "py-alienlife-modules",
      order = "yaed-c",
      stack_size = 50,
- 	effect = {pollution = {bonus = 1},speed = {bonus = 15}},
+ 	effect = {pollution = {bonus = 1},speed = {bonus = 3}},
  	limitation = {},
  	limitation_message_key = "yaedols"
  }
@@ -7317,7 +7317,7 @@ ITEM {
      subgroup = "py-alienlife-modules",
      order = "yaed-d",
      stack_size = 50,
- 	effect = {pollution = {bonus = 1},speed = {bonus = 17.5}},
+ 	effect = {pollution = {bonus = 1},speed = {bonus = 4}},
  	limitation = {},
  	limitation_message_key = "yaedols"
  }