From dea3092e68edac2f70b005caa61ca72256e5a3a7 Mon Sep 17 00:00:00 2001 From: Joachim Stolberg Date: Sat, 28 Mar 2020 01:19:37 +0100 Subject: [PATCH] TA4 street lamp added --- doc/items.lua | 1 + doc/manual_DE.lua | 13 +- init.lua | 1 + lamps/streetlamp2.lua | 127 ++++++++++++++++++++ locale/techage.de.tr | 7 ++ locale/template.txt | 7 ++ manuals/manual_ta4_DE.md | 12 +- manuals/toc_DE.md | 3 +- textures/techage_streetlamp2_housing.png | Bin 0 -> 262 bytes textures/techage_streetlamp2_housing_on.png | Bin 0 -> 262 bytes textures/techage_streetlamp2_off.png | Bin 0 -> 224 bytes textures/techage_streetlamp2_on.png | Bin 0 -> 221 bytes textures/techage_ta4_streetlamp.png | Bin 0 -> 821 bytes 13 files changed, 168 insertions(+), 3 deletions(-) create mode 100644 lamps/streetlamp2.lua create mode 100644 textures/techage_streetlamp2_housing.png create mode 100644 textures/techage_streetlamp2_housing_on.png create mode 100644 textures/techage_streetlamp2_off.png create mode 100644 textures/techage_streetlamp2_on.png create mode 100644 textures/techage_ta4_streetlamp.png diff --git a/doc/items.lua b/doc/items.lua index ec7757d..12eea1e 100644 --- a/doc/items.lua +++ b/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_ "", } diff --git a/doc/manual_DE.lua b/doc/manual_DE.lua index fe4e3b7..d40fadd 100644 --- a/doc/manual_DE.lua +++ b/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 = { "", "", "", + "", } diff --git a/init.lua b/init.lua index 4a1eab7..df5b33d 100644 --- a/init.lua +++ b/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") diff --git a/lamps/streetlamp2.lua b/lamps/streetlamp2.lua new file mode 100644 index 0000000..c5d92eb --- /dev/null +++ b/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"}, + {"", "", ""}, + }, +}) + diff --git a/locale/techage.de.tr b/locale/techage.de.tr index eccc348..07e5e48 100644 --- a/locale/techage.de.tr +++ b/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 diff --git a/locale/template.txt b/locale/template.txt index 4fbae80..0e0a69f 100644 --- a/locale/template.txt +++ b/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= diff --git a/manuals/manual_ta4_DE.md b/manuals/manual_ta4_DE.md index 3e7d663..b260a74 100644 --- a/manuals/manual_ta4_DE.md +++ b/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... diff --git a/manuals/toc_DE.md b/manuals/toc_DE.md index 2559702..7ef2502 100644 --- a/manuals/toc_DE.md +++ b/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) diff --git a/textures/techage_streetlamp2_housing.png b/textures/techage_streetlamp2_housing.png new file mode 100644 index 0000000000000000000000000000000000000000..73f7546137029673a479182bbb079c83ea57394c GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;SkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?smmW`;zRIOpf)rskCZxeN@>MX8A;sVNHOnI#zt?w-B@DSD~wKyl6jkH}&M z25w;xW@MN(M*=9w7T^=&`s&rIw{PFZ`mdh{6iM)OaSY+Op8SKKh3Eh6r~i#>{{8=N zd-(DH|NEOc7D#k(tGqML`Tu|MyhNaQz2vw5^Y^zu{6Bx!f1dviUUg1a8#_Kb9D3$& y+woi2<4>d4o6YP(2F!Jfq(2BwXZ-wop%8;{ZgKnB1mOmtT@0SCelF{r5}E+lX<#}4 literal 0 HcmV?d00001 diff --git a/textures/techage_streetlamp2_housing_on.png b/textures/techage_streetlamp2_housing_on.png new file mode 100644 index 0000000000000000000000000000000000000000..b556f6f3329e73ff4e2eadf62754bfd1945258cf GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;SkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?smmW`;zRIOpf)rskCZxeN@>MX8A;sVNHOnI#zt?w-B@DSD~wKyl6jkH}&M z25w;xW@MN(M*=9w7T^=&x_|!xAjlSYB?J^n@N{tu;kcgsgP(=x|Lv#$jcfk>|8INv z@&Et(n>iLpba1P@GtT+{fAPFTpm@FHxBv6^w?F(pf7gGW{|;VtPFEW{K06$G=5O2a wTiD}Iqt~0w>_P_2b&I4w2u^4G{ClAggK=(g``HBH2B2LGp00i_>zopr02b?Bu>b%7 literal 0 HcmV?d00001 diff --git a/textures/techage_streetlamp2_off.png b/textures/techage_streetlamp2_off.png new file mode 100644 index 0000000000000000000000000000000000000000..8a28be173cf4e272cd651fb39c661be5ee7fa34d GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@mUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIC?nIRD+&iT2ysd*(pE(3#eQEFmIYKlU6W=V#EyQgnJie4%^P@J>CBeIx* zfm;}a85w5HkpK$v1o(uw`eYVv*tmJhlxchR?(dy*iv=joSQ6wH%;50sMjDW#?&;zf zB5^r6;Q+gfv$OL7o|kvu&uftU^#6bT!i^lVYZ|%_*miI;Fzl*xyZq(N!<9fS44$rj JF6*2UngI1NS%G}U;vjb? zhIQv;UIIC?nIRD+&iT2ysd*(pE(3#eQEFmIYKlU6W=V#EyQgnJie4%^P@J>CBeIx* zfm;}a85w5HkpK$v1o(uw`eYV1x3tciH~;_t|7R{8SO^qnED7=pW^j0RBMrz=@pN$v zk+__k@F0qngmgWFVdQ&MBb@ E02UlRz5oCK literal 0 HcmV?d00001 diff --git a/textures/techage_ta4_streetlamp.png b/textures/techage_ta4_streetlamp.png new file mode 100644 index 0000000000000000000000000000000000000000..5ee306576e1782558abe3aeebc040dce0ad07443 GIT binary patch literal 821 zcmV-51Iqk~P))H<<%EJAs1&2~f`X4oWPD@RRQV(Gm9S86X;MV~E%e5WvR3oaKrD$FnZD zvvdxA)F(&a%<|4UsO#ErXZe)`90~C1Vqna&AixU&>NC%TA_uy5=fs+2SfY7q08I=h z&lsj}4y*~VCZ4?ktpjJm68y?VWwZpB<5t>pmZ3hr16Z@1m=A;|2G4tW|Ivht!FM5- z@NyM{XGyC}U&Y{iC6vC3!TU~q3X)>*zm)gpJqAEz-0Fu*kiRstn&}dxp_1l2D&IEp ztm$?b&QoRrZl6xna0XZ=+(wcBlWL<`PZ=8|3CPn_gNb-SzFGlkx&>gxpa8TL;0Onf zgb?w2kXQntSTQVU1ytG)fE7bxb+jgc{mwC$#L(zyO|akoR3eGN5n2;@Acg7enj_{Ec!1+b-;l z3O9~m0JyK>a~s1}00`zJ;lT*jK@mV3(LTi)iU2A{3*cXDg$@8C1_ZhR@c&n4Qh*)` zU@ZZl2#`quT`6D}La_X20Eh7dauGmOiqnn&AO_6F4~V3Ib#H)47Xa)6uX1xMLou;LorlpPI33&W_3U>c7AZr2aLRfYIz(D}=@d8%TPWvLQ zq`Tn&A_+j!C>KEg3U++~CgorNhu#5u2|!W^7X^7=3hcLOEV}@J7%<}lN*SQ2gn+6A zM0@}W0i_5K6a^tb&}m2eH5>$mFbqKPXCeFsFD$#)c}TIG00000NkvXXu0mjfS$0qV literal 0 HcmV?d00001