From 970dd3fab25a696dd4ca057be009f90fdd45cff4 Mon Sep 17 00:00:00 2001 From: James Stevenson Date: Sun, 3 Jul 2016 16:17:39 -0400 Subject: [PATCH 1/2] Use warps object/def From warps mod by sofar --- models/fun_caves_translocator.obj | 70 ++++++++++++++++++++++++++++ tesseract.lua | 35 ++++++++++---- textures/fun_caves_translocator.png | Bin 357 -> 2492 bytes 3 files changed, 95 insertions(+), 10 deletions(-) create mode 100644 models/fun_caves_translocator.obj diff --git a/models/fun_caves_translocator.obj b/models/fun_caves_translocator.obj new file mode 100644 index 0000000..5858c88 --- /dev/null +++ b/models/fun_caves_translocator.obj @@ -0,0 +1,70 @@ +# Blender v2.60 (sub 0) OBJ File: '' +# www.blender.org +mtllib warps_warpstone.mtl +o Plane +v 0.000345 -0.332211 0.238072 +v -0.238873 -0.332211 -0.000181 +v -0.187467 0.347788 0.000753 +v 0.003339 0.347788 0.186987 +v -0.000061 0.473738 -0.000013 +v -0.000061 -0.400212 -0.000013 +v 0.238345 -0.332211 0.000071 +v 0.187345 0.347788 -0.000779 +v -0.000467 -0.332211 -0.238097 +v -0.003461 0.347788 -0.187013 +vt 0.247005 0.000534 +vt 0.000000 0.000534 +vt 0.000000 0.499516 +vt 0.247005 0.499516 +vt 0.744000 0.749758 +vt 0.744000 0.501019 +vt 0.248498 0.501019 +vt 0.248498 0.749758 +vt 0.495503 0.000534 +vt 0.248498 0.000534 +vt 0.248498 0.499516 +vt 0.495503 0.499516 +vt 0.744000 1.000000 +vt 0.744000 0.751261 +vt 0.248498 0.751261 +vt 0.248498 1.000000 +vt 0.247005 1.000000 +vt 0.247005 0.752012 +vt 0.000746 1.000000 +vt 0.497742 0.249273 +vt 0.744000 0.001285 +vt 0.744000 0.249273 +vt 0.744000 0.251528 +vt 0.497742 0.499516 +vt 0.744000 0.499516 +vt 0.247005 0.749758 +vt 0.000746 0.749758 +vt 0.247005 0.501770 +vt 0.000000 0.751261 +vt 0.000000 0.999249 +vt 0.246259 0.751261 +vt 0.743254 0.000534 +vt 0.496995 0.248522 +vt 0.496995 0.000534 +vt 0.496995 0.250776 +vt 0.496995 0.498764 +vt 0.743254 0.250776 +vt 0.000000 0.501019 +vt 0.246259 0.501019 +vt 0.000000 0.749006 +g Plane_Plane_Material.001 +usemtl Material.001 +s off +f 2/1 1/2 4/3 3/4 +f 1/5 7/6 8/7 4/8 +f 7/9 9/10 10/11 8/12 +f 9/13 2/14 3/15 10/16 +s 1 +f 5/17 3/18 4/19 +f 1/20 2/21 6/22 +f 7/23 1/24 6/25 +f 5/26 4/27 8/28 +f 5/29 8/30 10/31 +f 9/32 7/33 6/34 +f 6/35 2/36 9/37 +f 5/38 10/39 3/40 diff --git a/tesseract.lua b/tesseract.lua index 1dfe840..d49e2d0 100644 --- a/tesseract.lua +++ b/tesseract.lua @@ -428,16 +428,31 @@ local function trans_dig(pos, node, digger) end end -local newnode = fun_caves.clone_node("default:steelblock") -newnode.description = "Translocator" -newnode.tiles = {'fun_caves_translocator.png'} -newnode.on_rightclick = translocate -newnode.on_use = trans_use -newnode.on_place = trans_place -newnode.on_dig = trans_dig -newnode.stack_max = 1 -newnode.groups = {cracky = 3, oddly_breakable_by_hand = 3} -minetest.register_node("fun_caves:translocator", newnode) +minetest.register_node("fun_caves:translocator", { + visual = 'mesh', + mesh = "fun_caves_translocator.obj", + description = 'Translocator', + tiles = {'fun_caves_translocator.png'}, + drawtype = 'mesh', + --wield_scale = {x = 1.5, y = 1.5, z = 1.5}, + sunlight_propagates = true, + walkable = false, + paramtype = 'light', + paramtype2 = 'facedir', + use_texture_alpha = true, + groups = {cracky = 3, oddly_breakable_by_hand = 3}, + light_source = 13, + sounds = default.node_sound_glass_defaults(), + stack_max = 1, + selection_box = { + type = "fixed", + fixed = {-0.25, -0.5, -0.25, 0.25, 0.5, 0.25} + }, + on_rightclick = translocate, + on_use = trans_use, + on_place = trans_place, + on_dig = trans_dig, +}) for _, gem in pairs(gems) do minetest.register_craft({ diff --git a/textures/fun_caves_translocator.png b/textures/fun_caves_translocator.png index 7f49f61f874d7e6c51c9354e12dac8fa916ba2b6..5b37ff3cf89e1a4041b5a2e20b1842e62ab4276e 100644 GIT binary patch literal 2492 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 literal 357 zcmV-r0h<1aP)CdN%F4pR!lI(0nVFf>)YQPi zz`nk|mzS5;($UPy&dklt&dbT3o}QJJm6MZ`yS%!%xVW#cug}lU(9+E?z=xIq006y7 zL_t&-(+!MQmI5&h1Y5Es=P&`70PNoXl=!o|UKPrH?|1HdzxHvCoS|{SBf{+IoMWfB z7A!G>%rgMjkrDqQ5FN7tw&RLe08B{4At}m&@Zz~09kgy8W1=U`-v1Izq~Ocsyk}-l zNrEXl&F59=5vzEgc64h1Tcv77bt)%ScA!utk#B2(PUYa2nGZg-mQmdE;X@F4%huYe z_^?kR+dFTPWL+}`j*!y2eYPeN!az~gqFGNJUB_2{&Y}rno2~Oo00000NkvXXu0mjf DKu@$c From 943977949b733b5a672200010d08412c844778b6 Mon Sep 17 00:00:00 2001 From: Duane Date: Mon, 4 Jul 2016 00:14:54 -0500 Subject: [PATCH 2/2] Remove the y+1 from translocate. --- LICENSE | 5 +++++ tesseract.lua | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index 7eb6728..a7dc63a 100644 --- a/LICENSE +++ b/LICENSE @@ -11,6 +11,11 @@ mod, distributed under the WTFPL license. https://forum.minetest.net/viewtopic.php?f=9&t=9522 +Translocator node design, including models and textures came from Auke Kok's warps mod, distributed under LGPL 2.1 and cc-by-sa 3. + +https://github.com/minetest-mods/warps/blob/master/LICENSE + + The rest of this mod is distributed under the LGPL 2.1 license for historic reasons. diff --git a/tesseract.lua b/tesseract.lua index d49e2d0..8cfca6e 100644 --- a/tesseract.lua +++ b/tesseract.lua @@ -325,12 +325,10 @@ local function translocate(pos, node, clicker, itemstack, pointed_thing) local pos2 if minetest.serialize(pair[2]) == minetest.serialize(pos) then - pos2 = table.copy(pair[1]) + clicker:setpos(pair[1]) else - pos2 = table.copy(pair[2]) + clicker:setpos(pair[2]) end - pos2.y = pos2.y + 1 - clicker:setpos(pos2) end local function trans_use(itemstack, user, pointed_thing) @@ -434,7 +432,6 @@ minetest.register_node("fun_caves:translocator", { description = 'Translocator', tiles = {'fun_caves_translocator.png'}, drawtype = 'mesh', - --wield_scale = {x = 1.5, y = 1.5, z = 1.5}, sunlight_propagates = true, walkable = false, paramtype = 'light',