Skip to content

Commit

Permalink
Fix reactor descriptions: fuel requirements (#162)
Browse files Browse the repository at this point in the history
* Fix i18n of tiered reactor desciption fuel requirements.

* Hide revamp setting Nuclear power overhaul #162

Setting only has effect if Power and MCI mods are enabled

* Fixed reactor descriptions #162

MCI: Overwrites description to say nuclear rather than uranium fuel cells
Power: Adds max temperature info
Revamp: Separate descriptions for Uranium / Thorium / Deuterium reactor. Plus max temperature info

* Update version numbers and changelogs #162

---------

Co-authored-by: KiwiHawk <[email protected]>
  • Loading branch information
dmeltzer and KiwiHawk authored Feb 8, 2024
1 parent ab155d0 commit 646f085
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 8 deletions.
5 changes: 5 additions & 0 deletions bobplates/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 1.2.1
Date: ???
Bugfixes:
- Fixed reactor descriptions #162
---------------------------------------------------------------------------------------------------
Version: 1.2.0
Date: 22. 12. 2023
Bugfixes:
Expand Down
2 changes: 1 addition & 1 deletion bobplates/info.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 2 additions & 0 deletions bobplates/locale/en/bobplates.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions bobpower/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 1.2.1
Date: ???
Bugfixes:
- Fixed reactor descriptions #162
---------------------------------------------------------------------------------------------------
Version: 1.2.0
Date: 22. 12. 2023
Bugfixes:
Expand Down
2 changes: 1 addition & 1 deletion bobpower/info.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion bobpower/locale/en/bobpower.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
6 changes: 3 additions & 3 deletions bobpower/prototypes/entity/nuclear.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions bobrevamp/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 1.2.1
Date: ???
Bugfixes:
- Fixed reactor descriptions #162
---------------------------------------------------------------------------------------------------
Version: 1.2.0
Date: 22. 12. 2023
Changes:
Expand Down
5 changes: 4 additions & 1 deletion bobrevamp/data-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion bobrevamp/info.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
5 changes: 5 additions & 0 deletions bobrevamp/locale/en/bobrevamp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions bobrevamp/settings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 646f085

Please sign in to comment.