some changes

Dysoch · Nov 25, 2023 · c30211f · c30211f
1 parent 99453bc
commit c30211f
Show file tree

Hide file tree

Showing 25 changed files with 242 additions and 69 deletions.
diff --git a/DyCore/changelog.txt b/DyCore/changelog.txt
@@ -1,4 +1,30 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.2.2
+Date: 19. 11. 2023
+  Additions:
+    - Added fuel categories
+    - Added crafting categories
+  Entity:
+    - No Changes
+  Equipment:
+    - No Changes
+  Fluid:
+    - No Changes
+  Function:
+    - No Changes
+  Item:
+    - No Changes
+  Module:
+    - No Changes
+  Recipe:
+    - No Changes
+  Technology:
+    - No Changes
+  Tool:
+    - No Changes
+  Locale:
+    - No Changes
+---------------------------------------------------------------------------------------------------
 Version: 0.2.0
 Date: 19. 11. 2023
   Features:

diff --git a/DyCore/data.lua b/DyCore/data.lua
@@ -51,5 +51,6 @@ require("data.tool.add")
 require("data.tool.change")
 require("data.tool.remove")
 
+require("data.additions.fuel-groups")
 require("data.additions.item-groups")
 require("data.additions.crafting-groups")
diff --git a/DyCore/data/additions/crafting-groups.lua b/DyCore/data/additions/crafting-groups.lua
@@ -8,6 +8,17 @@ local Table = {
     "grinding",
     "farming",
     "blast-furnace",
+
+    "assembling-1",
+    "assembling-2",
+    "assembling-3",
+    "assembling-4",
+    "assembling-5",
+    "assembling-6",
+    "assembling-7",
+    "assembling-8",
+    "assembling-9",
+    "assembling-10",
 }
 
 for _, Name in pairs(Table) do

diff --git a/DyCore/data/additions/fuel-groups.lua b/DyCore/data/additions/fuel-groups.lua
@@ -0,0 +1,22 @@
+
+local DyDs = "dyworld-"
+local Table = {
+    "unused",
+    "hidden",
+    "carbon",
+    "chemical",
+    "oil",
+    "water",
+    "nuclear",
+    --"hidden",
+}
+
+for _, Name in pairs(Table) do
+    data:extend(
+        {
+          {
+            type = "fuel-category",
+            name = DyDs..Name
+          }
+        })
+end
diff --git a/DyWorld-Dynamics-2/changelog.txt b/DyWorld-Dynamics-2/changelog.txt
@@ -1,4 +1,37 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.0.3
+Date: 25. 11. 2023
+  Resources:
+    - Done: 15%
+  Core:
+    - Done: 1%
+    - Added check for scripted recipes to check if they exist. Used when creating handmade recipes
+    - Added crafting categories. Old categories are still used in machines as well, to provide compatibility
+    - Added fuel categories. Old categories are still used in machines as well, to provide compatibility. DyWorld items have the correct fuel category now if they should have one
+  Metallurgy:
+    - Done: 3%
+  Logistics:
+    - Done: 5%
+  Machines:
+    - Done: 0.1%
+  Power:
+    - Done: 2%
+    - Added 2 more Boilers
+    - Added 2 more Steam Engines
+    - Steam Engines use less fluid: 30/s > 1/s (tier 2: 2/s, tier 3: 4/s)
+  Warfare:
+    - Done: 0%
+  Survival/RPG:
+    - Done: 5%
+  Story:
+    - Done: 0%
+  GUI:
+    - Done: 10%
+  Bugfixes:
+    - NA
+  Known Issues:
+    - Nanobots related building things dont count for the player (WIP)
+---------------------------------------------------------------------------------------------------
 Version: 0.0.2
 Date: 25. 11. 2023
   Resources:

diff --git a/DyWorld-Dynamics-2/data/core/edits/base-edits.lua b/DyWorld-Dynamics-2/data/core/edits/base-edits.lua
@@ -1,10 +1,24 @@
 
 if data.raw["mining-drill"]["burner-mining-drill"] then
     data.raw["mining-drill"]["burner-mining-drill"].energy_source.fuel_inventory_size = 2
+    data.raw["mining-drill"]["burner-mining-drill"].energy_source.fuel_categories = {DyDs.."carbon"}
 end
 
