Applied constants to node definitions

This commit is contained in:
Pascal Abresch 2019-10-04 05:13:42 +02:00
parent c5b25dc552
commit 67c8636a4f
7 changed files with 48 additions and 43 deletions

View File

@ -1,4 +1,5 @@
local NAME = minetest.get_current_modname() local NAME = minetest.get_current_modname()
local MAX_ENERGY
minetest.register_node(NAME ..":capacitor", { minetest.register_node(NAME ..":capacitor", {
description = "Capacitor", description = "Capacitor",
@ -11,11 +12,11 @@ minetest.register_node(NAME ..":capacitor", {
"capacitor_side.png" "capacitor_side.png"
}, },
groups = { groups = {
sparktech_techy = 3, sparktech_techy = WRENCHABLE,
sparktech_energy_type = 3, sparktech_energy_type = ENERGY_STORE,
sparktech_energy_storeonbreak = 1, sparktech_energy_storeonbreak = TRUE,
sparktech_energy_max = 30000, sparktech_energy_max = MAX_ENERGY,
sparktech_net_trigger = 1, sparktech_net_trigger = TRUE,
} }
}) })

View File

@ -9,11 +9,11 @@ minetest.register_node("sparkdebug:energyvoid", {
"capacitor_side.png" "capacitor_side.png"
}, },
groups = { groups = {
sparkdebug = 1, sparkdebug = TRUE,
sparktech_energy_type = 4, sparktech_energy_type = ENERGY_CONSUMER,
sparktech_net_trigger = 1, sparktech_net_trigger = TRUE,
sparktech_energy_max = 10000, sparktech_energy_max = 10000,
sparktech_techy = 1 sparktech_techy = WRENCHABLE
} }
}) })
@ -28,11 +28,11 @@ minetest.register_node("sparkdebug:energysource", {
"capacitor_side.png" "capacitor_side.png"
}, },
groups = { groups = {
sparkdebug = 1, sparkdebug = TRUE,
sparktech_energy_type = 2, sparktech_energy_type = ENERGY_PRODUCER,
sparktech_net_trigger = 1, sparktech_net_trigger = TRUE,
sparktech_energy_max = 10000, sparktech_energy_max = 10000,
sparktech_techy = 1 sparktech_techy = WRENCHABLE
} }
}) })

View File

@ -1,5 +1,6 @@
local fuel_multiplier = 2 local FUEL_MULTIPLIER = 2
local interval = 0.5 local INTERVAL= 0.5
local MAX_ENERGY = 2000
local NAME = minetest.get_current_modname() local NAME = minetest.get_current_modname()
@ -23,7 +24,7 @@ local function is_item_allowed(pos, target, _, stack)
end end
local function ongetitem(pos) -- could add checking if energy >= max energy here, not really required since timer does that first thing anyway local function ongetitem(pos) -- could add checking if energy >= max energy here, not really required since timer does that first thing anyway
local timer = minetest.get_node_timer(pos):start(interval) local timer = minetest.get_node_timer(pos):start(INTERVAL)
end end
local function update_formspec(pos) local function update_formspec(pos)
@ -57,11 +58,11 @@ minetest.register_node(NAME .. ":burnergenerator", {
"generator.png"}, "generator.png"},
paramtype2 = "facedir", paramtype2 = "facedir",
groups = { groups = {
sparktech_energy_wakeup = 1, sparktech_techy = WRENCHABLE,
sparktech_techy = 1, sparktech_energy_wakeup = TRUE,
sparktech_energy_type = 2, sparktech_energy_type = ENERGY_PRODUCER,
sparktech_net_trigger = 1, sparktech_net_trigger = TRUE,
sparktech_energy_max = 2000 sparktech_energy_max = MAX_ENERGY
}, },
on_construct = function(pos) on_construct = function(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
@ -69,7 +70,7 @@ minetest.register_node(NAME .. ":burnergenerator", {
meta:set_int("rem_energy_", 0) meta:set_int("rem_energy_", 0)
local inv = meta:get_inventory() local inv = meta:get_inventory()
inv:set_size('fuel', 1) inv:set_size('fuel', 1)
-- minetest.get_node_timer(pos):start(interval) -- minetest.get_node_timer(pos):start(INTERVAL)
-- not required! its not like we got items on construct -- not required! its not like we got items on construct
end, end,
@ -118,7 +119,7 @@ minetest.register_node(NAME .. ":burnergenerator", {
update_formspec(pos) -- Later this should only be done when a player looks into the block update_formspec(pos) -- Later this should only be done when a player looks into the block
minetest.get_node_timer(pos):start(interval) minetest.get_node_timer(pos):start(INTERVAL)
end end
}) })

View File

@ -1,4 +1,5 @@
local NAME = minetest.get_current_modname() local NAME = minetest.get_current_modname()
local MAX_ENERGY = 50
minetest.register_node(NAME .. ":solar", { minetest.register_node(NAME .. ":solar", {
description = "Solar Cell", description = "Solar Cell",
@ -16,10 +17,10 @@ minetest.register_node(NAME .. ":solar", {
} }
}, },
groups = { groups = {
sparktech_techy = 1, sparktech_techy = WRENCHABLE,
sparktech_energy_type = 2, sparktech_energy_type = ENERGY_PRODUCER,
sparktech_net_trigger = 1, sparktech_net_trigger = TRUE,
sparktech_energy_max = 50 sparktech_energy_max = MAX_ENERGY
} }
}) })

