release time

DyCore/data/additions/crafting-groups.lua

@@ -6,6 +6,7 @@ local Table = {
     "bloomery",
     "casting",
     "grinding",
+    "farming",
     "blast-furnace",
 }
 

DyCore/info.json

@@ -1,6 +1,6 @@
 {
 	"name": "DyCore",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"factorio_version": "1.1",
 	"title": "DyCore",
 	"author": "Dysoch",

DyWorld-Dynamics-2/changelog.txt

@@ -22,13 +22,15 @@ Date: 25. 11. 2023
     - Done: 5%
   Machines:
     - Done: 0.1%
+    - Added in greenhouse with first few recipes. Locked behind biological tech
   Power:
     - Done: 0%
+    - Made boilers about 8 times more effective (i hope)
   Warfare:
     - Done: 0%
   Survival/RPG:
     - Done: 5%
-    - Added in a stronger player check. Bascially 4 factors: Alive, Joined, Not in Editor, Not in Sandbox before any player related script works
+    - Added in a stronger player check in nearly all player/character related scripts. Bascially 4 factors: Alive, Joined, Not in Editor, Not in Sandbox before any player related script works
   Story:
     - Done: 0%
   GUI:

DyWorld-Dynamics-2/control.lua

@@ -1,7 +1,7 @@
 debugger = settings.startup["DyWorld_Debug"].value or nil
 Version_Build_Major = 0
 Version_Build_Minor = 0
-Version_Build_Hotfix = 1
+Version_Build_Hotfix = 2
 Version_Build = Version_Build_Major.."."..Version_Build_Minor.."."..Version_Build_Hotfix
 
 -- LuaLib --
@@ -47,6 +47,7 @@ script.on_event(defines.events.on_tick, Event_on_tick)
 -- Build Events --
 script.on_event(defines.events.script_raised_built, Event_script_raised_built)
 script.on_event(defines.events.script_raised_revive, Event_script_raised_revive)
+script.on_event(defines.events.on_pre_build, Event_on_pre_build)
 script.on_event(defines.events.on_built_entity, Event_on_built_entity)
 script.on_event(defines.events.on_robot_built_entity, Event_on_robot_built_entity)
 script.on_event(defines.events.on_player_used_capsule, Event_on_player_used_capsule)

DyWorld-Dynamics-2/data/core/edits/base-edits.lua

@@ -24,6 +24,7 @@ end
 if data.raw.boiler.boiler then
     data.raw.boiler.boiler.fluid_box.filter = nil
     data.raw.boiler.boiler.target_temperature = 250
+    data.raw.boiler.boiler.energy_source.effectivity = 8
 end
 
 if data.raw.generator["steam-engine"] then

DyWorld-Dynamics-2/data/core/edits/centrifuge.lua

@@ -59,6 +59,6 @@ data.raw["assembling-machine"]["centrifuge"].fluid_boxes = {
         pipe_connections = {{ type="output", position = {0, -2} }},
         secondary_draw_orders = { north = -1 }
       },
-      off_when_no_fluid_recipe = true
+      off_when_no_fluid_recipe = true,
     }
 data.raw.item.centrifuge.subgroup = DyDs.."centrifuge"

DyWorld-Dynamics-2/data/core/entities/blast-furnace.lua

