Floodlight and Powercell Fix

Floodlights reverted to Incandescent on active/inactive change - Thanks Yeti
Powercells wouldn't supply to machines in "Out of Power" state - Thanks Meise21
Both issues should now be resolved

Also pushed some changes I made to external_nodes_items.lua doesn't affect functionality purely tidy up
This commit is contained in:
Sirrobzeroone 2021-09-26 10:11:12 +10:00
parent 3d28ad39b5
commit 12eacba8f6
3 changed files with 299 additions and 192 deletions

View File

@ -423,7 +423,8 @@ function elepower_lighting.light_timer(pos)
local pos_s = minetest.deserialize(meta:get_string("flood_light_pos_s")) local pos_s = minetest.deserialize(meta:get_string("flood_light_pos_s"))
local pos_e = minetest.deserialize(meta:get_string("flood_light_pos_e")) local pos_e = minetest.deserialize(meta:get_string("flood_light_pos_e"))
local e_pos local e_pos
local bulb_type = string.match(reg_name, ':(.-)_')
if light_shape == "flood" then if light_shape == "flood" then
-- change floodlight node for angled/tilted version -- change floodlight node for angled/tilted version
@ -458,11 +459,11 @@ function elepower_lighting.light_timer(pos)
else else
tilt = 0 tilt = 0
end end
if not string.find(reg_name, "active") then if not string.find(reg_name, "active") then
new_name = "elepower_lighting:incandescent_floodlight_x"..rpn..rotate.."_y"..tpn..tilt new_name = "elepower_lighting:"..bulb_type.."_floodlight_x"..rpn..rotate.."_y"..tpn..tilt
else else
new_name = "elepower_lighting:incandescent_floodlight_x"..rpn..rotate.."_y"..tpn..tilt.."_active" new_name = "elepower_lighting:"..bulb_type.."_floodlight_x"..rpn..rotate.."_y"..tpn..tilt.."_active"
end end
if new_name ~= reg_name then if new_name ~= reg_name then

View File

