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
2 changes: 1 addition & 1 deletion mods/sbz_chem/elements.lua
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ sbz_api.register_element("silicon", "#5ba082", "Silicon %s (Si)",
{ part_of_crusher_drops = false, part_of_enhanced_drops = true, fluid = 1 })
-- alloys

sbz_api.register_element("bronze", "#87461d", "Bronze %s (CuSn)", { part_of_crusher_drops = false })
sbz_api.register_element("bronze", "#CD7F32", "Bronze %s (CuSn)", { part_of_crusher_drops = false })
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this look distinct enough from other elements?
and was this done intentionally or is it from an older version of sbz

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably is to old version... the first try have more a year

sbz_api.register_element("invar", "#808080", "Invar %s (FeNi)", { part_of_crusher_drops = false })
sbz_api.register_element("titanium_alloy", "#B0C4DE", "Titanium Alloy %s (TiAl)", { part_of_crusher_drops = false })

Expand Down
Binary file modified mods/sbz_chem/textures/compressor.ase
Binary file not shown.
Binary file modified mods/sbz_chem/textures/compressor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified mods/sbz_chem/textures/compressor_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified mods/sbz_chem/textures/hpef_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified mods/sbz_chem/textures/hpef_front_off.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified mods/sbz_chem/textures/hpef_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions mods/sbz_power/batteries.lua
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ minetest.register_craft({

sbz_power.register_battery("sbz_power:very_advanced_battery", {
description = "Very Advanced Battery",
info_extra = "Description is so original, i am aware.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You seem to have a slightly outdated version of skyblock zero, try replacing mods/sbz_power with the one that is in https://github.com/ChefZander/skyblock_zero (except the the textures folder)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if doing that is difficult, then maybe zander could manually merge the textures

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if doing that is difficult, then maybe zander could manually merge the textures

I think so, it's preferable, I feel like I'm going to break something

tiles = { "very_advanced_battery.png" },
groups = { matter = 1, level = 2 },
battery_max = 200000,
Expand Down
2 changes: 1 addition & 1 deletion mods/sbz_power/emittrium_reactor.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
local HEAT_MAX = 30
local POWER_GEN = 1200
local POWER_GEN = 800
--[[
local ghost_removal_delay = 5

Expand Down
4 changes: 3 additions & 1 deletion mods/sbz_power/extractor.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
-- Simple Extractor Node
sbz_api.register_machine("sbz_power:simple_matter_extractor", {
description = "Simple Matter Extractor",
tiles = { "simple_matter_extractor.png" },
tiles = {
{ name = "simple_matter_extractor.png", animation = { type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 1.0 } }
},
groups = { matter = 1, sbz_machine = 1, pipe_connects = 1 },
sunlight_propagates = true,
walkable = true,
Expand Down
12 changes: 6 additions & 6 deletions mods/sbz_power/generator.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ local generator_power_production = 30
sbz_api.register_stateful_generator("sbz_power:simple_charge_generator", {
description = "Simple Charge Generator",
tiles = { "simple_charge_generator_off.png" },

groups = { dig_immediate = 2, sbz_machine = 1, pipe_connects = 1 },
sunlight_propagates = true,
walkable = true,
Expand Down Expand Up @@ -85,14 +84,15 @@ listring[]
input_inv = "main",
output_inv = "main",
info_generated = 30,
info_extra = { "Consumes 1 core dust every 10 seconds" },
info_extra = "Consumes 1 core dust/10 seconds",
autostate = true,
}, {
},{
tiles = {
{ name = "simple_charge_generator.png", animation = { type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 1.0 } }
},
light_source = 14,
tiles = { "simple_charge_generator.png" }
})


minetest.register_craft({
output = "sbz_power:simple_charge_generator",
recipe = {
Expand Down Expand Up @@ -300,7 +300,7 @@ if not sbz_api.server_optimizations then
end

sbz_api.register_stateful_generator("sbz_power:antimatter_generator", {
description = "Antimatter Generator",
description = "Antimatter generator",
info_extra = {
"Generates 600 power",
"Needs 1 antimatter/s and 1 matter/s",
Expand Down
1 change: 1 addition & 0 deletions mods/sbz_power/switching_station.lua
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ minetest.register_node("sbz_power:switching_station", {
local meta = minetest.get_meta(pos)
meta:set_string("infotext", "Loading....")
end,
info_extra = "If you put 2 of them next to eachother a funny happens",
})

minetest.register_craft({
Expand Down
Binary file modified mods/sbz_power/textures/simple_charge_generator.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified mods/sbz_power/textures/simple_charge_generator_off.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified mods/sbz_power/textures/simple_matter_extractor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.