From c30211f3ce8f38492e782a20db567e5fd5e1ced8 Mon Sep 17 00:00:00 2001 From: Dysoch Date: Sat, 25 Nov 2023 22:30:35 +0100 Subject: [PATCH] some changes --- DyCore/changelog.txt | 26 +++++++++++++ DyCore/data.lua | 1 + DyCore/data/additions/crafting-groups.lua | 11 ++++++ DyCore/data/additions/fuel-groups.lua | 22 +++++++++++ DyWorld-Dynamics-2/changelog.txt | 33 ++++++++++++++++ .../data/core/edits/base-edits.lua | 30 ++++++++------- DyWorld-Dynamics-2/data/core/edits/player.lua | 16 ++++---- DyWorld-Dynamics-2/data/core/recipes.lua | 22 +++++------ .../data/core/recipes/circuits.lua | 6 +-- .../data/core/recipes/metal-cable.lua | 2 +- .../data/core/recipes/metal-frame.lua | 2 +- .../data/core/recipes/metal-gear.lua | 2 +- .../data/core/recipes/metal-stick.lua | 2 +- .../data/core/recipes/stone-basic.lua | 2 +- .../data/core/recipes/wood-basic.lua | 6 +-- DyWorld-Dynamics-2/data/main.lua | 4 ++ DyWorld-Dynamics-2/data/power/boiler/data.lua | 34 +++++++++++++++++ DyWorld-Dynamics-2/data/power/data.lua | 11 ++++++ DyWorld-Dynamics-2/data/power/solar/data.lua | 1 + .../data/power/steam-engine/data.lua | 36 ++++++++++++++++++ DyWorld-Dynamics-2/database/items/main.lua | 22 +++++------ .../script/events/player-events.lua | 4 +- DyWorld-Dynamics-2/script/lualib/bonus.lua | 2 + Info/Todo.txt | 14 +------ Updates.xlsx | Bin 10009 -> 10029 bytes 25 files changed, 242 insertions(+), 69 deletions(-) create mode 100644 DyCore/data/additions/fuel-groups.lua create mode 100644 DyWorld-Dynamics-2/data/power/boiler/data.lua create mode 100644 DyWorld-Dynamics-2/data/power/data.lua create mode 100644 DyWorld-Dynamics-2/data/power/solar/data.lua create mode 100644 DyWorld-Dynamics-2/data/power/steam-engine/data.lua diff --git a/DyCore/changelog.txt b/DyCore/changelog.txt index 304972d9..4b7544f0 100644 --- 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 index c7818e7f..54b1ac7e 100644 --- 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") \ No newline at end of file diff --git a/DyCore/data/additions/crafting-groups.lua b/DyCore/data/additions/crafting-groups.lua index 994d4d2e..698be6f6 100644 --- 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 new file mode 100644 index 00000000..c9f76b56 --- /dev/null +++ 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 \ No newline at end of file diff --git a/DyWorld-Dynamics-2/changelog.txt b/DyWorld-Dynamics-2/changelog.txt index 865631da..1f96857b 100644 --- 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 index ff304612..3b1e0b96 100644 --- 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 \ No newline at end of file diff --git a/DyWorld-Dynamics-2/data/core/edits/player.lua b/DyWorld-Dynamics-2/data/core/edits/player.lua index 0eede49d..a63b3346 100644 --- 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 index 3cd7d3b9..a06a07cf 100644 --- 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 index 386bdce5..362ca2ea 100644 --- 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 index dccd57bd..086585ae 100644 --- 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 index fa8bc01f..6850c30b 100644 --- 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 index 63bc9f51..a2364f48 100644 --- 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 index 58841331..6bea8dd5 100644 --- 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 index 1eed1ae8..856e38aa 100644 --- 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 index ac9427c2..496a4c02 100644 --- 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 index 99b4325e..47479836 100644 --- 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") \ No newline at end of file diff --git a/DyWorld-Dynamics-2/data/power/boiler/data.lua b/DyWorld-Dynamics-2/data/power/boiler/data.lua new file mode 100644 index 00000000..e8a3bf7c --- /dev/null +++ b/DyWorld-Dynamics-2/data/power/boiler/data.lua @@ -0,0 +1,34 @@ + +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.next_upgrade = "boiler-2" + data.raw.boiler.boiler.fast_replaceable_group = "energy" + data.raw.boiler.boiler.energy_source.effectivity = 8 + data.raw.boiler.boiler.energy_source.fuel_categories = {DyDs.."carbon"} +end + +local DyWorld_Prototype_1a = DyW.Fx.DC("boiler", "boiler", "boiler-2") +local DyWorld_Prototype_1b = DyW.Fx.DC("item", "boiler", "boiler-2") +local DyWorld_Prototype_2a = DyW.Fx.DC("boiler", "boiler", "boiler-3") +local DyWorld_Prototype_2b = DyW.Fx.DC("item", "boiler", "boiler-3") + + +DyWorld_Prototype_1a.target_temperature = 500 +DyWorld_Prototype_1a.energy_source.effectivity = 16 +DyWorld_Prototype_1a.energy_source.fuel_categories = {DyDs.."carbon", DyDs.."chemical"} +DyWorld_Prototype_1a.next_upgrade = "boiler-3" +DyWorld_Prototype_1a.fast_replaceable_group = "energy" + +DyWorld_Prototype_2a.target_temperature = 1000 +DyWorld_Prototype_2a.energy_source.effectivity = 32 +DyWorld_Prototype_2a.energy_source.fuel_categories = {DyDs.."carbon", DyDs.."chemical", DyDs.."oil"} +DyWorld_Prototype_2a.next_upgrade = nil +DyWorld_Prototype_2a.fast_replaceable_group = "energy" + +data:extend({ + DyWorld_Prototype_1a, + DyWorld_Prototype_1b, + DyWorld_Prototype_2a, + DyWorld_Prototype_2b, +}) \ No newline at end of file diff --git a/DyWorld-Dynamics-2/data/power/data.lua b/DyWorld-Dynamics-2/data/power/data.lua new file mode 100644 index 00000000..511b62d8 --- /dev/null +++ b/DyWorld-Dynamics-2/data/power/data.lua @@ -0,0 +1,11 @@ + +local power = "data.power." + +-- Boilers -- +require(power.."boiler.data") + +-- Solar -- +require(power.."solar.data") + +-- Steam -- +require(power.."steam-engine.data") \ No newline at end of file diff --git a/DyWorld-Dynamics-2/data/power/solar/data.lua b/DyWorld-Dynamics-2/data/power/solar/data.lua new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/DyWorld-Dynamics-2/data/power/solar/data.lua @@ -0,0 +1 @@ + diff --git a/DyWorld-Dynamics-2/data/power/steam-engine/data.lua b/DyWorld-Dynamics-2/data/power/steam-engine/data.lua new file mode 100644 index 00000000..5b7bce1e --- /dev/null +++ b/DyWorld-Dynamics-2/data/power/steam-engine/data.lua @@ -0,0 +1,36 @@ + +if data.raw.generator["steam-engine"] then + data.raw.generator["steam-engine"].fluid_box.filter = nil + data.raw.generator["steam-engine"].fluid_usage_per_tick = (1 / 60) + data.raw.generator["steam-engine"].effectivity = 10 + data.raw.generator["steam-engine"].maximum_temperature = 250 + data.raw.generator["steam-engine"].next_upgrade = "steam-engine-2" + data.raw.generator["steam-engine"].fast_replaceable_group = "energy" + data.raw.generator["steam-engine"].max_power_output = (500000 / 60).."J" -- 0.5 MW +end + +local DyWorld_Prototype_1a = DyW.Fx.DC("generator", "steam-engine", "steam-engine-2") +local DyWorld_Prototype_1b = DyW.Fx.DC("item", "steam-engine", "steam-engine-2") +local DyWorld_Prototype_2a = DyW.Fx.DC("generator", "steam-engine", "steam-engine-3") +local DyWorld_Prototype_2b = DyW.Fx.DC("item", "steam-engine", "steam-engine-3") + +DyWorld_Prototype_1a.fluid_usage_per_tick = (2 / 60) +DyWorld_Prototype_1a.maximum_temperature = 500 +DyWorld_Prototype_1a.effectivity = 10 +DyWorld_Prototype_1a.max_power_output = (1500000 / 60).."J" -- 1.5 MW +DyWorld_Prototype_1a.next_upgrade = "steam-engine-3" +DyWorld_Prototype_1a.fast_replaceable_group = "energy" + +DyWorld_Prototype_2a.fluid_usage_per_tick = (4 / 60) +DyWorld_Prototype_2a.maximum_temperature = 1000 +DyWorld_Prototype_2a.effectivity = 10 +DyWorld_Prototype_2a.max_power_output = (4500000 / 60).."J" -- 4.5 MW +DyWorld_Prototype_1a.next_upgrade = nil +DyWorld_Prototype_1a.fast_replaceable_group = "energy" + +data:extend({ + DyWorld_Prototype_1a, + DyWorld_Prototype_1b, + DyWorld_Prototype_2a, + DyWorld_Prototype_2b, +}) \ No newline at end of file diff --git a/DyWorld-Dynamics-2/database/items/main.lua b/DyWorld-Dynamics-2/database/items/main.lua index 4b3dfee0..e426a7b4 100644 --- a/DyWorld-Dynamics-2/database/items/main.lua +++ b/DyWorld-Dynamics-2/database/items/main.lua @@ -15,7 +15,7 @@ DyWorld_2_Main_Items = { order = "1-1", stack_size = 50, fuel_value = "2MJ", - fuel_category = "chemical", + fuel_category = DyDs.."carbon", }, ["log-sulfur"] = { icons = { @@ -27,7 +27,7 @@ DyWorld_2_Main_Items = { order = "1-2", stack_size = 50, fuel_value = "0.5MJ", - fuel_category = "chemical", + fuel_category = DyDs.."carbon", }, ["log-dead"] = { icons = { @@ -39,7 +39,7 @@ DyWorld_2_Main_Items = { order = "1-3", stack_size = 50, fuel_value = "0.2MJ", - fuel_category = "chemical", + fuel_category = DyDs.."carbon", }, ["wood"] = { icons = { @@ -51,7 +51,7 @@ DyWorld_2_Main_Items = { order = "2-1", stack_size = 200, fuel_value = "2MJ", - fuel_category = "chemical", + fuel_category = DyDs.."carbon", }, ["wood-sulfur"] = { icons = { @@ -63,7 +63,7 @@ DyWorld_2_Main_Items = { order = "2-2", stack_size = 200, fuel_value = "0.5MJ", - fuel_category = "chemical", + fuel_category = DyDs.."carbon", }, ["bark"] = { icons = { @@ -75,7 +75,7 @@ DyWorld_2_Main_Items = { order = "4-1", stack_size = 500, fuel_value = "0.02MJ", - fuel_category = "chemical", + fuel_category = DyDs.."carbon", }, ["sap"] = { icons = { @@ -97,7 +97,7 @@ DyWorld_2_Main_Items = { order = "0-1", stack_size = 500, fuel_value = "0.2MJ", - fuel_category = "chemical", + fuel_category = DyDs.."carbon", }, ["sapling-sulfur"] = { icons = { @@ -109,7 +109,7 @@ DyWorld_2_Main_Items = { order = "0-1", stack_size = 500, fuel_value = "0.2MJ", - fuel_category = "chemical", + fuel_category = DyDs.."carbon", }, ----- Main Ores ----- @@ -273,7 +273,7 @@ DyWorld_2_Main_Items = { order = "1", stack_size = 200, fuel_value = "4MJ", - fuel_category = "chemical", + fuel_category = DyDs.."carbon", }, ["hematite-ground"] = { icons = { @@ -435,7 +435,7 @@ DyWorld_2_Main_Items = { order = "1", stack_size = 200, fuel_value = "0.8MJ", - fuel_category = "chemical", + fuel_category = DyDs.."carbon", }, ["coal"] = { icons = { @@ -447,7 +447,7 @@ DyWorld_2_Main_Items = { order = "1", stack_size = 200, fuel_value = "8MJ", - fuel_category = "chemical", + fuel_category = DyDs.."carbon", }, ["stone-ground"] = { icons = { diff --git a/DyWorld-Dynamics-2/script/events/player-events.lua b/DyWorld-Dynamics-2/script/events/player-events.lua index b1b77f1c..a913cf94 100644 --- a/DyWorld-Dynamics-2/script/events/player-events.lua +++ b/DyWorld-Dynamics-2/script/events/player-events.lua @@ -528,8 +528,8 @@ function Dy_Player_init(event) type = "personal", }, stats = { - item = {max = 500, amount = 0, max2 = 500}, - total = {max = 500, amount = 0}, + item = {max = debugger and 500000 or 500, amount = 0, max2 = debugger and 500000 or 500}, + total = {max = debugger and 500000 or 500, amount = 0}, item_used = {}, item_used_total = 0, }, diff --git a/DyWorld-Dynamics-2/script/lualib/bonus.lua b/DyWorld-Dynamics-2/script/lualib/bonus.lua index 6bae8533..85a2444b 100644 --- a/DyWorld-Dynamics-2/script/lualib/bonus.lua +++ b/DyWorld-Dynamics-2/script/lualib/bonus.lua @@ -288,6 +288,8 @@ function Bonus_Calc(id) if v.enabled and v.toggled then game.players[id][v.callback] = math.min(Round(v.total, v.min_max.rounded), v.min_max.max) --LOG("("..id..") Bonus_Calc: enabled and toggled "..k..", it is now "..math.min(Round(v.total, v.min_max.rounded), v.min_max.max)) + else + game.players[id][v.callback] = v.native end end end diff --git a/Info/Todo.txt b/Info/Todo.txt index ad7504c9..cd3aa739 100644 --- a/Info/Todo.txt +++ b/Info/Todo.txt @@ -2,21 +2,9 @@ LaureenLlama's Carrot Cake = obviously the cake JD's Flashlight = the flamethrower JD's Boomstick = shotgun -/c remote.call("space-exploration", "begin_meteor_shower", {zone_name = "Nauvis", position = {x=0,y=0}, range = 1, meteors = 100}) -natives send meteors - - /c remote.call("space-exploration", "begin_solar_flare", {zone_name = "Nauvis", targeting="basic"}) - TODO Update guis only when they require Update -TODO add gui update script (seperate for each one) - -TODO add story mode technologies based on pull request from Maximus -BODY requires some alteration to fit nicely into DyWorld and the vision i have for this feature - -TODO add advanced science sprites from old archive to make them different - TODO add NG+ script TODO add NG+ take stats from current game -BODY will probably require manual adding of a file into the dyworld script to take affect, but will do some research if there is any other way +will probably require manual adding of a file into the dyworld script to take affect, but will do some research if there is any other way diff --git a/Updates.xlsx b/Updates.xlsx index ec7c5501569356b5a881e3f055e760f2c1c11f4b..214bf3cd5add6c468f12556571a5a170fd8dc44e 100644 GIT binary patch delta 3154 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