Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bobgreenhouse/prototypes/updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ if data.raw.item["bob-glass"] then
bobmods.lib.recipe.replace_ingredient("bob-greenhouse", "copper-plate", "bob-glass")
end

if data.raw.fluid["bob-ammonia"] and data.raw.fluid["bob-nitric-acid"] then
if data.raw.fluid["ammonia"] and data.raw.fluid["bob-nitric-acid"] then
data.raw.recipe["bob-fertiliser"].ingredients = {
{ type = "fluid", name = "bob-nitric-acid", amount = 10 },
{ type = "fluid", name = "bob-ammonia", amount = 10 },
{ type = "fluid", name = "ammonia", amount = 10 },
}
elseif data.raw.fluid["bob-nitrogen"] then
data.raw.recipe["bob-fertiliser"].ingredients = {
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": "2.0.5",
"version": "2.0.6",
"factorio_version": "2.0",
"title": "Bob's Revamp mod",
"author": "Bobingabout",
Expand Down
2 changes: 1 addition & 1 deletion bobrevamp/locale/cs/bobrevamp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bob-rtg=Radiotermoelektrický generátor


[fluid-name]
bob-ammonia=Amoniak
ammonia=Amoniak
bob-dinitrogen-tetroxide=Oxid dusičitý
bob-hydrazine=Hydrazin
bob-hydrogen-peroxide=Peroxid vodíku
Expand Down
2 changes: 1 addition & 1 deletion bobrevamp/locale/de/bobrevamp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bob-rtg=Radionuklidbatterie


[fluid-name]
bob-ammonia=Ammoniak
ammonia=Ammoniak
bob-dinitrogen-tetroxide=Distickstofftetroxid
bob-hydrazine=Hydrazin
bob-hydrogen-peroxide=Wasserstoffperoxid
Expand Down
2 changes: 1 addition & 1 deletion bobrevamp/locale/en/bobrevamp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bob-rtg=Radio thermoelectric generator


[fluid-name]
bob-ammonia=Ammonia
ammonia=Ammonia
bob-dinitrogen-tetroxide=Dinitrogen tetroxide
bob-hydrazine=Hydrazine
bob-hydrogen-peroxide=Hydrogen peroxide
Expand Down
2 changes: 1 addition & 1 deletion bobrevamp/locale/fr/bobrevamp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bob-rtg=Générateur de radio thermoélectrique


[fluid-name]
bob-ammonia=Ammoniaque
ammonia=Ammoniaque
bob-dinitrogen-tetroxide=Peroxyde d'azote
bob-hydrazine=Hydrazine
bob-hydrogen-peroxide=Peroxyde d'hydrogène
Expand Down
2 changes: 1 addition & 1 deletion bobrevamp/locale/it/bobrevamp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ bob-heat-shield-tile=Piastra dello scudo termico


[fluid-name]
bob-ammonia=Ammoniaca
ammonia=Ammoniaca
bob-dinitrogen-tetroxide=Triossido di diazoto
bob-hydrazine=Idrazina
bob-hydrogen-peroxide=Perossido di idrogeno
Expand Down
2 changes: 1 addition & 1 deletion bobrevamp/locale/ja/bobrevamp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bob-rtg=無線熱電発電機


[fluid-name]
bob-ammonia=アンモニア
ammonia=アンモニア
bob-dinitrogen-tetroxide=四酸化二窒素
bob-hydrazine=ヒドラジン
bob-hydrogen-peroxide=過酸化水素
Expand Down
4 changes: 2 additions & 2 deletions bobrevamp/locale/ko/bobrevamp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ bob-sodium-cobaltate=코발트산 나트륨
bob-rtg=방사성동위원소 열전발전기

[fluid-name]
bob-ammonia=암모니아
ammonia=암모니아
bob-dinitrogen-tetroxide=사산화 이질소
bob-hydrazine=하이드라진
bob-hydrogen-peroxide=과산화 수소
Expand Down Expand Up @@ -73,4 +73,4 @@ bobmods-revamp-nuclear=원자력 개편
bobmods-revamp-old-oil=활성화하면, 원유 처리 공정을 개편합니다.\n또한 기본 게임의 황, 황산 제작법을 제거하고 Mining Space Industries 모드가 설치된 경우 황이나 이산화 황을 얻을 수 있는 수단을 추가합니다.
bobmods-revamp-oil=활성화하면, 원유 처리 공정을 보다 현실적으로 개편합니다.\n원유 처리에 석유 가스 대신 석유 가스로 처리 할 수 있는 사워 가스로 대체합니다.\nMCI 모드가 설치된 경우 기본 게임의 황, 황산 제작법을 제거하고 사워 가스 처리 제작법에 황화수소가 필요하도록 추가합니다.\n이 설정은 다른 석유 및 황 개편 설정보다 우선적으로 적용됩니다.
bobmods-revamp-hardmode=활성화하면, 단순화된 화학 공정 중 일부를 확장하여 보다 현실적으로 만듭니다.\n이 설정은 이산화 질소, 질산, 황산, 과염소산 리튬, 염화칼슘, 탄산 나트륨, 산화 코발트, 석유 가스 열분해를 수소 제작법에 적용합니다.
bobmods-revamp-nuclear=활성화하면, 원자로 MK2를 토륨 원자로로, 원자로 MK3를 중수소 원자로로 변경하고 기술 연구를 이에 맞게 재구성합니다.
bobmods-revamp-nuclear=활성화하면, 원자로 MK2를 토륨 원자로로, 원자로 MK3를 중수소 원자로로 변경하고 기술 연구를 이에 맞게 재구성합니다.
2 changes: 1 addition & 1 deletion bobrevamp/locale/nl/bobrevamp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bob-rtg=Radio Thermo-elektrische generator


[fluid-name]
bob-ammonia=Ammoniak
ammonia=Ammoniak
bob-dinitrogen-tetroxide=Distikstoftetroxide
bob-hydrazine=Hydrazine
bob-hydrogen-peroxide=Waterstofperoxide
Expand Down
2 changes: 1 addition & 1 deletion bobrevamp/locale/pl/bobrevamp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bob-rtg=Radioizotopowy generator termoelektryczny


[fluid-name]
bob-ammonia=Amoniak
ammonia=Amoniak
bob-dinitrogen-tetroxide=Tetratlenek diazotu
bob-hydrazine=Hydrazyna
bob-hydrogen-peroxide=Nadtlenek wodoru
Expand Down
2 changes: 1 addition & 1 deletion bobrevamp/locale/pt-BR/bobrevamp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bob-rtg=Gerador termoelétrico de radioisótopos


[fluid-name]
bob-ammonia=Amônia
ammonia=Amônia
bob-dinitrogen-tetroxide=Tetróxido de dinitrogênio
bob-hydrazine=Hidrazina
bob-hydrogen-peroxide=Peróxido de hidrogênio
Expand Down
2 changes: 1 addition & 1 deletion bobrevamp/locale/ru/bobrevamp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bob-rtg=РИТЭГ


[fluid-name]
bob-ammonia=Аммиак
ammonia=Аммиак
bob-dinitrogen-tetroxide=Тетраоксид диазота
bob-hydrazine=Гидразин
bob-hydrogen-peroxide=Перекись водорода
Expand Down
2 changes: 1 addition & 1 deletion bobrevamp/locale/tr/bobrevamp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bob-rtg=Radyo Termoelektrik Üreteç


[fluid-name]
bob-ammonia=Amonyak
ammonia=Amonyak
bob-dinitrogen-tetroxide=Azot tetroksit
bob-hydrazine=Hidrazin
bob-hydrogen-peroxide=Hidrojen peroksit
Expand Down
2 changes: 1 addition & 1 deletion bobrevamp/locale/uk/bobrevamp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bob-rtg=Радіотермоелектричний генератор


[fluid-name]
bob-ammonia=Аміак
ammonia=Аміак
bob-dinitrogen-tetroxide=Азотний тетраоксид
bob-hydrazine=Гідразин
bob-hydrogen-peroxide=Гідроген пероксид
Expand Down
2 changes: 1 addition & 1 deletion bobrevamp/locale/zh-CN/bobrevamp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bob-rtg=放射性同位素温差发电机


[fluid-name]
bob-ammonia=氨
ammonia=氨
bob-dinitrogen-tetroxide=四氧化氮
bob-hydrazine=肼
bob-hydrogen-peroxide=过氧化氢
Expand Down
2 changes: 1 addition & 1 deletion bobrevamp/locale/zh-TW/bobrevamp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bob-rtg=放射性熱電發電機


[fluid-name]
bob-ammonia=氨
ammonia=氨
bob-dinitrogen-tetroxide=四氧化二氮
bob-hydrazine=聯氨
bob-hydrogen-peroxide=過氧化氫
Expand Down
6 changes: 0 additions & 6 deletions bobrevamp/migrations/bobrevamp_2.0.0.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"fluid":
[
["ammonia", "bob-ammonia"],
["ammoniated-brine", "bob-ammoniated-brine"],
["brine", "bob-brine"],
["carbon-dioxide", "bob-carbon-dioxide"],
Expand All @@ -13,7 +12,6 @@
],
"item":
[
["ammonia-barrel", "bob-ammonia-barrel"],
["ammoniated-brine-barrel", "bob-ammoniated-brine-barrel"],
["ammonium-chloride", "bob-ammonium-chloride"],
["brine-barrel", "bob-brine-barrel"],
Expand All @@ -34,15 +32,13 @@
],
"recipe":
[
["ammonia", "bob-ammonia"],
["ammoniated-brine", "bob-ammoniated-brine"],
["ammonium-chloride-recycling", "bob-ammonium-chloride-reprocessing"],
["brine", "bob-brine"],
["brine-electrolysis", "bob-brine-electrolysis"],
["carbon-dioxide", "bob-carbon-dioxide"],
["carbon-dioxide-oil-processing", "bob-carbon-dioxide-oil-processing"],
["dinitrogen-tetroxide", "bob-dinitrogen-tetroxide"],
["empty-ammonia-barrel", "empty-bob-ammonia-barrel"],
["empty-ammoniated-brine-barrel", "empty-bob-ammoniated-brine-barrel"],
["empty-brine-barrel", "empty-bob-brine-barrel"],
["empty-carbon-dioxide-barrel", "empty-bob-carbon-dioxide-barrel"],
Expand All @@ -52,7 +48,6 @@
["empty-nitric-oxide-barrel", "empty-bob-nitric-oxide-barrel"],
["empty-sour-gas-barrel", "empty-bob-sour-gas-barrel"],
["enriched-fuel-from-hydrazine", "bob-enriched-fuel-from-hydrazine"],
["fill-ammonia-barrel", "bob-ammonia-barrel"],
["fill-ammoniated-brine-barrel", "bob-ammoniated-brine-barrel"],
["fill-brine-barrel", "bob-brine-barrel"],
["fill-carbon-dioxide-barrel", "bob-carbon-dioxide-barrel"],
Expand All @@ -74,7 +69,6 @@
["sodium-cobaltate", "bob-sodium-cobaltate"],
["sodium-perchlorate", "bob-sodium-perchlorate"],
["solid-fuel-from-sour-gas", "bob-solid-fuel-from-sour-gas"],
["void-ammonia", "void-bob-ammonia"],
["void-carbon-dioxide", "void-bob-carbon-dioxide"],
["void-sour-gas", "void-bob-sour-gas"]
],
Expand Down
17 changes: 17 additions & 0 deletions bobrevamp/migrations/bobrevamp_2.0.6.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"fluid":
[
["bob-ammonia", "ammonia"]
],
"item":
[
["bob-ammonia-barrel", "ammonia-barrel"]
],
"recipe":
[
["bob-ammonia", "ammonia"],
["empty-bob-ammonia-barrel", "empty-ammonia-barrel"],
["bob-ammonia-barrel", "ammonia-barrel"],
["void-bob-ammonia", "void-ammonia"]
]
}
8 changes: 4 additions & 4 deletions bobrevamp/prototypes/rocket-fuel-updates.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if data.raw.fluid["bob-ammonia"] and data.raw.fluid["bob-hydrazine"] and data.raw.fluid["bob-dinitrogen-tetroxide"] then
if data.raw.fluid["ammonia"] and data.raw.fluid["bob-hydrazine"] and data.raw.fluid["bob-dinitrogen-tetroxide"] then
if data.raw.fluid["bob-pure-water"] then
bobmods.lib.recipe.remove_result("bob-hydrazine", "water")
bobmods.lib.recipe.add_result("bob-hydrazine", { type = "fluid", name = "bob-pure-water", amount = 4 })
Expand All @@ -20,10 +20,10 @@ if data.raw.fluid["bob-ammonia"] and data.raw.fluid["bob-hydrazine"] and data.ra
data.raw.item["rocket-fuel"].fuel_emissions_multiplier = 1.2

