Merge remote-tracking branch 'cacklingfiend/Bio_Industries_2/main' (Fork sync)

This commit is contained in:
MAGGen-hub 2025-11-02 14:35:59 +03:00
commit 80c904f82a
5 changed files with 122 additions and 142 deletions

3
.editorconfig Normal file
View file

@ -0,0 +1,3 @@
[*]
indent_style = space
indent_size = 2

View file

@ -1,4 +1,9 @@
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
Version: 2.0.28
Date: 01.11.2025
Changes:
- Add wooden rails again (thanks MAGGen)
---------------------------------------------------------------------------------------------------
Version: 2.0.27 Version: 2.0.27
Date: 21.10.2025 Date: 21.10.2025
Changes: Changes:

View file

@ -1,6 +1,6 @@
{ {
"name": "Bio_Industries_2", "name": "Bio_Industries_2",
"version": "2.0.27", "version": "2.0.28",
"factorio_version": "2.0", "factorio_version": "2.0",
"title": "Bio Industries", "title": "Bio Industries",
"author": "TheSAguy - Had a few Ideas, Pi-C (Programming Genius), Snouz (Graphics Wizard), Cackling Fiend - Conversion to F2.0", "author": "TheSAguy - Had a few Ideas, Pi-C (Programming Genius), Snouz (Graphics Wizard), Cackling Fiend - Conversion to F2.0",

View file

@ -39,7 +39,6 @@ log("Enabling disassemble recipes!")
}, },
main_product = "", main_product = "",
}, },
----
{ {
type = "recipe", type = "recipe",
name = "bi-burner-inserter-disassemble", name = "bi-burner-inserter-disassemble",
@ -61,7 +60,6 @@ log("Enabling disassemble recipes!")
}, },
main_product = "", main_product = "",
}, },
----
{ {
type = "recipe", type = "recipe",
name = "bi-long-handed-inserter-disassemble", name = "bi-long-handed-inserter-disassemble",
@ -85,7 +83,6 @@ log("Enabling disassemble recipes!")
}, },
main_product = "", main_product = "",
}, },
---
{ {
type = "recipe", type = "recipe",
name = "bi-stone-furnace-disassemble", name = "bi-stone-furnace-disassemble",
@ -107,7 +104,6 @@ log("Enabling disassemble recipes!")
}, },
main_product = "", main_product = "",
}, },
---
{ {
type = "recipe", type = "recipe",
name = "bi-steel-furnace-disassemble", name = "bi-steel-furnace-disassemble",
@ -134,9 +130,8 @@ log("Enabling disassemble recipes!")
}) })
end end
local KRAS = (mods["Krastorio2"] or mods["Krastorio"]) and true or false
local SET = settings.startup["BI_Game_Tweaks_Production_Science"].value local SET = settings.startup["BI_Game_Tweaks_Production_Science"].value
if SET and not KRAS then if SET and not mods["Krastorio2"] then
data:extend({ data:extend({
{ {
type = "recipe", type = "recipe",
@ -155,5 +150,6 @@ if SET and not KRAS then
--~ thxbob.lib.tech.add_recipe_unlock("production-science-pack", "bi-production-science-pack") --~ thxbob.lib.tech.add_recipe_unlock("production-science-pack", "bi-production-science-pack")
BioInd.writeDebug("Added alternative recipe for Production science packs.") BioInd.writeDebug("Added alternative recipe for Production science packs.")
else else
BioInd.writeDebug("Didn't add alternative recipe for Production science packs! (\"Krastorio\": %s\tSetting: %s", {(KRAS and "active" or "not active"), (SET and "enabled" or "disabled")}) BioInd.writeDebug("Didn't add alternative recipe for Production science packs! (\"Krastorio\": %s\tSetting: %s",
{ (mods["Krastorio2"] and "active" or "not active"), (SET and "enabled" or "disabled") })
end end

View file

@ -1,19 +1,10 @@
require("prototypes.Wood_Products.rail-pictures-wood") require("prototypes.Wood_Products.rail-pictures-wood")
local BioInd = require('common')('Bio_Industries_2') local BioInd = require('common')('Bio_Industries_2')
local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/"
local item_sounds = require("__base__.prototypes.item_sounds") local item_sounds = require("__base__.prototypes.item_sounds")
local hit_effects = require("__base__.prototypes.entity.hit-effects") local hit_effects = require("__base__.prototypes.entity.hit-effects")
local sounds = require("__base__.prototypes.entity.sounds")
local tile_sounds = require("__base__.prototypes.tile.tile-sounds") local tile_sounds = require("__base__.prototypes.tile.tile-sounds")
local simulations = require("__base__.prototypes.factoriopedia-simulations")
if BI.Settings.BI_Game_Tweaks_Recipe then
data:extend({ data:extend({
---- ITEM ---- ITEM
@ -29,8 +20,7 @@ local simulations = require("__base__.prototypes.factoriopedia-simulations")
drop_sound = item_sounds.train_inventory_move, drop_sound = item_sounds.train_inventory_move,
place_result = "bi-straight-rail-wood", place_result = "bi-straight-rail-wood",
stack_size = 100, stack_size = 100,
rails = rails = {
{
"bi-straight-rail-wood", "bi-straight-rail-wood",
"bi-curved-rail-a-wood", "bi-curved-rail-a-wood",
"bi-curved-rail-b-wood", "bi-curved-rail-b-wood",
@ -72,8 +62,7 @@ local simulations = require("__base__.prototypes.factoriopedia-simulations")
name = "bi-rail-wood-to-concrete", name = "bi-rail-wood-to-concrete",
icons = { { icon = ICONPATH_E .. "rail-wood-to-concrete.png", icon_size = 64, } }, icons = { { icon = ICONPATH_E .. "rail-wood-to-concrete.png", icon_size = 64, } },
enabled = false, enabled = false,
ingredients = ingredients = {
{
{ type = "item", name = "bi-rail-wood", amount = 2 }, { type = "item", name = "bi-rail-wood", amount = 2 },
{ type = "item", name = "stone-brick", amount = 6 }, { type = "item", name = "stone-brick", amount = 6 },
@ -95,12 +84,10 @@ local simulations = require("__base__.prototypes.factoriopedia-simulations")
minable = { mining_time = 0.2, result = "bi-rail-wood", count = 1 }, minable = { mining_time = 0.2, result = "bi-rail-wood", count = 1 },
max_health = 200, max_health = 200,
corpse = "straight-rail-remnants", corpse = "straight-rail-remnants",
dying_explosion = dying_explosion = {
{
name = "rail-explosion" name = "rail-explosion"
}, },
resistances = resistances = {
{
{ {
type = "fire", type = "fire",
percent = 100 percent = 100
@ -137,8 +124,7 @@ local simulations = require("__base__.prototypes.factoriopedia-simulations")
minable = { mining_time = 0.2, result = "bi-rail-wood", count = 2 }, minable = { mining_time = 0.2, result = "bi-rail-wood", count = 2 },
max_health = 200, max_health = 200,
corpse = "half-diagonal-rail-remnants", corpse = "half-diagonal-rail-remnants",
dying_explosion = dying_explosion = {
{
{ {
name = "rail-explosion", name = "rail-explosion",
offset = { 0.9, 2.2 } offset = { 0.9, 2.2 }
@ -151,8 +137,7 @@ local simulations = require("__base__.prototypes.factoriopedia-simulations")
offset = { -1.2, -2 } offset = { -1.2, -2 }
} }
}, },
resistances = resistances = {
{
{ {
type = "fire", type = "fire",
percent = 100 percent = 100
@ -186,8 +171,7 @@ local simulations = require("__base__.prototypes.factoriopedia-simulations")
minable = { mining_time = 0.2, result = "bi-rail-wood", count = 3 }, minable = { mining_time = 0.2, result = "bi-rail-wood", count = 3 },
max_health = 200, max_health = 200,
corpse = "curved-rail-a-remnants", corpse = "curved-rail-a-remnants",
dying_explosion = dying_explosion = {
{
{ {
name = "rail-explosion", name = "rail-explosion",
offset = { 0.9, 2.2 } offset = { 0.9, 2.2 }
@ -200,8 +184,7 @@ local simulations = require("__base__.prototypes.factoriopedia-simulations")
offset = { -1.2, -2 } offset = { -1.2, -2 }
} }
}, },
resistances = resistances = {
{
{ {
type = "fire", type = "fire",
percent = 100 percent = 100
@ -236,8 +219,7 @@ local simulations = require("__base__.prototypes.factoriopedia-simulations")
minable = { mining_time = 0.2, result = "bi-rail-wood", count = 3 }, minable = { mining_time = 0.2, result = "bi-rail-wood", count = 3 },
max_health = 200, max_health = 200,
corpse = "curved-rail-b-remnants", corpse = "curved-rail-b-remnants",
dying_explosion = dying_explosion = {
{
{ {
name = "rail-explosion", name = "rail-explosion",
offset = { 0.9, 2.2 } offset = { 0.9, 2.2 }
@ -250,8 +232,7 @@ local simulations = require("__base__.prototypes.factoriopedia-simulations")
offset = { -1.2, -2 } offset = { -1.2, -2 }
} }
}, },
resistances = resistances = {
{
{ {
type = "fire", type = "fire",
percent = 100 percent = 100
@ -275,8 +256,3 @@ local simulations = require("__base__.prototypes.factoriopedia-simulations")
fast_replaceable_group = "curved-rail-b", fast_replaceable_group = "curved-rail-b",
}, },
}) })
end