Fix fuels/matter, changes to collectors
|
@ -82,8 +82,8 @@ You can find the old textures and sounds by going back to previous commits in Gi
|
||||||
- [x] Add EMC Link
|
- [x] Add EMC Link
|
||||||
- [x] Add Alchemical Books
|
- [x] Add Alchemical Books
|
||||||
- [x] Add more matter/fuel types
|
- [x] Add more matter/fuel types
|
||||||
- [ ] Make collectors less expensive and less effective (gold instead of glowstone)
|
- [x] Make collectors less expensive and less effective (gold instead of glowstone)
|
||||||
- [ ] Make collectors use ProjectExpansion's textures
|
- [x] Make collectors use ProjectExpansion's textures
|
||||||
- [ ] Add Knowledge Sharing Book
|
- [ ] Add Knowledge Sharing Book
|
||||||
- [ ] Add function for getting player's learned items
|
- [ ] Add function for getting player's learned items
|
||||||
- [ ] Add Evertide Amulet
|
- [ ] Add Evertide Amulet
|
||||||
|
|
|
@ -9,7 +9,7 @@ local formspec =
|
||||||
"listring[context;main]"..
|
"listring[context;main]"..
|
||||||
(exchangeclone.mcl and mcl_formspec.get_itemslot_bg(4,2,1,1) or "")
|
(exchangeclone.mcl and mcl_formspec.get_itemslot_bg(4,2,1,1) or "")
|
||||||
|
|
||||||
minetest.register_alias("exchangeclone:energy_collector", "exchangeclone:energy_collector_mk1")
|
minetest.register_alias("exchangeclone:energy_collector", "exchangeclone:basic_collector")
|
||||||
|
|
||||||
local function check_for_furnaces(pos, set_furnace, start)
|
local function check_for_furnaces(pos, set_furnace, start)
|
||||||
local found = false
|
local found = false
|
||||||
|
@ -118,12 +118,10 @@ local function allow_metadata_inventory_take(pos, listname, index, stack, player
|
||||||
return stack:get_count()
|
return stack:get_count()
|
||||||
end
|
end
|
||||||
|
|
||||||
function exchangeclone.register_energy_collector(itemstring, name, amount, modifier, recipe, glow)
|
function exchangeclone.register_energy_collector(itemstring, name, amount, texture, recipe, glow)
|
||||||
minetest.register_node(itemstring, {
|
minetest.register_node(itemstring, {
|
||||||
description = name.."\nGenerates "..exchangeclone.format_number(amount).." EMC/second",
|
description = name.."\nGenerates "..exchangeclone.format_number(amount).." EMC/second",
|
||||||
tiles = {
|
tiles = {texture},
|
||||||
"exchangeclone_energy_collector_base.png^(exchangeclone_energy_collector_overlay.png"..modifier..")"
|
|
||||||
},
|
|
||||||
groups = {
|
groups = {
|
||||||
cracky = 2,
|
cracky = 2,
|
||||||
pickaxey = 1,
|
pickaxey = 1,
|
||||||
|
@ -133,7 +131,7 @@ function exchangeclone.register_energy_collector(itemstring, name, amount, modif
|
||||||
energy_collector = 1,
|
energy_collector = 1,
|
||||||
container = 2,
|
container = 2,
|
||||||
tubedevice = 1,
|
tubedevice = 1,
|
||||||
tubedevice_receiver = 1,
|
tubedevice_receiver = 1,
|
||||||
},
|
},
|
||||||
light_source = glow,
|
light_source = glow,
|
||||||
_mcl_hardness = 1,
|
_mcl_hardness = 1,
|
||||||
|
@ -171,9 +169,11 @@ function exchangeclone.register_energy_collector(itemstring, name, amount, modif
|
||||||
allow_metadata_inventory_move = allow_metadata_inventory_move,
|
allow_metadata_inventory_move = allow_metadata_inventory_move,
|
||||||
allow_metadata_inventory_take = allow_metadata_inventory_take,
|
allow_metadata_inventory_take = allow_metadata_inventory_take,
|
||||||
})
|
})
|
||||||
|
minetest.log(dump(recipe))
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
output = itemstring,
|
output = itemstring,
|
||||||
recipe = recipe
|
type = recipe[2] or "shaped",
|
||||||
|
recipe = recipe[1]
|
||||||
})
|
})
|
||||||
|
|
||||||
if exchangeclone.pipeworks then
|
if exchangeclone.pipeworks then
|
||||||
|
@ -199,82 +199,58 @@ function exchangeclone.register_energy_collector(itemstring, name, amount, modif
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local iron_block = "default:steelblock"
|
local collectors = {
|
||||||
local glass = "default:glass"
|
"Basic",
|
||||||
local chest = "default:chest"
|
"Dark",
|
||||||
|
"Red",
|
||||||
|
"Magenta",
|
||||||
|
"Pink",
|
||||||
|
"Purple",
|
||||||
|
"Violet",
|
||||||
|
"Blue",
|
||||||
|
"Cyan",
|
||||||
|
"Green",
|
||||||
|
"Lime",
|
||||||
|
"Yellow",
|
||||||
|
"Orange",
|
||||||
|
"White",
|
||||||
|
}
|
||||||
|
|
||||||
if exchangeclone.mcl then
|
local ingredient = exchangeclone.mcl and "mcl_nether:glowstone" or "default:gold_ingot"
|
||||||
iron_block = "mcl_core:ironblock"
|
|
||||||
glass = "mcl_core:glass"
|
|
||||||
chest = "mcl_chests:chest"
|
|
||||||
end
|
|
||||||
|
|
||||||
exchangeclone.register_energy_collector("exchangeclone:energy_collector_mk1", S("Energy Collector MK1"), 16, "", {
|
exchangeclone.register_energy_collector(
|
||||||
{glass, glass, glass},
|
"exchangeclone:basic_collector",
|
||||||
{"exchangeclone:klein_star_drei", chest, "exchangeclone:klein_star_drei"},
|
S("Basic Collector [MK 1]"),
|
||||||
{iron_block, iron_block, iron_block}
|
4,
|
||||||
}, 5
|
"exchangeclone_basic_collector.png",
|
||||||
|
{{
|
||||||
|
{ingredient, exchangeclone.itemstrings.glass, ingredient},
|
||||||
|
{ingredient, "exchangeclone:aeternalis_fuel_block", ingredient},
|
||||||
|
{ingredient, (exchangeclone.mcl and "mcl_furnaces:furnace" or "default:furnace"), ingredient},
|
||||||
|
|
||||||
|
}},
|
||||||
|
5
|
||||||
)
|
)
|
||||||
|
|
||||||
exchangeclone.register_energy_collector("exchangeclone:energy_collector_mk2", S("Energy Collector MK2"), 48, "^[multiply:#333333", {
|
minetest.register_alias("exchangeclone:energy_collector_mk1", "exchangeclone:basic_collector")
|
||||||
{iron_block, iron_block, iron_block},
|
|
||||||
{"exchangeclone:energy_collector_mk1", "exchangeclone:energy_collector_mk1", "exchangeclone:energy_collector_mk1"},
|
|
||||||
{iron_block, iron_block, iron_block}
|
|
||||||
}, 6
|
|
||||||
)
|
|
||||||
|
|
||||||
exchangeclone.register_energy_collector("exchangeclone:energy_collector_mk3", S("Energy Collector MK3"), 160, "^[multiply:#770000", {
|
for i = 2, #collectors do
|
||||||
{iron_block, iron_block, iron_block},
|
local collector = collectors[i]
|
||||||
{"exchangeclone:energy_collector_mk2", "exchangeclone:energy_collector_mk2", "exchangeclone:energy_collector_mk2"},
|
local codified = collector:lower().."_collector"
|
||||||
{iron_block, iron_block, iron_block}
|
local previous = "exchangeclone:"..collectors[i-1]:lower().."_collector"
|
||||||
}, 7
|
exchangeclone.register_energy_collector(
|
||||||
)
|
"exchangeclone:"..codified,
|
||||||
|
S(collector.." Energy Collector [MK"..i.."]"),
|
||||||
exchangeclone.register_energy_collector("exchangeclone:energy_collector_mk4", S("Energy Collector MK4"), 640, "^[multiply:#aa5500", {
|
4*math.pow(6,i-1),
|
||||||
{iron_block, iron_block, iron_block},
|
"exchangeclone_"..codified..".png",
|
||||||
{"exchangeclone:energy_collector_mk3", "exchangeclone:energy_collector_mk3", "exchangeclone:energy_collector_mk3"},
|
{
|
||||||
{iron_block, iron_block, iron_block}
|
{
|
||||||
}, 8
|
previous,
|
||||||
)
|
"exchangeclone:"..collector:lower().."_matter"
|
||||||
|
},
|
||||||
exchangeclone.register_energy_collector("exchangeclone:energy_collector_mk5", S("Energy Collector MK5"), 2560, "^[multiply:#cc9900", {
|
"shapeless"
|
||||||
{iron_block, iron_block, iron_block},
|
},
|
||||||
{"exchangeclone:energy_collector_mk4", "exchangeclone:energy_collector_mk4", "exchangeclone:energy_collector_mk4"},
|
5+i
|
||||||
{iron_block, iron_block, iron_block}
|
)
|
||||||
}, 9
|
minetest.register_alias("exchangeclone:energy_collector_mk"..i, "exchangeclone:"..codified)
|
||||||
)
|
end
|
||||||
|
|
||||||
exchangeclone.register_energy_collector("exchangeclone:energy_collector_mk6", S("Energy Collector MK6"), 10240, "^[multiply:#007700", {
|
|
||||||
{iron_block, iron_block, iron_block},
|
|
||||||
{"exchangeclone:energy_collector_mk5", "exchangeclone:energy_collector_mk5", "exchangeclone:energy_collector_mk5"},
|
|
||||||
{iron_block, iron_block, iron_block}
|
|
||||||
}, 10
|
|
||||||
)
|
|
||||||
|
|
||||||
exchangeclone.register_energy_collector("exchangeclone:energy_collector_mk7", S("Energy Collector MK7"), 40960, "^[multiply:#007777", {
|
|
||||||
{iron_block, iron_block, iron_block},
|
|
||||||
{"exchangeclone:energy_collector_mk6", "exchangeclone:energy_collector_mk6", "exchangeclone:energy_collector_mk6"},
|
|
||||||
{iron_block, iron_block, iron_block}
|
|
||||||
}, 11
|
|
||||||
)
|
|
||||||
|
|
||||||
exchangeclone.register_energy_collector("exchangeclone:energy_collector_mk8", S("Energy Collector MK8"), 163840, "^[multiply:#000077", {
|
|
||||||
{iron_block, iron_block, iron_block},
|
|
||||||
{"exchangeclone:energy_collector_mk7", "exchangeclone:energy_collector_mk7", "exchangeclone:energy_collector_mk7"},
|
|
||||||
{iron_block, iron_block, iron_block}
|
|
||||||
}, 12
|
|
||||||
)
|
|
||||||
|
|
||||||
exchangeclone.register_energy_collector("exchangeclone:energy_collector_mk9", S("Energy Collector MK9"), 655360, "^[multiply:#770077", {
|
|
||||||
{iron_block, iron_block, iron_block},
|
|
||||||
{"exchangeclone:energy_collector_mk8", "exchangeclone:energy_collector_mk8", "exchangeclone:energy_collector_mk8"},
|
|
||||||
{iron_block, iron_block, iron_block}
|
|
||||||
}, 13
|
|
||||||
)
|
|
||||||
|
|
||||||
exchangeclone.register_energy_collector("exchangeclone:energy_collector_mk10", S("Energy Collector MK10"), 2621440, "^[multiply:#cc00aa", {
|
|
||||||
{iron_block, iron_block, iron_block},
|
|
||||||
{"exchangeclone:energy_collector_mk9", "exchangeclone:energy_collector_mk9", "exchangeclone:energy_collector_mk9"},
|
|
||||||
{iron_block, iron_block, iron_block}
|
|
||||||
}, minetest.LIGHT_MAX
|
|
||||||
)
|
|
|
@ -38,6 +38,8 @@ for i, fuel in ipairs(exchangeclone.fuels) do
|
||||||
_mcl_hardness = 7,
|
_mcl_hardness = 7,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
minetest.log(string.format("%s: %s", fuel, fuel_time))
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
type = "fuel",
|
type = "fuel",
|
||||||
recipe = "exchangeclone:"..codified,
|
recipe = "exchangeclone:"..codified,
|
||||||
|
@ -47,9 +49,9 @@ for i, fuel in ipairs(exchangeclone.fuels) do
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
type = "fuel",
|
type = "fuel",
|
||||||
recipe = "exchangeclone:"..codified.."_block",
|
recipe = "exchangeclone:"..codified.."_block",
|
||||||
burntime = fuel_time * 10,
|
burntime = math.min(fuel_time * 10, exchangeclone.fuel_limit)
|
||||||
})
|
})
|
||||||
fuel_time = fuel_time * 4
|
fuel_time = math.min(fuel_time * 4, exchangeclone.fuel_limit)
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
output = "exchangeclone:"..codified.."_block",
|
output = "exchangeclone:"..codified.."_block",
|
||||||
|
|
|
@ -80,7 +80,12 @@ for i, matter in ipairs(exchangeclone.matter_types) do
|
||||||
|
|
||||||
local previous = exchangeclone.matter_types[i-1] or "Dark"
|
local previous = exchangeclone.matter_types[i-1] or "Dark"
|
||||||
previous = "exchangeclone:"..previous:lower().."_matter"
|
previous = "exchangeclone:"..previous:lower().."_matter"
|
||||||
local fuel = "exchangeclone:"..exchangeclone.fuels[i+2]:lower():gsub(" ", "_")
|
local fuel
|
||||||
|
if matter ~= "Red" then
|
||||||
|
fuel = "exchangeclone:"..exchangeclone.fuels[i+1]:lower():gsub(" ", "_")
|
||||||
|
else
|
||||||
|
fuel = "exchangeclone:aeternalis_fuel"
|
||||||
|
end
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
output = itemstring,
|
output = itemstring,
|
||||||
|
|
After Width: | Height: | Size: 883 B |
After Width: | Height: | Size: 900 B |
After Width: | Height: | Size: 898 B |
After Width: | Height: | Size: 897 B |
After Width: | Height: | Size: 914 B |
After Width: | Height: | Size: 905 B |
After Width: | Height: | Size: 916 B |
After Width: | Height: | Size: 922 B |
After Width: | Height: | Size: 877 B |
After Width: | Height: | Size: 906 B |
After Width: | Height: | Size: 905 B |
After Width: | Height: | Size: 897 B |
After Width: | Height: | Size: 875 B |
After Width: | Height: | Size: 914 B |
Before Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 741 B |
|
@ -341,6 +341,9 @@ function exchangeclone.charge_update(itemstack, player)
|
||||||
return itemstack
|
return itemstack
|
||||||
end
|
end
|
||||||
|
|
||||||
|
exchangeclone.int_limit = 2147483647
|
||||||
|
exchangeclone.fuel_limit = 2147483583 -- no idea why...
|
||||||
|
|
||||||
-- Itemstrings for various items used in crafting recipes.
|
-- Itemstrings for various items used in crafting recipes.
|
||||||
exchangeclone.itemstrings = {
|
exchangeclone.itemstrings = {
|
||||||
cobble = exchangeclone.mcl and "mcl_core:cobble" or "default:cobble",
|
cobble = exchangeclone.mcl and "mcl_core:cobble" or "default:cobble",
|
||||||
|
@ -360,7 +363,8 @@ exchangeclone.itemstrings = {
|
||||||
clay = exchangeclone.mcl and "mcl_core:clay" or "default:clay",
|
clay = exchangeclone.mcl and "mcl_core:clay" or "default:clay",
|
||||||
sand = exchangeclone.mcl and "mcl_core:sand" or "default:sand",
|
sand = exchangeclone.mcl and "mcl_core:sand" or "default:sand",
|
||||||
torch = exchangeclone.mcl and "mcl_torches:torch" or "default:torch",
|
torch = exchangeclone.mcl and "mcl_torches:torch" or "default:torch",
|
||||||
book = exchangeclone.mcl and "mcl_books:book" or "default:book"
|
book = exchangeclone.mcl and "mcl_books:book" or "default:book",
|
||||||
|
glass = exchangeclone.mcl and "mcl_core:glass" or "default:glass",
|
||||||
}
|
}
|
||||||
|
|
||||||
exchangeclone.emc_aliases = {}
|
exchangeclone.emc_aliases = {}
|
||||||
|
|