diff options
| author | Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com> | 2018-09-15 15:04:52 +0000 |
|---|---|---|
| committer | Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com> | 2018-09-15 15:04:52 +0000 |
| commit | 25c00a6e052bffacf9c3cab7d6cffd9d73a9097d (patch) | |
| tree | a6a52e51eb2c1966b9e9e4cb57f891bd682d7ac4 | |
| parent | a69c210b569df7b659a3fd4fe6f5a414b3d1282c (diff) | |
| parent | d8ed6d3af41051c2d5a7fe3f71bc0005aa0fd39e (diff) | |
| download | pipeworks-25c00a6e052bffacf9c3cab7d6cffd9d73a9097d.tar pipeworks-25c00a6e052bffacf9c3cab7d6cffd9d73a9097d.tar.gz pipeworks-25c00a6e052bffacf9c3cab7d6cffd9d73a9097d.tar.bz2 pipeworks-25c00a6e052bffacf9c3cab7d6cffd9d73a9097d.tar.xz pipeworks-25c00a6e052bffacf9c3cab7d6cffd9d73a9097d.zip | |
Merge branch 'master' into 'master'
Tubes now update their connections when rotated with the screwdriver.
See merge request VanessaE/pipeworks!3
| -rw-r--r-- | autoplace_tubes.lua | 16 | ||||
| -rw-r--r-- | decorative_tubes.lua | 2 | ||||
| -rw-r--r-- | routing_tubes.lua | 1 | ||||
| -rw-r--r-- | tube_registration.lua | 1 |
4 files changed, 20 insertions, 0 deletions
diff --git a/autoplace_tubes.lua b/autoplace_tubes.lua index 0d28e64..a3a6aee 100644 --- a/autoplace_tubes.lua +++ b/autoplace_tubes.lua @@ -111,6 +111,22 @@ function pipeworks.after_dig(pos) pipeworks.scan_for_tube_objects(pos) end +-- Screwdriver calls this function before rotating a node. +-- However, connections must be updated *after* the node is rotated +-- So, this function does the rotation itself and returns `true`. +-- (Note: screwdriver already checks for protected areas.) + +-- This should only be used for tubes that don't autoconnect. +-- (For example, one-way tubes.) +-- Autoconnecting tubes will just revert back to their original state +-- when they are updated. +function pipeworks.on_rotate(pos, node, user, mode, new_param2) + node.param2 = new_param2 + minetest.set_node(pos, node) + pipeworks.scan_for_tube_objects(pos) + return true +end + if minetest.get_modpath("mesecons_mvps") then mesecon.register_on_mvps_move(function(moved_nodes) for _, n in ipairs(moved_nodes) do diff --git a/decorative_tubes.lua b/decorative_tubes.lua index 39ba8f3..2b48b6b 100644 --- a/decorative_tubes.lua +++ b/decorative_tubes.lua @@ -24,6 +24,7 @@ minetest.register_node("pipeworks:steel_block_embedded_tube", { }, after_place_node = pipeworks.after_place, after_dig_node = pipeworks.after_dig, + on_rotate = pipeworks.on_rotate, }) minetest.register_craft( { @@ -71,6 +72,7 @@ minetest.register_node("pipeworks:steel_pane_embedded_tube", { }, after_place_node = pipeworks.after_place, after_dig_node = pipeworks.after_dig, + on_rotate = pipeworks.on_rotate, }) minetest.register_craft( { diff --git a/routing_tubes.lua b/routing_tubes.lua index ba9e0aa..e2f1af4 100644 --- a/routing_tubes.lua +++ b/routing_tubes.lua @@ -161,6 +161,7 @@ if pipeworks.enable_one_way_tube then }, after_place_node = pipeworks.after_place, after_dig_node = pipeworks.after_dig, + on_rotate = pipeworks.on_rotate, }) minetest.register_craft({ output = "pipeworks:one_way_tube 2", diff --git a/tube_registration.lua b/tube_registration.lua index 48fa912..7bef10e 100644 --- a/tube_registration.lua +++ b/tube_registration.lua @@ -108,6 +108,7 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e }, after_place_node = pipeworks.after_place, after_dig_node = pipeworks.after_dig, + on_rotate = false, on_blast = function(pos, intensity) if not intensity or intensity > 1 + 3^0.5 then minetest.remove_node(pos) |