Skip to content

Commit 887fbe5

Browse files
DysochDysoch
committed
Adding Science Pack + Locales
1 parent 257e58b commit 887fbe5

40 files changed

Lines changed: 169 additions & 6 deletions

‎DyCore/changelog.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Date: 19. 11. 2023
2323
Tool:
2424
- No Changes
2525
Locale:
26-
- No Changes
26+
- Added locale for: Steam Engines (tier 1,2,3), Boilers (tier 1,2,3), Solar Panels (tier 1,2,3)
2727
---------------------------------------------------------------------------------------------------
2828
Version: 0.2.0
2929
Date: 19. 11. 2023

‎DyCore/data/additions/fuel-groups.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ local Table = {
88
"oil",
99
"water",
1010
"nuclear",
11+
"energy",
1112
--"hidden",
1213
}
1314

‎DyCore/data/additions/item-groups.lua‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,10 @@ local Table = {
172172
["med-pack"] = "1",
173173
["labs"] = "1",
174174
["science-fluids"] = "1",
175-
["science-packs"] = "1",
175+
["science-packs-1"] = "1",
176+
["science-packs-2"] = "1",
177+
["science-bio"] = "1",
178+
["science-metal"] = "1",
176179
["repair-pack"] = "1",
177180
["mod-nanobots"] = "1",
178181
},

‎DyCore/locale/en/entity.cfg‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,25 @@ fast-loader=Fast Loader
1212
express-loader=Express Loader
1313
insane-loader=Insane Loader
1414
supreme-loader=Supreme Loader
15+
boiler=Boiler
16+
boiler-2=Boiler Mk2
17+
boiler-3=Boiler Mk3
18+
steam-engine=Steam Engine
19+
steam-engine-2=Steam Engine Mk2
20+
steam-engine-3=Steam Engine Mk3
21+
solar-panel=Solar Panel
22+
solar-panel-2=Solar Panel Mk2
23+
solar-panel-3=Solar Panel Mk3
1524

1625
[entity-description]
1726
boat-1=Basic Boat that can only be entered by standing on shallows.\n(WIP Graphics)\nFrequently used by BoldViking for some reason
18-
car-1=Previous iterations bravely went into battle with BoldViking, only to be destroyed in a matter of seconds
27+
car-1=Previous iterations bravely went into battle with BoldViking, only to be destroyed in a matter of seconds
28+
boiler=Heats fluids to a maximum of 250 degrees
29+
boiler-2=Heats fluids to a maximum of 500 degrees
30+
boiler-3=Heats fluids to a maximum of 1000 degrees
31+
steam-engine=Uses fluids to a maximum of 250 degrees
32+
steam-engine-2=Uses fluids to a maximum of 500 degrees
33+
steam-engine-3=Uses fluids to a maximum of 1000 degrees
34+
solar-panel=Power your base with the energy from the Star\nSadly does not work during the night.
35+
solar-panel-2=Power your base with the energy from the Star\nSadly does not work during the night.
36+
solar-panel-3=Power your base with the energy from the Star.\nSadly does not work during the night.

‎DyCore/locale/en/fuel.cfg‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
[fuel-category-name]
2-
carbon=Carbon Fuel Source
3-
fusion=Fusion Fuel Source
4-
fission=Fission Fuel Source
2+
dyworld-carbon=Carbon Fuel Source
3+
dyworld-fusion=Fusion Fuel Source
4+
dyworld-fission=Fission Fuel Source
5+
dyworld-chemical=Chemical Fuel Source
6+
dyworld-oil=Oil Fuel Source
7+
dyworld-water=Water Fuel Source
8+
dyworld-energy=Energy Fuel Source
9+
dyworld-nuclear=Nuclear Fuel Source

‎DyCore/locale/en/item.cfg‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,21 @@ express-loader=Express Loader
129129
insane-loader=Insane Loader
130130
supreme-loader=Supreme Loader
131131

132+
automation-science-pack=Science Pack (Automation)
133+
logistic-science-pack=Science Pack (Logistic)
134+
chemical-science-pack=Science Pack (Chemical)
135+
military-science-pack=Science Pack (Military)
136+
production-science-pack=Science Pack (Production)
137+
utility-science-pack=Science Pack (Utility)
138+
space-science-pack=Science Pack (Space)
139+
advanced-automation-science-pack=Advanced Science Pack (Automation)
140+
advanced-logistic-science-pack=Advanced Science Pack (Logistic)
141+
advanced-chemical-science-pack=Advanced Science Pack (Chemical)
142+
advanced-military-science-pack=Advanced Science Pack (Military)
143+
advanced-production-science-pack=Advanced Science Pack (Production)
144+
advanced-utility-science-pack=Advanced Science Pack (Utility)
145+
advanced-space-science-pack=Advanced Science Pack (Space)
146+
132147
[item-description]
133148
hematite=Hematite, commonly known as Iron \n([color=yellow]Fe2-O3[/color])
134149
chalcopyrite=Chalcopyrite, commonly known as Copper \n([color=yellow]Cu-Fe-S2[/color])