if data.raw.technology["bob-nitrogen-processing"] then
bobmods.lib.tech.add_recipe_unlock("bob-nitrogen-processing", "bob-ammonia")
bobmods.lib.tech.add_recipe_unlock("bob-nitrogen-processing", "ammonia")
bobmods.lib.tech.add_prerequisite("bob-hydrazine", "bob-nitrogen-processing")
else
bobmods.lib.tech.add_recipe_unlock("bob-chemical-plant", "bob-ammonia")
bobmods.lib.tech.add_recipe_unlock("bob-chemical-plant", "ammonia")
bobmods.lib.tech.add_recipe_unlock("bob-chemical-plant", "bob-nitrogen-dioxide")
bobmods.lib.tech.add_prerequisite("bob-hydrazine", "bob-chemical-plant")
end
Expand All @@ -35,7 +35,7 @@ if data.raw.fluid["bob-ammonia"] and data.raw.fluid["bob-hydrazine"] and data.ra
bobmods.lib.tech.add_prerequisite("bob-hydrazine", "flammables")
end

bobmods.lib.create_gas_bottle(data.raw.fluid["bob-ammonia"])
bobmods.lib.create_gas_bottle(data.raw.fluid["ammonia"])
bobmods.lib.create_gas_bottle(data.raw.fluid["bob-nitrogen-dioxide"])

