Skip to content

Commit

Permalink
Earlier bots (#182)
Browse files Browse the repository at this point in the history
* Robot tiers #180

* Robot tiers #180

* Robot tiers #180

- Remove red circuits from recipes for red and yellow chests
- Leave blue chests at blue science

* Robot tiers #180

Remove roboport recipe update setting

* Robot tiers #180

Use red circuits for T1 roboports

* Adding missing prerequisites

* Robot tiers #180

* Missing prerequisites

* Robot tiers #180

* Robot tiers #180

* Format Code

---------

Co-authored-by: StyLuaFormatter <[email protected]>
  • Loading branch information
KiwiHawk and KiwiHawk authored May 27, 2024
1 parent 5221433 commit 44f8f27
Show file tree
Hide file tree
Showing 30 changed files with 116 additions and 92 deletions.
5 changes: 5 additions & 0 deletions bobclasses/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 1.3.0
Date: ???
Changes:
- Reduced the tier of electronics required for player brains #180
---------------------------------------------------------------------------------------------------
Version: 1.2.1
Date: 21. 02. 2024
Changes:
Expand Down
2 changes: 1 addition & 1 deletion bobclasses/info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bobclasses",
"version": "1.2.1",
"version": "1.3.0",
"factorio_version": "1.1",
"title": "Bob's Classes and Multiple characters mod",
"author": "Bobingabout",
Expand Down
3 changes: 2 additions & 1 deletion bobclasses/prototypes/bodies.lua
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ data:extend({
},
prerequisites = {
"robotics",
"advanced-electronics-2",
"advanced-electronics",
"automation-2",
},
unit = {
Expand Down Expand Up @@ -559,6 +559,7 @@ data:extend({
prerequisites = {
"bodies",
"production-science-pack",
"advanced-electronics-2",
},
unit = {
count = 250,
Expand Down
2 changes: 1 addition & 1 deletion bobclasses/prototypes/parts.lua
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ data:extend({
enabled = false,
ingredients = {
{ "battery", 15 },
{ "processing-unit", 50 },
{ "advanced-circuit", 50 },
},
result = "player-power-core",
},
Expand Down
14 changes: 3 additions & 11 deletions bobclasses/prototypes/recipe-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -37,33 +37,25 @@ if data.raw["recipe-category"]["electronics"] then
end

if
data.raw.item["superior-circuit-board"]
data.raw.item["circuit-board"]
and data.raw.item["basic-electronic-components"]
and data.raw.item["electronic-components"]
and data.raw.item["intergrated-electronics"]
and data.raw.item["processing-electronics"]
then
bobmods.lib.recipe.add_ingredient("player-brain", { "superior-circuit-board", 5 })
bobmods.lib.recipe.add_ingredient("player-brain", { "circuit-board", 5 })
bobmods.lib.recipe.add_ingredient("player-brain", { "basic-electronic-components", 10 })
bobmods.lib.recipe.add_ingredient("player-brain", { "electronic-components", 25 })
bobmods.lib.recipe.add_ingredient("player-brain", { "intergrated-electronics", 10 })

bobmods.lib.recipe.add_ingredient("player-brain-2", { "superior-circuit-board", 8 })
bobmods.lib.recipe.add_ingredient("player-brain-2", { "basic-electronic-components", 8 })
bobmods.lib.recipe.add_ingredient("player-brain-2", { "electronic-components", 30 })
bobmods.lib.recipe.add_ingredient("player-brain-2", { "intergrated-electronics", 20 })
bobmods.lib.recipe.add_ingredient("player-brain-2", { "processing-electronics", 2 })
if data.raw.technology["advanced-electronics-3"] then
bobmods.lib.tech.add_prerequisite("bodies-2", "advanced-electronics-3")
end
if data.raw.item["solder"] then
bobmods.lib.recipe.add_ingredient("player-brain", { "solder", 5 })

bobmods.lib.recipe.add_ingredient("player-brain-2", { "solder", 10 })
end
else
bobmods.lib.recipe.add_ingredient("player-brain", { "advanced-circuit", 10 })
bobmods.lib.recipe.add_ingredient("player-brain", { "processing-unit", 5 })
bobmods.lib.recipe.add_ingredient("player-brain", { "advanced-circuit", 20 })

bobmods.lib.recipe.add_ingredient("player-brain-2", { "advanced-circuit", 10 })
bobmods.lib.recipe.add_ingredient("player-brain-2", { "processing-unit", 10 })
Expand Down
5 changes: 5 additions & 0 deletions bobequipment/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 1.3.0
Date: ???
Changes:
- Reduced the tier of electronics required for Personal roboport robot control #180
---------------------------------------------------------------------------------------------------
Version: 1.2.1
Date: 21. 02. 2024
Changes:
Expand Down
2 changes: 1 addition & 1 deletion bobequipment/info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bobequipment",
"version": "1.2.1",
"version": "1.3.0",
"factorio_version": "1.1",
"title": "Bob's Personal Equipment mod",
"author": "Bobingabout",
Expand Down
2 changes: 1 addition & 1 deletion bobequipment/prototypes/personal-roboport.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,7 @@ data:extend({
enabled = false,
energy_required = 2,
ingredients = {
{ "advanced-circuit", 5 },
{ "electronic-circuit", 10 },
},
result = "personal-roboport-robot-equipment",
},
Expand Down
4 changes: 2 additions & 2 deletions bobequipment/prototypes/recipe/updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -250,14 +250,14 @@ if
and data.raw.item["electronic-components"]
and data.raw.item["intergrated-electronics"]
and data.raw.item["processing-electronics"]
and data.raw.item["basic-circuit-board"]
and data.raw.item["circuit-board"]
and data.raw.item["superior-circuit-board"]
and data.raw.item["multi-layer-circuit-board"]
then
data.raw.recipe["personal-roboport-robot-equipment"].ingredients = {
{ "circuit-board", 1 },
{ "basic-circuit-board", 1 },
{ "basic-electronic-components", 30 },
{ "electronic-components", 15 },
}

data.raw.recipe["personal-roboport-robot-equipment-2"].ingredients = {
Expand Down
3 changes: 3 additions & 0 deletions bobequipment/prototypes/technology/equipment.lua
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ data:extend({
order = "g-g-c",
prerequisites = {
"night-vision-equipment-2",
"production-science-pack",
},
effects = {
{
Expand Down Expand Up @@ -496,6 +497,7 @@ data:extend({
order = "g-k-d",
prerequisites = {
"solar-panel-equipment-3",
"production-science-pack",
},
effects = {
{
Expand Down Expand Up @@ -719,6 +721,7 @@ data:extend({
order = "g-h-c",
prerequisites = {
"exoskeleton-equipment-2",
"production-science-pack",
},
effects = {
{
Expand Down
5 changes: 5 additions & 0 deletions boblogistics/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 1.3.0
Date: ???
Changes:
- Reduced the tier of electronics required for T1 robots #180
---------------------------------------------------------------------------------------------------
Version: 1.2.2
Date: 21. 02. 2024
Changes:
Expand Down
2 changes: 1 addition & 1 deletion boblogistics/info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boblogistics",
"version": "1.2.2",
"version": "1.3.0",
"factorio_version": "1.1",
"title": "Bob's Logistics mod",
"author": "Bobingabout",
Expand Down
2 changes: 0 additions & 2 deletions boblogistics/locale/en/boblogistics.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,6 @@ bob-inserter-long=Change inserter long range (pickup and drop)
bobmods-logistics-flyingrobotframes=Flying robot frames
bobmods-logistics-robotparts=Robot parts
bobmods-logistics-robotrequireprevious=Robot require previous tier
bobmods-logistics-roboportrecipeupdate=Roboport recipe update
bobmods-logistics-drainlessinserters=Drainless inserters
bobmods-logistics-disableroboports=Disable Roboports
bobmods-logistics-beltrequireprevious=Belt require previous tier
Expand All @@ -446,7 +445,6 @@ bobmods-logistics-highpipes=Bigger pipes
bobmods-logistics-flyingrobotframes=If set to true, the Flying robot frame intermediates will exist for use in recipes.
bobmods-logistics-robotparts=If set to true, the Logistic/Construction robot tool/brain intermediates will exist for use in recipes.
bobmods-logistics-robotrequireprevious=If set to true, Logistic/Construction robots require the previous tier to craft.
bobmods-logistics-roboportrecipeupdate=If set to true, the recipe for the base game Roboport 1 is updated to the modular recipe.
bobmods-logistics-drainlessinserters=If set to true, the idle power drain will be removed from all Inserters.
bobmods-logistics-disableroboports=If set to true, standard roboports are disabled, causing you to be reliant on the modular roboports
bobmods-logistics-beltrequireprevious=If set to true, Transport belts and related entities require the previous tier to craft.
Expand Down
2 changes: 0 additions & 2 deletions boblogistics/locale/ru/boblogistics.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,6 @@ bob-inserter-long=Изменить радиус действия (подбор
bobmods-logistics-flyingrobotframes=Каркасы дронов
bobmods-logistics-robotparts=Компоненты дронов
bobmods-logistics-robotrequireprevious=Улучшенные дроны создаются с использованием старых
bobmods-logistics-roboportrecipeupdate=Изменить базовый рецепт дронстанций
bobmods-logistics-drainlessinserters=Простаивающие манипуляторы не требуют энергии
bobmods-logistics-disableroboports=Отключить дронстанции
bobmods-logistics-beltrequireprevious=Улучшенные конвейеры создаются с использованием старых
Expand All @@ -446,7 +445,6 @@ bobmods-logistics-highpipes=Трубы большего размера
bobmods-logistics-flyingrobotframes=Включает использование компонента "Каркас дрона" в рецептах дронов.
bobmods-logistics-robotparts=Включает использование компонентов мозг/инструмент в рецептах дронов.
bobmods-logistics-robotrequireprevious=Если включено, то улучшенные дроны будут требовать для создания дрона предыдущего уровня.
bobmods-logistics-roboportrecipeupdate=Изменяет рецепт дронстанции из базовой игры чтобы соответствовать новым модульным рецептам.
bobmods-logistics-drainlessinserters=Манипуляторы во время простоя не потребляют энергию.
bobmods-logistics-disableroboports=Отключает стандартные дронстанции, в результате чего придётся пользоваться модульными дронстанциями
bobmods-logistics-beltrequireprevious=Если включено, то улучшенные конвейеры будут требовать для создания конвейер предыдущего уровня.
Expand Down
5 changes: 3 additions & 2 deletions boblogistics/prototypes/recipe/roboport-parts-recipe.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ data:extend({
ingredients = {
{ "steel-plate", 1 },
{ "copper-cable", 2 },
{ "advanced-circuit", 5 },
{ "electronic-circuit", 5 },
},
result = "roboport-antenna-1",
energy_required = 0.2,
Expand Down Expand Up @@ -57,7 +57,8 @@ data:extend({
enabled = false,
ingredients = {
{ "steel-plate", 2 },
{ "advanced-circuit", 5 },
{ "electronic-circuit", 5 },
{ "battery", 2 },
},
result = "roboport-chargepad-1",
energy_required = 1,
Expand Down
17 changes: 6 additions & 11 deletions boblogistics/prototypes/recipe/roboport-recipe-updates.lua
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
if settings.startup["bobmods-logistics-roboportrecipeupdate"].value == true then
if bobmods.lib.recipe.set_ingredients then
bobmods.lib.recipe.set_ingredients(
"roboport",
{ { "steel-plate", 15 }, { "roboport-antenna-1", 5 }, { "roboport-chargepad-1", 4 }, { "roboport-door-1", 1 } }
)
else
data.raw.recipe["roboport"].ingredients =
{ { "steel-plate", 15 }, { "roboport-antenna-1", 5 }, { "roboport-chargepad-1", 4 }, { "roboport-door-1", 1 } }
end
end
bobmods.lib.recipe.set_ingredients("roboport", {
{ "steel-plate", 15 },
{ "roboport-antenna-1", 5 },
{ "roboport-chargepad-1", 4 },
{ "roboport-door-1", 1 },
})

if data.raw.item["aluminium-plate"] then
bobmods.lib.recipe.replace_ingredient("roboport-antenna-2", "steel-plate", "aluminium-plate")
Expand Down
2 changes: 1 addition & 1 deletion boblogistics/prototypes/recipe/roboport-recipe.lua
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ data:extend({
ingredients = {
{ "steel-plate", 5 },
{ "roboport-antenna-1", 1 },
{ "advanced-circuit", 2 },
{ "electronic-circuit", 2 },
},
result = "bob-logistic-zone-interface",
energy_required = 2,
Expand Down
51 changes: 21 additions & 30 deletions boblogistics/prototypes/recipe/robots-recipe-updates.lua
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
bobmods.lib.recipe.remove_ingredient("logistic-chest-passive-provider", "advanced-circuit")
bobmods.lib.recipe.remove_ingredient("logistic-chest-storage", "advanced-circuit")

if settings.startup["bobmods-logistics-robotrequireprevious"].value == true then
bobmods.lib.recipe.add_ingredient("bob-logistic-robot-2", { "logistic-robot", 1 })
bobmods.lib.recipe.add_ingredient("bob-construction-robot-2", { "construction-robot", 1 })
Expand All @@ -11,41 +14,29 @@ if data.raw.recipe["robot-brain-logistic"] then
if data.raw["recipe-category"]["electronics"] then
data.raw.recipe["robot-brain-logistic"].category = "electronics"
end
if
data.raw.item["circuit-board"]
and data.raw.item["basic-electronic-components"]
and data.raw.item["electronic-components"]
then
bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "circuit-board", 1 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "basic-electronic-components", 6 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "electronic-components", 4 })
if data.raw.item["basic-circuit-board"] and data.raw.item["basic-electronic-components"] then
bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "basic-circuit-board", 1 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "basic-electronic-components", 8 })
if data.raw.item["solder"] then
bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "solder", 5 })
end
else
bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "electronic-circuit", 2 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "advanced-circuit", 2 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "electronic-circuit", 4 })
end
end

if data.raw.recipe["robot-brain-construction"] then
if data.raw["recipe-category"]["electronics"] then
data.raw.recipe["robot-brain-construction"].category = "electronics"
end
if
data.raw.item["circuit-board"]
and data.raw.item["basic-electronic-components"]
and data.raw.item["electronic-components"]
then
bobmods.lib.recipe.add_ingredient("robot-brain-construction", { "circuit-board", 1 })
if data.raw.item["basic-circuit-board"] and data.raw.item["basic-electronic-components"] then
bobmods.lib.recipe.add_ingredient("robot-brain-construction", { "basic-circuit-board", 1 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction", { "basic-electronic-components", 8 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction", { "electronic-components", 3 })
if data.raw.item["solder"] then
bobmods.lib.recipe.add_ingredient("robot-brain-construction", { "solder", 5 })
end
else
bobmods.lib.recipe.add_ingredient("robot-brain-construction", { "electronic-circuit", 3 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction", { "advanced-circuit", 1 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction", { "electronic-circuit", 4 })
end
end

Expand Down Expand Up @@ -79,8 +70,8 @@ if data.raw.recipe["robot-brain-construction-2"] then
and data.raw.item["electronic-components"]
then
bobmods.lib.recipe.add_ingredient("robot-brain-construction-2", { "circuit-board", 1 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction-2", { "basic-electronic-components", 12 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction-2", { "electronic-components", 4 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction-2", { "basic-electronic-components", 10 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction-2", { "electronic-components", 6 })
if data.raw.item["solder"] then
bobmods.lib.recipe.add_ingredient("robot-brain-construction-2", { "solder", 5 })
end
Expand All @@ -101,9 +92,9 @@ if data.raw.recipe["robot-brain-logistic-3"] then
and data.raw.item["intergrated-electronics"]
then
bobmods.lib.recipe.add_ingredient("robot-brain-logistic-3", { "superior-circuit-board", 1 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic-3", { "basic-electronic-components", 4 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic-3", { "basic-electronic-components", 8 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic-3", { "electronic-components", 6 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic-3", { "intergrated-electronics", 6 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic-3", { "intergrated-electronics", 4 })
if data.raw.item["solder"] then
bobmods.lib.recipe.add_ingredient("robot-brain-logistic-3", { "solder", 5 })
end
Expand All @@ -124,8 +115,8 @@ if data.raw.recipe["robot-brain-construction-3"] then
and data.raw.item["intergrated-electronics"]
then
bobmods.lib.recipe.add_ingredient("robot-brain-construction-3", { "superior-circuit-board", 1 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction-3", { "basic-electronic-components", 4 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction-3", { "electronic-components", 8 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction-3", { "basic-electronic-components", 8 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction-3", { "electronic-components", 6 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction-3", { "intergrated-electronics", 4 })
if data.raw.item["solder"] then
bobmods.lib.recipe.add_ingredient("robot-brain-construction-3", { "solder", 5 })
Expand All @@ -148,9 +139,9 @@ if data.raw.recipe["robot-brain-logistic-4"] then
and data.raw.item["processing-electronics"]
then
bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "multi-layer-circuit-board", 1 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "basic-electronic-components", 2 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "electronic-components", 4 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "intergrated-electronics", 8 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "basic-electronic-components", 12 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "electronic-components", 8 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "intergrated-electronics", 6 })
bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "processing-electronics", 4 })
if data.raw.item["solder"] then
bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "solder", 5 })
Expand All @@ -177,8 +168,8 @@ if data.raw.recipe["robot-brain-construction-4"] then
and data.raw.item["processing-electronics"]
then
bobmods.lib.recipe.add_ingredient("robot-brain-construction-4", { "multi-layer-circuit-board", 1 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction-4", { "basic-electronic-components", 2 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction-4", { "electronic-components", 6 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction-4", { "basic-electronic-components", 12 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction-4", { "electronic-components", 8 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction-4", { "intergrated-electronics", 6 })
bobmods.lib.recipe.add_ingredient("robot-brain-construction-4", { "processing-electronics", 4 })
if data.raw.item["solder"] then
Expand Down
10 changes: 2 additions & 8 deletions boblogistics/prototypes/technology-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ bobmods.lib.tech.add_prerequisite("worker-robots-storage-1", "bob-robots-1")
if not mods["bobequipment"] then
bobmods.lib.tech.add_prerequisite("personal-roboport-equipment", "chemical-science-pack")
end
bobmods.lib.tech.add_prerequisite("construction-robotics", "advanced-electronics")
bobmods.lib.tech.add_prerequisite("logistic-robotics", "advanced-electronics")

bobmods.lib.tech.replace_prerequisite("lubricant", "advanced-oil-processing", "oil-processing")
bobmods.lib.tech.remove_science_pack("lubricant", "chemical-science-pack")
Expand Down Expand Up @@ -262,10 +260,8 @@ if data.raw.item["silver-zinc-battery"] and data.raw.technology["battery-3"] the
end
end

if settings.startup["bobmods-logistics-roboportrecipeupdate"].value == true then
bobmods.lib.tech.remove_recipe_unlock("construction-robotics", "roboport")
bobmods.lib.tech.remove_recipe_unlock("logistic-robotics", "roboport")
end
bobmods.lib.tech.remove_recipe_unlock("construction-robotics", "roboport")
bobmods.lib.tech.remove_recipe_unlock("logistic-robotics", "roboport")

if settings.startup["bobmods-logistics-robotparts"].value == true then
bobmods.lib.tech.add_recipe_unlock("logistic-robotics", "robot-brain-logistic")
Expand Down Expand Up @@ -376,9 +372,7 @@ end

-- Chest ballancing.
bobmods.lib.tech.remove_recipe_unlock("construction-robotics", "logistic-chest-passive-provider")
bobmods.lib.tech.add_recipe_unlock("logistic-robotics", "logistic-chest-requester")
bobmods.lib.tech.remove_recipe_unlock("logistic-robotics", "logistic-chest-storage")
bobmods.lib.tech.remove_recipe_unlock("logistic-system", "logistic-chest-requester")
bobmods.lib.tech.add_prerequisite("logistic-system", "construction-robotics")

-- Old DyTech compatibillity bullshit
Expand Down
Loading

0 comments on commit 44f8f27

Please sign in to comment.