-if data.raw["assembling-machine"]["stone-furnace"] then
-    data.raw["assembling-machine"]["stone-furnace"].energy_source.fuel_inventory_size = 2
+if data.raw["furnace"]["stone-furnace"] then
+    data.raw["furnace"]["stone-furnace"].energy_source.fuel_inventory_size = 2
+    data.raw["furnace"]["stone-furnace"].energy_source.fuel_categories = {DyDs.."carbon"}
+end
+
+if data.raw["assembling-machine"]["assembling-machine-1"] then
+    data.raw["assembling-machine"]["assembling-machine-1"].crafting_categories = {"crafting", "basic-crafting", "advanced-crafting", DyDs.."assembling-1", DyDs.."assembling-2"}
+end
+
+if data.raw["assembling-machine"]["assembling-machine-2"] then
+    data.raw["assembling-machine"]["assembling-machine-2"].crafting_categories = {"crafting", "basic-crafting", "advanced-crafting", DyDs.."assembling-1", DyDs.."assembling-2", "crafting-with-fluid"}
+end
+
+if data.raw["assembling-machine"]["assembling-machine-3"] then
+    data.raw["assembling-machine"]["assembling-machine-3"].crafting_categories = {"crafting", "basic-crafting", "advanced-crafting", DyDs.."assembling-1", DyDs.."assembling-2", "crafting-with-fluid", DyDs.."assembling-3", DyDs.."assembling-4"}
 end
 
 if data.raw.recipe["gun-turret"] then
@@ -20,15 +34,3 @@ if data.raw.recipe["copper-plate"] then
     data.raw.recipe["copper-plate"].hidden = true
     data.raw.recipe["copper-plate"].category = DyDs.."hidden"
 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
-    data.raw.generator["steam-engine"].fluid_box.filter = nil
-    data.raw.generator["steam-engine"].maximum_temperature = 250
-    data.raw.generator["steam-engine"].max_power_output = "1.5MJ"
-end
diff --git a/DyWorld-Dynamics-2/data/core/edits/player.lua b/DyWorld-Dynamics-2/data/core/edits/player.lua
@@ -3,10 +3,12 @@
 
 
 
--- Player Edits --
-data.raw.character.character.max_health = 1000
---data.raw.character.character.crafting_categories = {"assembling-tier-0", "assembling-tier-1"}
---data.raw.character.character.mining_categories = {"resource-solid-tier-0"}
-data.raw.character.character.inventory_size = 30
-data.raw.character.character.healing_per_tick = 0
-data.raw.character.character.build_distance = 15
+if data.raw.character.character then
+    -- Player Edits --
+    data.raw.character.character.max_health = 1000
+    data.raw.character.character.crafting_categories = {DyDs.."assembling-1", "crafting"}
+    --data.raw.character.character.mining_categories = {"resource-solid-tier-0"}
+    data.raw.character.character.inventory_size = 30
+    data.raw.character.character.healing_per_tick = 0
+    data.raw.character.character.build_distance = 15
+end
diff --git a/DyWorld-Dynamics-2/data/core/recipes.lua b/DyWorld-Dynamics-2/data/core/recipes.lua
@@ -2,7 +2,7 @@
 
 -- Main Ore to Ore --
 for k,v in pairs(DyWorld_2_Ore_Table_Main) do 
-    if v.plate and data.raw.item[v.plate] and data.raw.item[k] then
+    if v.plate and data.raw.item[v.plate] and data.raw.item[k] and not data.raw.recipe[v.plate.."-0a"] then
         data:extend({
             {
               type = "recipe",
@@ -27,7 +27,7 @@ for k,v in pairs(DyWorld_2_Ore_Table_Main) do
             },
         })
     end
-    if v.ore and v.plate and data.raw.item[v.plate] and data.raw.item[v.ore.."-clean"] then
+    if v.ore and v.plate and data.raw.item[v.plate] and data.raw.item[v.ore.."-clean"] and not data.raw.recipe[v.plate.."-0b"] then
         data:extend({
             {
               type = "recipe",
@@ -52,12 +52,12 @@ for k,v in pairs(DyWorld_2_Ore_Table_Main) do
             },
         })
     end