View File

@ -1,4 +1,5 @@
local NAME = minetest.get_current_modname() local NAME = minetest.get_current_modname()
local MAX_ENERGY = 300
local modifier = 10 -- Cooking cost modifier local modifier = 10 -- Cooking cost modifier
local time_modifier = 1.5 -- Cooking time modifier local time_modifier = 1.5 -- Cooking time modifier
@ -46,7 +47,7 @@ local function update_formspec(pos)
cfmsp = cfmsp .. cfmsp = cfmsp ..
sparktech.makebar("energy2.png", 0, 1.125, 9.75, 0.25, sparktech.makebar("energy2.png", 0, 1.125, 9.75, 0.25,
energy, minetest.get_item_group(minetest.get_node(pos).name, "sparktech_energy_max") energy, minetest.get_item_group(MAX_ENERGY)
, 0) , 0)
for item=0, 1 do for item=0, 1 do
@ -130,7 +131,7 @@ minetest.register_node( NAME .. ":lv_furnace", {
sparktech_techy = WRENCHABLE, sparktech_techy = WRENCHABLE,
sparktech_energy_type = ENERGY_CONSUMER, sparktech_energy_type = ENERGY_CONSUMER,
sparktech_net_trigger = TRUE, sparktech_net_trigger = TRUE,
sparktech_energy_max = 300, sparktech_energy_max = MAX_ENERGY,
sparktech_energy_wakeup = 10 sparktech_energy_wakeup = 10
}, },

View File

@ -3,8 +3,9 @@ local ENERGYCOST = {
static_strut = 20, static_strut = 20,
dynamic_struct = 24, dynamic_struct = 24,
hardness_mod = 1, hardness_mod = 1,
mining_cost = 25, mining = 25,
} }
local MAX_ENERGY = 3000
local FORMSPEC = sparktech.add_inventory(19.8,8, local FORMSPEC = sparktech.add_inventory(19.8,8,
"list[current_name;quarry;0,0;16,6;]") "list[current_name;quarry;0,0;16,6;]")
local MAX_SIZE = 64 local MAX_SIZE = 64
@ -56,7 +57,7 @@ end
local function dig_node(pos, quarrypos) local function dig_node(pos, quarrypos)
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
if node.name ~= "air" and try_drain_energy(quarrypos, ENERGYCOST.mining_cost) then if node.name ~= "air" and try_drain_energy(quarrypos, ENERGYCOST.mining) then
local quarry = minetest.get_meta(quarrypos) local quarry = minetest.get_meta(quarrypos)
local quarry_inv = quarry:get_inventory() local quarry_inv = quarry:get_inventory()
@ -285,12 +286,11 @@ minetest.register_node( NAME .. ":lv_quarry", {
paramtype2 = "facedir", paramtype2 = "facedir",
groups = { groups = {
sparktech_techy = 1, sparktech_techy = WRENCHABLE,
sparktech_struty = 1, sparktech_energy_type = ENERGY_CONSUMER,
sparktech_energy_type = 4, sparktech_net_trigger = TRUE,
sparktech_net_trigger = 1, sparktech_energy_max = MAX_ENERGY,
sparktech_energy_max = 3000, sparktech_energy_wakeup = ENERGYCOST.mining
spark_energy_timer = 2
}, },
on_timer = timer_trigger, on_timer = timer_trigger,

View File

@ -1,4 +1,5 @@
local NAME = minetest.get_current_modname() local NAME = minetest.get_current_modname()
local MAX_ENERGY = 200
local formspec = sparktech.add_inventory(8,1.5, local formspec = sparktech.add_inventory(8,1.5,
"list[current_name;charge;0,0;1,1;]") "list[current_name;charge;0,0;1,1;]")
@ -16,12 +17,12 @@ minetest.register_node(NAME ..":charger", {
NAME .. "_charger_frontplate.png", NAME .. "_charger_frontplate.png",
}, },
groups = { groups = {
sparktech_techy = 3, sparktech_techy = WRENCHABLE,
sparktech_energy_type = 4, sparktech_energy_type = ENERGY_CONSUMER,
sparktech_energy_storeonbreak = 1, sparktech_energy_storeonbreak = TRUE,
sparktech_energy_max = 200, sparktech_net_trigger = TRUE,
sparktech_net_trigger = 1, sparktech_energy_max = MAX_ENERGY,
spark_energy_timer = 2 sparktech_energy_wakeup = 10
}, },
allow_metadata_inventory_put = function (_, _, _, itemstack) allow_metadata_inventory_put = function (_, _, _, itemstack)
if minetest.get_item_group(itemstack:get_name(), "sparktech_chargable") > 0 then if minetest.get_item_group(itemstack:get_name(), "sparktech_chargable") > 0 then