Describe item power storage in guide

guide.lua

@@ -66,8 +66,10 @@ local function createMachineInformationTable(fields,machineName,num)
 	local fieldLabels={
 		inputVoltage="Input voltage level",
 		outputVoltage="Output voltage level",
+		voltage="Voltage",
 		lowVoltage="Low voltage",
 		highVoltage="High voltage",
+		damageRed="Damage reduction",
 		recipe="Recipe type",
 		powerCapacity="Power capacity",
 		opPower="Power per operation",
@@ -1206,6 +1208,399 @@ local pages={
 				<left>||Picture 1. <item name="industrialtest:electric_furnace" height="{{ITEM_HEIGHT}}"> <b>Electric Furnace</b> with <item name="industrialtest:overclocker_upgrade" height="{{ITEM_HEIGHT}}"> <b>Overclocker Upgrade</b>.||</left>
 			]]
 		}
+	},
+
+	{
+		name="batpacks",
+		title=S("BatPacks"),
+		icon="industrialtest:batpack_v",
+		content={
+			[[
+				<big>||BatPacks||</big>
+				<left>
+					||BatPack when equipped charges currently wielded electric item. There are two types of BatPacks:||
+				</left>
+				<left>
+					||<item name="industrialtest:batpack_v" height="{{ITEM_HEIGHT}}"> <b>BatPack</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="LV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.BatPack.capacity)
+				}
+			},S("BatPack")),
+			[[
+				<mono></mono>
+				<left>
+					||<item name="industrialtest:lappack_v" height="{{ITEM_HEIGHT}}"> <b>LapPack</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="MV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.LapPack.capacity)
+				}
+			},S("LapPack"),2)
+		}
+	},
+
+	{
+		name="electricToolset",
+		title=S("Electric toolset"),
+		icon="industrialtest:electric_drill",
+		content={
+			[[
+				<big>||Electric toolset||</big>
+				<left>
+					||Electric toolset consists of typical tools like pickaxe but powered by electricity. While used they don't wear out but instead discharge which allow them to be reused. When completely discharged it's still possible to use the tool but it will be considerably slower. Those are (regular and advanced version):||
+				</left>
+				<left>
+					||<item name="industrialtest:electric_chainsaw" height="{{ITEM_HEIGHT}}"> <b>Electric Chainsaw</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="LV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.ElectricChainsaw.capacity)
+				}
+			},S("Electric Chainsaw")),
+			[[
+				<mono></mono>
+				<left>
+					||<item name="industrialtest:electric_drill" height="{{ITEM_HEIGHT}}"> <b>Electric Drill</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="LV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.ElectricDrill.capacity)
+				}
+			},S("Electric Drill"),2),
+			[[
+				<mono></mono>
+				||<item name="industrialtest:electric_hoe" height="{{ITEM_HEIGHT}}"> <b>Electric Hoe</b>||
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="LV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.ElectricHoe.capacity)
+				}
+			},S("Electric Hoe"),3),
+			[[
+				<mono></mono>
+				||<item name="industrialtest:electric_saber" height="{{ITEM_HEIGHT}}"> <b>Electric Saber</b>||
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="LV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.ElectricSaber.capacity)
+				}
+			},S("Electric Saber"),4),
+			[[
+				<mono></mono>
+				||<item name="industrialtest:electric_treetap" height="{{ITEM_HEIGHT}}"> <b>Electric Treetap</b>||
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="LV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.ElectricTreetap.capacity)
+				}
+			},S("Electric Treetap"),5)
+		}
+	},
+
+	{
+		name="itemPowerStorage",
+		title=S("Item power storage"),
+		icon="industrialtest:re_battery",
+		content={
+			[[
+				<big>||Item power storage||</big>
+				<left>
+					||There are items which purpose is solely to store power in them. Those are following:||
+				</left>
+				<left>
+					||<item name="industrialtest:re_battery" height="{{ITEM_HEIGHT}}"> <b>RE-Battery</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="LV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.REBattery.capacity)
+				}
+			},S("RE-Battery")),
+			[[
+				<mono></mono>
+				<left>
+					||<item name="industrialtest:advanced_re_battery" height="{{ITEM_HEIGHT}}"> <b>Advanced RE-Battery</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="MV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.AdvancedREBattery.capacity)
+				}
+			},S("Advanced RE-Battery"),2),
+			[[
+				<mono></mono>
+				<left>
+					||<item name="industrialtest:energy_crystal" height="{{ITEM_HEIGHT}}"> <b>Energy Crystal</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="HV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.EnergyCrystal.capacity)
+				}
+			},S("Energy Crystal"),3),
+			[[
+				<mono></mono>
+				<left>
+					||<item name="industrialtest:lapotron_crystal" height="{{ITEM_HEIGHT}}"> <b>Lapotron Crystal</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="EV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.LapotronCrystal.capacity)
+				}
+			},S("Lapotron Crystal"),4)
+		}
+	},
+
+	{
+		name="jetpacks",
+		title=S("Jetpacks"),
+		icon="industrialtest:jetpack_v",
+		content={
+			[[
+				<big>||Jetpacks||</big>
+				<left>
+					||Jetpacks allow to combat against the gravity after pressing the jump key. They are equipped as chest part of armor. There are two jetpack types:||
+				</left>
+				<left>
+					||<item name="industrialtest:jetpack_v" height="{{ITEM_HEIGHT}}"> <b>Jetpack</b> - regular jetpack which is powered by fuel, can be refilled in <item name="industrialtest:canning_machine" height="{{ITEM_HEIGHT}}"> <b>Canning Machine</b>.||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="Fuel capacity",
+					value=string.format("%d mB",industrialtest.Jetpack.capacity)
+				}
+			},S("Jetpack")),
+			[[
+				<mono></mono>
+				<left>
+					||<item name="industrialtest:electric_jetpack" height="{{ITEM_HEIGHT}}"> <b>Electric Jetpack</b> - jetpack powered by electricity.||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="LV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.ElectricJetpack.capacity)
+				}
+			},S("Electric Jetpack"),2)
+		}
+	},
+
+	{
+		name="miningLaser",
+		title=S("Mining Laser"),
+		icon="industrialtest:mining_laser",
+		content={
+			[[
+				<big>||Mining Laser||</big>
+				<left>
+					||Mining Laser is a tool that emits beam when used. Depending on the mode beam will cause different a result:||
+					||Mode 1 - breaks nodes at full power, direction where player looks.||
+					||Mode 2 - breaks nodes at low power, direction where player looks.||
+					||Mode 3 - breaks nodes at full power, direction only horizontal.||
+					||Mode 4 - explodes after touching node, direction where player looks.||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="HV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.MiningLaser.capacity)
+				},
+				{
+					name="Power per operation (Mode 1)",
+					value="1250 EU"
+				},
+				{
+					name="Power per operation (Mode 2)",
+					value="100 EU"
+				},
+				{
+					name="Power per operation (Mode 3)",
+					value="100 EU"
+				},
+				{
+					name="Power per operation (Mode 4)",
+					value="5000 EU"
+				}
+			},S("Mining Laser"))
+		}
+	},
+
+	{
+		name="nanoSuit",
+		title=S("Nano Suit"),
+		icon="industrialtest:nano_bodyarmor",
+		content={
+			[[
+				<big>||Nano Suit||</big>
+				<left>
+					||Nano Suit is an armor which with power of electricity can reduce damage which player takes. It consists of following parts:||
+				</left>
+				<left>
+					||<item name="industrialtest:nano_helmet" height="{{ITEM_HEIGHT}}"> <b>Nano Helmet</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="EV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.NanoSuit.capacity)
+				},
+				{
+					name="opPower",
+					value=string.format("%d EU",industrialtest.NanoSuit:getPowerPerDamageForItem())
+				},
+				{
+					name="damageRed",
+					value="0.12"
+				}
+			},S("Nano Helmet")),
+			[[
+				<mono></mono>
+				<left>
+					||<item name="industrialtest:nano_bodyarmor" height="{{ITEM_HEIGHT}}"> <b>Nano Bodyarmor</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="EV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.NanoSuit.capacity)
+				},
+				{
+					name="opPower",
+					value=string.format("%d EU",industrialtest.NanoSuit:getPowerPerDamageForItem())
+				},
+				{
+					name="damageRed",
+					value="0.32"
+				}
+			},S("Nano Bodyarmor"),2),
+			[[
+				<mono></mono>
+				<left>
+					||<item name="industrialtest:nano_leggings" height="{{ITEM_HEIGHT}}"> <b>Nano Leggings</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="EV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.NanoSuit.capacity)
+				},
+				{
+					name="opPower",
+					value=string.format("%d EU",industrialtest.NanoSuit:getPowerPerDamageForItem())
+				},
+				{
+					name="damageRed",
+					value="0.3"
+				}
+			},S("Nano Leggings"),3),
+			[[
+				<mono></mono>
+				<left>
+					||<item name="industrialtest:nano_boots" height="{{ITEM_HEIGHT}}"> <b>Nano Boots</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="EV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.NanoSuit.capacity)
+				},
+				{
+					name="opPower",
+					value=string.format("%d EU",industrialtest.NanoSuit:getPowerPerDamageForItem())
+				},
+				{
+					name="damageRed",
+					value="0.24"
+				}
+			},S("Nano Boots"),4)
+		}
 	}
 }
 