@@ -17,21 +17,21 @@ data:extend(
     minable = {mining_time = 0.5, result = "blast-furnace"},
 	collision_box = {{-2.4, -2.4}, {2.4, 2.4}},
     selection_box = {{-2.5, -2.5}, {2.5, 2.5}},
-    max_health = 1000,
+    max_health = Dy_Diff(1000, 0, nil),
+    crafting_speed = Dy_Diff(1, 1, "crafting"),
     corpse = "big-remnants",
     dying_explosion = "medium-explosion",
     fast_replaceable_group = "crafting",
     next_upgrade = nil,
     crafting_categories = {DyDs.."blast-furnace"},
-    crafting_speed = Dy_Diff(1, 1, "crafting"),
     energy_source =
     {
       type = "electric",
       usage_priority = "secondary-input",
-      drain = "1kW",
+      drain = Dy_Diff(1000, 0, nil).."W",
       --emissions_per_minute = Dy_Sett.Difficulty == "Easy" and 20 or Dy_Sett.Difficulty == "Normal" and 60 or Dy_Sett.Difficulty == "Hard" and 180 or 5,
     },
-    energy_usage = "500kW",
+    energy_usage = Dy_Diff(500, 0, nil).."kW",
     ingredient_count = 25,
     resistances =
     {
@@ -98,6 +98,7 @@ data:extend(
         base_level = -1,
         pipe_connections = {{ type="input", position = {-1,3} }}
       },
+      off_when_no_fluid_recipe = true,
 	},
     module_specification =
     {
@@ -153,6 +154,7 @@ data:extend(
     type = "recipe",
     name = "blast-furnace",
 	--category = "assembling-tier-2",
+    Add_To_Tech = "metallurgy",
     normal =
     {
       ingredients =

DyWorld-Dynamics-2/data/core/entities/bloomery.lua

@@ -5,6 +5,7 @@ DyWorld_Prototype_1.icon = "__base__/graphics/icons/electric-furnace.png"
 DyWorld_Prototype_1.crafting_categories = {DyDs.."bloomery"}
 DyWorld_Prototype_1.energy_usage = "500W"
 DyWorld_Prototype_1.crafting_speed = Dy_Diff(1, 1, "crafting")
+DyWorld_Prototype_1.max_health = Dy_Diff(500, 0, nil)
 DyWorld_Prototype_1.corpse = "electric-furnace-remnants"
 DyWorld_Prototype_1.dying_explosion = "electric-furnace-explosion"
 DyWorld_Prototype_1.animation = data.raw.furnace["electric-furnace"].animation

DyWorld-Dynamics-2/data/core/entities/caster.lua

@@ -19,12 +19,12 @@ data:extend(
     minable = {hardness = 0.2, mining_time = 0.5, result = "caster"},
     collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
     selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-    max_health = 2500,
+    max_health = Dy_Diff(2500, 0, nil),
+    crafting_speed = Dy_Diff(1, 1, "crafting"),
     corpse = "big-remnants",
     dying_explosion = "medium-explosion",
     fast_replaceable_group = "caster",
     crafting_categories = {DyDs.."casting"},
-    crafting_speed = Dy_Diff(1, 1, "crafting"),
     energy_source =
     {
       type = "electric",
@@ -50,6 +50,7 @@ data:extend(
         base_level = -1,
         pipe_connections = {{ type="input", position = {0, -2} }}
       },
+      off_when_no_fluid_recipe = true,
     },
     module_specification =
     {

DyWorld-Dynamics-2/data/core/entities/grinder.lua

@@ -11,7 +11,8 @@ data:extend(
     icon_size = 64,
     flags = {"placeable-neutral", "placeable-player", "player-creation"},
     minable = {mining_time = 1, result = "grinder"},
-    max_health = 500,
+    max_health = Dy_Diff(500, 0, nil),
+    crafting_speed = Dy_Diff(1, 1, "crafting"),
     corpse = "big-remnants",
     dying_explosion = "medium-explosion",
 	--resistances = Resist_Tier_1(1.4),
@@ -34,6 +35,7 @@ data:extend(
         base_level = -1,
         pipe_connections = {{ type = "input", position = {0, -2} }}
       },
+      off_when_no_fluid_recipe = true,
     },
     module_specification =
     {
@@ -43,7 +45,6 @@ data:extend(
     allowed_effects = {"consumption", "speed", "pollution"},
     crafting_categories = {DyDs.."grinding"},
     result_inventory_size = 1,
-    crafting_speed = Dy_Diff(1, 1, "crafting"),
     energy_usage = "150kW",
     ingredient_count = 25,
     energy_source =

DyWorld-Dynamics-2/data/core/recipes.lua

@@ -82,26 +82,70 @@ for k,v in pairs(DyWorld_2_Ore_Table_Main) do
         data:extend({
             {
               type = "recipe",
-              name = k.."-to-ground",
+              name = k.."-to-ground-1",
               category = DyDs.."grinding",
               main_product = k.."-ground",
               Add_To_Tech = k.."-processing-1",
               normal =
               {
                 ingredients =
                 {
-                    {type = "item", name = k, amount = 100},
+                    {type = "item", name = k, amount = 15},
                 },
                 results =
                 {
-                  {type = "item", name = k.."-ground", amount_min = 100, amount_max = 110},
-                  {type = "item", name = k.."-ground", amount_min = 100, amount_max = 200, probability = 0.01},
+                  {type = "item", name = k.."-ground", amount_min = 12, amount_max = 18},
+                  {type = "item", name = k.."-ground", amount_min = 10, amount_max = 15, probability = 0.01},
                 },
                 main_product = k.."-ground",
                 energy_required = 2.5,
                 enabled = false,
               },
             },
+            {
+              type = "recipe",
+              name = k.."-to-ground-2",
+              category = DyDs.."grinding",
+              main_product = k.."-ground",
+              Add_To_Tech = k.."-processing-2",
+              normal =
+              {
+                ingredients =
+                {
+                    {type = "item", name = k, amount = 30},
+                },
+                results =
+                {
+                  {type = "item", name = k.."-ground", amount_min = 25, amount_max = 45},
+                  {type = "item", name = k.."-ground", amount_min = 10, amount_max = 15, probability = 0.01},
+                },
+                main_product = k.."-ground",
+                energy_required = 4,
+                enabled = false,
+              },
+            },
+            {
+              type = "recipe",
+              name = k.."-to-ground-3",
+              category = DyDs.."grinding",
+              main_product = k.."-ground",
+              Add_To_Tech = k.."-processing-3",
+              normal =
+              {
+                ingredients =
+                {
+                    {type = "item", name = k, amount = 50},
+                },
+                results =
+                {
+                  {type = "item", name = k.."-ground", amount_min = 70, amount_max = 80},
+                  {type = "item", name = k.."-ground", amount_min = 10, amount_max = 15, probability = 0.01},
+                },
+                main_product = k.."-ground",
+                energy_required = 10,
+                enabled = false,
+              },
+            },
         })
     end
 end

DyWorld-Dynamics-2/data/core/recipes/wood-basic.lua

@@ -1,57 +1,99 @@
 
 
 data:extend({
-{
-    type = "recipe",
-    name = "log-wood-1a",
-    --category = "centrifuging",
-    main_product = "wood",
-    normal = {
-        ingredients = {
-            {type = "item", name = "log", amount = 1},
-        },
-        results = {
-            {type = "item", name = "wood", amount_min = 2, amount_max = 4, probability = 1},
-        },
+    {
+        type = "recipe",
+        name = "log-wood-1a",
+        --category = "centrifuging",
         main_product = "wood",
-        energy_required = 5,
-        enabled = true,
+        normal = {
+            ingredients = {
+                {type = "item", name = "log", amount = 1},
+            },
+            results = {
+                {type = "item", name = "wood", amount_min = 2, amount_max = 4, probability = 1},
+            },
+            main_product = "wood",
+            energy_required = 5,
+            enabled = true,
+        },
     },
-},
-{
-    type = "recipe",
-    name = "log-wood-1b",
-    --category = "centrifuging",
-    main_product = "wood-sulfur",
-    normal = {
-        ingredients = {
-            {type = "item", name = "log-sulfur", amount = 1},
+    {
+        type = "recipe",
+        name = "log-wood-1b",
+        --category = "centrifuging",
+        main_product = "wood-sulfur",
+        normal = {
+            ingredients = {
+                {type = "item", name = "log-sulfur", amount = 1},
+            },
+            results = {
+                {type = "item", name = "wood", amount_min = 1, amount_max = 1, probability = 0.75},
+                {type = "item", name = "wood-sulfur", amount_min = 1, amount_max = 2, probability = 1},
+            },
+            main_product = "wood-sulfur",
+            energy_required = 5,
+            enabled = true,
         },
-        results = {
-            {type = "item", name = "wood", amount_min = 1, amount_max = 1, probability = 0.75},
-            {type = "item", name = "wood-sulfur", amount_min = 1, amount_max = 2, probability = 1},
+    },
+    {
+        type = "recipe",
+        name = "log-wood-1c",
+        --category = "centrifuging",
+        main_product = "wood",
+        normal = {
+            ingredients = {
+                {type = "item", name = "log-dead", amount = 1},
+            },
+            results = {
+                {type = "item", name = "wood", amount_min = 1, amount_max = 1, probability = 0.275},
+                {type = "item", name = "wood-sulfur", amount_min = 1, amount_max = 1, probability = 0.1},
+            },
+            main_product = "wood",
+            energy_required = 5,
+            enabled = true,
         },
-        main_product = "wood-sulfur",
-        energy_required = 5,
-        enabled = true,
     },
-},
-{
-    type = "recipe",
-    name = "log-wood-1c",
-    --category = "centrifuging",
-    main_product = "wood",
-    normal = {
-        ingredients = {
-            {type = "item", name = "log-dead", amount = 1},
+    {
+        type = "recipe",
+        name = "greenhouse-wood-1a",
+        category = DyDs.."farming",
+        main_product = "log",
+        Add_To_Tech = "biological",
+        normal = {
+            ingredients = {
+                {type = "item", name = "sapling-normal", amount = 1},
+                {type = "fluid", name = "water", amount = 250},
+            },
+            results = {
+                {type = "item", name = "log", amount_min = 5, amount_max = 10, probability = 1},
+                {type = "item", name = "log-sulfur", amount_min = 1, amount_max = 5, probability = 0.1},
+                {type = "item", name = "sapling-normal", amount_min = 1, amount_max = 3, probability = 0.8},
+            },
+            main_product = "log",
+            energy_required = 60,
+            enabled = false,
         },
-        results = {
-            {type = "item", name = "wood", amount_min = 1, amount_max = 1, probability = 0.275},
-            {type = "item", name = "wood-sulfur", amount_min = 1, amount_max = 1, probability = 0.1},
+    },
+    {
+        type = "recipe",
+        name = "greenhouse-wood-1b",
+        category = DyDs.."farming",
+        main_product = "log-sulfur",
+        Add_To_Tech = "biological",
+        normal = {
+            ingredients = {
+                {type = "item", name = "sapling-sulfur", amount = 1},
+                {type = "fluid", name = "water", amount = 2500},
+            },
+            results = {
+                {type = "item", name = "log-sulfur", amount_min = 5, amount_max = 10, probability = 1},
+                {type = "item", name = "log", amount_min = 1, amount_max = 5, probability = 0.1},
+                {type = "item", name = "sapling-sulfur", amount_min = 1, amount_max = 3, probability = 0.8},
+            },
+            main_product = "log-sulfur",
+            energy_required = 300,
+            enabled = false,
         },
-        main_product = "wood",
-        energy_required = 5,
-        enabled = true,
     },
-},
 })