TA4 street lamp added

doc/items.lua

@@ -156,5 +156,6 @@ techage.Items = {
 	ta4_detector = "techage:ta4_detector_off",
 	ta4_chest = "techage:ta4_chest",
 	ta4_growlight = "techage:growlight_on",
+	ta4_streetlamp = "techage_ta4_streetlamp.png",
 	--ta4_ "", 
 }

doc/manual_DE.lua

@@ -156,7 +156,8 @@ techage.manual_DE.aTitel = {
   "3,TA4 Detektor / Detector",
   "2,TA4 Lampen",
   "3,TA4 LED Pflanzenlampe / TA4 LED Grow Light",
-  "3,weitere Lampen kommen noch...",
+  "3,TA4 LED Straßenlampe / TA4 LED Street Lamp",
+  "3,weitere Lampen folgen...",
   "2,Weitere TA4 Blöcke",
   "3,TA4 Tank / TA4 Tank",
   "3,TA4 Pumpe / TA4 Pump",
@@ -1271,6 +1272,14 @@ techage.manual_DE.aText = {
   "\n"..
   "\n"..
   "\n",
+  "Die TA4 LED Straßenlampe ist eine Lampe mit besonders starker Ausleuchtung. Die Lampe besteht aus dem Lampengehäuse\\, Lampenarm und Lampenmast Blöcken.\n"..
+  "\n"..
+  "Der Strom muss von unten durch den Mast nach oben zum Lampengehäuse geführt werden. Dazu zuerst die Stromleitung nach oben ziehen und das Stromkabel dann mit Lampenmast Blöcken \"verputzen\".\n"..
+  "\n"..
+  "Die Lampe benötigt 1 ku Strom.\n"..
+  "\n"..
+  "\n"..
+  "\n",
   "",
   "",
   "Siehe TA3 Tank.\n"..
@@ -1494,6 +1503,7 @@ techage.manual_DE.aItemName = {
   "ta4_detector",
   "",
   "ta4_growlight",
+  "ta4_streetlamp",
   "",
   "",
   "ta4_tank",
@@ -1678,5 +1688,6 @@ techage.manual_DE.aPlanTable = {
   "",
   "",
   "",
+  "",
 }
 

init.lua

@@ -143,6 +143,7 @@ else
 	dofile(MP.."/lamps/lightblock.lua")	
 	dofile(MP.."/lamps/simplelamp.lua")
 	dofile(MP.."/lamps/streetlamp.lua")
+	dofile(MP.."/lamps/streetlamp2.lua")
 	dofile(MP.."/lamps/ceilinglamp.lua")
 	dofile(MP.."/lamps/industriallamp1.lua")
 	dofile(MP.."/lamps/industriallamp2.lua")

lamps/streetlamp2.lua

@@ -0,0 +1,127 @@
+--[[
+
+	TechAge
+	=======
+
+	Copyright (C) 2020 Joachim Stolberg
+
+	GPL v3
+	See LICENSE.txt for more information
+	
+	TA4 LED Street Lamp
+
+]]--
+
+local S = techage.S
+
+local function on_switch_lamp(pos, on)
+	techage.light_ring({x = pos.x, y = pos.y - 3, z = pos.z}, on)
+end
+
+techage.register_lamp("techage:streetlamp2", {
+	description = S("TA4 LED Street Lamp"),
+	tiles = {
+		"techage_streetlamp2_housing.png",
+		"techage_streetlamp2_housing.png^techage_streetlamp2_off.png",
+		"techage_streetlamp2_housing.png",
+	},
+	
+	paramtype2 = "facedir", -- important!
+	drawtype = "nodebox",
+	node_box = {
+		type = "fixed",
+		fixed = {{ -8/32, 8/32, -16/32, 8/32, 15/32, 16/32}},
+	},
+	on_switch_lamp = on_switch_lamp,
+	on_rotate = screwdriver.disallow,
+	conn_sides = {"F", "B"},
+},{
+	description = S("TA4 LED Street Lamp"),
+	tiles = {
+		-- up, down, right, left, back, front
+		"techage_streetlamp2_housing_on.png",
+		"techage_streetlamp2_housing_on.png^techage_streetlamp2_on.png",
+		"techage_streetlamp2_housing_on.png",
+	},
+
+	drawtype = "nodebox",
+	node_box = {
+		type = "fixed",
+		fixed = {{ -8/32, 8/32, -16/32, 8/32, 15/32, 16/32}},
+	},
+	on_switch_lamp = on_switch_lamp,
+	on_rotate = screwdriver.disallow,
+	conn_sides = {"F", "B"},
+})
+
+minetest.register_node("techage:streetlamp_pole", {
+	description = S("TA4 LED Street Lamp Pole"),
+	tiles = {
+		"techage_streetlamp2_housing.png",
+	},
+	
+	paramtype2 = "facedir", -- important!
+	drawtype = "nodebox",
+	node_box = {
+		type = "connected",
+		fixed = {{ -5/32, -16/32,  -5/32,   5/32, 16/32,   5/32}},
+		
+		connect_left =  {{-16/32, 8/32, -3/32,   3/32, 14/32, 3/32}},	
+		connect_right = {{ -3/32, 8/32, -3/32,  16/32, 14/32, 3/32}},	
+		connect_back =  {{ -3/32, 8/32, -3/32,   3/32, 14/32, 16/32}},
+		connect_front = {{ -3/32, 8/32, -16/32,  3/32, 14/32, 3/32}},
+	},
+	connects_to = {"techage:streetlamp_arm", "techage:streetlamp2_off", "techage:streetlamp2_on"},
+	paramtype = "light",
+	sunlight_propagates = true,
+	is_ground_content = false,
+	groups = {cracky=2, crumbly=2, choppy=2},
+	sounds = default.node_sound_defaults(),
+})
+
+minetest.register_node("techage:streetlamp_arm", {
+	description = S("TA4 LED Street Lamp Arm"),
+	tiles = {
+		"techage_streetlamp2_housing.png",
+	},
+	
+	paramtype2 = "facedir", -- important!
+	drawtype = "nodebox",
+	node_box = {
+		type = "fixed",
+		fixed = {{ -3/32, 8/32, -16/32, 3/32, 14/32, 16/32}},
+	},
+	paramtype = "light",
+	sunlight_propagates = true,
+	is_ground_content = false,
+	groups = {cracky=2, crumbly=2, choppy=2},
+	sounds = default.node_sound_defaults(),
+})
+
+minetest.register_craft({
+	output = "techage:streetlamp2_off",
+	recipe = {
+		{"basic_materials:steel_strip", "dye:white", "basic_materials:steel_strip"},
+		{"techage:ta4_leds", "techage:ta4_leds", "techage:ta4_leds"},
+		{"techage:ta4_leds", "techage:basalt_glass_thin", "techage:ta4_leds"},
+	},
+})
+
+minetest.register_craft({
+	output = "techage:streetlamp_pole 2",
+	recipe = {
+		{"", "basic_materials:steel_bar", ""},
+		{"", "basic_materials:steel_bar", "dye:white"},
+		{"", "basic_materials:steel_bar", ""},
+	},
+})
+
+minetest.register_craft({
+	output = "techage:streetlamp_arm 2",
+	recipe = {
+		{"", "dye:white", ""},
+		{"basic_materials:steel_bar", "basic_materials:steel_bar", "basic_materials:steel_bar"},
+		{"", "", ""},
+	},
+})
+

locale/techage.de.tr

@@ -256,11 +256,13 @@ TA3 Timer=TA3 Timer
 TA3 Tiny Power Generator=TA3 Kleiner Stromgenerator
 TA3 Turbine=TA3 Turbine
 TA3 Vacuum Tube=TA3 Vakuumröhre
+TA4 8x2000 Chest=TA4 8x2000 Kiste
 TA4 Button/Switch=TA4 Schalter/Taster
 TA4 Carbon Fiber=TA4 Kohlefaser
 TA4 Derrick=TA4 Bohrturm
 TA4 Detector=TA4 Detektor
 TA4 Doser=TA4 Dosierer
+TA4 Ele Fab=TA4 E-Fabrik
 TA4 Electrolyzer=TA4 Elektrolyseur
 TA4 Fuel Cell=TA4 Brennstoffzelle
 TA4 Fuel Cell Stack=Brennstoffzellenstapel
@@ -272,6 +274,11 @@ TA4 Heat Exchanger 1=TA4 Wärmetauscher 1
 TA4 Heat Exchanger 2=TA4 Wärmetauscher 2
 TA4 Heat Exchanger 3=TA4 Wärmetauscher 3
 TA4 Hydrogen=TA4 Wasserstoff
+TA4 LED Grow Light=TA4 LED Pflanzenlampe
+TA4 LED Street Lamp=TA4 LED Straßenlampe
+TA4 LED Street Lamp Arm=TA4 LED Lampenarm
+TA4 LED Street Lamp Pole=TA4 LED Lampenmast
+TA4 LEDs=TA4 LEDs
 TA4 Low Power Box=TA4 Niederspannungsverteilerbox
 TA4 Low Power Cable=TA4 Niederspannungskabel
 TA4 Pillar=TA4 Säule

locale/template.txt

@@ -254,11 +254,13 @@ TA3 Timer=
 TA3 Tiny Power Generator=
 TA3 Turbine=
 TA3 Vacuum Tube=
+TA4 8x2000 Chest=
 TA4 Button/Switch=
 TA4 Carbon Fiber=
 TA4 Derrick=
 TA4 Detector=
 TA4 Doser=
+TA4 Ele Fab=
 TA4 Electrolyzer=
 TA4 Fuel Cell=
 TA4 Fuel Cell Stack=
@@ -270,6 +272,11 @@ TA4 Heat Exchanger 1=
 TA4 Heat Exchanger 2=
 TA4 Heat Exchanger 3=
 TA4 Hydrogen=
+TA4 LED Grow Light=
+TA4 LED Street Lamp=
+TA4 LED Street Lamp Arm=
+TA4 LED Street Lamp Pole=
+TA4 LEDs=
 TA4 Low Power Box=
 TA4 Low Power Cable=
 TA4 Pillar=

manuals/manual_ta4_DE.md

@@ -426,7 +426,17 @@ Die Lampe benötigt 1 ku Strom.
 
 [ta4_growlight|image]
 
-### weitere Lampen kommen noch...
+### TA4 LED Straßenlampe / TA4 LED Street Lamp
+
+Die TA4 LED Straßenlampe ist eine Lampe mit besonders starker Ausleuchtung. Die Lampe besteht aus dem Lampengehäuse, Lampenarm und Lampenmast Blöcken.
+
+Der Strom muss von unten durch den Mast nach oben zum Lampengehäuse geführt werden. Dazu zuerst die Stromleitung nach oben ziehen und das Stromkabel dann mit Lampenmast Blöcken "verputzen".
+
+Die Lampe benötigt 1 ku Strom.
+
+[ta4_streetlamp|image]
+
+### weitere Lampen folgen...
 
 
 

manuals/toc_DE.md

@@ -155,7 +155,8 @@
         - [TA4 Detektor / Detector](./manual_ta4_DE.md#ta4-detektor--detector)
     - [TA4 Lampen](./manual_ta4_DE.md#ta4-lampen)
         - [TA4 LED Pflanzenlampe / TA4 LED Grow Light](./manual_ta4_DE.md#ta4-led-pflanzenlampe--ta4-led-grow-light)
-        - [weitere Lampen kommen noch...](./manual_ta4_DE.md#weitere-lampen-kommen-noch...)
+        - [TA4 LED Straßenlampe / TA4 LED Street Lamp](./manual_ta4_DE.md#ta4-led-straßenlampe--ta4-led-street-lamp)
+        - [weitere Lampen folgen...](./manual_ta4_DE.md#weitere-lampen-folgen...)
     - [Weitere TA4 Blöcke](./manual_ta4_DE.md#weitere-ta4-blöcke)
         - [TA4 Tank / TA4 Tank](./manual_ta4_DE.md#ta4-tank--ta4-tank)
         - [TA4 Pumpe / TA4 Pump](./manual_ta4_DE.md#ta4-pumpe--ta4-pump)