Ethereal support added, manual correction, tin ingot recipe bugfix

README.md

@@ -89,5 +89,5 @@ to 'lsqlite3' and 'lua-marshal', but there is no way back, so:
 - 2020-05-31  V0.09  * TA4 tubes upgraded, manuals updated  
 - 2020-06-04  V0.10  * minor changes and bugfixes
 - 2020-06-14  V0.11  * cart commands added for both controllers, support for moreores added
-
+- 2020-06-17  V0.12  * Ethereal support added, manual correction, tin ingot recipe bugfix
 

basis/numbers_sqlite.lua

@@ -80,6 +80,9 @@ end
 local Version = storage:get_int("Version") or 0
 local NextNumber = 0
 
+if Version == 0 then
+	Version = 4
+end
 if Version == 3 then
 	Version = 4
 	NextNumber = storage:get_int("NextNumber")

doc/items.lua

@@ -46,6 +46,7 @@ techage.Items = {
 	ta2_rinser = "techage:ta2_rinser_pas",
 	ta2_chest = "techage:chest_ta2",
 	ta2_forceload = "techage:forceload",
+	ta2_driveaxle = "techage:axle",
 	---------------------
 	techage_ta3 = "techage_ta3.png",
 	techage_ta31 = "techage_ta3b.png",

doc/manual_DE.lua

@@ -26,6 +26,7 @@ techage.manual_DE.aTitel = {
   "3,TA2 Zylinder /Cylinder",
   "3,TA2 Schwungrad / Flywheel",
   "3,TA2 Dampfleitungen / Steam Pipe",
+  "3,TA2 Antriebsachsen / TA2 Drive Axle",
   "2,Items schieben und sortieren",
   "3,Röhren / TechAge Tube",
   "3,TA2 Schieber / Pusher",
@@ -233,6 +234,7 @@ techage.manual_DE.aText = {
   "\n"..
   "\n",
   "Baborium wird nur im Untertagebau gewonnen. Baborium findet man nur in Stein in einer Höhe zwischen -250 und -340 Meter.\n"..
+  "Baborium kann nur im TA3 Industrieofen geschmolzen werden.\n"..
   "\n"..
   "\n"..
   "\n",
@@ -377,6 +379,10 @@ techage.manual_DE.aText = {
   "\n"..
   "\n"..
   "\n",
+  "Die Antriebsachsen dienen zur Kraftübertragung von der Dampfmaschine zu anderen Maschinen. Die maximale Länge einer Antriebsachse beträgt 8 Blöcke. Über Getriebeboxen können auch größere Strecken überbrückt\\, sowie Abzweigungen und Richtungswechsel realisiert werden.\n"..
+  "\n"..
+  "\n"..
+  "\n",
   "Um Gegenstände (Items) von einer Verarbeitungsstation zur nächsten weiter zu transportieren\\, werden Schieber und Röhren verwendet. Siehe Plan.\n"..
   "\n"..
   "\n"..
@@ -1487,6 +1493,7 @@ techage.manual_DE.aItemName = {
   "ta2_cylinder",
   "ta2_flywheel",
   "ta2_steampipe",
+  "ta2_driveaxle",
   "",
   "tube",
   "ta2_pusher",
@@ -1670,6 +1677,7 @@ techage.manual_DE.aPlanTable = {
   "",
   "",
   "",
+  "",
   "itemtransport",
   "",
   "",

doc/manual_EN.lua

@@ -26,6 +26,7 @@ techage.manual_EN.aTitel = {
   "3,TA2 Cylinder",
   "3,TA2 Flywheel",
   "3,TA2 Steam Pipes",
+  "3,TA2 Drive Axle / TA2 Gearbox",
   "2,Push and sort items",
   "3,TechAge Tube",
   "3,TA2 Pusher",
@@ -233,6 +234,7 @@ techage.manual_EN.aText = {
   "\n"..
   "\n",
   "Baborium is only extracted in underground mining. Baborium can only be found in stone at an altitude between -250 and -340 meters.\n"..
+  "Baborium can only be melted in the TA3 Industrial Furnace.\n"..
   "\n"..
   "\n"..
   "\n",
@@ -377,6 +379,10 @@ techage.manual_EN.aText = {
   "\n"..
   "\n"..
   "\n",
+  "The drive axles are used to transmit power from the steam engine to other machines. The maximum length of a drive axis is 8 blocks. With TA2 Gearboxes\\, larger distances can be bridged\\, and branches and changes of direction can be realized.\n"..
+  "\n"..
+  "\n"..
+  "\n",
   "In order to transport objects from one processing station to the next\\, pushers and tubes are used. See plan.\n"..
   "\n"..
   "\n"..
@@ -1477,6 +1483,7 @@ techage.manual_EN.aItemName = {
   "ta2_cylinder",
   "ta2_flywheel",
   "ta2_steampipe",
+  "ta2_driveaxle",
   "",
   "tube",
   "ta2_pusher",
@@ -1660,6 +1667,7 @@ techage.manual_EN.aPlanTable = {
   "",
   "",
   "",
+  "",
   "itemtransport",
   "",
   "",

init.lua

@@ -13,7 +13,7 @@
 techage = {}
 
 -- Version for compatibility checks, see readme.md/history
-techage.version = 0.11
+techage.version = 0.12
 
 if minetest.global_exists("tubelib") then
 	minetest.log("error", "[techage] Techage can't be used together with the mod tubelib!")
@@ -278,6 +278,7 @@ dofile(MP.."/lua_controller/sensorchest.lua")
 dofile(MP.."/lua_controller/terminal.lua")
 
 -- Items
+dofile(MP.."/items/registered_nodes.lua")
 dofile(MP.."/items/barrel.lua")
 dofile(MP.."/items/baborium.lua")
 dofile(MP.."/items/usmium.lua")

iron_age/charcoalpile.lua

@@ -29,8 +29,7 @@ end
 local function num_dirt(pos)
 	local pos1 = {x=pos.x-2, y=pos.y-1, z=pos.z-2}
 	local pos2 = {x=pos.x+2, y=pos.y+3, z=pos.z+2}
-	local nodes = minetest.find_nodes_in_area(pos1, pos2, {"default:dirt", "default:dirt_with_grass", 
+	local nodes = minetest.find_nodes_in_area(pos1, pos2, techage.aAnyKindOfDirtBlocks)
-			"default:dirt_with_dry_grass", "default:dirt_with_snow", "techage:dirt_with_ash"})
 	return #nodes
 end
 
@@ -41,6 +40,11 @@ local function make_dirt_with_dry_grass(pos)
 	for _,p in ipairs(minetest.find_nodes_in_area(pos1, pos2, "default:dirt_with_grass")) do
 		minetest.swap_node(p, {name = "default:dirt_with_dry_grass"})
 	end
+	if minetest.global_exists("ethereal") then
+		for _,p in ipairs(minetest.find_nodes_in_area(pos1, pos2, techage.aEtherealDirts)) do
+			minetest.swap_node(p, {name = "default:dirt_with_dry_grass"})
+		end
+	end
 end
 
 -- replace pile bottom nodes

iron_age/recipes.lua

@@ -174,6 +174,13 @@ if techage.modified_recipes_enabled then
 		time = 8,
 	})
 
+	techage.ironage_register_recipe({
+		output = "default:tin_ingot 1", 
+		recipe = {"default:tin_lump"}, 
+		heat = 4,
+		time = 2,
+	})
+	
 	if minetest.global_exists("moreores") then
 		techage.ironage_register_recipe({
 			output = "moreores:silver_ingot 1", 
@@ -182,12 +189,6 @@ if techage.modified_recipes_enabled then
 			time = 2,
 		})
 
-		techage.ironage_register_recipe({
-			output = "moreores:tin_ingot 1", 
-			recipe = {"moreores:tin_lump"}, 
-			heat = 4,
-			time = 2,
-		})
 	end
 
 	minetest.register_craft({

items/registered_nodes.lua

@@ -0,0 +1,40 @@
+--[[
+
+	TechAge
+	=======
+
+	Copyright (C) 2019 Joachim Stolberg
+
+	GPL v3
+	See LICENSE.txt for more information
+	
+	Collect data of registered nodes
+
+]]--
+
+
+techage.aEtherealDirts = {
+	"ethereal:fiery_dirt",
+	"ethereal:cold_dirt",
+	"ethereal:crystal_dirt",
+	"ethereal:gray_dirt",
+	"ethereal:mushroom_dirt",
+	"ethereal:prairie_dirt",
+	"ethereal:grove_dirt",
+	"ethereal:jungle_dirt",
+	"ethereal:bamboo_dirt",
+}
+
+techage.aAnyKindOfDirtBlocks = {}
+
+minetest.register_on_mods_loaded(function()
+	for name, ndef in pairs(minetest.registered_nodes) do
+		if string.find(name, "dirt") and 
+				ndef.drawtype == "normal" and
+				ndef.groups.crumbly and ndef.groups.crumbly > 0 then
+			techage.aAnyKindOfDirtBlocks[#techage.aAnyKindOfDirtBlocks + 1] = name
+			print(name)
+		end
+	end
+end)
+

manuals/QSG.md

@@ -26,7 +26,7 @@ Since the levels build on each other, all ages have to be run through one after
 
 ## Iron Age (TA1)
 
-1. Search and harvest cactus to make paper and craft the Techage Construction Board. This plan is the ingame manual for all four Techage phases
+1. Search and harvest papyrus to make paper and craft the Techage Construction Board. This plan is the ingame manual for all four Techage phases
 2. Cut trees and make wood out of them
 3. Collect dirt for the charcoal burner to make charcoal
 4. Go mining and seach for ores, or

manuals/manual_ta2_DE.md

@@ -64,6 +64,12 @@ Teil der Dampfmaschine. Der Boiler muss mit dem Zylinder über die Dampfleitunge
 
 [ta2_steampipe|image]
 
+### TA2 Antriebsachsen / TA2 Drive Axle
+
+Die Antriebsachsen dienen zur Kraftübertragung von der Dampfmaschine zu anderen Maschinen. Die maximale Länge einer Antriebsachse beträgt 8 Blöcke. Über Getriebeboxen können auch größere Strecken überbrückt, sowie Abzweigungen und Richtungswechsel realisiert werden.
+
+[ta2_driveaxle|image]
+
 
 ## Items schieben und sortieren
 

manuals/manual_ta2_EN.md

@@ -65,6 +65,12 @@ Part of the steam engine. The boiler must be connected to the cylinder via the s
 [ta2_steampipe|image]
 
 
+### TA2 Drive Axle / TA2 Gearbox
+
+The drive axles are used to transmit power from the steam engine to other machines. The maximum length of a drive axis is 8 blocks. With TA2 Gearboxes, larger distances can be bridged, and branches and changes of direction can be realized.
+
+[ta2_driveaxle|image]
+
 ## Push and sort items
 
 In order to transport objects from one processing station to the next, pushers and tubes are used. See plan.

manuals/toc_DE.md

@@ -25,6 +25,7 @@
         - [TA2 Zylinder /Cylinder](./manual_ta2_DE.md#ta2-zylinder-cylinder)
         - [TA2 Schwungrad / Flywheel](./manual_ta2_DE.md#ta2-schwungrad--flywheel)
         - [TA2 Dampfleitungen / Steam Pipe](./manual_ta2_DE.md#ta2-dampfleitungen--steam-pipe)
+        - [TA2 Antriebsachsen / TA2 Drive Axle](./manual_ta2_DE.md#ta2-antriebsachsen--ta2-drive-axle)
     - [Items schieben und sortieren](./manual_ta2_DE.md#items-schieben-und-sortieren)
         - [Röhren / TechAge Tube](./manual_ta2_DE.md#röhren--techage-tube)
         - [TA2 Schieber / Pusher](./manual_ta2_DE.md#ta2-schieber--pusher)

manuals/toc_EN.md

@@ -25,6 +25,7 @@
         - [TA2 Cylinder](./manual_ta2_EN.md#ta2-cylinder)
         - [TA2 Flywheel](./manual_ta2_EN.md#ta2-flywheel)
         - [TA2 Steam Pipes](./manual_ta2_EN.md#ta2-steam-pipes)
+        - [TA2 Drive Axle / TA2 Gearbox](./manual_ta2_EN.md#ta2-drive-axle--ta2-gearbox)
     - [Push and sort items](./manual_ta2_EN.md#push-and-sort-items)
         - [TechAge Tube](./manual_ta2_EN.md#techage-tube)
         - [TA2 Pusher](./manual_ta2_EN.md#ta2-pusher)

mod.conf

@@ -1,4 +1,4 @@
 name = techage
 depends = default,doors,tubelib2,basic_materials,bucket,stairs,screwdriver,minecart,lcdlib,safer_lua
-optional_depends = unified_inventory,wielded_light,unifieddyes,moreores
+optional_depends = unified_inventory,wielded_light,unifieddyes,moreores, ethereal
 description = Techage, go through 4 tech ages in search of wealth and power!