‎DyWorld-Dynamics-2/changelog.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Date: 25. 11. 2023
1212
- Increased Dirty Steam Heat Capacity: 0.02KJ > 0.05KJ
1313
- Increased Water Heat Capacity: 0.2KJ > 0.25KJ
1414
- Increased Dirty Water Heat Capacity: 0.02KJ > 0.025KJ
15+
- Increased magazine size Nanobots: 1 > 1e32
16+
- Changed stack size Nanobots: 100 > 1
1517
Metallurgy:
1618
- Done: 3%
1719
Logistics:
@@ -22,12 +24,14 @@ Date: 25. 11. 2023
2224
- Done: 2%
2325
- Added 2 more Boilers
2426
- Added 2 more Steam Engines
27+
- Added 2 more Solar Panels
2528
- Steam Engines use less fluid: Tier 1: 30/s > 4/s (Tier 2: 8/s, Tier 3: 16/s)
2629
- Steam Engines create more power: Tier 1: 300kW, Tier 2: 1,5MW, Tier 3: 4,5MW
2730
- Steam Engines have higher max temperature: Tier 1: 250, Tier 2: 500, Tier 3: 1000
2831
- Boilers have higher max temperature: Tier 1: 250, Tier 2: 500, Tier 3: 1000
2932
- Boilers have other fuel consumptions: Tier 1: 1MW, Tier 2: 2MW, Tier 3: 4MW
3033
- New ratio for Boiler to Steam Engine: Tier 1: 1:4, Tier 2: 1:2, Tier 3: 1:1
34+
- Solar Panel Power output: Tier 1: 60kW > 100kW, Tier 2: 500kW, Tier 3: 2.5MW
3135
Warfare:
3236
- Done: 0%
3337
Survival/RPG:

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,8 @@ if data.raw.recipe["copper-plate"] then
3434
data.raw.recipe["copper-plate"].hidden = true
3535
data.raw.recipe["copper-plate"].category = DyDs.."hidden"
3636
end
37+
38+
if data.raw.ammo["ammo-nano-constructors"] then
39+
data.raw.ammo["ammo-nano-constructors"].magazine_size = 100000000000000000000000000000000
40+
data.raw.ammo["ammo-nano-constructors"].stack_size = 1
41+
end

‎DyWorld-Dynamics-2/data/core/items/science.lua‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
2+
3+
local Science_Table = {
4+
["automation"] = 1,
5+
["logistic"] = 2,
6+
["chemical"] = 3,
7+
["military"] = 4,
8+
["production"] = 5,
9+
["utility"] = 6,
10+
["space"] = 7,
11+
}
12+
local Metal_Table = {}
13+
local Bio_Table = {}
14+
15+
for k,v in pairs(Science_Table) do
16+
data:extend({
17+
{
18+
type = "tool",
19+
name = k.."-science-pack",
20+
localised_description = {"item-description.science-pack"},
21+
icons =
22+
{
23+
{
24+
icon = Dy_icon.."science-1/"..k..".png",
25+
},
26+
},
27+
icon_size = 32,
28+
stack_size = 500,
29+
durability = 1,
30+
durability_description_key = "description.science-pack-remaining-amount-key",
31+
durability_description_value = "description.science-pack-remaining-amount-value",
32+
subgroup = DyDs.."science-packs-1",
33+
order = v,
34+
rocket_launch_product = {"advanced-"..k.."-science-pack", 1},
35+
},
36+
{
37+
type = "tool",
38+
name = "advanced-"..k.."-science-pack",
39+
localised_description = {"item-description.science-pack"},
40+
icons =
41+
{
42+
{
43+
icon = Dy_icon.."science-2/"..k..".png",
44+
},
45+
},
46+
icon_size = 32,
47+
stack_size = 500,
48+
durability = 1,
49+
durability_description_key = "description.science-pack-remaining-amount-key",
50+
durability_description_value = "description.science-pack-remaining-amount-value",
51+
subgroup = DyDs.."science-packs-2",
52+
order = v,
53+
},
54+
})
55+
end

‎DyWorld-Dynamics-2/data/core/main.lua‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ require(core.."entities.bloomery")
1616
require(core.."entities.caster")
1717
require(core.."entities.grinder")
1818

19+
-- Items --
20+
require(core.."items.science")
21+
1922
-- Recipes --
2023
require(core.."recipes") -- Recipes
2124

0 commit comments

Comments
 (0)