@ -1,8 +1,18 @@
-- These are all the nodes and items used by elepower which ------------------------------------------------------------
-- are not contained in this mod. These names/references can -- ___ _ --
-- be updated to more easily integrate elepower with -- | __| |___ _ __ _____ __ _____ _ _ --
-- non-minetest game, game. -- | _|| / -_) '_ \/ _ \ V V / -_) '_| --
-- |___|_\___| .__/\___/\_/\_/\___|_| --
-- ___ _|_| _ --
-- | __|_ _| |_ ___ _ _ _ _ __ _| | --
-- | _|\ \ / _/ -_) '_| ' \/ _` | | --
-- |___/_\_\\__\___|_| |_||_\__,_|_| --
------------------------------------------------------------
-- These are all the nodes and items used by elepower --
-- which are not contained in this mod. These --
-- names/references can be updated to more easily --
-- integrate elepower with non-minetest game, game. --
------------------------------------------------------------
------------ ------------
-- Tables -- -- Tables --
------------ ------------
@ -17,19 +27,156 @@ ele.external.graphic = {}
----------- -----------
-- Index -- -- Index --
----------- -----------
--- settings to update............line 34
--- elepower_papi.................line 171
--- elepower_dynamics.............line 192
--- elepower_machines.............line 315
--- elepower_tools................line 576
--- elepower_farming..............line 627
--- elepower_solar................line 732
--- elepower_thermal..............line 768
--- elepower_mining...............line 801
--- elepower_nuclear..............line 829
--- elepower_wireless.............line 917
--- elepower_lighting.............line 991
--- elepower_tome.................line 1048
------------------------------------------------------------
-- _ _ _ ___ _ _ _ --
-- /_\ | | | / __| ___| |_| |_(_)_ _ __ _ ___ --
-- / _ \| | | \__ \/ -_) _| _| | ' \/ _` (_-< --
-- /_/ \_\_|_| |___/\___|\__|\__|_|_||_\__, /__/ --
-- |___/ --
------------------------------------------------------------
-- Update these refs to new values/names to remove --
-- elepower reliance on default --
------------------------------------------------------------
-------------
-- General --
-------------
ele.external.tools.enable_iron_lead_tools = true -- split in two
ele.external.armor.enable_iron_armor = true
ele.external.armor.enable_carbon_fiber_armor = true
ele.external.conduit_dirt_with_grass = true
ele.external.conduit_dirt_with_dry_grass = true
ele.external.conduit_stone_block = true
ele.external.conduit_stone_block_desert = true
----------------
-- References --
----------------
ele.external.ref.gui_bg = default.gui_bg
ele.external.ref.gui_bg_img = default.gui_bg_img
ele.external.ref.gui_slots = default.gui_slots
ele.external.ref.get_hotbar_bg = default.get_hotbar_bg
ele.external.ref.water_source = "default:water_source" -- convert to ing
ele.external.ref.stone = "default:stone" -- convert to ing
-------------------------------------------------
-- Ingredients or node item references in code --
-------------------------------------------------
ele.external.ing.group_stick = "group:stick"
ele.external.ing.group_stone = "group:stone"
ele.external.ing.group_color_red = "group:color_red"
ele.external.ing.group_color_green = "group:color_green"
ele.external.ing.group_color_blue = "group:color_blue"
ele.external.ing.group_color_black = "group:color_black"
ele.external.ing.group_color_violet = "group:color_violet"
ele.external.ing.group_wood = "group:wood"
ele.external.ing.dirt = "default:dirt" -- only used by conduit_dirt_with_grass/dry_grass
ele.external.ing.wheat = "farming:wheat" -- only used by conduit_dirt_with_dry_grass
ele.external.ing.glass = "default:glass"
ele.external.ing.seed_wheat = "farming:seed_wheat" -- essential to acidic compound
ele.external.ing.iron_lump = "default:iron_lump"
ele.external.ing.coal_lump = "default:coal_lump"
ele.external.ing.copper_ingot = "default:copper_ingot"
ele.external.ing.silver_ingot = "moreores:silver_ingot"
ele.external.ing.gold_ingot = "default:gold_ingot"
ele.external.ing.tin_ingot = "default:tin_ingot"
ele.external.ing.bronze_ingot = "default:bronze_ingot"
ele.external.ing.steel_ingot = "default:steel_ingot"
ele.external.ing.mithril_ingot = "moreores:mithril_ingot"
ele.external.ing.steel_block = "default:steelblock"
ele.external.ing.diamond_block = "default:diamondblock"
ele.external.ing.mese = "default:mese"
ele.external.ing.mese_crystal = "default:mese_crystal"
ele.external.ing.mese_crystal_fragment = "default:mese_crystal_fragment"
ele.external.ing.mese_lamp = "default:meselamp"
ele.external.ing.flour = "farming:flour"
ele.external.ing.sand = "default:sand"
ele.external.ing.desert_sand = "default:desert_sand"
ele.external.ing.cobble = "default:cobble"
ele.external.ing.gravel = "default:gravel"
ele.external.ing.brick = "default:brick"
ele.external.ing.flint = "default:flint"
ele.external.ing.clay_brick = "default:clay_brick"
ele.external.ing.obsidian = "default:obsidian"
ele.external.ing.lava_source = "default:lava_source"
ele.external.ing.hoe_steel = "farming:hoe_steel"
ele.external.ing.axe_steel = "default:axe_steel"
ele.external.ing.tree = "default:tree"
ele.external.ing.leaves = "default:leaves"
ele.external.ing.apple = "default:apple"
ele.external.ing.jungle_tree = "default:jungletree"
ele.external.ing.jungle_leaves = "default:jungleleaves"
ele.external.ing.pine_tree = "default:pine_tree"
ele.external.ing.pine_needles = "default:pine_needles"
ele.external.ing.acacia_tree = "default:acacia_tree"
ele.external.ing.acacia_leaves = "default:acacia_leaves"
ele.external.ing.aspen_tree = "default:aspen_tree"
ele.external.ing.aspen_leaves = "default:aspen_leaves"
ele.external.ing.slab_wood = "stairs:slab_wood"
ele.external.ing.stick = "default:stick"
ele.external.ing.paper = "default:paper" -- elepower_lighting decorative shades only
ele.external.ing.farming_soil = "farming:soil"
ele.external.ing.farming_soil_wet = "farming:soil_wet"
ele.external.ing.slab_glass = "stairs:slab_glass"
ele.external.ing.dye_red = "dye:red"
ele.external.ing.dye_green = "dye:green"
ele.external.ing.dye_blue = "dye:blue"
ele.external.ing.furnace = "default:furnace"
ele.external.ing.obsidian_glass = "default:obsidian_glass"
ele.external.ing.slab_stone_block = "stairs:slab_stone_block"
ele.external.ing.blueberry_bush_leaves = "default:blueberry_bush_leaves"
ele.external.ing.slab_desert_stone_block = "stairs:slab_desert_stone_block"
------------
-- Sounds --
------------
ele.external.sounds.node_sound_stone = default.node_sound_stone_defaults()
ele.external.sounds.node_sound_water = default.node_sound_water_defaults()
ele.external.sounds.node_sound_stone = default.node_sound_stone_defaults()
ele.external.sounds.node_sound_wood = default.node_sound_wood_defaults()
ele.external.sounds.node_sound_glass = default.node_sound_glass_defaults()
ele.external.sounds.node_sound_metal = default.node_sound_metal_defaults()
ele.external.sounds.tool_breaks = "default_tool_breaks"
ele.external.sounds.dig_crumbly = "default_dig_crumbly"
ele.external.sounds.node_sound_dirt_c = default.node_sound_dirt_defaults(
{
footstep = {name = "default_grass_footstep", gain = 0.25}
})
---------------------
-- Graphics/Images --
---------------------
ele.external.graphic.water = "default_water.png"
ele.external.graphic.grass = "default_grass.png"
ele.external.graphic.dirt = "default_dirt.png"
ele.external.graphic.grass_side = "default_grass_side.png"
ele.external.graphic.grass_dry = "default_dry_grass.png"
ele.external.graphic.grass_side_dry = "default_dry_grass_side.png"
ele.external.graphic.stone_block = "default_stone_block.png"
ele.external.graphic.desert_stone_block = "default_desert_stone_block.png"
ele.external.graphic.stone = "default_stone.png"
ele.external.graphic.wood = "default_wood.png"
ele.external.graphic.obsidian_glass = "default_obsidian_glass.png"
ele.external.graphic.furnace_fire_bg = "default_furnace_fire_bg.png"
ele.external.graphic.furnace_fire_fg = "default_furnace_fire_fg.png"
ele.external.graphic.gui_furnace_arrow_bg = "gui_furnace_arrow_bg.png"
ele.external.graphic.gui_furnace_arrow_fg = "gui_furnace_arrow_fg.png"
--- elepower_papi.................line
--- elepower_dynamics.............line
--- elepower_machines.............line
--- elepower_tools................line
--- elepower_farming..............line
--- elepower_solar................line
--- elepower_thermal..............line
--- elepower_mining...............line
--- elepower_nuclear..............line
--- elepower_wireless.............line
--- elepower_lighting.............line
--- elepower_tome.................line
------------------------------------------------------------ ------------------------------------------------------------
-- ___ _ ___ _ -- -- ___ _ ___ _ --
@ -40,17 +187,15 @@ ele.external.graphic = {}
------------------------------------------------------------ ------------------------------------------------------------
-- Other mods nodes/items used by elepower_papi -- -- Other mods nodes/items used by elepower_papi --
------------------------------------------------------------ ------------------------------------------------------------
------------------ ------------------
-- formspec.lua -- -- formspec.lua --
------------------ ------------------
ele.external.graphic.water = "default_water.png" -- uses graphic.water
----------------- -----------------
-- helpers.lua -- -- helpers.lua --
----------------- -----------------
ele.external.sounds.node_sound_water = default.node_sound_water_defaults() -- uses sounds.node_sound_water
-- rest NIL -- rest NIL
@ -67,7 +212,6 @@ ele.external.sounds.node_sound_water = default.node_sound_water_defaults()
------------------------------------------------------------ ------------------------------------------------------------
-- Other mods nodes/items used by elepower_dynamics -- -- Other mods nodes/items used by elepower_dynamics --
------------------------------------------------------------ ------------------------------------------------------------
-------------------- --------------------
-- components.lua -- -- components.lua --
-------------------- --------------------
@ -77,68 +221,56 @@ ele.external.sounds.node_sound_water = default.node_sound_water_defaults()
-- conduits.lua -- -- conduits.lua --
------------------ ------------------
-- if any are false also disables craft recipe -- if any are false also disables craft recipe
ele.external.conduit_dirt_with_grass = true -- uses conduit_dirt_with_grass
ele.external.conduit_dirt_with_dry_grass = true -- uses conduit_dirt_with_dry_grass
ele.external.conduit_stone_block = true -- uses conduit_stone_block
ele.external.conduit_stone_block_desert = true -- uses conduit_stone_block_desert
-- uses tools.enable_iron_lead_tools
ele.external.graphic.grass = "default_grass.png" -- uses graphic.grass
ele.external.graphic.dirt = "default_dirt.png" -- uses graphic.dirt
ele.external.graphic.grass_side = "default_grass_side.png" -- uses graphic.grass_side
ele.external.graphic.grass_dry = "default_dry_grass.png" -- uses graphic.grass_dry
ele.external.graphic.grass_side_dry = "default_dry_grass_side.png" -- uses graphic.grass_side_dry
ele.external.graphic.stone_block = "default_stone_block.png" -- uses graphic.stone_block
ele.external.graphic.desert_stone_block = "default_desert_stone_block.png" -- uses graphic.desert_stone_block
-- uses sounds.node_sound_dirt_c
ele.external.sounds.node_sound_dirt_c = default.node_sound_dirt_defaults( -- uses .sounds.node_sound_stone
{
footstep = {name = "default_grass_footstep", gain = 0.25}
})
ele.external.sounds.node_sound_stone = default.node_sound_stone_defaults()
------------------ ------------------
-- crafting.lua -- -- crafting.lua --
------------------ ------------------
ele.external.ing.group_stick = "group:stick" -- uses ing.group_stick
ele.external.ing.group_stone = "group:stone" -- uses ing.group_stone
ele.external.ing.group_color_red = "group:color_red" -- uses ing.group_color_red
ele.external.ing.group_color_green = "group:color_green" -- uses ing.group_color_green
ele.external.ing.group_color_blue = "group:color_blue" -- uses ing.group_color_blue
ele.external.ing.group_color_black = "group:color_black" -- uses ing.group_color_black
ele.external.ing.group_color_violet = "group:color_violet" -- uses ing.group_color_violet
-- uses ing.dirt
-- uses ing.wheat
-- uses ing.slab_stone_block
-- uses ing.slab_desert_stone_block
-- uses ing.glass
-- uses ing.seed_wheat
-- uses ing.iron_lump
-- uses ing.coal_lump
-- uses ing.copper_ingot
-- uses ing.silver_ingot
-- uses ing.gold_ingot
-- uses ing.tin_ingot
-- uses ing.bronze_ingot
-- uses ing.steel_ingot
-- uses ing.mithril_ingot
-- uses ing.mese_crystal
-- uses ing.mese_crystal_fragment
-- uses ing.mese_lamp
ele.external.ing.dirt = "default:dirt" -- only used by conduit_dirt_with_grass/dry_grass -- uses tools.enable_iron_lead_tools
ele.external.ing.wheat = "farming:wheat" -- only used by conduit_dirt_with_dry_grass
ele.external.ing.slab_stone_block = "stairs:slab_stone_block" -- only used by conduit_stone_block
ele.external.ing.slab_desert_stone_block = "stairs:slab_desert_stone_block" -- only used by conduit_stone_block_desert
ele.external.ing.glass = "default:glass"
ele.external.ing.seed_wheat = "farming:seed_wheat" -- essential to acidic compound
-- all metal lumps listed here but used in other places
ele.external.ing.iron_lump = "default:iron_lump"
ele.external.ing.coal_lump = "default:coal_lump"
-- all ingots listed here but used in other places
ele.external.ing.copper_ingot = "default:copper_ingot"
ele.external.ing.silver_ingot = "moreores:silver_ingot"
ele.external.ing.gold_ingot = "default:gold_ingot"
ele.external.ing.tin_ingot = "default:tin_ingot"
ele.external.ing.bronze_ingot = "default:bronze_ingot"
ele.external.ing.steel_ingot = "default:steel_ingot"
ele.external.ing.mithril_ingot = "moreores:mithril_ingot"
ele.external.ing.mese_crystal = "default:mese_crystal"
ele.external.ing.mese_crystal_fragment = "default:mese_crystal_fragment"
ele.external.ing.mese_lamp = "default:meselamp"
ele.external.tools.enable_iron_lead_tools = true
-------------------- --------------------
-- craftitems.lua -- -- craftitems.lua --
-------------------- --------------------
ele.external.ref.water_source = "default:water_source" -- uses ref.water_source
-- uses ing.steel_ingot -- uses ing.steel_ingot
---------------- ----------------
@ -154,13 +286,12 @@ ele.external.ref.water_source = "default:water_source"
---------------- ----------------
-- nodes.lua -- -- nodes.lua --
--------------- ---------------
ele.external.graphic.stone = "default_stone.png" -- uses graphic.stone
ele.external.graphic.obsidian_glass = "default_obsidian_glass.png" -- uses graphic.obsidian_glass
-- uses sounds.node_sound_stone
ele.external.sounds.node_sound_stone = default.node_sound_stone_defaults() -- uses sounds.node_sound_wood
ele.external.sounds.node_sound_wood = default.node_sound_wood_defaults() -- uses sounds.node_sound_glass
ele.external.sounds.node_sound_glass = default.node_sound_glass_defaults() -- uses sounds.node_sound_metal
ele.external.sounds.node_sound_metal = default.node_sound_metal_defaults()
--------------- ---------------
-- tanks.lua -- -- tanks.lua --
@ -172,13 +303,13 @@ ele.external.sounds.node_sound_metal = default.node_sound_metal_defaults()
-- tools.lua -- -- tools.lua --
--------------- ---------------
-- not registered if "ele.external.tools.enable_iron_lead_tools = false" -- not registered if "ele.external.tools.enable_iron_lead_tools = false"
ele.external.sounds.tool_breaks = "default_tool_breaks" -- uses sounds.tool_breaks
------------------ ------------------
-- worldgen.lua -- -- worldgen.lua --
------------------ ------------------
ele.external.ref.stone = "default:stone" -- uses ref.stone
---------------------- ----------------------
-- subfolder compat -- -- subfolder compat --
@ -203,43 +334,40 @@ ele.external.ref.stone = "default:stone"
------------------------------------------------------------ ------------------------------------------------------------
-- Other mods nodes/items used by elepower_machines -- -- Other mods nodes/items used by elepower_machines --
------------------------------------------------------------ ------------------------------------------------------------
--------------- ---------------
-- craft.lua -- -- craft.lua --
--------------- ---------------
-- NIL -- NIL
------------------ ------------------
-- crafting.lua -- -- crafting.lua --
------------------ ------------------
--[[ Uses -- uses ing.steel_ingot
ing.steel_ingot -- uses ing.copper_ingot
ing.copper_ingot -- uses ing.tin_ingot
ing.tin_ingot -- uses ing.bronze_ingot
ing.bronze_ingot -- uses ing.gold_ingot
ing.gold_ingot -- uses ing.silver_ingot
ing.silver_ingot -- uses ing.coal_lump
ing.coal_lump -- uses ing.wheat
ing.wheat -- uses ing.mese_crystal
ing.mese_crystal -- uses ing.mese_crystal_fragment
ing.mese_crystal_fragment -- uses ing.group_stick
ing.group_stick -- uses ing.group_stone
ing.group_stone -- uses ing.glass
ing.glass -- uses ing.obsidian_glass
--]] -- uses ing.flour
-- uses ing.sand
ele.external.ing.obsidian_glass = "default:obsidian_glass" -- uses ing.desert_sand
ele.external.ing.flour = "farming:flour" -- uses ing.cobble
ele.external.ing.sand = "default:sand" -- uses ing.gravel
ele.external.ing.desert_sand = "default:desert_sand" -- uses ing.mese
ele.external.ing.cobble = "default:cobble" -- uses ing.group_wood
ele.external.ing.gravel = "default:gravel" -- uses ing.brick
ele.external.ing.mese = "default:mese" -- uses ing.flint
ele.external.ing.group_wood = "group:wood" -- uses ing.clay_brick
ele.external.ing.brick = "default:brick" -- uses ing.steel_block
ele.external.ing.flint = "default:flint"
ele.external.ing.clay_brick = "default:clay_brick"
ele.external.ing.steel_block = "default:steelblock"
-------------------- --------------------
-- craftitems.lua -- -- craftitems.lua --
@ -272,10 +400,10 @@ ele.external.ing.steel_block = "default:steelblock"
--------------------- ---------------------
-- bucketer.lua -- -- bucketer.lua --
--------------------- ---------------------
ele.external.ref.gui_bg = default.gui_bg -- uses ref.gui_bg
ele.external.ref.gui_bg_img = default.gui_bg_img -- uses ref.gui_bg_img
ele.external.ref.gui_slots = default.gui_slots -- uses ref.gui_slots
ele.external.ref.get_hotbar_bg = default.get_hotbar_bg -- uses ref.get_hotbar_bg
------------------------- -------------------------
-- canning_machine.lua -- -- canning_machine.lua --
@ -289,11 +417,10 @@ ele.external.ref.get_hotbar_bg = default.get_hotbar_bg
-- uses ref.gui_bg_img -- uses ref.gui_bg_img
-- uses ref.gui_slots -- uses ref.gui_slots
-- uses ref.get_hotbar_bg -- uses ref.get_hotbar_bg
-- uses graphic.furnace_fire_bg
ele.external.graphic.furnace_fire_bg = "default_furnace_fire_bg.png" -- uses graphic.furnace_fire_fg
ele.external.graphic.furnace_fire_fg = "default_furnace_fire_fg.png" -- uses graphic.gui_furnace_arrow_bg
ele.external.graphic.gui_furnace_arrow_bg = "gui_furnace_arrow_bg.png" -- uses graphic.gui_furnace_arrow_fg
ele.external.graphic.gui_furnace_arrow_fg = "gui_furnace_arrow_fg.png"
------------------------- -------------------------
-- compressor.lua -- -- compressor.lua --
@ -342,8 +469,7 @@ ele.external.graphic.gui_furnace_arrow_fg = "gui_furnace_arrow_fg.png"
-- uses ref.get_hotbar_bg -- uses ref.get_hotbar_bg
-- uses graphic.gui_furnace_arrow_fg -- uses graphic.gui_furnace_arrow_fg
-- uses graphic.gui_furnace_arrow_bg -- uses graphic.gui_furnace_arrow_bg
-- uses graphic.wood
ele.external.graphic.wood = "default_wood.png"
--------------------- ---------------------
-- lava_cooler.lua -- -- lava_cooler.lua --
@ -357,9 +483,8 @@ ele.external.graphic.wood = "default_wood.png"
-- uses ref.get_hotbar_bg -- uses ref.get_hotbar_bg
-- uses graphic.gui_furnace_arrow_fg -- uses graphic.gui_furnace_arrow_fg
-- uses graphic.gui_furnace_arrow_bg -- uses graphic.gui_furnace_arrow_bg
-- uses ing.obsidian
ele.external.ing.obsidian = "default:obsidian" -- uses ing.lava_source
ele.external.ing.lava_source = "default:lava_source"
------------------------ ------------------------
-- lava_generator.lua -- -- lava_generator.lua --
@ -467,12 +592,12 @@ ele.external.ing.lava_source = "default:lava_source"
--------------------------------------------------------------- ---------------------------------------------------------------
-- Other mods nodes/items used by elepower_tools -- -- Other mods nodes/items used by elepower_tools --
--------------------------------------------------------------- ---------------------------------------------------------------
--------------- ---------------
-- armor.lua -- -- armor.lua --
--------------- ---------------
ele.external.armor.enable_iron_armor = true -- uses armor.enable_iron_armor
ele.external.armor.enable_carbon_fiber_armor = true -- uses armor.enable_carbon_fiber_armor
------------------ ------------------
-- crafting.lua -- -- crafting.lua --
@ -481,7 +606,7 @@ ele.external.armor.enable_carbon_fiber_armor = true
ing.steel_ingot ing.steel_ingot
ing.mese ing.mese
--]] --]]
ele.external.ing.diamond_block = "default:diamondblock" -- uses ing.diamond_block
-------------------- --------------------
-- craftitems.lua -- -- craftitems.lua --
@ -525,13 +650,10 @@ ele.external.ing.diamond_block = "default:diamondblock"
------------------ ------------------
-- crafting.lua -- -- crafting.lua --
------------------ ------------------
--[[ Uses -- uses ing.glass
ing.glass -- uses ing.mese_crystal
ing.mese_crystal -- uses ing.hoe_steel
--]] -- uses ing.axe_steel
ele.external.ing.hoe_steel = "farming:hoe_steel"
ele.external.ing.axe_steel = "default:axe_steel"
-------------------- --------------------
-- craftitems.lua -- -- craftitems.lua --
@ -551,19 +673,19 @@ ele.external.ing.axe_steel = "default:axe_steel"
-------------------- --------------------
-- treecutter.lua -- -- treecutter.lua --
-------------------- --------------------
ele.external.ing.tree = "default:tree" -- uses ing.tree
ele.external.ing.leaves = "default:leaves" -- uses ing.leaves
ele.external.ing.apple = "default:apple" -- uses ing.apple
ele.external.ing.jungle_tree = "default:jungletree" -- uses ing.jungle_tree
ele.external.ing.jungle_leaves = "default:jungleleaves" -- uses ing.jungle_leaves
ele.external.ing.pine_tree = "default:pine_tree" -- uses ing.pine_tree
ele.external.ing.pine_needles = "default:pine_needles" -- uses ing.pine_needles
ele.external.ing.acacia_tree = "default:acacia_tree" -- uses ing.acacia_tree
ele.external.ing.acacia_leaves = "default:acacia_leaves" -- uses ing.acacia_leaves
ele.external.ing.aspen_tree = "default:aspen_tree" -- uses ing.aspen_tree
ele.external.ing.aspen_leaves = "default:aspen_leaves" -- uses ing.aspen_leaves
-- treecutter supports farming_plus, ethereal and moretrees -- treecutter optionally supports mods farming_plus, ethereal and moretrees
------------------------ ------------------------
-- subfolder machines -- -- subfolder machines --
@ -587,9 +709,9 @@ ele.external.ing.aspen_leaves = "default:aspen_leaves"
----------------- -----------------
-- planter.lua -- -- planter.lua --
----------------- -----------------
ele.external.sounds.dig_crumbly = "default_dig_crumbly" -- uses sounds.dig_crumbly
ele.external.ing.farming_soil = "farming:soil" -- uses ing.farming_soil
ele.external.ing.farming_soil_wet = "farming:soil_wet" -- uses ing.farming_soil_wet
----------------- -----------------
-- spawner.lua -- -- spawner.lua --
@ -602,11 +724,11 @@ ele.external.ing.farming_soil_wet = "farming:soil_wet"
------------------------ ------------------------
-- tree_extractor.lua -- -- tree_extractor.lua --
------------------------ ------------------------
ele.external.ing.tree = "default:tree" -- uses ing.tree
ele.external.ing.jungle_tree = "default:jungletree" -- uses ing.jungle_tree
ele.external.ing.pine_tree = "default:pine_tree" -- uses ing.pine_tree
ele.external.ing.acacia_tree = "default:acacia_tree" -- uses ing.acacia_tree
ele.external.ing.aspen_tree = "default:aspen_tree" -- uses ing.aspen_tree
------------------------ ------------------------
-- tree_processor.lua -- -- tree_processor.lua --
@ -730,7 +852,7 @@ ele.external.ing.aspen_tree = "default:aspen_tree"
-- crafting.lua -- -- crafting.lua --
------------------ ------------------
-- uses ing.steel_block -- uses ing.steel_block
ele.external.ing.silver_ingot = "moreores:silver_ingot" -- uses ing.silver_ingot
-------------------- --------------------
-- craftitems.lua -- -- craftitems.lua --
@ -893,13 +1015,12 @@ ele.external.ing.silver_ingot = "moreores:silver_ingot"
-- i_crafting.lua -- -- i_crafting.lua --
-------------------- --------------------
-- uses ing.glass -- uses ing.glass
-- uses ing.slab_glass
ele.external.ing.slab_glass = "stairs:slab_glass" -- uses ing.slab_wood
ele.external.ing.slab_wood = "stairs:slab_wood" -- uses ing.stick
ele.external.ing.stick = "default:stick" -- uses ing.dye_red
ele.external.ing.dye_red = "dye:red" -- uses ing.dye_green
ele.external.ing.dye_green = "dye:green" -- uses ing.dye_blue
ele.external.ing.dye_blue = "dye:blue"
--------------------------- ---------------------------
-- i_crafting_shades.lua -- -- i_crafting_shades.lua --
@ -907,7 +1028,7 @@ ele.external.ing.dye_blue = "dye:blue"
-- uses ing.glass -- uses ing.glass
-- uses ing.dye_red -- uses ing.dye_red
-- uses ing.dye_blue -- uses ing.dye_blue
ele.external.ing.paper = "default:paper" -- uses ing.paper
---------------------- ----------------------
-- i_craftitems.lua -- -- i_craftitems.lua --
@ -962,9 +1083,8 @@ ele.external.ing.paper = "default:paper"
-- uses ing.lava_source -- uses ing.lava_source
-- uses ref.stone -- uses ref.stone
-- uses ref,water_source -- uses ref,water_source
-- uses ing.blueberry_bush_leaves
ele.external.ing.blueberry_bush_leaves = "default:blueberry_bush_leaves" -- uses ing.furnace
ele.external.ing.furnace = "default:furnace"
--------------------- ---------------------
-- i_functions.lua -- -- i_functions.lua --
@ -994,20 +1114,4 @@ ele.external.ing.furnace = "default:furnace"
------------------------- -------------------------
-- i_page_machines.lua -- -- i_page_machines.lua --
------------------------- -------------------------
--NIL --NIL

View File

@ -306,7 +306,9 @@ minetest.register_abm({
-- the word "Active" was found. -- the word "Active" was found.
if bat_flag == true then if bat_flag == true then
local active = string.find(user_status, "Active") local active = string.find(user_status, "Active")
if active ~= nil then local out_power = string.find(user_status, "Out of Power")
--minetest.debug(dump(user_status))
if active ~= nil or out_power ~= nil then
if user_gets > user_usage then if user_gets > user_usage then
user_gets = user_usage user_gets = user_usage
end end