pillar added

minor bugfixes

basic_machines/electronic_fab.lua

@@ -272,7 +272,7 @@ minetest.register_craft({
 })
 
 minetest.register_craftitem("techage:vacuum_tube", {
-	description = S("TA3 Vacuum Tubes"),
+	description = S("TA3 Vacuum Tube"),
 	inventory_image = "techage_vacuum_tube.png",
 })
 

init.lua

@@ -149,6 +149,7 @@ else
 	end
 	dofile(MP.."/nodes/gateblock.lua")
 	dofile(MP.."/nodes/doorblock.lua")
+	dofile(MP.."/nodes/pillar.lua")
 	
 	-- Logic
 	dofile(MP.."/logic/lib.lua")

logic/signallamp.lua

@@ -61,8 +61,8 @@ minetest.register_node("techage:signal_lamp_off", {
 		end
 	end,
 
-	on_construct = COLORED and unifieddyes.on_construct,
-	on_dig = COLORED and unifieddyes.on_dig,
+	on_construct = COLORED and unifieddyes.on_construct or nil,
+	on_dig = COLORED and unifieddyes.on_dig or nil,
 	
 	paramtype = "light",
 	paramtype2 = "color",
@@ -94,8 +94,8 @@ minetest.register_node("techage:signal_lamp_on", {
 	palette = COLORED and "unifieddyes_palette_extended.png" or 'techage_color16.png',
 	groups = {choppy=2, cracky=1, not_in_creative_inventory=1, ud_param2_colorable = 1},
 	
-	on_construct = COLORED and unifieddyes.on_construct,
-	after_place_node = COLORED and unifieddyes.recolor_on_place,
+	on_construct = COLORED and unifieddyes.on_construct or nil,
+	after_place_node = COLORED and unifieddyes.recolor_on_place or nil,
 	
 	after_dig_node = function(pos, oldnode, oldmetadata, digger)
 		techage.remove_node(pos)
@@ -105,7 +105,7 @@ minetest.register_node("techage:signal_lamp_on", {
 		end
 	end,
    
-	on_dig = COLORED and unifieddyes.on_dig,
+	on_dig = COLORED and unifieddyes.on_dig or nil,
 	light_source = 10,	
 	is_ground_content = false,
 	drop = "techage:signal_lamp_off"

mod.conf

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

models/techage_pillar.obj

@@ -0,0 +1,124 @@
+# Blender v2.78 (sub 0) OBJ File: 'oven.blend'
+# www.blender.org
+o Cylinder
+v 0.000000 -0.500000 -0.360000
+v 0.000000 0.500000 -0.360000
+v 0.137766 -0.500000 -0.332597
+v 0.137766 0.500000 -0.332597
+v 0.254558 -0.500000 -0.254558
+v 0.254558 0.500000 -0.254558
+v 0.332597 -0.500000 -0.137766
+v 0.332597 0.500000 -0.137766
+v 0.360000 -0.500000 0.000000
+v 0.360000 0.500000 0.000000
+v 0.332597 -0.500000 0.137766
+v 0.332597 0.500000 0.137766
+v 0.254558 -0.500000 0.254558
+v 0.254558 0.500000 0.254558
+v 0.137766 -0.500000 0.332597
+v 0.137766 0.500000 0.332597
+v 0.000000 -0.500000 0.360000
+v 0.000000 0.500000 0.360000
+v -0.137766 -0.500000 0.332597
+v -0.137766 0.500000 0.332597
+v -0.254558 -0.500000 0.254559
+v -0.254558 0.500000 0.254559
+v -0.332597 -0.500000 0.137766
+v -0.332597 0.500000 0.137766
+v -0.360000 -0.500000 -0.000000
+v -0.360000 0.500000 -0.000000
+v -0.332597 -0.500000 -0.137766
+v -0.332597 0.500000 -0.137766
+v -0.254558 -0.500000 -0.254559
+v -0.254558 0.500000 -0.254559
+v -0.137766 -0.500000 -0.332597
+v -0.137766 0.500000 -0.332597
+vt 0.5486 0.5000
+vt 0.5486 1.0000
+vt 0.4725 1.0000
+vt 0.4725 0.5000
+vt 0.4142 1.0000
+vt 0.4142 0.5000
+vt 1.0000 0.5000
+vt 1.0000 1.0000
+vt 0.9239 1.0000
+vt 0.9239 0.5000
+vt 0.8415 1.0000
+vt 0.8415 0.5000
+vt 0.7654 1.0000
+vt 0.7654 0.5000
+vt 0.4142 0.5000
+vt 0.4142 0.0000
+vt 0.4725 0.0000
+vt 0.4725 0.5000
+vt 0.5486 0.0000
+vt 0.5486 0.5000
+vt 0.6310 0.0000
+vt 0.6310 0.5000
+vt 0.7071 0.0000
+vt 0.7071 0.5000
+vt 0.7654 0.0000
+vt 0.7654 0.5000
+vt 0.8415 0.0000
+vt 0.8415 0.5000
+vt 0.9239 0.0000
+vt 0.9239 0.5000
+vt 1.0000 0.0000
+vt 1.0000 0.5000
+vt 0.7654 0.5000
+vt 0.7654 1.0000
+vt 0.7071 1.0000
+vt 0.7071 0.5000
+vt 0.3244 0.4749
+vt 0.3827 0.5370
+vt 0.4142 0.6181
+vt 0.4142 0.7059
+vt 0.3827 0.7870
+vt 0.3244 0.8491
+vt 0.2483 0.8827
+vt 0.1659 0.8827
+vt 0.0898 0.8491
+vt 0.0315 0.7870
+vt 0.0000 0.7059
+vt 0.0000 0.6181
+vt 0.0315 0.5370
+vt 0.0898 0.4749
+vt 0.1659 0.4414
+vt 0.2483 0.4414
+vt 0.6310 1.0000
+vt 0.6310 0.5000
+vt 0.0000 0.2646
+vt 0.0000 0.1768
+vt 0.0315 0.0957
+vt 0.0898 0.0336
+vt 0.1659 0.0000
+vt 0.2483 0.0000
+vt 0.3244 0.0336
+vt 0.3827 0.0957
+vt 0.4142 0.1768
+vt 0.4142 0.2646
+vt 0.3827 0.3457
+vt 0.3244 0.4078
+vt 0.2483 0.4414
+vt 0.1659 0.4414
+vt 0.0898 0.4078
+vt 0.0315 0.3457
+s off
+f 1/1 2/2 4/3 3/4
+f 3/4 4/3 6/5 5/6
+f 5/7 6/8 8/9 7/10
+f 7/10 8/9 10/11 9/12
+f 9/12 10/11 12/13 11/14
+f 11/15 12/16 14/17 13/18
+f 13/18 14/17 16/19 15/20
+f 15/20 16/19 18/21 17/22
+f 17/22 18/21 20/23 19/24
+f 19/24 20/23 22/25 21/26
+f 21/26 22/25 24/27 23/28
+f 23/28 24/27 26/29 25/30
+f 25/30 26/29 28/31 27/32
+f 27/33 28/34 30/35 29/36
+f 4/37 2/38 32/39 30/40 28/41 26/42 24/43 22/44 20/45 18/46 16/47 14/48 12/49 10/50 8/51 6/52
+f 29/36 30/35 32/53 31/54
+f 31/54 32/53 2/2 1/1
+f 1/55 3/56 5/57 7/58 9/59 11/60 13/61 15/62 17/63 19/64 21/65 23/66 25/67 27/68 29/69 31/70

nodes/pillar.lua

@@ -0,0 +1,31 @@
+--[[
+
+	TechAge
+	=======
+
+	Copyright (C) 2019 Joachim Stolberg
+
+	GPL v3
+	See LICENSE.txt for more information
+	
+	pillar
+	
+]]--
+
+local S = techage.S
+
+minetest.register_node("techage:pillar", {
+	description = S("TA4 Pillar"),
+	tiles = {"techage_concrete.png"},
+	drawtype = "mesh",
+	mesh = "techage_pillar.obj",
+	selection_box = {
+		type = "fixed",
+		fixed = {-8/32, -16/32, -8/32, 8/32, 16/32, 8/32},
+	},
+
+	groups = {cracky=1},
+	on_rotate = screwdriver.disallow,
+	is_ground_content = false,
+	sounds = default.node_sound_stone_defaults(),
+})

oil/drillbox.lua

@@ -251,7 +251,7 @@ local tubing = {
 }
 
 local _, node_name_ta3, _ = 
-	techage.register_consumer("drillbox", S("TA3 Oil Drill Box"), tiles, {
+	techage.register_consumer("drillbox", S("Oil Drill Box"), tiles, {
 		drawtype = "normal",
 		cycle_time = CYCLE_TIME,
 		standby_ticks = STANDBY_TICKS,

oil/pumpjack.lua

@@ -155,7 +155,7 @@ local tubing = {
 }
 	
 local _, node_name_ta3, _ = 
-	techage.register_consumer("pumpjack", S("TA3 Oil Pumpjack"), tiles, {
+	techage.register_consumer("pumpjack", S("Oil Pumpjack"), tiles, {
 		cycle_time = CYCLE_TIME,
 		standby_ticks = STANDBY_TICKS,
 		formspec = formspec,