cacklingfiend/bzsilicon2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updates

Browse source
This commit is contained in:
Brevven 2025-04-07 21:14:21 -07:00
parent 6d4513d783
commit 7d383717d1
13 changed files with 181 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

30
prototypes/basic-crusher.lua
View file

@ -4,7 +4,7 @@ local item_sounds = require("__base__.prototypes.item_sounds")
local sounds = require("__base__.prototypes.entity.sounds")
local hit_effects = require("__base__.prototypes.entity.hit-effects")
if mods["space-age"] then
if mods["space-age"] and not data.raw.furnace["basic-crusher"] then
-- note that crusher is a space age asset and as such can only be used with space age
local graphics = require("__space-age__.prototypes.entity.crusher-pictures")
@ -20,10 +20,10 @@ graphics.animation.east.layers[1].scale = graphics.animation.east.layers[1].scal
graphics.animation.east.layers[2].scale = graphics.animation.east.layers[2].scale * 0.5
graphics.animation.west.layers[1].scale = graphics.animation.west.layers[1].scale * 0.5
graphics.animation.west.layers[2].scale = graphics.animation.west.layers[2].scale * 0.5
graphics.working_visualisations.layers.north_animation.scale = graphics.working_visualisations.layers.north_animation.scale * 0.5
graphics.working_visualisations.layers.east_animation.scale = graphics.working_visualisations.layers.east_animation.scale * 0.5
graphics.working_visualisations.layers.south_animation.scale = graphics.working_visualisations.layers.south_animation.scale * 0.5
graphics.working_visualisations.layers.west_animation.scale = graphics.working_visualisations.layers.west_animation.scale * 0.5
graphics.working_visualisations[1].north_animation.scale = graphics.working_visualisations[1].north_animation.scale * 0.5
graphics.working_visualisations[1].east_animation.scale = graphics.working_visualisations[1].east_animation.scale * 0.5
graphics.working_visualisations[1].south_animation.scale = graphics.working_visualisations[1].south_animation.scale * 0.5
graphics.working_visualisations[1].west_animation.scale = graphics.working_visualisations[1].west_animation.scale * 0.5
graphics.integration_patch.north.shift[1] = graphics.integration_patch.north.shift[1] * 0.5
graphics.integration_patch.north.shift[2] = graphics.integration_patch.north.shift[2] * 0.5
@ -49,15 +49,14 @@ graphics.animation.west.layers[1].shift[1] = graphics.animation.west.layers[1].s
graphics.animation.west.layers[1].shift[2] = graphics.animation.west.layers[1].shift[2] * 0.5
graphics.animation.west.layers[2].shift[1] = graphics.animation.west.layers[2].shift[1] * 0.5
graphics.animation.west.layers[2].shift[2] = graphics.animation.west.layers[2].shift[2] * 0.5
graphics.working_visualisations.layers.north_animation.shift[1] = graphics.working_visualisations.layers.north_animation.shift[1] * 0.5
graphics.working_visualisations.layers.north_animation.shift[2] = graphics.working_visualisations.layers.north_animation.shift[2] * 0.5
graphics.working_visualisations.layers.south_animation.shift[1] = graphics.working_visualisations.layers.south_animation.shift[1] * 0.5
graphics.working_visualisations.layers.south_animation.shift[2] = graphics.working_visualisations.layers.south_animation.shift[2] * 0.5
graphics.working_visualisations.layers.east_animation.shift[1] = graphics.working_visualisations.layers.east_animation.shift[1] * 0.5
graphics.working_visualisations.layers.east_animation.shift[2] = graphics.working_visualisations.layers.east_animation.shift[2] * 0.5
graphics.working_visualisations.layers.west_animation.shift[1] = graphics.working_visualisations.layers.west_animation.shift[1] * 0.5
graphics.working_visualisations.layers.west_animation.shift[2] = graphics.working_visualisations.layers.west_animation.shift[2] * 0.5
graphics.working_visualisations[1].north_animation.shift[1] = graphics.working_visualisations[1].north_animation.shift[1] * 0.5
graphics.working_visualisations[1].north_animation.shift[2] = graphics.working_visualisations[1].north_animation.shift[2] * 0.5
graphics.working_visualisations[1].south_animation.shift[1] = graphics.working_visualisations[1].south_animation.shift[1] * 0.5
graphics.working_visualisations[1].south_animation.shift[2] = graphics.working_visualisations[1].south_animation.shift[2] * 0.5
graphics.working_visualisations[1].east_animation.shift[1] = graphics.working_visualisations[1].east_animation.shift[1] * 0.5
graphics.working_visualisations[1].east_animation.shift[2] = graphics.working_visualisations[1].east_animation.shift[2] * 0.5
graphics.working_visualisations[1].west_animation.shift[1] = graphics.working_visualisations[1].west_animation.shift[1] * 0.5
graphics.working_visualisations[1].west_animation.shift[2] = graphics.working_visualisations[1].west_animation.shift[2] * 0.5
util.add_new_crafting_category("basic-crushing", true)
@ -180,3 +179,6 @@ else
end
util.add_prerequisite("silica-processing", "automation-2")
end
-- For graphite we can't have steel as an ingredient.
util.remove_ingredient("basic-crusher", "steel-plate")
util.add_to_ingredient("basic-crusher", "iron-plate", 20)

