diff --git a/doc/items.lua b/doc/items.lua index afb3983..c4ddef0 100644 --- a/doc/items.lua +++ b/doc/items.lua @@ -178,7 +178,8 @@ techage.Items = { ta4_liquid_filter = "techage_ta4_filter.png", ta4_recycler = "techage:ta4_recycler_pas", ta4_waterinlet = "techage:ta4_waterinlet", - + ta4_laser = "techage:ta4_laser_emitter", + --ta4_ "", } diff --git a/doc/manual_DE.lua b/doc/manual_DE.lua index ad641fe..888a580 100644 --- a/doc/manual_DE.lua +++ b/doc/manual_DE.lua @@ -195,6 +195,7 @@ techage.manual_DE.aTitel = { "3,TA4 Elektronikfabrik / Electronic Fab", "3,TA4 Injektor / Injector", "3,TA4 Recycler", + "3,TA4 Laser", } techage.manual_DE.aText = { @@ -1592,6 +1593,16 @@ techage.manual_DE.aText = { "\n".. "\n".. "\n", + "Der TA4 Laser dient zur kabellosen Stromübertagung. Dazu sind zwei Blöcke notwendig: TA4 Laserstrahl Sender und TA4 Laserstrahl Empfänger. Zwischen beiden Blöcken muss sich eine Luftstrecke befinden\\, so dass der Laserstrahl vom Sender bis zum Empfänger aufgebaut werden kann.\n".. + "\n".. + "Zuerst muss der Sender platziert werden. Dieser schaltet sofort den Laserstahls ein und zeigt damit mögliche Positionen des Empfängers an. Mögliche Positionen für den Empfänger werden auch über eine Chat-Nachricht ausgegeben. Mit dem Laser lassen sich Strecken bis 96 Blöcke überbrücken.\n".. + "\n".. + "Ist die Verbindung aufgebaut (es muss dazu noch kein Strom fließen)\\, wird dies über den Info-Text des Senders und auch des Empfängers angezeigt.\n".. + "\n".. + "Die Laserblöcke selbst benötigen keinen Strom.\n".. + "\n".. + "\n".. + "\n", } techage.manual_DE.aItemName = { @@ -1789,6 +1800,7 @@ techage.manual_DE.aItemName = { "ta4_electronicfab", "ta4_injector", "ta4_recycler", + "ta4_laser", } techage.manual_DE.aPlanTable = { @@ -1986,5 +1998,6 @@ techage.manual_DE.aPlanTable = { "", "", "", + "", } diff --git a/doc/manual_EN.lua b/doc/manual_EN.lua index 8d817a2..c775da8 100644 --- a/doc/manual_EN.lua +++ b/doc/manual_EN.lua @@ -193,7 +193,8 @@ techage.manual_EN.aTitel = { "3,TA4 Quarry", "3,TA4 Electronic Fab", "3,TA4 Injector", - "3,TA4 recycler", + "3,TA4 Recycler", + "3,TA4 Laser", } techage.manual_EN.aText = { @@ -1575,6 +1576,14 @@ techage.manual_EN.aText = { "\n".. " \n".. "\n", + "The TA4 laser is used for wireless power transmission. Two blocks are required for this: TA4 Laser Beam Emitter and TA4 Laser Beam Receiver. There must be an air gap between the two blocks so that the laser beam can be built up from the emitter to the receiver. First the emitter must be placed. This immediately switches on the laser beam and shows possible positions of the receiver. Possible positions for the receiver are also output via a chat message. \n".. + "\n".. + "With the laser\\, distances of up to 96 blocks can be bridged. Once the connection has been established (no current has to flow)\\, this is indicated via the info text of the emitter and also of the receiver. \n".. + "\n".. + "The laser blocks themselves do not require any electricity.\n".. + "\n".. + "\n".. + "\n", } techage.manual_EN.aItemName = { @@ -1771,6 +1780,7 @@ techage.manual_EN.aItemName = { "ta4_electronicfab", "ta4_injector", "ta4_recycler", + "ta4_laser", } techage.manual_EN.aPlanTable = { @@ -1967,5 +1977,6 @@ techage.manual_EN.aPlanTable = { "", "", "", + "", } diff --git a/locale/techage.de.tr b/locale/techage.de.tr index 36e5314..093a3c4 100644 --- a/locale/techage.de.tr +++ b/locale/techage.de.tr @@ -503,6 +503,14 @@ TA Lamp Holder Copper=TA Lampenhalter Kupfer TA Lamp Holder Gold=TA Lampenhalter Gold TA Lamp Holder White=TA Lampenhalter Weiß +### laser.lua ### + +Laser beam error!=Laserstrahl Fehler! +TA4 Laser Beam Emitter=TA4 Laserstrahl Sender +TA4 Laser Beam Receiver=TA4 Laserstrahl Empfänger +Valid destination positions:=Gültige Zielpositionen +to=bis + ### lib.lua ### ### sensorchest.lua ### diff --git a/locale/template.txt b/locale/template.txt index 837cfe6..63e1246 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -503,6 +503,14 @@ TA Lamp Holder Copper= TA Lamp Holder Gold= TA Lamp Holder White= +### laser.lua ### + +Laser beam error!= +TA4 Laser Beam Emitter= +TA4 Laser Beam Receiver= +Valid destination positions:= +to= + ### lib.lua ### ### sensorchest.lua ### diff --git a/manuals/manual_ta4_DE.md b/manuals/manual_ta4_DE.md index a1b6c85..d205a2c 100644 --- a/manuals/manual_ta4_DE.md +++ b/manuals/manual_ta4_DE.md @@ -677,4 +677,16 @@ Aber nicht alle Materialen lassen sich recyclen: Die Verarbeitungsleistung beträgt ein Item alle 8 s. Der Block benötigt hierfür 16 ku Strom. -[ta4_recycler|image] \ No newline at end of file +[ta4_recycler|image] + +### TA4 Laser + +Der TA4 Laser dient zur kabellosen Stromübertagung. Dazu sind zwei Blöcke notwendig: TA4 Laserstrahl Sender und TA4 Laserstrahl Empfänger. Zwischen beiden Blöcken muss sich eine Luftstrecke befinden, so dass der Laserstrahl vom Sender bis zum Empfänger aufgebaut werden kann. + +Zuerst muss der Sender platziert werden. Dieser schaltet sofort den Laserstahls ein und zeigt damit mögliche Positionen des Empfängers an. Mögliche Positionen für den Empfänger werden auch über eine Chat-Nachricht ausgegeben. Mit dem Laser lassen sich Strecken bis 96 Blöcke überbrücken. + +Ist die Verbindung aufgebaut (es muss dazu noch kein Strom fließen), wird dies über den Info-Text des Senders und auch des Empfängers angezeigt. + +Die Laserblöcke selbst benötigen keinen Strom. + +[ta4_laser|image] \ No newline at end of file diff --git a/manuals/manual_ta4_EN.md b/manuals/manual_ta4_EN.md index dad57b4..4a44a9d 100644 --- a/manuals/manual_ta4_EN.md +++ b/manuals/manual_ta4_EN.md @@ -666,7 +666,7 @@ The processing power is up to 8 items every 3 seconds. [ta4_injector|image] -### TA4 recycler +### TA4 Recycler The recycler is a machine that processes all Techage recipes backwards, i.e. it can dismantle machines and blocks back into their components. @@ -681,3 +681,12 @@ The processing power is one item every 8 s. The block requires 16 ku of electri [ta4_recycler|image] +### TA4 Laser + +The TA4 laser is used for wireless power transmission. Two blocks are required for this: TA4 Laser Beam Emitter and TA4 Laser Beam Receiver. There must be an air gap between the two blocks so that the laser beam can be built up from the emitter to the receiver. First the emitter must be placed. This immediately switches on the laser beam and shows possible positions of the receiver. Possible positions for the receiver are also output via a chat message. + +With the laser, distances of up to 96 blocks can be bridged. Once the connection has been established (no current has to flow), this is indicated via the info text of the emitter and also of the receiver. + +The laser blocks themselves do not require any electricity. + +[ta4_laser|image] \ No newline at end of file diff --git a/manuals/toc_DE.md b/manuals/toc_DE.md index b13b87a..c40c255 100644 --- a/manuals/toc_DE.md +++ b/manuals/toc_DE.md @@ -193,4 +193,5 @@ - [TA4 Steinbrecher / Quarry](./manual_ta4_DE.md#ta4-steinbrecher--quarry) - [TA4 Elektronikfabrik / Electronic Fab](./manual_ta4_DE.md#ta4-elektronikfabrik--electronic-fab) - [TA4 Injektor / Injector](./manual_ta4_DE.md#ta4-injektor--injector) - - [TA4 Recycler](./manual_ta4_DE.md#ta4-recycler) \ No newline at end of file + - [TA4 Recycler](./manual_ta4_DE.md#ta4-recycler) + - [TA4 Laser](./manual_ta4_DE.md#ta4-laser) \ No newline at end of file diff --git a/manuals/toc_EN.md b/manuals/toc_EN.md index e2751f7..6fa7de1 100644 --- a/manuals/toc_EN.md +++ b/manuals/toc_EN.md @@ -192,4 +192,5 @@ - [TA4 Quarry](./manual_ta4_EN.md#ta4-quarry) - [TA4 Electronic Fab](./manual_ta4_EN.md#ta4-electronic-fab) - [TA4 Injector](./manual_ta4_EN.md#ta4-injector) - - [TA4 recycler](./manual_ta4_EN.md#ta4-recycler) \ No newline at end of file + - [TA4 Recycler](./manual_ta4_EN.md#ta4-recycler) + - [TA4 Laser](./manual_ta4_EN.md#ta4-laser) \ No newline at end of file diff --git a/power/laser.lua b/power/laser.lua index 6ccf46c..238bd96 100644 --- a/power/laser.lua +++ b/power/laser.lua @@ -22,7 +22,7 @@ local Cable = techage.ElectricCable local power = techage.power local networks = techage.networks -minetest.register_node("techage:laser_emitter", { +minetest.register_node("techage:ta4_laser_emitter", { description = S("TA4 Laser Beam Emitter"), tiles = { -- up, down, right, left, back, front @@ -42,14 +42,16 @@ minetest.register_node("techage:laser_emitter", { local pos1, pos2 = techage.renew_laser(pos, true) if pos1 then local node = techage.get_node_lvm(pos2) - if node.name == "techage:laser_receiver" then + if node.name == "techage:ta4_laser_receiver" then Cable:pairing(pos2, "laser") Cable:pairing(pos, "laser") else - minetest.chat_send_player(placer:get_player_name(), S("Valid destination positions:") .. " " .. P2S(pos1) .. " " .. S("to") .. " " .. P2S(pos2)) + minetest.chat_send_player(placer:get_player_name(), + S("Valid destination positions:") .. " " .. + P2S(pos1) .. " " .. S("to") .. " " .. P2S(pos2)) end else - minetest.chat_send_player(placer:get_player_name(), S("The line of sight is blocked")) + minetest.chat_send_player(placer:get_player_name(), S("Laser beam error!")) end minetest.get_node_timer(pos):start(2) end, @@ -58,7 +60,7 @@ minetest.register_node("techage:laser_emitter", { local pos1, pos2 = techage.renew_laser(pos) if pos1 then local node = techage.get_node_lvm(pos2) - if node.name == "techage:laser_receiver" then + if node.name == "techage:ta4_laser_receiver" then Cable:pairing(pos2, "laser") Cable:pairing(pos, "laser") end @@ -79,7 +81,7 @@ minetest.register_node("techage:laser_emitter", { sounds = default.node_sound_wood_defaults(), }) -minetest.register_node("techage:laser_receiver", { +minetest.register_node("techage:ta4_laser_receiver", { description = S("TA4 Laser Beam Receiver"), tiles = { -- up, down, right, left, back, front @@ -109,7 +111,25 @@ minetest.register_node("techage:laser_receiver", { sounds = default.node_sound_wood_defaults(), }) -Cable:add_secondary_node_names({"techage:laser_emitter", "techage:laser_receiver"}) -Cable:set_valid_sides("techage:laser_emitter", {"F"}) -Cable:set_valid_sides("techage:laser_receiver", {"F"}) +Cable:add_secondary_node_names({"techage:ta4_laser_emitter", "techage:ta4_laser_receiver"}) +Cable:set_valid_sides("techage:ta4_laser_emitter", {"F"}) +Cable:set_valid_sides("techage:ta4_laser_receiver", {"F"}) + +minetest.register_craft({ + output = "techage:ta4_laser_emitter", + recipe = { + {"techage:ta4_carbon_fiber", "dye:blue", "techage:ta4_carbon_fiber"}, + {"techage:electric_cableS", "basic_materials:energy_crystal_simple", "techage:ta4_leds"}, + {"default:steel_ingot", "techage:ta4_wlanchip", "default:steel_ingot"}, + }, +}) + +minetest.register_craft({ + output = "techage:ta4_laser_receiver", + recipe = { + {"techage:ta4_carbon_fiber", "dye:blue", "techage:ta4_carbon_fiber"}, + {"techage:electric_cableS", "basic_materials:gold_wire", "default:obsidian_glass"}, + {"default:steel_ingot", "techage:ta4_wlanchip", "default:steel_ingot"}, + }, +})