MTSR/techage
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfixes

Browse Source
This commit is contained in:
Joachim Stolberg 2019-03-08 22:26:55 +01:00
parent c037ac6613
commit 74b62368ba
2 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
basis/power.lua
View File

@ -104,9 +104,12 @@ local turn_on = nil
local function call_turn_on(pos, in_dir, sum) local function call_turn_on(pos, in_dir, sum)
if not pos_already_reached(pos) then if not pos_already_reached(pos) then
local mem = tubelib2.get_mem(pos)
local this = TP(pos) local this = TP(pos)
if this and this.turn_on then if this and (not this.valid_power_dir or this.valid_power_dir(pos, mem, in_dir)) then
this.turn_on(pos, in_dir, sum) if this.turn_on then
this.turn_on(pos, in_dir, sum)
end
end end
if this and this.animated_power_network then if this and this.animated_power_network then
turn_tube_on(pos, in_dir, this.power_network, sum > 0) turn_tube_on(pos, in_dir, this.power_network, sum > 0)

51
steam_engine/consumer.lua
View File

@ -17,8 +17,10 @@ local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
local P = minetest.string_to_pos local P = minetest.string_to_pos
local M = minetest.get_meta local M = minetest.get_meta
local POWER_CONSUME = 4 local POWER_CONSUMPTION = 4
local Axle = techage.Axle
local consumer = techage.consumer
local function swap_node(pos, name) local function swap_node(pos, name)
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
@ -35,13 +37,13 @@ local function valid_power_dir(pos, mem, in_dir)
return mem.power_dir == in_dir return mem.power_dir == in_dir
end end
local function turn_on(pos, in_dir, on) local function turn_on_clbk(pos, in_dir, sum)
if on then local mem = tubelib2.get_mem(pos)
swap_node(pos, "techage:consumer_on") if sum > 0 then
else swap_node(pos, "techage:consumer_on")
swap_node(pos, "techage:consumer") else
end swap_node(pos, "techage:consumer")
-- end end
end end
minetest.register_node("techage:consumer", { minetest.register_node("techage:consumer", {
@ -56,23 +58,21 @@ minetest.register_node("techage:consumer", {
'techage_filling_ta2.png^techage_frame_ta2.png', 'techage_filling_ta2.png^techage_frame_ta2.png',
}, },
techage = { techage = {
turn_on = turn_on, turn_on = turn_on_clbk,
power_consumption = techage.consumer_power_consumption, read_power_consumption = consumer.read_power_consumption,
power_network = techage.Axle, power_network = Axle,
power_consume = POWER_CONSUME,
animated_power_network = true,
power_side = "L", power_side = "L",
valid_power_dir = valid_power_dir, valid_power_dir = valid_power_dir,
animated_power_network = true,
}, },
after_place_node = function(pos, placer) after_place_node = function(pos, placer)
local mem = techage.consumer_after_place_node(pos, placer) local mem = consumer.after_place_node(pos, placer)
mem.power_consume = POWER_CONSUME mem.power_consumption = POWER_CONSUMPTION
end, end,
after_tube_update = techage.consumer_after_tube_update, after_tube_update = consumer.after_tube_update,
after_dig_node = techage.consumer_after_dig_node, after_dig_node = consumer.after_dig_node,
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {choppy=2, cracky=2, crumbly=2}, groups = {choppy=2, cracky=2, crumbly=2},
@ -119,17 +119,16 @@ minetest.register_node("techage:consumer_on", {
}, },
}, },
techage = { techage = {
turn_on = turn_on, turn_on = turn_on_clbk,
power_consumption = techage.consumer_power_consumption, read_power_consumption = consumer.read_power_consumption,
power_network = techage.Axle, power_network = Axle,
power_consume = POWER_CONSUME, power_side = "L",
animated_power_network = true,
valid_power_dir = valid_power_dir, valid_power_dir = valid_power_dir,
animated_power_network = true,
}, },
after_place_node = techage.consumer_after_place_node, after_tube_update = consumer.after_tube_update,
after_tube_update = techage.consumer_after_tube_update, after_dig_node = consumer.after_dig_node,
after_dig_node = techage.consumer_after_dig_node,
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {not_in_creative_inventory=1}, groups = {not_in_creative_inventory=1},