4
prototypes/gyro.lua
View file

@ -1,4 +1,5 @@
local util = require("data-util");
local item_sounds = require('__base__.prototypes.item_sounds')
if util.me.use_gyros() then
gyro_ingredients = { -- outputs 4
@ -28,6 +29,9 @@ data:extend({
name = "gyro",
icon = "__bzsilicon__/graphics/icons/gyro.png",
icon_size = 128,
inventory_move_sound = item_sounds.electric_small_inventory_move,
pick_sound = item_sounds.electric_small_inventory_pickup,
drop_sound = item_sounds.electric_small_inventory_move,
subgroup = util.se6() and "electronic" or "intermediate-product",
order = "s[silicon]-z-gyro",
stack_size = util.get_stack_size(200),

4
prototypes/optical-fiber.lua
View file

@ -1,5 +1,6 @@
-- Optical Fiber
local util = require("__bzsilicon__.data-util");
local item_sounds = require('__base__.prototypes.item_sounds')
data:extend(
{
{
@ -7,6 +8,9 @@ data:extend(
name = "optical-fiber",
icon = "__bzsilicon__/graphics/icons/optical-fiber.png",
icon_size = 64, icon_mipmaps = 3,
inventory_move_sound = item_sounds.wire_inventory_move,
pick_sound = item_sounds.wire_inventory_pickup,
drop_sound = item_sounds.wire_inventory_move,
subgroup = util.cablesg,
order = "a[optical-fiber]",
stack_size = util.get_stack_size(200),

18
prototypes/razorgrass.lua
View file

@ -1,10 +1,11 @@
if mods["space-age"] then
local futil = require("util")
local util = require("data-util")
if mods["space-age"] then
data.raw.planet.gleba.map_gen_settings.autoplace_settings.entity.settings["razorgrass-plant"] = {}
local space_age_item_sounds = require("__space-age__.prototypes.item_sounds")
local item_sounds = require('__base__.prototypes.item_sounds')
data.raw.planet.gleba.map_gen_settings.autoplace_settings.entity.settings["razorgrass-plant"] = {}
local function razorgrass_variations()
local variation_count = 8 --variation_count or 5
local per_row = 4 -- per_row or 5
@ -243,6 +244,9 @@ data:extend({
{filename="__bzsilicon__/graphics/icons/razorgrass-2.png", size=128, scale=.3},
{filename="__bzsilicon__/graphics/icons/razorgrass-3.png", size=128, scale=.3},
},
inventory_move_sound = space_age_item_sounds.agriculture_inventory_move,
pick_sound = space_age_item_sounds.agriculture_inventory_pickup,
drop_sound = space_age_item_sounds.agriculture_inventory_move,
subgroup = "agriculture-processes",
group = "intermediate-products",
stack_size = 50,
@ -264,6 +268,9 @@ data:extend({
{filename="__bzsilicon__/graphics/icons/razorgrass-dried-2.png", size=128, scale=.3},
{filename="__bzsilicon__/graphics/icons/razorgrass-dried-3.png", size=128, scale=.3},
},
inventory_move_sound = space_age_item_sounds.agriculture_inventory_move,
pick_sound = space_age_item_sounds.agriculture_inventory_pickup,
drop_sound = space_age_item_sounds.agriculture_inventory_move,
subgroup = "agriculture-processes",
group = "intermediate-products",
stack_size = 100,
@ -278,6 +285,9 @@ data:extend({
name = "razorgrass-ash",
icon = "__bzsilicon__/graphics/icons/ash.png",
icon_size = 64,
inventory_move_sound = item_sounds.sulfur_inventory_move,
pick_sound = item_sounds.resource_inventory_pickup,
drop_sound = item_sounds.sulfur_inventory_move,
subgroup = "agriculture-processes",
group = "intermediate-products",
stack_size = 100,

22
prototypes/silica-recipe.lua
View file

@ -1,5 +1,6 @@
-- Silica
local util = require("__bzsilicon__.data-util");
local item_sounds = require('__base__.prototypes.item_sounds')
data:extend(
{
mods["Krastorio2"] and {
@ -29,15 +30,15 @@ data:extend(
allow_productivity = true,
ingredients = {util.item("stone-crushed", 4)},
results = {util.item("silica", 5)},
} or mods["aai-industry"] and {
type = "recipe",
name = "silica",
category = mods["space-age"] and "basic-crushing" or "crafting",
enabled = false,
energy_required = 0.5,
allow_productivity = true,
ingredients = {util.item("sand", 1)},
results = {util.item("silica", 1)},
-- } or mods["aai-industry"] and {
-- type = "recipe",
-- name = "silica",
-- category = mods["space-age"] and "basic-crushing" or "crafting",
-- enabled = false,
-- energy_required = 0.5,
-- allow_productivity = true,
-- ingredients = {util.item("sand", 1)},
-- results = {util.item("silica", 1)},
} or
{
type = "recipe",
@ -62,6 +63,9 @@ data:extend(
name = "silica",
icon = "__bzsilicon__/graphics/icons/silica.png",
icon_size = 64, icon_mipmaps = 3,
inventory_move_sound = item_sounds.sulfur_inventory_move,
pick_sound = item_sounds.resource_inventory_pickup,
drop_sound = item_sounds.sulfur_inventory_move,
subgroup = "raw-material",
order = "b[silica]",
stack_size = util.get_stack_size(100),

22
prototypes/silicon-recipe.lua
View file

@ -1,5 +1,6 @@
-- Silicon
local util = require("data-util");
local item_sounds = require('__base__.prototypes.item_sounds')
if mods["Krastorio2"] then
util.remove_raw("recipe", "silicon-2")
util.remove_recipe_effect("kr-silicon-processing", "silicon-2")
@ -54,6 +55,9 @@ data:extend(
name = "silicon",
icon = "__bzsilicon__/graphics/icons/silicon.png",
icon_size = 64, icon_mipmaps = 3,
inventory_move_sound = item_sounds.sulfur_inventory_move,
pick_sound = item_sounds.resource_inventory_pickup,
drop_sound = item_sounds.sulfur_inventory_move,
subgroup = "raw-material",
order = "b[silicon]",
stack_size = util.get_stack_size(100),
@ -99,6 +103,9 @@ data:extend({
name = "silicon-wafer",
icon = "__bzsilicon__/graphics/icons/silicon-wafer.png",
icon_size = 64, icon_mipmaps = 3,
inventory_move_sound = item_sounds.electric_small_inventory_move,
pick_sound = item_sounds.electric_small_inventory_pickup,
drop_sound = item_sounds.electric_small_inventory_move,
subgroup = "intermediate-product",
stack_size = util.get_stack_size(100),
order = "s[silicon]-silicon-wafer",
@ -110,16 +117,16 @@ data:extend({
category = "crafting-with-fluid",
subgroup = "intermediate-product",
enabled = false,
energy_required = 20,
energy_required = 2,
allow_productivity = true,
ingredients = (mods["Krastorio2"] and {
{type= "item", name="silicon", amount=20},
{type= "fluid", name="hydrogen-chloride", amount=50},
{type= "item", name="silicon", amount=2},
{type= "fluid", name="hydrogen-chloride", amount=5},
} or {
{type= "item", name="silicon", amount=20},
{type= "fluid", name="sulfuric-acid", amount=50},
{type= "item", name="silicon", amount=2},
{type= "fluid", name="sulfuric-acid", amount=5},
}),
results = {util.item("silicon-wafer", 30)}
results = {util.item("silicon-wafer", 3)}
},
{
type = "item",
@ -153,6 +160,9 @@ data:extend({
name = "solar-cell",
icon = "__bzsilicon__/graphics/icons/solar-cell.png",
icon_size = 64, icon_mipmaps = 3,
inventory_move_sound = item_sounds.electric_small_inventory_move,
pick_sound = item_sounds.electric_small_inventory_pickup,
drop_sound = item_sounds.electric_small_inventory_move,
subgroup = "intermediate-product",
stack_size = util.get_stack_size(100),
order = "s[silicon]-solar-cell",