@@ -1224,17 +1619,18 @@ local function preprocessHypertext(content,vars)
 end
 
 local function getGuideFormspec(playerName,pageName)
+	local PAGE_BUTTON_HEIGHT=0.7
+
 	local formspec={
 		"formspec_version[4]",
 		"size[15,10.8]",
 		"label[0.1,0.2;"..S("IndustrialTest Guide").."]",
-		--"scrollbaroptions[]",
+		string.format("scrollbaroptions[max=%f]",(#pages-10.3/PAGE_BUTTON_HEIGHT)*PAGE_BUTTON_HEIGHT*10),
 		"scrollbar[3.6,0.4;0.5,10.3;vertical;scrollbarList;0]",
-		"scroll_container[0.1,0.4;4,10.3;scrollbarList;vertical]"
+		"scroll_container[0.1,0.4;4,10.3;scrollbarList;vertical;0.1]"
 	}
 
 	-- Contents sidebar
-	local PAGE_BUTTON_HEIGHT=0.7
 	for i,page in ipairs(pages) do
 		table.insert(formspec,string.format("container[0,%f]",(i-1)*PAGE_BUTTON_HEIGHT))
 		table.insert(formspec,string.format("item_image[0,0;%f,%f;%s]",PAGE_BUTTON_HEIGHT,PAGE_BUTTON_HEIGHT,page.icon))

tools/batpack.lua

@@ -69,8 +69,8 @@ industrialtest.internal.unpackTableInto(industrialtest.LapPack,{
 	description=S("LapPack"),
 	inventoryImage="industrialtest_lappack_v_inv.png",
 	modelImage="industrialtest_lappack_v.png",
-	capacity=60000,
+	capacity=300000,
-	flow=industrialtest.api.lvPowerFlow
+	flow=industrialtest.api.mvPowerFlow
 })
 
 industrialtest.LapPack:register()
@@ -79,7 +79,7 @@ minetest.register_craft({
 	type="shaped",
 	output="industrialtest:lappack_v",
 	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.elementKeys.powerCarrier}
 	}