diff --git a/bobplates/changelog.txt b/bobplates/changelog.txt index c1f7d830f..e4375214e 100644 --- a/bobplates/changelog.txt +++ b/bobplates/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.1 +Date: ??? + Bugfixes: + - Fixed reactor descriptions #162 +--------------------------------------------------------------------------------------------------- Version: 1.2.0 Date: 22. 12. 2023 Bugfixes: diff --git a/bobplates/info.json b/bobplates/info.json index 5d2d39ee4..406be718d 100644 --- a/bobplates/info.json +++ b/bobplates/info.json @@ -1,6 +1,6 @@ { "name": "bobplates", - "version": "1.2.0", + "version": "1.2.1", "factorio_version": "1.1", "title": "Bob's Metals, Chemicals and Intermediates mod", "author": "Bobingabout", diff --git a/bobplates/locale/en/bobplates.cfg b/bobplates/locale/en/bobplates.cfg index cef6dc496..af38070bb 100644 --- a/bobplates/locale/en/bobplates.cfg +++ b/bobplates/locale/en/bobplates.cfg @@ -272,6 +272,8 @@ bob-small-inline-storage-tank=Small inline storage tank void-pump=Gas venting pump +[entity-description] +nuclear-reactor=Uses nuclear fuel cells to generate heat. The heat output increases when built next to other reactors. [item-group-name] bob-intermediate-products=Bob's Intermediate products diff --git a/bobpower/changelog.txt b/bobpower/changelog.txt index 5c9521bdc..8c71d1806 100644 --- a/bobpower/changelog.txt +++ b/bobpower/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.1 +Date: ??? + Bugfixes: + - Fixed reactor descriptions #162 +--------------------------------------------------------------------------------------------------- Version: 1.2.0 Date: 22. 12. 2023 Bugfixes: diff --git a/bobpower/info.json b/bobpower/info.json index 376ba8ca5..65bbc3a33 100644 --- a/bobpower/info.json +++ b/bobpower/info.json @@ -1,6 +1,6 @@ { "name": "bobpower", - "version": "1.2.0", + "version": "1.2.1", "factorio_version": "1.1", "title": "Bob's Power mod", "author": "Bobingabout", diff --git a/bobpower/locale/en/bobpower.cfg b/bobpower/locale/en/bobpower.cfg index 7ccab195b..535f9f014 100644 --- a/bobpower/locale/en/bobpower.cfg +++ b/bobpower/locale/en/bobpower.cfg @@ -120,7 +120,7 @@ fluid-reactor=A retrofit steel furnace, the fluid burning heat source burns flui heat-pipe=The heat pipe can transport heat over longer distances and connect devices which produce and use heat.\nMax. temperature __1__°C. -nuclear-reactor=Uses uranium and plutonium fuel cells to generate heat. The heat output increases when built next to other reactors.\nMax. temperature __1__°C. +reactor-max-temperature=\nMax. temperature __1__°C. oil-boiler=Burns liquid fuel to turn water into steam. diff --git a/bobpower/prototypes/entity/nuclear.lua b/bobpower/prototypes/entity/nuclear.lua index 0dd1ed106..377d79224 100644 --- a/bobpower/prototypes/entity/nuclear.lua +++ b/bobpower/prototypes/entity/nuclear.lua @@ -3,7 +3,7 @@ if settings.startup["bobmods-power-nuclear"].value == true then data.raw.reactor["nuclear-reactor"].fast_replaceable_group = "nuclear-reactor" data.raw.reactor["nuclear-reactor"].use_fuel_glow_color = true data.raw.reactor["nuclear-reactor"].default_fuel_glow_color = { 0, 1, 0, 1 } -- color used as working_light_picture tint for fuels that don't have glow color defined - data.raw.reactor["nuclear-reactor"].localised_description = { "entity-description.nuclear-reactor", 1000 } + data.raw.reactor["nuclear-reactor"].localised_description = { "", { "entity-description.nuclear-reactor" }, { "entity-description.reactor-max-temperature", 1000 } } data.raw.reactor["nuclear-reactor"].working_light_picture = { filename = "__bobpower__/graphics/nuclear-reactor/reactor-lights.png", width = 160, @@ -27,7 +27,7 @@ if settings.startup["bobmods-power-nuclear"].value == true then data.raw.reactor["nuclear-reactor"], { name = "nuclear-reactor-2", - localised_description = { "entity-description.nuclear-reactor", 1250 }, + localised_description = { "", { "entity-description.nuclear-reactor" }, { "entity-description.reactor-max-temperature", 1250 } }, icon = "__base__/graphics/icons/nuclear-reactor.png", icon_size = 64, icon_mipmaps = 4, @@ -92,7 +92,7 @@ if settings.startup["bobmods-power-nuclear"].value == true then data.raw.reactor["nuclear-reactor"], { name = "nuclear-reactor-3", - localised_description = { "entity-description.nuclear-reactor", 1500 }, + localised_description = { "", { "entity-description.nuclear-reactor" }, { "entity-description.reactor-max-temperature", 1500 } }, icon = "__base__/graphics/icons/nuclear-reactor.png", icon_size = 64, icon_mipmaps = 4, diff --git a/bobrevamp/changelog.txt b/bobrevamp/changelog.txt index e71f80598..30cd1c958 100644 --- a/bobrevamp/changelog.txt +++ b/bobrevamp/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.1 +Date: ??? + Bugfixes: + - Fixed reactor descriptions #162 +--------------------------------------------------------------------------------------------------- Version: 1.2.0 Date: 22. 12. 2023 Changes: diff --git a/bobrevamp/data-updates.lua b/bobrevamp/data-updates.lua index 7db41107a..1655981fd 100644 --- a/bobrevamp/data-updates.lua +++ b/bobrevamp/data-updates.lua @@ -175,7 +175,8 @@ then data.raw.item["nuclear-reactor"].localised_name = { "entity-name.uranium-reactor" } data.raw.reactor["nuclear-reactor"].localised_name = { "entity-name.uranium-reactor" } data.raw["fuel-category"]["nuclear"].localised_name = { "fuel-category-name.uranium" } - + data.raw.reactor["nuclear-reactor"].localised_description = { "", { "entity-description.uranium-reactor" }, { "entity-description.reactor-max-temperature", 1000 } } + data:extend({ { type = "fuel-category", @@ -184,6 +185,7 @@ then }) data.raw.reactor["nuclear-reactor-2"].energy_source.fuel_category = "thorium" data.raw.reactor["nuclear-reactor-2"].localised_name = { "entity-name.thorium-reactor" } + data.raw.reactor["nuclear-reactor-2"].localised_description = { "", { "entity-description.thorium-reactor" }, { "entity-description.reactor-max-temperature", 1250 } } data.raw.reactor["nuclear-reactor-2"].default_fuel_glow_color = { r = 1.0, g = 1.0, b = 0.0 } data.raw.reactor["nuclear-reactor-2"].icon = "__bobrevamp__/graphics/icons/thorium-reactor.png" data.raw.reactor["nuclear-reactor-2"].icon_size = 32 @@ -232,6 +234,7 @@ then }) data.raw.reactor["nuclear-reactor-3"].energy_source.fuel_category = "deuterium" data.raw.reactor["nuclear-reactor-3"].localised_name = { "entity-name.deuterium-reactor" } + data.raw.reactor["nuclear-reactor-3"].localised_description = { "", { "entity-description.deuterium-reactor" }, { "entity-description.reactor-max-temperature", 1500 } } data.raw.reactor["nuclear-reactor-3"].icon_size = 32 data.raw.reactor["nuclear-reactor-3"].icon_mipmaps = nil diff --git a/bobrevamp/info.json b/bobrevamp/info.json index f76f93901..b17fa1dfe 100644 --- a/bobrevamp/info.json +++ b/bobrevamp/info.json @@ -1,6 +1,6 @@ { "name": "bobrevamp", - "version": "1.2.0", + "version": "1.2.1", "factorio_version": "1.1", "title": "Bob's Revamp mod", "author": "Bobingabout", diff --git a/bobrevamp/locale/en/bobrevamp.cfg b/bobrevamp/locale/en/bobrevamp.cfg index 3b428b21a..e37ccfd1e 100644 --- a/bobrevamp/locale/en/bobrevamp.cfg +++ b/bobrevamp/locale/en/bobrevamp.cfg @@ -15,6 +15,11 @@ uranium-reactor=Uranium reactor thorium-reactor=Thorium reactor deuterium-reactor=Deuterium reactor +[entity-description] +uranium-reactor=Uses uranium and plutonium fuel cells to generate heat. The heat output increases when built next to other reactors. +thorium-reactor=Uses thorium fuel cells to generate heat. The heat output increases when built next to other reactors. +deuterium-reactor=Uses deuterium fuel cells to generate heat. The heat output increases when built next to other reactors. + [item-name] heat-shield-tile=Heat shielding tile diff --git a/bobrevamp/settings.lua b/bobrevamp/settings.lua index 0be99e8bb..c9322af1b 100644 --- a/bobrevamp/settings.lua +++ b/bobrevamp/settings.lua @@ -4,6 +4,7 @@ data:extend({ name = "bobmods-revamp-nuclear", setting_type = "startup", default_value = true, + hidden = not (mods["bobplates"] and mods["bobpower"]), }, { type = "bool-setting",