if data.raw.fluid["bob-nitric-oxide"] then
Expand Down
14 changes: 7 additions & 7 deletions bobrevamp/prototypes/rocket-fuel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ if data.raw.fluid["bob-hydrogen"] and data.raw.fluid["bob-oxygen"] and data.raw.
data:extend({
{
type = "fluid",
name = "bob-ammonia",
name = "ammonia",
icon = "__bobrevamp__/graphics/icons/ammonia.png",
icon_size = 64,
subgroup = "fluid",
Expand Down Expand Up @@ -85,7 +85,7 @@ if data.raw.fluid["bob-hydrogen"] and data.raw.fluid["bob-oxygen"] and data.raw.
data:extend({
{
type = "recipe",
name = "bob-ammonia",
name = "ammonia",
icon = "__bobrevamp__/graphics/icons/ammonia.png",
icon_size = 64,
order = "b[fluid-chemistry]-b[ammonia]",
Expand All @@ -98,9 +98,9 @@ if data.raw.fluid["bob-hydrogen"] and data.raw.fluid["bob-oxygen"] and data.raw.
{ type = "fluid", name = "bob-hydrogen", amount = 24 },
},
results = {
{ type = "fluid", name = "bob-ammonia", amount = 20 },
{ type = "fluid", name = "ammonia", amount = 20 },
},
main_product = "bob-ammonia",
main_product = "ammonia",
crafting_machine_tint = {
primary = { r = 0.0, g = 0.0, b = 1.0, a = 0.000 },
secondary = { r = 0.7, g = 0.7, b = 0.7, a = 0.000 },
Expand Down Expand Up @@ -144,7 +144,7 @@ if data.raw.fluid["bob-hydrogen"] and data.raw.fluid["bob-oxygen"] and data.raw.
subgroup = "fluid-recipes",
enabled = false,
ingredients = {
{ type = "fluid", name = "bob-ammonia", amount = 20 },
{ type = "fluid", name = "ammonia", amount = 20 },
{ type = "fluid", name = "bob-hydrogen-peroxide", amount = 4 },
},
results = {
Expand Down Expand Up @@ -210,7 +210,7 @@ if data.raw.fluid["bob-hydrogen"] and data.raw.fluid["bob-oxygen"] and data.raw.
})

if bobmods.plates.make_void_fluid_recipe then
bobmods.plates.make_void_fluid_recipe("bob-ammonia", 25, 15)
bobmods.plates.make_void_fluid_recipe("ammonia", 25, 15)
end

if settings.startup["bobmods-revamp-hardmode"].value == true then
Expand Down Expand Up @@ -241,7 +241,7 @@ if data.raw.fluid["bob-hydrogen"] and data.raw.fluid["bob-oxygen"] and data.raw.
subgroup = "fluid-recipes",
enabled = false,
ingredients = {
{ type = "fluid", name = "bob-ammonia", amount = 20 },
{ type = "fluid", name = "ammonia", amount = 20 },
{ type = "fluid", name = "bob-oxygen", amount = 25 },
},
results = {
Expand Down
4 changes: 2 additions & 2 deletions bobrevamp/prototypes/rtg.lua
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then
enabled = false,
ingredients = {
{ type = "fluid", name = "bob-brine", amount = 10 },
{ type = "fluid", name = "bob-ammonia", amount = 25 },
{ type = "fluid", name = "ammonia", amount = 25 },
},
results = {
{ type = "fluid", name = "bob-ammoniated-brine", amount = 10 },
Expand Down Expand Up @@ -201,7 +201,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then
},
results = {
{ type = "item", name = "bob-calcium-chloride", amount = 1 },
{ type = "fluid", name = "bob-ammonia", amount = 50 },
{ type = "fluid", name = "ammonia", amount = 50 },
{ type = "fluid", name = "water", amount = 10 },
},
crafting_machine_tint = {
Expand Down