Compare commits
52 Commits
c594ac4743
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 29b5a6c996 | |||
| 42378a4331 | |||
| bd2e7f56f4 | |||
| c7ff88087e | |||
| cd585391ec | |||
| d50908dedb | |||
| ae26f0fe58 | |||
| a210cc78e0 | |||
| f480f16340 | |||
| 6a37a84114 | |||
| eb546fd07b | |||
| 6c93528d13 | |||
| 520f3717d6 | |||
| 75894128f0 | |||
| 7efdf28b37 | |||
| 8125d280da | |||
| 0d8807a1c3 | |||
| e7ed72b261 | |||
| 647d46b2f4 | |||
| 27ebd4fbc5 | |||
| 603ae83507 | |||
| 9633214a85 | |||
| a920bef790 | |||
| a9be76866f | |||
| 9b0792f1ff | |||
| fad7a690ae | |||
| 60717d8ec1 | |||
| 08fd6a5a40 | |||
| 0cd9db64fb | |||
| 374f9037a1 | |||
| 8760600105 | |||
| d709feee6e | |||
| b5f9955e07 | |||
| 986a0d189c | |||
| 8aa5ddc972 | |||
| a2ce0e5177 | |||
| 85b5d5808a | |||
| 69c8355ecb | |||
| 37b6d2b8ff | |||
| c9e73102c9 | |||
| d1511a5f10 | |||
| be435e616a | |||
| b4ea5629c1 | |||
| 92ed913cac | |||
| f98bebab4e | |||
| 6348ca2094 | |||
| 10045582e9 | |||
| fe55ade9b0 | |||
| f7d3ef2190 | |||
| 595241a9b2 | |||
| 25b9c2e1b8 | |||
| 1e1797e1dc |
@@ -41,6 +41,15 @@ function industrialtest.internal.clamp(num,min,max)
|
|||||||
return math.max(math.min(num,max),min)
|
return math.max(math.min(num,max),min)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function industrialtest.internal.addYVelocityClamped(player,vel,max)
|
||||||
|
local playerVel=player:get_velocity()
|
||||||
|
if playerVel.y+vel>max then
|
||||||
|
player:add_velocity(vector.new(0,math.max(max-playerVel.y,0),0))
|
||||||
|
else
|
||||||
|
player:add_velocity(vector.new(0,vel,0))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function industrialtest.internal.unpackTableInto(first,second)
|
function industrialtest.internal.unpackTableInto(first,second)
|
||||||
for k,v in pairs(second) do
|
for k,v in pairs(second) do
|
||||||
first[k]=v
|
first[k]=v
|
||||||
|
|||||||
@@ -53,6 +53,21 @@ industrialtest.internal={}
|
|||||||
if industrialtest.mclAvailable then
|
if industrialtest.mclAvailable then
|
||||||
industrialtest.stackMax=64
|
industrialtest.stackMax=64
|
||||||
|
|
||||||
|
minetest.override_item("mcl_buckets:bucket_empty",{
|
||||||
|
groups={
|
||||||
|
_industrialtest_simpleFluidStorage=1
|
||||||
|
},
|
||||||
|
_industrialtest_getResultingFluidStorageItemByNode=function(fluidType)
|
||||||
|
local resultingItem=mcl_buckets.liquids[fluidType]
|
||||||
|
if resultingItem then
|
||||||
|
return {
|
||||||
|
name=resultingItem.bucketname
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
_industrialtest_simpleFluidStorageCapacity=1000
|
||||||
|
})
|
||||||
|
|
||||||
industrialtest.internal.mclMakeStrippedTrunk=function(itemstack,placer,pointedThing,electricTool)
|
industrialtest.internal.mclMakeStrippedTrunk=function(itemstack,placer,pointedThing,electricTool)
|
||||||
-- Taken from https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_tools/init.lua#L360
|
-- Taken from https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_tools/init.lua#L360
|
||||||
if pointedThing.type ~= "node" then return end
|
if pointedThing.type ~= "node" then return end
|
||||||
@@ -86,10 +101,26 @@ if industrialtest.mclAvailable then
|
|||||||
mcl_explosions.explode(pos,radius,{drop_chance=dropChance})
|
mcl_explosions.explode(pos,radius,{drop_chance=dropChance})
|
||||||
end
|
end
|
||||||
|
|
||||||
industrialtest.internal.getItemSlotBg=mcl_formspec.get_itemslot_bg
|
industrialtest.internal.getItemSlotBg=mcl_formspec.get_itemslot_bg_v4
|
||||||
elseif industrialtest.mtgAvailable then
|
elseif industrialtest.mtgAvailable then
|
||||||
industrialtest.stackMax=99
|
industrialtest.stackMax=99
|
||||||
|
|
||||||
|
-- Override bucket to add function which will be used to query bucket with fluid
|
||||||
|
minetest.override_item("bucket:bucket_empty",{
|
||||||
|
groups={
|
||||||
|
_industrialtest_simpleFluidStorage=1
|
||||||
|
},
|
||||||
|
_industrialtest_getResultingFluidStorageItemByNode=function(fluidType)
|
||||||
|
local resultingItem=bucket.liquids[fluidType]
|
||||||
|
if resultingItem then
|
||||||
|
return {
|
||||||
|
name=resultingItem.itemname
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
_industrialtest_simpleFluidStorageCapacity=1000
|
||||||
|
})
|
||||||
|
|
||||||
industrialtest.internal.explode=function(pos,radius)
|
industrialtest.internal.explode=function(pos,radius)
|
||||||
tnt.boom(pos,{radius=radius})
|
tnt.boom(pos,{radius=radius})
|
||||||
end
|
end
|
||||||
@@ -507,6 +538,7 @@ if industrialtest.mclAvailable then
|
|||||||
industrialtest.elementKeys.cactus="mcl_core:cactus"
|
industrialtest.elementKeys.cactus="mcl_core:cactus"
|
||||||
industrialtest.elementKeys.gunpowder="mcl_mobitems:gunpowder"
|
industrialtest.elementKeys.gunpowder="mcl_mobitems:gunpowder"
|
||||||
industrialtest.elementKeys.chest="mcl_chests:chest_small"
|
industrialtest.elementKeys.chest="mcl_chests:chest_small"
|
||||||
|
industrialtest.elementKeys.paper="mcl_core:paper"
|
||||||
industrialtest.elementKeys.groupSapling="group:sapling"
|
industrialtest.elementKeys.groupSapling="group:sapling"
|
||||||
industrialtest.elementKeys.groupLeaves="group:leaves"
|
industrialtest.elementKeys.groupLeaves="group:leaves"
|
||||||
industrialtest.elementKeys.stickyResin=(industrialtest.mods.mclRubber and "mcl_rubber:rubber_raw" or "industrialtest:sticky_resin")
|
industrialtest.elementKeys.stickyResin=(industrialtest.mods.mclRubber and "mcl_rubber:rubber_raw" or "industrialtest:sticky_resin")
|
||||||
@@ -742,6 +774,7 @@ elseif industrialtest.mtgAvailable then
|
|||||||
industrialtest.elementKeys.cactus="default:cactus"
|
industrialtest.elementKeys.cactus="default:cactus"
|
||||||
industrialtest.elementKeys.gunpowder="tnt:gunpowder"
|
industrialtest.elementKeys.gunpowder="tnt:gunpowder"
|
||||||
industrialtest.elementKeys.chest="default:chest"
|
industrialtest.elementKeys.chest="default:chest"
|
||||||
|
industrialtest.elementKeys.paper="default:paper"
|
||||||
industrialtest.elementKeys.groupSapling="group:sapling"
|
industrialtest.elementKeys.groupSapling="group:sapling"
|
||||||
industrialtest.elementKeys.groupLeaves="group:leaves"
|
industrialtest.elementKeys.groupLeaves="group:leaves"
|
||||||
industrialtest.elementKeys.stickyResin="industrialtest:sticky_resin"
|
industrialtest.elementKeys.stickyResin="industrialtest:sticky_resin"
|
||||||
|
|||||||
@@ -503,6 +503,13 @@ industrialtest.api.registerPlate("carbon_plate",S("Carbon Plate"),{
|
|||||||
}
|
}
|
||||||
},"#272725ff",true)
|
},"#272725ff",true)
|
||||||
|
|
||||||
|
industrialtest.api.registerPlate("iron_plate",S("Iron Plate"),{
|
||||||
|
{
|
||||||
|
resource=industrialtest.elementKeys.ironIngot,
|
||||||
|
count=1
|
||||||
|
}
|
||||||
|
},colors.iron,true)
|
||||||
|
|
||||||
industrialtest.api.registerPlate("tin_plate",S("Tin Plate"),{
|
industrialtest.api.registerPlate("tin_plate",S("Tin Plate"),{
|
||||||
{
|
{
|
||||||
resource=industrialtest.elementKeys.tinIngot,
|
resource=industrialtest.elementKeys.tinIngot,
|
||||||
|
|||||||
2
init.lua
@@ -56,6 +56,7 @@ dofile(modpath.."/machines/generator.lua")
|
|||||||
dofile(modpath.."/machines/induction_furnace.lua")
|
dofile(modpath.."/machines/induction_furnace.lua")
|
||||||
dofile(modpath.."/machines/iron_furnace.lua")
|
dofile(modpath.."/machines/iron_furnace.lua")
|
||||||
dofile(modpath.."/machines/macerator.lua")
|
dofile(modpath.."/machines/macerator.lua")
|
||||||
|
dofile(modpath.."/machines/magnetizer.lua")
|
||||||
dofile(modpath.."/machines/mass_fabricator.lua")
|
dofile(modpath.."/machines/mass_fabricator.lua")
|
||||||
dofile(modpath.."/machines/miner.lua")
|
dofile(modpath.."/machines/miner.lua")
|
||||||
dofile(modpath.."/machines/nuclear_reactor.lua")
|
dofile(modpath.."/machines/nuclear_reactor.lua")
|
||||||
@@ -97,6 +98,7 @@ dofile(modpath.."/tools/wrench.lua")
|
|||||||
|
|
||||||
dofile(modpath.."/upgrades.lua")
|
dofile(modpath.."/upgrades.lua")
|
||||||
dofile(modpath.."/craftitems.lua")
|
dofile(modpath.."/craftitems.lua")
|
||||||
|
dofile(modpath.."/guide.lua")
|
||||||
dofile(modpath.."/nodes.lua")
|
dofile(modpath.."/nodes.lua")
|
||||||
if industrialtest.config.developerMode then
|
if industrialtest.config.developerMode then
|
||||||
dofile(modpath.."/utils.lua")
|
dofile(modpath.."/utils.lua")
|
||||||
|
|||||||
@@ -79,20 +79,20 @@ function industrialtest.CanningMachine.getFormspec(self,pos)
|
|||||||
local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
|
local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
|
||||||
local srcPercent=meta:get_float("srcTime")/self._canningTime*100
|
local srcPercent=meta:get_float("srcTime")/self._canningTime*100
|
||||||
local formspec={
|
local formspec={
|
||||||
"list[context;src;3.4,1.8;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(3.4,1.8,1,1),
|
industrialtest.internal.getItemSlotBg(3.4,1.8,1,1),
|
||||||
|
"list[context;src;3.4,1.8;1,1]",
|
||||||
(powerPercent>0 and "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
|
(powerPercent>0 and "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
|
||||||
or "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
|
or "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
|
||||||
"list[context;powerStorage;3.4,3.9;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(3.4,3.9,1,1),
|
industrialtest.internal.getItemSlotBg(3.4,3.9,1,1),
|
||||||
|
"list[context;powerStorage;3.4,3.9;1,1]",
|
||||||
(srcPercent>0 and "image[4.9,1.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
|
(srcPercent>0 and "image[4.9,1.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
|
||||||
or "image[4.9,1.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
|
or "image[4.9,1.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
|
||||||
"list[context;dst;6.4,1.8;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(6.4,1.8,1,1),
|
industrialtest.internal.getItemSlotBg(6.4,1.8,1,1),
|
||||||
"list[context;leftover;6.4,2.8;1,1]",
|
"list[context;dst;6.4,1.8;1,1]",
|
||||||
industrialtest.internal.getItemSlotBg(6.4,2.8,1,1),
|
industrialtest.internal.getItemSlotBg(6.4,2.8,1,1),
|
||||||
"list[context;upgrades;9,0.9;1,4]",
|
"list[context;leftover;6.4,2.8;1,1]",
|
||||||
industrialtest.internal.getItemSlotBg(9,0.9,1,4),
|
industrialtest.internal.getItemSlotBg(9,0.9,1,4),
|
||||||
|
"list[context;upgrades;9,0.9;1,4]",
|
||||||
"listring[context;src]",
|
"listring[context;src]",
|
||||||
"listring[context;dst]"
|
"listring[context;dst]"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,11 +52,11 @@ function industrialtest.Chargepad.getFormspec(self,pos)
|
|||||||
local parentFormspec=industrialtest.ActivatedElectricMachine.getFormspec(self,pos)
|
local parentFormspec=industrialtest.ActivatedElectricMachine.getFormspec(self,pos)
|
||||||
local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
|
local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
|
||||||
local formspec={
|
local formspec={
|
||||||
"list[context;charged;1,2.5;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(1,2.5,1,1),
|
industrialtest.internal.getItemSlotBg(1,2.5,1,1),
|
||||||
|
"list[context;charged;1,2.5;1,1]",
|
||||||
"label[0.9,3.9;"..S("Charge").."]",
|
"label[0.9,3.9;"..S("Charge").."]",
|
||||||
"list[context;discharged;3,2.5;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(3,2.5,1,1),
|
industrialtest.internal.getItemSlotBg(3,2.5,1,1),
|
||||||
|
"list[context;discharged;3,2.5;1,1]",
|
||||||
"label[2.7,3.9;"..S("Discharge").."]",
|
"label[2.7,3.9;"..S("Discharge").."]",
|
||||||
self.createPowerIndicatorWidget(charged,9,1),
|
self.createPowerIndicatorWidget(charged,9,1),
|
||||||
"listring[context;charged]",
|
"listring[context;charged]",
|
||||||
|
|||||||
@@ -36,13 +36,13 @@ local function getFormspec(self,pos)
|
|||||||
local fuel=self.getFuel(fluid)
|
local fuel=self.getFuel(fluid)
|
||||||
local tile=(fuel and fuel.texture or "industrialtest_gui_fluid_bg.png")
|
local tile=(fuel and fuel.texture or "industrialtest_gui_fluid_bg.png")
|
||||||
local formspec={
|
local formspec={
|
||||||
"list[context;src;2,1.8;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(2,1.8,1,1),
|
industrialtest.internal.getItemSlotBg(2,1.8,1,1),
|
||||||
|
"list[context;src;2,1.8;1,1]",
|
||||||
(fluidPercent>0 and "image[2,3;1,1;industrialtest_gui_fluid_bg.png^[lowpart:"..fluidPercent..":"..tile.."]" or "image[2,3;1,1;industrialtest_gui_fluid_bg.png]"),
|
(fluidPercent>0 and "image[2,3;1,1;industrialtest_gui_fluid_bg.png^[lowpart:"..fluidPercent..":"..tile.."]" or "image[2,3;1,1;industrialtest_gui_fluid_bg.png]"),
|
||||||
"list[context;dst;2,4.2;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(2,4.2,1,1),
|
industrialtest.internal.getItemSlotBg(2,4.2,1,1),
|
||||||
"list[context;charged;6,3;1,1]",
|
"list[context;dst;2,4.2;1,1]",
|
||||||
industrialtest.internal.getItemSlotBg(6,3,1,1),
|
industrialtest.internal.getItemSlotBg(6,3,1,1),
|
||||||
|
"list[context;charged;6,3;1,1]",
|
||||||
self.createPowerIndicatorWidget(powerPercent,9,1),
|
self.createPowerIndicatorWidget(powerPercent,9,1),
|
||||||
"listring[context;src]",
|
"listring[context;src]",
|
||||||
"listring[context;dst]"
|
"listring[context;dst]"
|
||||||
@@ -94,6 +94,7 @@ local function takeFuelFromItem(self,pos)
|
|||||||
inv:set_stack("src",1,fluidSlot)
|
inv:set_stack("src",1,fluidSlot)
|
||||||
meta:set_string("fluid",fuel.name)
|
meta:set_string("fluid",fuel.name)
|
||||||
meta:set_float("fluidAmount",fluidAmount+1000)
|
meta:set_float("fluidAmount",fluidAmount+1000)
|
||||||
|
self:updateFormspec(pos)
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -72,12 +72,12 @@ function industrialtest.Generator.getFormspec(self,pos)
|
|||||||
local fuelPercent=meta:get_float("fuelTime")/meta:get_float("maxFuelTime")*100
|
local fuelPercent=meta:get_float("fuelTime")/meta:get_float("maxFuelTime")*100
|
||||||
local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
|
local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
|
||||||
local formspec={
|
local formspec={
|
||||||
"list[context;charged;4.7,1.8;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(4.7,1.8,1,1),
|
industrialtest.internal.getItemSlotBg(4.7,1.8,1,1),
|
||||||
|
"list[context;charged;4.7,1.8;1,1]",
|
||||||
(fuelPercent>0 and "image[4.7,2.8;1,1;default_furnace_fire_bg.png^[lowpart:"..fuelPercent..":default_furnace_fire_fg.png]"
|
(fuelPercent>0 and "image[4.7,2.8;1,1;default_furnace_fire_bg.png^[lowpart:"..fuelPercent..":default_furnace_fire_fg.png]"
|
||||||
or "image[4.7,2.8;1,1;default_furnace_fire_bg.png]"),
|
or "image[4.7,2.8;1,1;default_furnace_fire_bg.png]"),
|
||||||
"list[context;src;4.7,3.9;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(4.7,3.9,1,1),
|
industrialtest.internal.getItemSlotBg(4.7,3.9,1,1),
|
||||||
|
"list[context;src;4.7,3.9;1,1]",
|
||||||
self.createPowerIndicatorWidget(charged,9,1),
|
self.createPowerIndicatorWidget(charged,9,1),
|
||||||
"listring[context;src]"
|
"listring[context;src]"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,18 +80,18 @@ function industrialtest.InductionFurnace.getFormspec(self,pos)
|
|||||||
local srcPercent=maxSrcTime>0 and meta:get_float("srcTime")/maxSrcTime*100 or 0
|
local srcPercent=maxSrcTime>0 and meta:get_float("srcTime")/maxSrcTime*100 or 0
|
||||||
local heat=meta:get_int("heat")
|
local heat=meta:get_int("heat")
|
||||||
local formspec={
|
local formspec={
|
||||||
"list[context;src;3.7,1.8;2,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(3.7,1.8,2,1),
|
industrialtest.internal.getItemSlotBg(3.7,1.8,2,1),
|
||||||
|
"list[context;src;3.7,1.8;2,1]",
|
||||||
(powerPercent>0 and "image[3.7,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
|
(powerPercent>0 and "image[3.7,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
|
||||||
or "image[3.7,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
|
or "image[3.7,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
|
||||||
"list[context;powerStorage;3.7,3.9;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(3.7,3.9,1,1),
|
industrialtest.internal.getItemSlotBg(3.7,3.9,1,1),
|
||||||
|
"list[context;powerStorage;3.7,3.9;1,1]",
|
||||||
(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
|
(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
|
||||||
or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
|
or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
|
||||||
"list[context;dst;6,2.8;2,1;]",
|
|
||||||
industrialtest.internal.getItemSlotBg(6,2.8,2,1),
|
industrialtest.internal.getItemSlotBg(6,2.8,2,1),
|
||||||
"list[context;upgrades;9,0.9;1,4]",
|
"list[context;dst;6,2.8;2,1;]",
|
||||||
industrialtest.internal.getItemSlotBg(9,0.9,1,4),
|
industrialtest.internal.getItemSlotBg(9,0.9,1,4),
|
||||||
|
"list[context;upgrades;9,0.9;1,4]",
|
||||||
"label[0.5,2.8;"..minetest.formspec_escape(S("Heat: @1 %",heat)).."]",
|
"label[0.5,2.8;"..minetest.formspec_escape(S("Heat: @1 %",heat)).."]",
|
||||||
"listring[context;src]",
|
"listring[context;src]",
|
||||||
"listring[context;dst]"
|
"listring[context;dst]"
|
||||||
|
|||||||
@@ -80,16 +80,16 @@ function industrialtest.IronFurnace.getFormspec(self,pos)
|
|||||||
}
|
}
|
||||||
elseif industrialtest.mclAvailable then
|
elseif industrialtest.mclAvailable then
|
||||||
formspec={
|
formspec={
|
||||||
|
mcl_formspec.get_itemslot_bg_v4(3.4,1.8,1,1),
|
||||||
"list[context;src;3.4,1.8;1,1]",
|
"list[context;src;3.4,1.8;1,1]",
|
||||||
mcl_formspec.get_itemslot_bg(3.4,1.8,1,1),
|
|
||||||
(fuelPercent>0 and "image[3.4,2.8;1,1;default_furnace_fire_bg.png^[lowpart:"..fuelPercent..":default_furnace_fire_fg.png]"
|
(fuelPercent>0 and "image[3.4,2.8;1,1;default_furnace_fire_bg.png^[lowpart:"..fuelPercent..":default_furnace_fire_fg.png]"
|
||||||
or "image[3.4,2.8;1,1;default_furnace_fire_bg.png]"),
|
or "image[3.4,2.8;1,1;default_furnace_fire_bg.png]"),
|
||||||
|
mcl_formspec.get_itemslot_bg_v4(3.4,3.9,1,1),
|
||||||
"list[context;fuel;3.4,3.9;1,1]",
|
"list[context;fuel;3.4,3.9;1,1]",
|
||||||
mcl_formspec.get_itemslot_bg(3.4,3.9,1,1),
|
|
||||||
(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
|
(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
|
||||||
or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
|
or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
|
||||||
|
mcl_formspec.get_itemslot_bg_v4(6.4,2.8,1,1),
|
||||||
"list[context;dst;6.4,2.8;1,1]",
|
"list[context;dst;6.4,2.8;1,1]",
|
||||||
mcl_formspec.get_itemslot_bg(6.4,2.8,1,1),
|
|
||||||
"listring[context;src]",
|
"listring[context;src]",
|
||||||
"listring[context;dst]"
|
"listring[context;dst]"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,12 +54,13 @@ function industrialtest.Machine.getFormspec(self,pos)
|
|||||||
}
|
}
|
||||||
elseif industrialtest.mclAvailable then
|
elseif industrialtest.mclAvailable then
|
||||||
formspec={
|
formspec={
|
||||||
"size[10.04,12]",
|
"formspec_version[4]",
|
||||||
"label[0.25,0.25;"..self.description.."]",
|
"size[12,12.5]",
|
||||||
|
"label[0.5,0.5;"..self.description.."]",
|
||||||
|
mcl_formspec.get_itemslot_bg_v4(0.5,7,9,3),
|
||||||
"list[current_player;main;0.5,7;9,3;9]",
|
"list[current_player;main;0.5,7;9,3;9]",
|
||||||
mcl_formspec.get_itemslot_bg(0.5,7,9,3),
|
mcl_formspec.get_itemslot_bg_v4(0.5,11,9,1),
|
||||||
"list[current_player;main;0.5,10.24;9,1]",
|
"list[current_player;main;0.5,11;9,1]",
|
||||||
mcl_formspec.get_itemslot_bg(0.5,10.24,9,1),
|
|
||||||
"listring[current_player;main]"
|
"listring[current_player;main]"
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|||||||
273
machines/magnetizer.lua
Normal file
@@ -0,0 +1,273 @@
|
|||||||
|
-- IndustrialTest
|
||||||
|
-- Copyright (C) 2025 mrkubax10
|
||||||
|
|
||||||
|
-- This program is free software: you can redistribute it and/or modify
|
||||||
|
-- it under the terms of the GNU General Public License as published by
|
||||||
|
-- the Free Software Foundation, either version 3 of the License, or
|
||||||
|
-- (at your option) any later version.
|
||||||
|
|
||||||
|
-- This program is distributed in the hope that it will be useful,
|
||||||
|
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
-- GNU General Public License for more details.
|
||||||
|
|
||||||
|
-- You should have received a copy of the GNU General Public License
|
||||||
|
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
local S=minetest.get_translator("industrialtest")
|
||||||
|
|
||||||
|
local function findFenceRailEnd(initialPosition,direction)
|
||||||
|
local y=initialPosition.y
|
||||||
|
local railNode=minetest.get_node(vector.new(initialPosition.x,y,initialPosition.z))
|
||||||
|
while minetest.get_item_group(railNode.name,"_industrialtest_metalFence")>0 and math.abs(initialPosition.y-y)<=19 do
|
||||||
|
y=y+direction
|
||||||
|
railNode=minetest.get_node(vector.new(initialPosition.x,y,initialPosition.z))
|
||||||
|
end
|
||||||
|
return y-direction
|
||||||
|
end
|
||||||
|
|
||||||
|
local function hasMetalBoots(player)
|
||||||
|
local inv
|
||||||
|
if industrialtest.mtgAvailable then
|
||||||
|
_,inv=armor:get_valid_player(player,"")
|
||||||
|
elseif industrialtest.mclAvailable then
|
||||||
|
inv=player:get_inventory()
|
||||||
|
end
|
||||||
|
|
||||||
|
if inv then
|
||||||
|
local armorList=inv:get_list("armor")
|
||||||
|
assert(armorList)
|
||||||
|
local requiredGroups={
|
||||||
|
"armor_iron",
|
||||||
|
"armor_gold",
|
||||||
|
"armor_bronze",
|
||||||
|
"_industrialtest_electricArmor"
|
||||||
|
}
|
||||||
|
-- 3D armor boots have to be hardcoded here because they don't provide any group depending on material
|
||||||
|
local requiredNames={
|
||||||
|
"3d_armor:boots_steel",
|
||||||
|
"3d_armor:boots_gold",
|
||||||
|
"3d_armor:boots_bronze"
|
||||||
|
}
|
||||||
|
for _,itemstack in ipairs(armorList) do
|
||||||
|
local def=itemstack:get_definition()
|
||||||
|
if def and def.groups and def.groups.armor_feet then
|
||||||
|
for _,group in ipairs(requiredGroups) do
|
||||||
|
if def.groups[group] then
|
||||||
|
-- Matching group succeeded
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
for _,itemname in ipairs(requiredNames) do
|
||||||
|
if itemname==itemstack:get_name() then
|
||||||
|
-- Matching itemname succeeded
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
industrialtest.Magnetizer=table.copy(industrialtest.ElectricMachine)
|
||||||
|
industrialtest.internal.unpackTableInto(industrialtest.Magnetizer,{
|
||||||
|
name="industrialtest:magnetizer",
|
||||||
|
description=S("Magnetizer"),
|
||||||
|
tiles={
|
||||||
|
"industrialtest_machine_block.png",
|
||||||
|
"industrialtest_machine_block.png",
|
||||||
|
"industrialtest_machine_block.png",
|
||||||
|
"industrialtest_machine_block.png",
|
||||||
|
"industrialtest_machine_block.png",
|
||||||
|
"industrialtest_machine_block.png^industrialtest_magnetizer_front.png"
|
||||||
|
},
|
||||||
|
sounds="metal",
|
||||||
|
facedir=true,
|
||||||
|
storageLists={
|
||||||
|
"powerStorage"
|
||||||
|
},
|
||||||
|
powerLists={
|
||||||
|
{
|
||||||
|
list="powerStorage",
|
||||||
|
direction="i"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
capacity=industrialtest.api.lvPowerFlow*2,
|
||||||
|
flow=industrialtest.api.lvPowerFlow,
|
||||||
|
ioConfig="iiiiii",
|
||||||
|
requiresWrench=true,
|
||||||
|
hasPowerInput=true,
|
||||||
|
_capacityPerFence=15,
|
||||||
|
_opPower=4
|
||||||
|
})
|
||||||
|
|
||||||
|
function industrialtest.Magnetizer.onConstruct(self,pos)
|
||||||
|
local meta=minetest.get_meta(pos)
|
||||||
|
local inv=meta:get_inventory()
|
||||||
|
inv:set_size("powerStorage",1)
|
||||||
|
self:determineFenceRail(pos)
|
||||||
|
self:determinePowerCapacity(pos)
|
||||||
|
industrialtest.ElectricMachine.onConstruct(self,pos)
|
||||||
|
end
|
||||||
|
|
||||||
|
function industrialtest.Magnetizer.onDestruct(self,pos)
|
||||||
|
self.detachFenceRail(pos)
|
||||||
|
industrialtest.ElectricMachine.onDestruct(self,pos)
|
||||||
|
end
|
||||||
|
|
||||||
|
function industrialtest.Magnetizer.onDig(self,pos,node,digger)
|
||||||
|
self.detachFenceRail(pos)
|
||||||
|
return industrialtest.ElectricMachine.onDig(self,pos,node,digger)
|
||||||
|
end
|
||||||
|
|
||||||
|
function industrialtest.Magnetizer.getFormspec(self,pos)
|
||||||
|
local parentFormspec=industrialtest.ElectricMachine.getFormspec(self,pos)
|
||||||
|
local meta=minetest.get_meta(pos)
|
||||||
|
local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
|
||||||
|
local formspec={
|
||||||
|
(powerPercent>0 and "image[4.7,2.7;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
|
||||||
|
or "image[4.7,2.7;1,1;industrialtest_gui_electricity_bg.png]"),
|
||||||
|
industrialtest.internal.getItemSlotBg(4.7,3.7,1,1),
|
||||||
|
"list[context;powerStorage;4.7,3.7;1,1]",
|
||||||
|
"listring[context;powerStorage]"
|
||||||
|
}
|
||||||
|
return parentFormspec..table.concat(formspec,"")
|
||||||
|
end
|
||||||
|
|
||||||
|
function industrialtest.Magnetizer.determinePowerCapacity(self,pos)
|
||||||
|
local meta=minetest.get_meta(pos)
|
||||||
|
if meta:contains("lowY") and meta:contains("highY") then
|
||||||
|
local lowY=meta:get_int("lowY")
|
||||||
|
local highY=meta:get_int("highY")
|
||||||
|
local capacity=self.capacity+(highY-lowY)*self._capacityPerFence
|
||||||
|
meta:set_int("industrialtest.powerCapacity",capacity)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Checks all sides on the same Y level if there is rail made from metal fences attached
|
||||||
|
function industrialtest.Magnetizer.determineFenceRail(self,pos)
|
||||||
|
local neighbourPositions={
|
||||||
|
vector.offset(pos,-1,0,0),
|
||||||
|
vector.offset(pos,1,0,0),
|
||||||
|
vector.offset(pos,0,0,-1),
|
||||||
|
vector.offset(pos,0,0,1)
|
||||||
|
}
|
||||||
|
local railPosition
|
||||||
|
for _,neighbourPosition in ipairs(neighbourPositions) do
|
||||||
|
local neighbourNode=minetest.get_node(neighbourPosition)
|
||||||
|
if minetest.get_item_group(neighbourNode.name,"_industrialtest_metalFence")>0 then
|
||||||
|
railPosition=neighbourPosition
|
||||||
|
break
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if not railPosition then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local direction=vector.subtract(railPosition,pos)
|
||||||
|
minetest.swap_node(pos,{
|
||||||
|
name=self.name,
|
||||||
|
-- Some cryptic code that converts direction vector to param2
|
||||||
|
param2=direction.z+1*math.abs(direction.z)+direction.x+2*math.abs(direction.x)
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Find low and high points of fence rail
|
||||||
|
local lowY=findFenceRailEnd(railPosition,-1)
|
||||||
|
local highY=findFenceRailEnd(railPosition,1)
|
||||||
|
|
||||||
|
-- Keep magnetizer position in fence metadata so new fences can be attached easily
|
||||||
|
for y=lowY,highY,1 do
|
||||||
|
local meta=minetest.get_meta(vector.new(railPosition.x,y,railPosition.z))
|
||||||
|
meta:set_string("magnetizerPosition",minetest.serialize(pos))
|
||||||
|
end
|
||||||
|
|
||||||
|
local meta=minetest.get_meta(pos)
|
||||||
|
meta:set_string("railPosition",minetest.serialize(railPosition))
|
||||||
|
meta:set_int("lowY",lowY)
|
||||||
|
meta:set_int("highY",highY)
|
||||||
|
end
|
||||||
|
|
||||||
|
function industrialtest.Magnetizer.detachFenceRail(pos)
|
||||||
|
local meta=minetest.get_meta(pos)
|
||||||
|
if not meta:contains("railPosition") or not meta:contains("lowY") or not meta:contains("highY") then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local railPosition=minetest.deserialize(meta:get_string("railPosition"))
|
||||||
|
local lowY=meta:get_int("lowY")
|
||||||
|
local highY=meta:get_int("highY")
|
||||||
|
for y=lowY,highY,1 do
|
||||||
|
local fenceMeta=minetest.get_meta(vector.new(railPosition.x,y,railPosition.z))
|
||||||
|
fenceMeta:set_string("magnetizerPosition","")
|
||||||
|
end
|
||||||
|
meta:set_string("railPosition","")
|
||||||
|
end
|
||||||
|
|
||||||
|
industrialtest.Magnetizer:register()
|
||||||
|
|
||||||
|
minetest.register_craft({
|
||||||
|
type="shaped",
|
||||||
|
output="industrialtest:magnetizer",
|
||||||
|
recipe={
|
||||||
|
{industrialtest.elementKeys.powerCarrier,"industrialtest:iron_fence",industrialtest.elementKeys.powerCarrier},
|
||||||
|
{industrialtest.elementKeys.powerCarrier,"industrialtest:machine_block",industrialtest.elementKeys.powerCarrier},
|
||||||
|
{industrialtest.elementKeys.powerCarrier,"industrialtest:iron_fence",industrialtest.elementKeys.powerCarrier}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Players to which Y velocity should be added
|
||||||
|
local validatedPlayers={}
|
||||||
|
-- Time since last check to which players the effect should be applied
|
||||||
|
local validationDelta=0.2
|
||||||
|
minetest.register_globalstep(function(dtime)
|
||||||
|
validationDelta=validationDelta+dtime
|
||||||
|
if validationDelta>=0.2 then
|
||||||
|
validatedPlayers={}
|
||||||
|
local players=minetest.get_connected_players()
|
||||||
|
for _,player in ipairs(players) do
|
||||||
|
local control=player:get_player_control()
|
||||||
|
if (control.jump or control.sneak) and hasMetalBoots(player) then
|
||||||
|
local props=player:get_properties()
|
||||||
|
local pos=player:get_pos()
|
||||||
|
local offsets={
|
||||||
|
vector.new(props.collisionbox[1],0,0),
|
||||||
|
vector.new(props.collisionbox[4],0,0),
|
||||||
|
vector.new(0,0,props.collisionbox[3]),
|
||||||
|
vector.new(0,0,props.collisionbox[6])
|
||||||
|
}
|
||||||
|
for _,offset in ipairs(offsets) do
|
||||||
|
local targetPos=vector.add(pos,offset)
|
||||||
|
local targetNode=minetest.get_node(targetPos)
|
||||||
|
if minetest.get_item_group(targetNode.name,"_industrialtest_metalFence")>0 then
|
||||||
|
local fenceMeta=minetest.get_meta(targetPos)
|
||||||
|
if fenceMeta:contains("magnetizerPosition") then
|
||||||
|
table.insert(validatedPlayers,{
|
||||||
|
playerName=player:get_player_name(),
|
||||||
|
magnetizerPosition=minetest.deserialize(fenceMeta:get_string("magnetizerPosition")),
|
||||||
|
multiplier=(control.sneak and 0.55 or 1)
|
||||||
|
})
|
||||||
|
break
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
for _,validatedPlayer in ipairs(validatedPlayers) do
|
||||||
|
local player=minetest.get_player_by_name(validatedPlayer.playerName)
|
||||||
|
if player then
|
||||||
|
local magnetizerMeta=minetest.get_meta(validatedPlayer.magnetizerPosition)
|
||||||
|
local physicsOverride=player:get_physics_override()
|
||||||
|
local requiredPower=industrialtest.Magnetizer._opPower*physicsOverride.gravity
|
||||||
|
if magnetizerMeta:get_int("industrialtest.powerAmount")>=requiredPower then
|
||||||
|
industrialtest.api.addPower(magnetizerMeta,-requiredPower)
|
||||||
|
industrialtest.Magnetizer:requestPower(validatedPlayer.magnetizerPosition)
|
||||||
|
industrialtest.Magnetizer:updateFormspec(validatedPlayer.magnetizerPosition)
|
||||||
|
industrialtest.internal.addYVelocityClamped(player,30*dtime*physicsOverride.gravity*validatedPlayer.multiplier,5*physicsOverride.gravity)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end)
|
||||||
@@ -186,23 +186,23 @@ function industrialtest.Miner.getFormspec(self,pos)
|
|||||||
local meta=minetest.get_meta(pos)
|
local meta=minetest.get_meta(pos)
|
||||||
local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
|
local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
|
||||||
local formspec={
|
local formspec={
|
||||||
"label[0.7,1.2;"..S("Drill").."]",
|
"label[0.7,1.15;"..S("Drill").."]",
|
||||||
"list[context;drill;0.7,1.5;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(0.7,1.5,1,1),
|
industrialtest.internal.getItemSlotBg(0.7,1.5,1,1),
|
||||||
"label[0.7,2.8;"..S("Pipe").."]",
|
"list[context;drill;0.7,1.5;1,1]",
|
||||||
"list[context;src;0.7,3.1;1,1]",
|
"label[0.7,2.75;"..S("Pipe").."]",
|
||||||
industrialtest.internal.getItemSlotBg(0.7,3.1,1,1),
|
industrialtest.internal.getItemSlotBg(0.7,3.1,1,1),
|
||||||
"label[0.7,4.4;"..S("Scanner").."]",
|
"list[context;src;0.7,3.1;1,1]",
|
||||||
"list[context;scanner;0.7,4.7;1,1]",
|
"label[0.7,4.35;"..S("Scanner").."]",
|
||||||
industrialtest.internal.getItemSlotBg(0.7,4.7,1,1),
|
industrialtest.internal.getItemSlotBg(0.7,4.7,1,1),
|
||||||
"list[context;dst;2.28,1.9;5,3]",
|
"list[context;scanner;0.7,4.7;1,1]",
|
||||||
industrialtest.internal.getItemSlotBg(2.28,1.9,5,3),
|
industrialtest.internal.getItemSlotBg(2.28,1.9,5,3),
|
||||||
"list[context;upgrades;9.1,1.2;1,1]",
|
"list[context;dst;2.28,1.9;5,3]",
|
||||||
industrialtest.internal.getItemSlotBg(9.1,1.2,1,1),
|
industrialtest.internal.getItemSlotBg(9.1,1.2,1,1),
|
||||||
|
"list[context;upgrades;9.1,1.2;1,1]",
|
||||||
(powerPercent>0 and "image[9.1,2.29;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
|
(powerPercent>0 and "image[9.1,2.29;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
|
||||||
or "image[9.1,2.29;1,1;industrialtest_gui_electricity_bg.png]"),
|
or "image[9.1,2.29;1,1;industrialtest_gui_electricity_bg.png]"),
|
||||||
"list[context;powerStorage;9.1,3.5;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(9.1,3.5,1,1),
|
industrialtest.internal.getItemSlotBg(9.1,3.5,1,1),
|
||||||
|
"list[context;powerStorage;9.1,3.5;1,1]",
|
||||||
"listring[context;src]",
|
"listring[context;src]",
|
||||||
"listring[context;dst]"
|
"listring[context;dst]"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -86,10 +86,10 @@ function industrialtest.Reactor.getFormspec(self,pos)
|
|||||||
local size=math.floor(meta:get_int("size")/3)
|
local size=math.floor(meta:get_int("size")/3)
|
||||||
local switchText=(meta:get_int("enabled")==0 and S("Start") or S("Stop"))
|
local switchText=(meta:get_int("enabled")==0 and S("Start") or S("Stop"))
|
||||||
local formspec={
|
local formspec={
|
||||||
"list[context;fuel;1,1;"..size..","..size.."]",
|
|
||||||
industrialtest.internal.getItemSlotBg(1,1,size,size),
|
industrialtest.internal.getItemSlotBg(1,1,size,size),
|
||||||
"list[context;charged;7,2.8;1,1]",
|
"list[context;fuel;1,1;"..size..","..size.."]",
|
||||||
industrialtest.internal.getItemSlotBg(7.7,2.8,1,1),
|
industrialtest.internal.getItemSlotBg(7.7,2.8,1,1),
|
||||||
|
"list[context;charged;7,2.8;1,1]",
|
||||||
"button[7.7,1;1,0.8;toggle;"..minetest.formspec_escape(switchText).."]",
|
"button[7.7,1;1,0.8;toggle;"..minetest.formspec_escape(switchText).."]",
|
||||||
self.createPowerIndicatorWidget(charged,9,1),
|
self.createPowerIndicatorWidget(charged,9,1),
|
||||||
"listring[context;fuel]"
|
"listring[context;fuel]"
|
||||||
|
|||||||
@@ -50,11 +50,11 @@ function industrialtest.PowerStorage.getFormspec(self,pos)
|
|||||||
local meta=minetest.get_meta(pos)
|
local meta=minetest.get_meta(pos)
|
||||||
local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
|
local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
|
||||||
local formspec={
|
local formspec={
|
||||||
"list[context;charged;1,2.5;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(1,2.5,1,1),
|
industrialtest.internal.getItemSlotBg(1,2.5,1,1),
|
||||||
|
"list[context;charged;1,2.5;1,1]",
|
||||||
"label[0.9,3.9;"..S("Charge").."]",
|
"label[0.9,3.9;"..S("Charge").."]",
|
||||||
"list[context;discharged;3,2.5;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(3,2.5,1,1),
|
industrialtest.internal.getItemSlotBg(3,2.5,1,1),
|
||||||
|
"list[context;discharged;3,2.5;1,1]",
|
||||||
"label[2.7,3.9;"..S("Discharge").."]",
|
"label[2.7,3.9;"..S("Discharge").."]",
|
||||||
self.createPowerIndicatorWidget(charged,9,1),
|
self.createPowerIndicatorWidget(charged,9,1),
|
||||||
"listring[context;charged]",
|
"listring[context;charged]",
|
||||||
|
|||||||
@@ -85,19 +85,19 @@ function industrialtest.Pump.getFormspec(self,pos)
|
|||||||
local pumpFluid=industrialtest.api.getPumpFluid(fluidType)
|
local pumpFluid=industrialtest.api.getPumpFluid(fluidType)
|
||||||
local tile=(pumpFluid and pumpFluid.texture or "industrialtest_gui_fluid_bg.png")
|
local tile=(pumpFluid and pumpFluid.texture or "industrialtest_gui_fluid_bg.png")
|
||||||
local formspec={
|
local formspec={
|
||||||
"list[context;src;3.2,1.7;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(3.2,1.7,1,1),
|
industrialtest.internal.getItemSlotBg(3.2,1.7,1,1),
|
||||||
"list[context;dst;4.6,1.7;1,1]",
|
"list[context;src;3.2,1.7;1,1]",
|
||||||
industrialtest.internal.getItemSlotBg(4.6,1.7,1,1),
|
industrialtest.internal.getItemSlotBg(4.6,1.7,1,1),
|
||||||
"list[context;powerStorage;3.9,3.7;1,1]",
|
"list[context;dst;4.6,1.7;1,1]",
|
||||||
industrialtest.internal.getItemSlotBg(3.9,3.7,1,1),
|
industrialtest.internal.getItemSlotBg(3.9,3.7,1,1),
|
||||||
|
"list[context;powerStorage;3.9,3.7;1,1]",
|
||||||
(powerPercent>0 and "image[3.9,2.7;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
|
(powerPercent>0 and "image[3.9,2.7;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
|
||||||
or "image[3.9,2.7;1,1;industrialtest_gui_electricity_bg.png]"),
|
or "image[3.9,2.7;1,1;industrialtest_gui_electricity_bg.png]"),
|
||||||
(srcPercent>0 and "image[6.7,2.7;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png]"
|
(srcPercent>0 and "image[6.7,2.7;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png]"
|
||||||
or "image[6.7,2.7;1,1;gui_furnace_arrow_bg.png]"),
|
or "image[6.7,2.7;1,1;gui_furnace_arrow_bg.png]"),
|
||||||
(fluidPercent>0 and "image[7.7,2.7;1,1;industrialtest_gui_fluid_bg.png^[lowpart:"..fluidPercent..":"..tile.."]" or "image[7.7,2.7;1,1;industrialtest_gui_fluid_bg.png]"),
|
(fluidPercent>0 and "image[7.7,2.7;1,1;industrialtest_gui_fluid_bg.png^[lowpart:"..fluidPercent..":"..tile.."]" or "image[7.7,2.7;1,1;industrialtest_gui_fluid_bg.png]"),
|
||||||
"label[3.2,1.5;"..S("Input").."]",
|
"label[3.2,1.35;"..S("Input").."]",
|
||||||
"label[4.6,1.5;"..S("Output").."]",
|
"label[4.6,1.35;"..S("Output").."]",
|
||||||
"listring[context;src]",
|
"listring[context;src]",
|
||||||
"listring[context;dst]"
|
"listring[context;dst]"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -84,20 +84,20 @@ function industrialtest.RotaryMacerator.getFormspec(self,pos)
|
|||||||
local rpm=meta:get_int("rpm")
|
local rpm=meta:get_int("rpm")
|
||||||
local buttonMaintainSpeedText=meta:get_int("maintainSpeed")==1 and S("Don't maintain speed") or S("Maintain speed")
|
local buttonMaintainSpeedText=meta:get_int("maintainSpeed")==1 and S("Don't maintain speed") or S("Maintain speed")
|
||||||
local formspec={
|
local formspec={
|
||||||
"list[context;src;3.8,1.8;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(3.8,1.8,1,1),
|
industrialtest.internal.getItemSlotBg(3.8,1.8,1,1),
|
||||||
"list[context;modifier;4.9,1.8;1,1]",
|
"list[context;src;3.8,1.8;1,1]",
|
||||||
industrialtest.internal.getItemSlotBg(4.9,1.8,1,1),
|
industrialtest.internal.getItemSlotBg(4.9,1.8,1,1),
|
||||||
|
"list[context;modifier;4.9,1.8;1,1]",
|
||||||
(powerPercent>0 and "image[3.8,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
|
(powerPercent>0 and "image[3.8,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
|
||||||
or "image[3.8,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
|
or "image[3.8,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
|
||||||
"list[context;powerStorage;3.8,3.9;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(3.8,3.9,1,1),
|
industrialtest.internal.getItemSlotBg(3.8,3.9,1,1),
|
||||||
|
"list[context;powerStorage;3.8,3.9;1,1]",
|
||||||
(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
|
(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
|
||||||
or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
|
or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
|
||||||
"list[context;dst;6,2.8;1,1;]",
|
|
||||||
industrialtest.internal.getItemSlotBg(6,2.8,1,1),
|
industrialtest.internal.getItemSlotBg(6,2.8,1,1),
|
||||||
"list[context;upgrades;9,0.9;1,4]",
|
"list[context;dst;6,2.8;1,1;]",
|
||||||
industrialtest.internal.getItemSlotBg(9,0.9,1,4),
|
industrialtest.internal.getItemSlotBg(9,0.9,1,4),
|
||||||
|
"list[context;upgrades;9,0.9;1,4]",
|
||||||
"label[0.5,2.8;"..minetest.formspec_escape(S("Speed: @1",rpm)).."]",
|
"label[0.5,2.8;"..minetest.formspec_escape(S("Speed: @1",rpm)).."]",
|
||||||
"button[0.5,3.4;3,0.8;maintainSpeed;"..minetest.formspec_escape(buttonMaintainSpeedText).."]",
|
"button[0.5,3.4;3,0.8;maintainSpeed;"..minetest.formspec_escape(buttonMaintainSpeedText).."]",
|
||||||
"listring[context;src]",
|
"listring[context;src]",
|
||||||
|
|||||||
@@ -56,18 +56,18 @@ function industrialtest.SimpleElectricItemProcessor.getFormspec(self,pos)
|
|||||||
local recipeOverride=self.isRecipeOverride(meta)
|
local recipeOverride=self.isRecipeOverride(meta)
|
||||||
local formspec={
|
local formspec={
|
||||||
(recipeOverride and "label[3.4,1.5;"..S("Recipe override: @1", minetest.registered_items[recipeOverride].description).."]" or ""),
|
(recipeOverride and "label[3.4,1.5;"..S("Recipe override: @1", minetest.registered_items[recipeOverride].description).."]" or ""),
|
||||||
"list[context;src;3.4,1.8;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(3.4,1.8,1,1),
|
industrialtest.internal.getItemSlotBg(3.4,1.8,1,1),
|
||||||
|
"list[context;src;3.4,1.8;1,1]",
|
||||||
(powerPercent>0 and "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
|
(powerPercent>0 and "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
|
||||||
or "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
|
or "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
|
||||||
"list[context;powerStorage;3.4,3.9;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(3.4,3.9,1,1),
|
industrialtest.internal.getItemSlotBg(3.4,3.9,1,1),
|
||||||
|
"list[context;powerStorage;3.4,3.9;1,1]",
|
||||||
(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
|
(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
|
||||||
or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
|
or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
|
||||||
"list[context;dst;6.4,2.8;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(6.4,2.8,1,1),
|
industrialtest.internal.getItemSlotBg(6.4,2.8,1,1),
|
||||||
"list[context;upgrades;9,0.9;1,4]",
|
"list[context;dst;6.4,2.8;1,1]",
|
||||||
industrialtest.internal.getItemSlotBg(9,0.9,1,4),
|
industrialtest.internal.getItemSlotBg(9,0.9,1,4),
|
||||||
|
"list[context;upgrades;9,0.9;1,4]",
|
||||||
"listring[context;src]",
|
"listring[context;src]",
|
||||||
"listring[context;dst]"
|
"listring[context;dst]"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,8 +48,8 @@ function industrialtest.SolarPanelBase.getFormspec(self,pos)
|
|||||||
local amount=minetest.get_natural_light(vector.offset(pos,0,1,0))/15.0
|
local amount=minetest.get_natural_light(vector.offset(pos,0,1,0))/15.0
|
||||||
local charging=amount>0.5
|
local charging=amount>0.5
|
||||||
local formspec={
|
local formspec={
|
||||||
"list[context;charged;4.7,1.8;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(4.7,1.8,1,1),
|
industrialtest.internal.getItemSlotBg(4.7,1.8,1,1),
|
||||||
|
"list[context;charged;4.7,1.8;1,1]",
|
||||||
(charging and "image[4.7,2.8;1,1;industrialtest_gui_sun_fg.png]"
|
(charging and "image[4.7,2.8;1,1;industrialtest_gui_sun_fg.png]"
|
||||||
or "image[4.7,2.8;1,1;industrialtest_gui_sun_bg.png]"),
|
or "image[4.7,2.8;1,1;industrialtest_gui_sun_bg.png]"),
|
||||||
"listring[context;charged]"
|
"listring[context;charged]"
|
||||||
|
|||||||
@@ -73,14 +73,14 @@ function industrialtest.ToolWorkshop.getFormspec(self,pos)
|
|||||||
local meta=minetest.get_meta(pos)
|
local meta=minetest.get_meta(pos)
|
||||||
local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
|
local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
|
||||||
local formspec={
|
local formspec={
|
||||||
"list[context;powerStorage;3.7,3.7;1,1;0]",
|
|
||||||
industrialtest.internal.getItemSlotBg(3.7,3.7,1,1),
|
industrialtest.internal.getItemSlotBg(3.7,3.7,1,1),
|
||||||
|
"list[context;powerStorage;3.7,3.7;1,1;0]",
|
||||||
(powerPercent>0 and "image[3.7,2.5;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
|
(powerPercent>0 and "image[3.7,2.5;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
|
||||||
or "image[3.7,2.5;1,1;industrialtest_gui_electricity_bg.png]"),
|
or "image[3.7,2.5;1,1;industrialtest_gui_electricity_bg.png]"),
|
||||||
"list[context;src;5.9,3.2;1,1;0]",
|
|
||||||
industrialtest.internal.getItemSlotBg(5.9,3.2,1,1),
|
industrialtest.internal.getItemSlotBg(5.9,3.2,1,1),
|
||||||
"list[context;upgrades;9,0.9;1,4]",
|
"list[context;src;5.9,3.2;1,1;0]",
|
||||||
industrialtest.internal.getItemSlotBg(9,0.9,1,4),
|
industrialtest.internal.getItemSlotBg(9,0.9,1,4),
|
||||||
|
"list[context;upgrades;9,0.9;1,4]",
|
||||||
"listring[context;src]"
|
"listring[context;src]"
|
||||||
}
|
}
|
||||||
return parentFormspec..table.concat(formspec,"")
|
return parentFormspec..table.concat(formspec,"")
|
||||||
|
|||||||
@@ -58,8 +58,8 @@ function industrialtest.WindMill.getFormspec(self,pos)
|
|||||||
local meta=minetest.get_meta(pos)
|
local meta=minetest.get_meta(pos)
|
||||||
local charging=meta:get_int("charging")
|
local charging=meta:get_int("charging")
|
||||||
local formspec={
|
local formspec={
|
||||||
"list[context;charged;4.7,1.8;1,1]",
|
|
||||||
industrialtest.internal.getItemSlotBg(4.7,1.8,1,1),
|
industrialtest.internal.getItemSlotBg(4.7,1.8,1,1),
|
||||||
|
"list[context;charged;4.7,1.8;1,1]",
|
||||||
(charging>0 and "image[4.7,3;1,1;industrialtest_gui_wind_bg.png^[lowpart:"..charging..":industrialtest_gui_wind_fg.png]"
|
(charging>0 and "image[4.7,3;1,1;industrialtest_gui_wind_bg.png^[lowpart:"..charging..":industrialtest_gui_wind_fg.png]"
|
||||||
or "image[4.7,3;1,1;industrialtest_gui_wind_bg.png]"),
|
or "image[4.7,3;1,1;industrialtest_gui_wind_bg.png]"),
|
||||||
"listring[context;charged]"
|
"listring[context;charged]"
|
||||||
@@ -76,13 +76,14 @@ function industrialtest.WindMill.action(self,pos)
|
|||||||
local dimMax=31000
|
local dimMax=31000
|
||||||
local dim=mcl_worlds.pos_to_dimension(pos)
|
local dim=mcl_worlds.pos_to_dimension(pos)
|
||||||
if dim=="overworld" then
|
if dim=="overworld" then
|
||||||
dimMax=mcl_vars.mg_overworld_max
|
dimMax=mcl_vars.mg_overworld_max_official
|
||||||
elseif dim=="nether" then
|
elseif dim=="nether" then
|
||||||
dimMax=mcl_vars.mg_nether_max
|
dimMax=mcl_vars.mg_nether_max
|
||||||
elseif dim=="end" then
|
elseif dim=="end" then
|
||||||
dimMax=mcl_vars.mg_end_max
|
dimMax=mcl_vars.mg_end_max_official
|
||||||
end
|
end
|
||||||
charging=math.max(mcl_worlds.layer_to_y(pos.y,dim),0)/dimMax
|
local layer,_=mcl_worlds.y_to_layer(pos.y)
|
||||||
|
charging=math.min(math.max((layer or 0),0)/dimMax,1.0)
|
||||||
end
|
end
|
||||||
local neighbourPositions={
|
local neighbourPositions={
|
||||||
vector.offset(pos,-1,0,0),
|
vector.offset(pos,-1,0,0),
|
||||||
|
|||||||
138
nodes.lua
@@ -489,3 +489,141 @@ minetest.register_craft({
|
|||||||
{industrialtest.elementKeys.glass,"industrialtest:advanced_alloy",industrialtest.elementKeys.glass}
|
{industrialtest.elementKeys.glass,"industrialtest:advanced_alloy",industrialtest.elementKeys.glass}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
-- \brief Function which should be called after iron fence was constructed
|
||||||
|
-- \param pos vector
|
||||||
|
-- \returns nil
|
||||||
|
local function ironFenceOnConstruct(pos)
|
||||||
|
local neighbours={
|
||||||
|
vector.offset(pos,0,-1,0),
|
||||||
|
vector.offset(pos,0,1,0)
|
||||||
|
}
|
||||||
|
for _,neighbourPosition in ipairs(neighbours) do
|
||||||
|
local meta=minetest.get_meta(neighbourPosition)
|
||||||
|
if meta:contains("magnetizerPosition") then
|
||||||
|
local magnetizerPosition=minetest.deserialize(meta:get_string("magnetizerPosition"))
|
||||||
|
industrialtest.Magnetizer:determineFenceRail(magnetizerPosition)
|
||||||
|
industrialtest.Magnetizer:determinePowerCapacity(magnetizerPosition)
|
||||||
|
industrialtest.Magnetizer:updateFormspec(magnetizerPosition)
|
||||||
|
industrialtest.Magnetizer:requestPower(magnetizerPosition)
|
||||||
|
break
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
neighbours={
|
||||||
|
vector.offset(pos,1,0,0),
|
||||||
|
vector.offset(pos,-1,0,0),
|
||||||
|
vector.offset(pos,0,0,1),
|
||||||
|
vector.offset(pos,0,0,-1)
|
||||||
|
}
|
||||||
|
for _,neighbourPosition in ipairs(neighbours) do
|
||||||
|
local neighbourNode=minetest.get_node(neighbourPosition)
|
||||||
|
if neighbourNode.name=="industrialtest:magnetizer" then
|
||||||
|
local meta=minetest.get_meta(neighbourPosition)
|
||||||
|
if not meta:contains("railPosition") then
|
||||||
|
industrialtest.Magnetizer:determineFenceRail(neighbourPosition)
|
||||||
|
industrialtest.Magnetizer:determinePowerCapacity(neighbourPosition)
|
||||||
|
industrialtest.Magnetizer:updateFormspec(neighbourPosition)
|
||||||
|
industrialtest.Magnetizer:requestPower(neighbourPosition)
|
||||||
|
break
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- \brief Function which should be called before iron fence was removed
|
||||||
|
-- \param pos vector
|
||||||
|
-- \returns nil
|
||||||
|
local function ironFenceOnDestruct(pos)
|
||||||
|
local meta=minetest.get_meta(pos)
|
||||||
|
if not meta:contains("magnetizerPosition") then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
local magnetizerPosition=minetest.deserialize(meta:get_string("magnetizerPosition"))
|
||||||
|
industrialtest.Magnetizer.detachFenceRail(magnetizerPosition)
|
||||||
|
end
|
||||||
|
|
||||||
|
-- \brief Function which should be called after iron fence was removed
|
||||||
|
-- \param meta table
|
||||||
|
-- \returns nil
|
||||||
|
local function ironFenceDetach(meta)
|
||||||
|
if not meta or not meta.fields or not meta.fields.magnetizerPosition then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
local magnetizerPosition=minetest.deserialize(meta.fields.magnetizerPosition)
|
||||||
|
industrialtest.Magnetizer:determineFenceRail(magnetizerPosition)
|
||||||
|
industrialtest.Magnetizer:determinePowerCapacity(magnetizerPosition)
|
||||||
|
industrialtest.Magnetizer:updateFormspec(magnetizerPosition)
|
||||||
|
end
|
||||||
|
|
||||||
|
if industrialtest.mtgAvailable then
|
||||||
|
local inventoryImage="default_fence_overlay.png^default_steel_block.png^default_fence_overlay.png^[makealpha:255,126,126"
|
||||||
|
default.register_fence("industrialtest:iron_fence",{
|
||||||
|
description=S("Iron Fence"),
|
||||||
|
texture="default_steel_block.png",
|
||||||
|
inventory_image=inventoryImage,
|
||||||
|
wield_image=inventoryImage,
|
||||||
|
groups={
|
||||||
|
cracky=1,
|
||||||
|
level=2,
|
||||||
|
_industrialtest_metalFence=1
|
||||||
|
},
|
||||||
|
sounds=default.node_sound_metal_defaults(),
|
||||||
|
connects_to={
|
||||||
|
"group:fence",
|
||||||
|
"group:wood",
|
||||||
|
"group:tree",
|
||||||
|
"group:wall",
|
||||||
|
"industrialtest:magnetizer"
|
||||||
|
},
|
||||||
|
on_construct=ironFenceOnConstruct,
|
||||||
|
on_destruct=ironFenceOnDestruct,
|
||||||
|
after_dig_node=function(pos,oldnode,oldmeta)
|
||||||
|
ironFenceDetach(oldmeta)
|
||||||
|
end
|
||||||
|
})
|
||||||
|
minetest.register_craft({
|
||||||
|
type="shaped",
|
||||||
|
output="industrialtest:iron_fence 4",
|
||||||
|
recipe={
|
||||||
|
{"industrialtest:iron_plate","industrialtest:iron_plate","industrialtest:iron_plate"},
|
||||||
|
{"industrialtest:iron_plate","industrialtest:iron_plate","industrialtest:iron_plate"}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
elseif industrialtest.mclAvailable then
|
||||||
|
-- Some MCL2 forks define this function so use it if available
|
||||||
|
if mcl_fences.register_fence_def then
|
||||||
|
mcl_fences.register_fence_def("iron_fence",{
|
||||||
|
description=S("Iron Fence"),
|
||||||
|
tiles={"default_steel_block.png"},
|
||||||
|
groups={
|
||||||
|
_industrialtest_metalFence=1
|
||||||
|
},
|
||||||
|
connects_to={
|
||||||
|
"group:fence",
|
||||||
|
"group:fence_gate",
|
||||||
|
"group:solid",
|
||||||
|
"industrialtest:magnetizer"
|
||||||
|
},
|
||||||
|
on_construct=ironFenceOnConstruct,
|
||||||
|
on_destruct=ironFenceOnDestruct,
|
||||||
|
after_destruct=function(pos,oldnode,oldmeta)
|
||||||
|
ironFenceDetach(oldmeta)
|
||||||
|
end
|
||||||
|
})
|
||||||
|
else
|
||||||
|
mcl_fences.register_fence("iron_fence",S("Iron Fence"),"default_steel_block.png",{_industrialtest_metalFence=1},4,5,{"industrialtest:magnetizer","group:fence"},mcl_sounds.node_sound_metal_defaults())
|
||||||
|
end
|
||||||
|
if minetest.registered_nodes["mcl_fences:iron_fence"] then
|
||||||
|
-- mcl_fences.register_fence_def registers fences in it's own namespace so register alias here to keep compatibility
|
||||||
|
minetest.register_alias("industrialtest:iron_fence","mcl_fences:iron_fence")
|
||||||
|
end
|
||||||
|
minetest.register_craft({
|
||||||
|
type="shaped",
|
||||||
|
output="industrialtest:iron_fence 3",
|
||||||
|
recipe={
|
||||||
|
{"industrialtest:iron_plate","industrialtest:iron_plate","industrialtest:iron_plate"},
|
||||||
|
{"industrialtest:iron_plate","industrialtest:iron_plate","industrialtest:iron_plate"}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
end
|
||||||
|
|||||||
BIN
textures/industrialtest_guide_batbox.png
Normal file
|
After Width: | Height: | Size: 8.4 KiB |
BIN
textures/industrialtest_guide_cable_former.png
Normal file
|
After Width: | Height: | Size: 8.9 KiB |
BIN
textures/industrialtest_guide_canning_machine.png
Normal file
|
After Width: | Height: | Size: 8.6 KiB |
BIN
textures/industrialtest_guide_chargepad.png
Normal file
|
After Width: | Height: | Size: 226 KiB |
BIN
textures/industrialtest_guide_compressor.png
Normal file
|
After Width: | Height: | Size: 9.3 KiB |
BIN
textures/industrialtest_guide_electric_furnace.png
Normal file
|
After Width: | Height: | Size: 8.8 KiB |
BIN
textures/industrialtest_guide_explosion.png
Normal file
|
After Width: | Height: | Size: 295 KiB |
BIN
textures/industrialtest_guide_extractor.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
textures/industrialtest_guide_generator.png
Normal file
|
After Width: | Height: | Size: 8.4 KiB |
BIN
textures/industrialtest_guide_geothermal_generator.png
Normal file
|
After Width: | Height: | Size: 8.7 KiB |
BIN
textures/industrialtest_guide_induction_furnace.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
textures/industrialtest_guide_introduction.png
Normal file
|
After Width: | Height: | Size: 321 KiB |
BIN
textures/industrialtest_guide_iron_furnace.png
Normal file
|
After Width: | Height: | Size: 9.1 KiB |
BIN
textures/industrialtest_guide_macerator.png
Normal file
|
After Width: | Height: | Size: 9.2 KiB |
BIN
textures/industrialtest_guide_magnetizer.png
Normal file
|
After Width: | Height: | Size: 183 KiB |
BIN
textures/industrialtest_guide_mass_fabricator.png
Normal file
|
After Width: | Height: | Size: 9.3 KiB |
BIN
textures/industrialtest_guide_miner_digging.png
Normal file
|
After Width: | Height: | Size: 236 KiB |
BIN
textures/industrialtest_guide_miner_formspec.png
Normal file
|
After Width: | Height: | Size: 14 KiB |
BIN
textures/industrialtest_guide_nuclear_reactor_chambers.png
Normal file
|
After Width: | Height: | Size: 216 KiB |
BIN
textures/industrialtest_guide_nuclear_reactor_formspec.png
Normal file
|
After Width: | Height: | Size: 8.8 KiB |
BIN
textures/industrialtest_guide_pump.png
Normal file
|
After Width: | Height: | Size: 215 KiB |
BIN
textures/industrialtest_guide_pump_formspec.png
Normal file
|
After Width: | Height: | Size: 8.3 KiB |
BIN
textures/industrialtest_guide_recycler.png
Normal file
|
After Width: | Height: | Size: 9.6 KiB |
BIN
textures/industrialtest_guide_rotary_macerator.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
BIN
textures/industrialtest_guide_solar_panel_full.png
Normal file
|
After Width: | Height: | Size: 7.8 KiB |
BIN
textures/industrialtest_guide_solar_panel_none.png
Normal file
|
After Width: | Height: | Size: 9.4 KiB |
BIN
textures/industrialtest_guide_tool_workshop.png
Normal file
|
After Width: | Height: | Size: 8.5 KiB |
BIN
textures/industrialtest_guide_transformer.png
Normal file
|
After Width: | Height: | Size: 220 KiB |
BIN
textures/industrialtest_guide_upgrades.png
Normal file
|
After Width: | Height: | Size: 4.8 KiB |
BIN
textures/industrialtest_guide_water_mill.png
Normal file
|
After Width: | Height: | Size: 221 KiB |
BIN
textures/industrialtest_guide_water_mill_formspec.png
Normal file
|
After Width: | Height: | Size: 8.0 KiB |
BIN
textures/industrialtest_guide_wind_mill.png
Normal file
|
After Width: | Height: | Size: 4.0 KiB |
BIN
textures/industrialtest_magnetizer_front.png
Normal file
|
After Width: | Height: | Size: 4.3 KiB |
@@ -69,8 +69,8 @@ industrialtest.internal.unpackTableInto(industrialtest.LapPack,{
|
|||||||
description=S("LapPack"),
|
description=S("LapPack"),
|
||||||
inventoryImage="industrialtest_lappack_v_inv.png",
|
inventoryImage="industrialtest_lappack_v_inv.png",
|
||||||
modelImage="industrialtest_lappack_v.png",
|
modelImage="industrialtest_lappack_v.png",
|
||||||
capacity=60000,
|
capacity=300000,
|
||||||
flow=industrialtest.api.lvPowerFlow
|
flow=industrialtest.api.mvPowerFlow
|
||||||
})
|
})
|
||||||
|
|
||||||
industrialtest.LapPack:register()
|
industrialtest.LapPack:register()
|
||||||
@@ -79,7 +79,7 @@ minetest.register_craft({
|
|||||||
type="shaped",
|
type="shaped",
|
||||||
output="industrialtest:lappack_v",
|
output="industrialtest:lappack_v",
|
||||||
recipe={
|
recipe={
|
||||||
{industrialtest.elementKeys.powerCarrier,"industrialtest:electronic_circuit",industrialtest.elementKeys.powerCarrier},
|
{industrialtest.elementKeys.powerCarrier,"industrialtest:advanced_electronic_circuit",industrialtest.elementKeys.powerCarrier},
|
||||||
{industrialtest.elementKeys.powerCarrier,"industrialtest:batpack_v",industrialtest.elementKeys.powerCarrier},
|
{industrialtest.elementKeys.powerCarrier,"industrialtest:batpack_v",industrialtest.elementKeys.powerCarrier},
|
||||||
{industrialtest.elementKeys.powerCarrier,"",industrialtest.elementKeys.powerCarrier}
|
{industrialtest.elementKeys.powerCarrier,"",industrialtest.elementKeys.powerCarrier}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ function industrialtest.JetpackBase.update(self, player, inv, itemstack, dtime)
|
|||||||
local playerName = player:get_player_name()
|
local playerName = player:get_player_name()
|
||||||
local control = player:get_player_control()
|
local control = player:get_player_control()
|
||||||
if control.jump and self:tryFly(itemstack) then
|
if control.jump and self:tryFly(itemstack) then
|
||||||
self.addYVelocityClamped(player,1,10)
|
industrialtest.internal.addYVelocityClamped(player,1,10)
|
||||||
if not soundHandles[playerName] then
|
if not soundHandles[playerName] then
|
||||||
local pos = player:get_pos()
|
local pos = player:get_pos()
|
||||||
local handle = minetest.sound_play("industrialtest_jetpack_loop", {
|
local handle = minetest.sound_play("industrialtest_jetpack_loop", {
|
||||||
@@ -47,15 +47,6 @@ function industrialtest.JetpackBase.update(self, player, inv, itemstack, dtime)
|
|||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
function industrialtest.JetpackBase.addYVelocityClamped(player,vel,max)
|
|
||||||
local playerVel=player:get_velocity()
|
|
||||||
if playerVel.y+vel>max then
|
|
||||||
player:add_velocity(vector.new(0,math.max(max-playerVel.y,0),0))
|
|
||||||
else
|
|
||||||
player:add_velocity(vector.new(0,vel,0))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
industrialtest.Jetpack=table.copy(industrialtest.JetpackBase)
|
industrialtest.Jetpack=table.copy(industrialtest.JetpackBase)
|
||||||
industrialtest.internal.unpackTableInto(industrialtest.Jetpack,{
|
industrialtest.internal.unpackTableInto(industrialtest.Jetpack,{
|
||||||
-- _v is hack to suppress "Registered armor doesn't have material at the end of registration name" warning from 3D Armor.
|
-- _v is hack to suppress "Registered armor doesn't have material at the end of registration name" warning from 3D Armor.
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ industrialtest.internal.unpackTableInto(industrialtest.QuantumBodyarmor,{
|
|||||||
part="torso",
|
part="torso",
|
||||||
modelImage="industrialtest_quantum_bodyarmor.png",
|
modelImage="industrialtest_quantum_bodyarmor.png",
|
||||||
update=industrialtest.JetpackBase.update,
|
update=industrialtest.JetpackBase.update,
|
||||||
addYVelocityClamped=industrialtest.JetpackBase.addYVelocityClamped,
|
addYVelocityClamped=industrialtest.internal.addYVelocityClamped,
|
||||||
tryFly=industrialtest.ElectricJetpack.tryFly
|
tryFly=industrialtest.ElectricJetpack.tryFly
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||