-    if v.chunk and v.ore and data.raw.item[v.chunk] and data.raw.item[v.ore] then
+    if v.chunk and v.ore and data.raw.item[v.chunk] and data.raw.item[v.ore] and not data.raw.recipe[v.ore.."-0a"] then
         data:extend({
             {
               type = "recipe",
               name = v.ore.."-0a",
-              --category = "smelting",
+              category = DyDs.."assembling-1",
               main_product = v.ore,
               Add_To_Tech = v.Tech and v.Tech or nil,
               normal =
@@ -78,7 +78,7 @@ for k,v in pairs(DyWorld_2_Ore_Table_Main) do
             },
         })
     end
-    if v.ground and data.raw.item[k.."-ground"] and data.raw.item[k] then
+    if v.ground and data.raw.item[k.."-ground"] and data.raw.item[k] and not data.raw.recipe[k.."-to-ground-1"] and not data.raw.recipe[k.."-to-ground-2"] and not data.raw.recipe[k.."-to-ground-3"] then
         data:extend({
             {
               type = "recipe",
@@ -157,7 +157,7 @@ for k,v in pairs(DyWorld_2_Ore_Table) do
         -- chunk to plate --
         --maybe add it????
     end
-    if (v.properties.plate and data.raw.item[k.."-plate"]) and (v.properties.ore and data.raw.item[k.."-ore"]) then
+    if (v.properties.plate and data.raw.item[k.."-plate"]) and (v.properties.ore and data.raw.item[k.."-ore"]) and not data.raw.recipe[k.."-plate-from-"..k.."-ore"] then
         -- ore to plate --
         data:extend({
             {
@@ -188,7 +188,7 @@ for k,v in pairs(DyWorld_2_Ore_Table) do
         -- clean ore to plate --
 
     end
-    if (v.properties.slurry and data.raw.fluid["slurry-"..k]) and (v.properties.clean and data.raw.item[k.."-ore-clean"]) then
+    if (v.properties.slurry and data.raw.fluid["slurry-"..k]) and (v.properties.clean and data.raw.item[k.."-ore-clean"]) and not data.raw.recipe[k.."-ore-clean-from-slurry-"..k] then
         -- slurry to clean ore --
         data:extend({
             {
@@ -217,7 +217,7 @@ for k,v in pairs(DyWorld_2_Ore_Table) do
 
     end
     if (v.properties.slurry and data.raw.fluid["slurry-"..k]) then
-        if (v.properties.ore and data.raw.item[k.."-ore"]) then
+        if (v.properties.ore and data.raw.item[k.."-ore"]) and not data.raw.recipe[k.."-ore-to-slurry-"..k] then
             -- ore to slurry --
             data:extend({
                 {
@@ -243,7 +243,7 @@ for k,v in pairs(DyWorld_2_Ore_Table) do
                 },
                 },
             })
-        elseif data.raw.item[k] then
+        elseif data.raw.item[k] and not data.raw.recipe[k.."-to-slurry-"..k] then
             -- to slurry --
             data:extend({
                 {
@@ -272,7 +272,7 @@ for k,v in pairs(DyWorld_2_Ore_Table) do
 
         end
     end
-    if (v.molten.enabled and data.raw.fluid["molten-"..k]) and (v.properties.plate and data.raw.item[k.."-plate"]) then
+    if (v.molten.enabled and data.raw.fluid["molten-"..k]) and (v.properties.plate and data.raw.item[k.."-plate"]) and not data.raw.recipe[k.."-plate-from-molten-"..k] then
         -- molten to plate --
         data:extend({
             {
@@ -303,7 +303,7 @@ for k,v in pairs(DyWorld_2_Ore_Table) do
         end
         ]]
     end
-    if (v.molten.enabled and data.raw.fluid["molten-"..k]) and (v.properties.clean and data.raw.item[k.."-ore-clean"]) then
+    if (v.molten.enabled and data.raw.fluid["molten-"..k]) and (v.properties.clean and data.raw.item[k.."-ore-clean"]) and not data.raw.recipe["molten-"..k.."-from-"..k.."-ore-clean"] then
         -- ore clean to molten --
         data:extend({
             {

diff --git a/DyWorld-Dynamics-2/data/core/recipes/circuits.lua b/DyWorld-Dynamics-2/data/core/recipes/circuits.lua
@@ -3,7 +3,7 @@ data:extend({
     {
         type = "recipe",
         name = "basic-circuit",
-        --category = "centrifuging",
+        category = DyDs.."assembling-1",
         main_product = "basic-circuit",
         Add_To_Tech = nil,
         normal = {
@@ -22,7 +22,7 @@ data:extend({
     {
         type = "recipe",
         name = "electronic-circuit",
-        --category = "centrifuging",
+        category = DyDs.."assembling-1",
         main_product = "electronic-circuit",
         Add_To_Tech = nil,
         normal = {
@@ -41,7 +41,7 @@ data:extend({
     --[[{
         type = "recipe",
         name = "advanced-circuit",
-        --category = "centrifuging",
+        category = DyDs.."assembling-2",
         main_product = "electronic-circuit",
         Add_To_Tech = nil,
         normal = {

diff --git a/DyWorld-Dynamics-2/data/core/recipes/metal-cable.lua b/DyWorld-Dynamics-2/data/core/recipes/metal-cable.lua
@@ -7,7 +7,7 @@ data:extend({
     {
         type = "recipe",
         name = k.."-"..Name,
-        --category = "centrifuging",
+        category = DyDs.."assembling-1",
         main_product = k.."-"..Name,
         Add_To_Tech = v >= 2 and k.."-processing-1" or nil,
         normal = {

diff --git a/DyWorld-Dynamics-2/data/core/recipes/metal-frame.lua b/DyWorld-Dynamics-2/data/core/recipes/metal-frame.lua
@@ -7,7 +7,7 @@ data:extend({
     {
         type = "recipe",
         name = k.."-"..Name,
-        --category = "centrifuging",
+        category = DyDs.."assembling-1",
         main_product = k.."-"..Name,
         Add_To_Tech = v >= 2 and k.."-processing-1" or nil,
         normal = {

diff --git a/DyWorld-Dynamics-2/data/core/recipes/metal-gear.lua b/DyWorld-Dynamics-2/data/core/recipes/metal-gear.lua
@@ -7,7 +7,7 @@ data:extend({
     {
         type = "recipe",
         name = k.."-"..Name,
-        --category = "centrifuging",
+        category = DyDs.."assembling-1",
         main_product = k.."-"..Name,
         Add_To_Tech = v >= 2 and k.."-processing-1" or nil,
         normal = {

diff --git a/DyWorld-Dynamics-2/data/core/recipes/metal-stick.lua b/DyWorld-Dynamics-2/data/core/recipes/metal-stick.lua
@@ -7,7 +7,7 @@ data:extend({
     {
         type = "recipe",
         name = k.."-"..Name,
-        --category = "centrifuging",
+        category = DyDs.."assembling-1",
         main_product = k.."-"..Name,
         Add_To_Tech = v >= 2 and k.."-processing-1" or nil,
         normal = {

diff --git a/DyWorld-Dynamics-2/data/core/recipes/stone-basic.lua b/DyWorld-Dynamics-2/data/core/recipes/stone-basic.lua
@@ -4,7 +4,7 @@ data:extend({
 {
     type = "recipe",
     name = "limestone-stone-1a",
-    --category = "centrifuging",
+    category = DyDs.."assembling-1",
     main_product = "stone",
     normal = {
         ingredients = {

diff --git a/DyWorld-Dynamics-2/data/core/recipes/wood-basic.lua b/DyWorld-Dynamics-2/data/core/recipes/wood-basic.lua
@@ -4,7 +4,7 @@ data:extend({
     {
         type = "recipe",
         name = "log-wood-1a",
-        --category = "centrifuging",
+        category = DyDs.."assembling-1",
         main_product = "wood",
         normal = {
             ingredients = {
@@ -21,7 +21,7 @@ data:extend({
     {
         type = "recipe",
         name = "log-wood-1b",
-        --category = "centrifuging",
+        category = DyDs.."assembling-1",
         main_product = "wood-sulfur",
         normal = {
             ingredients = {
@@ -39,7 +39,7 @@ data:extend({
     {
         type = "recipe",
         name = "log-wood-1c",
-        --category = "centrifuging",
+        category = DyDs.."assembling-1",
         main_product = "wood",
         normal = {
             ingredients = {

diff --git a/DyWorld-Dynamics-2/data/main.lua b/DyWorld-Dynamics-2/data/main.lua
@@ -112,6 +112,7 @@ local core = "data.core."
 local logistics = "data.logistics."
 local warfare = "data.warfare."
 local machine = "data.machines."
+local power = "data.power."
 
 
 -- Core --
@@ -123,5 +124,8 @@ require(logistics.."data")
 -- Machines --
 require(machine.."data")
 
+-- Power --
+require(power.."data")
+
 -- Warfare --
 require(warfare.."data")