Merge branch 'master' of https://github.com/technix/minestead_mods
This commit is contained in:
Sergei Mozhaisky
commit
ccbf2be54a
10
wield3d/.luacheckrc
Normal file
10
wield3d/.luacheckrc
Normal file
@ -0,0 +1,10 @@
|
||||
allow_defined_top = true
|
||||
|
||||
read_globals = {
|
||||
"vector",
|
||||
table = {fields = {"getn"}},
|
||||
}
|
||||
|
||||
globals = {
|
||||
"minetest",
|
||||
}
|
||||
21
wield3d/LICENSE
Normal file
21
wield3d/LICENSE
Normal file
@ -0,0 +1,21 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2019 Stuart Jones
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
@ -1,17 +1,26 @@
|
||||
[mod] 3d wielded items [wield3d]
|
||||
================================
|
||||
|
||||
Mod Version: 0.4.0
|
||||
Mod Version: 0.5.1
|
||||
|
||||
Minetest Version: 0.4.12 or later
|
||||
Minetest Version: 5.0.0 or later
|
||||
|
||||
Decription: Visible 3d wielded items for Minetest
|
||||
|
||||
Depends: default
|
||||
|
||||
Makes hand wielded items visible to other players.
|
||||
|
||||
By default the wielded object is updated at one second intervals,
|
||||
you can override this by adding wield3d_update_time = 1 (seconds)
|
||||
you can override this by adding `wield3d_update_time = 1` (seconds)
|
||||
to your minetest.conf
|
||||
|
||||
Servers can also control how often to verify the wield item of each
|
||||
individual player by setting `wield3d_verify_time = 10` (seconds)
|
||||
|
||||
The default wielditem scale can now be specified by including `wield3d_scale = 0.25`
|
||||
|
||||
|
||||
### Known Issues
|
||||
|
||||
Items occasionally disappear when viewing in 3rd person. This is a minetest engine bug and not the fault of the mod, turning 3rd person off then back on restores the view.
|
||||
|
||||
Wield item switches direction at certain animation key-frames. I have yet to identify the true cause of this issue but a specially adapted version of the player model can be found [here](https://github.com/stujones11/minetest-models/tree/master/character/sam_viewer) that attempts to work around the problem.
|
||||
|
||||
267
wield3d/init.lua
267
wield3d/init.lua
@ -1,120 +1,207 @@
|
||||
--[[
|
||||
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2019 stujones11, Stuart Jones
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
||||
]]--
|
||||
|
||||
wield3d = {}
|
||||
|
||||
dofile(minetest.get_modpath(minetest.get_current_modname()).."/location.lua")
|
||||
|
||||
local has_wieldview = minetest.get_modpath("wieldview")
|
||||
local update_time_conf = minetest.setting_get("wield3d_update_time") or 1
|
||||
local update_time = tonumber(update_time_conf) or 1
|
||||
local timer = 0
|
||||
local player_wielding = {}
|
||||
local has_wieldview = minetest.get_modpath("wieldview")
|
||||
local update_time = minetest.settings:get("wield3d_update_time")
|
||||
local verify_time = minetest.settings:get("wield3d_verify_time")
|
||||
local wield_scale = minetest.settings:get("wield3d_scale")
|
||||
|
||||
update_time = update_time and tonumber(update_time) or 1
|
||||
verify_time = verify_time and tonumber(verify_time) or 10
|
||||
wield_scale = wield_scale and tonumber(wield_scale) or 0.25 -- default scale
|
||||
|
||||
local location = {
|
||||
"Arm_Right", -- default bone
|
||||
{x=0, y=5.5, z=3}, -- default position
|
||||
{x=-90, y=225, z=90}, -- default rotation
|
||||
{x=0.25, y=0.25}, -- default scale
|
||||
{x=wield_scale, y=wield_scale},
|
||||
}
|
||||
|
||||
local function add_wield_entity(player)
|
||||
if not player or not player:is_player() then
|
||||
return
|
||||
end
|
||||
local name = player:get_player_name()
|
||||
local pos = player:getpos()
|
||||
if name and pos then
|
||||
local pos = player:get_pos()
|
||||
if name and pos and not player_wielding[name] then
|
||||
pos.y = pos.y + 0.5
|
||||
local object = minetest.add_entity(pos, "wield3d:wield_entity")
|
||||
local object = minetest.add_entity(pos, "wield3d:wield_entity", name)
|
||||
if object then
|
||||
object:set_attach(player, location[1], location[2], location[3])
|
||||
object:set_properties({
|
||||
textures = {"wield3d:hand"},
|
||||
visual_size = location[4],
|
||||
})
|
||||
player_wielding[name] = {}
|
||||
player_wielding[name].item = ""
|
||||
player_wielding[name].object = object
|
||||
player_wielding[name].location = location
|
||||
player_wielding[name] = {item="", location=location}
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local function sq_dist(a, b)
|
||||
local x = a.x - b.x
|
||||
local y = a.y - b.y
|
||||
local z = a.z - b.z
|
||||
return x * x + y * y + z * z
|
||||
end
|
||||
|
||||
local wield_entity = {
|
||||
physical = false,
|
||||
collisionbox = {-0.125,-0.125,-0.125, 0.125,0.125,0.125},
|
||||
visual = "wielditem",
|
||||
textures = {"wield3d:hand"},
|
||||
wielder = nil,
|
||||
timer = 0,
|
||||
static_save = false,
|
||||
}
|
||||
|
||||
function wield_entity:on_activate(staticdata)
|
||||
if staticdata and staticdata ~= "" then
|
||||
self.wielder = staticdata
|
||||
return
|
||||
end
|
||||
self.object:remove()
|
||||
end
|
||||
|
||||
function wield_entity:on_step(dtime)
|
||||
if self.wielder == nil then
|
||||
return
|
||||
end
|
||||
self.timer = self.timer + dtime
|
||||
if self.timer < update_time then
|
||||
return
|
||||
end
|
||||
local player = minetest.get_player_by_name(self.wielder)
|
||||
if player == nil or not player:is_player() or
|
||||
sq_dist(player:get_pos(), self.object:get_pos()) > 3 then
|
||||
self.object:remove()
|
||||
return
|
||||
end
|
||||
local wield = player_wielding[self.wielder]
|
||||
local stack = player:get_wielded_item()
|
||||
local item = stack:get_name() or ""
|
||||
if wield and item ~= wield.item then
|
||||
if has_wieldview then
|
||||
local def = minetest.registered_items[item] or {}
|
||||
if def.inventory_image ~= "" then
|
||||
item = ""
|
||||
end
|
||||
end
|
||||
wield.item = item
|
||||
if item == "" then
|
||||
item = "wield3d:hand"
|
||||
end
|
||||
local loc = wield3d.location[item] or location
|
||||
if loc[1] ~= wield.location[1] or
|
||||
not vector.equals(loc[2], wield.location[2]) or
|
||||
not vector.equals(loc[3], wield.location[3]) then
|
||||
self.object:set_attach(player, loc[1], loc[2], loc[3])
|
||||
wield.location = {loc[1], loc[2], loc[3]}
|
||||
end
|
||||
self.object:set_properties({
|
||||
textures = {item},
|
||||
visual_size = loc[4],
|
||||
})
|
||||
end
|
||||
self.timer = 0
|
||||
end
|
||||
|
||||
local function table_iter(t)
|
||||
local i = 0
|
||||
local n = table.getn(t)
|
||||
return function ()
|
||||
i = i + 1
|
||||
if i <= n then
|
||||
return t[i]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local player_iter = nil
|
||||
|
||||
local function verify_wielditems()
|
||||
if player_iter == nil then
|
||||
local names = {}
|
||||
local tmp = {}
|
||||
for player in table_iter(minetest.get_connected_players()) do
|
||||
local name = player:get_player_name()
|
||||
if name then
|
||||
tmp[name] = true;
|
||||
table.insert(names, name)
|
||||
end
|
||||
end
|
||||
player_iter = table_iter(names)
|
||||
-- clean-up player_wielding table
|
||||
for name, wield in pairs(player_wielding) do
|
||||
player_wielding[name] = tmp[name] and wield
|
||||
end
|
||||
end
|
||||
-- only deal with one player per server step
|
||||
local name = player_iter()
|
||||
if name then
|
||||
local player = minetest.get_player_by_name(name)
|
||||
if player and player:is_player() then
|
||||
local pos = player:get_pos()
|
||||
pos.y = pos.y + 0.5
|
||||
local wielding = false
|
||||
local objects = minetest.get_objects_inside_radius(pos, 1)
|
||||
for _, object in pairs(objects) do
|
||||
local entity = object:get_luaentity()
|
||||
if entity and entity.wielder == name then
|
||||
if wielding then
|
||||
-- remove duplicates
|
||||
object:remove()
|
||||
end
|
||||
wielding = true
|
||||
end
|
||||
end
|
||||
if not wielding then
|
||||
player_wielding[name] = nil
|
||||
add_wield_entity(player)
|
||||
end
|
||||
end
|
||||
return minetest.after(0, verify_wielditems)
|
||||
end
|
||||
player_iter = nil
|
||||
minetest.after(verify_time, verify_wielditems)
|
||||
end
|
||||
|
||||
minetest.after(verify_time, verify_wielditems)
|
||||
|
||||
minetest.register_entity("wield3d:wield_entity", wield_entity)
|
||||
|
||||
minetest.register_item("wield3d:hand", {
|
||||
type = "none",
|
||||
wield_image = "blank.png",
|
||||
})
|
||||
|
||||
minetest.register_entity("wield3d:wield_entity", {
|
||||
physical = false,
|
||||
collisionbox = {-0.125,-0.125,-0.125, 0.125,0.125,0.125},
|
||||
visual = "wielditem",
|
||||
on_activate = function(self, staticdata)
|
||||
if staticdata == "expired" then
|
||||
self.object:remove()
|
||||
end
|
||||
end,
|
||||
on_punch = function(self)
|
||||
self.object:remove()
|
||||
end,
|
||||
get_staticdata = function(self)
|
||||
return "expired"
|
||||
end,
|
||||
})
|
||||
|
||||
minetest.register_globalstep(function(dtime)
|
||||
timer = timer + dtime
|
||||
if timer < update_time then
|
||||
return
|
||||
end
|
||||
local active_players = {}
|
||||
for _, player in pairs(minetest.get_connected_players()) do
|
||||
local name = player:get_player_name()
|
||||
local wield = player_wielding[name]
|
||||
if wield and wield.object then
|
||||
local stack = player:get_wielded_item()
|
||||
local item = stack:get_name() or ""
|
||||
if item ~= wield.item then
|
||||
if has_wieldview then
|
||||
local def = minetest.registered_items[item] or {}
|
||||
if def.inventory_image ~= "" then
|
||||
item = ""
|
||||
end
|
||||
end
|
||||
wield.item = item
|
||||
if item == "" then
|
||||
item = "wield3d:hand"
|
||||
end
|
||||
local loc = wield3d.location[item] or location
|
||||
if loc[1] ~= wield.location[1] or
|
||||
not vector.equals(loc[2], wield.location[2]) or
|
||||
not vector.equals(loc[3], wield.location[3]) then
|
||||
wield.object:set_attach(player, loc[1], loc[2], loc[3])
|
||||
wield.location = {loc[1], loc[2], loc[3]}
|
||||
end
|
||||
wield.object:set_properties({
|
||||
textures = {item},
|
||||
visual_size = loc[4],
|
||||
})
|
||||
end
|
||||
else
|
||||
add_wield_entity(player)
|
||||
end
|
||||
active_players[name] = true
|
||||
end
|
||||
for name, wield in pairs(player_wielding) do
|
||||
if not active_players[name] then
|
||||
if wield.object then
|
||||
wield.object:remove()
|
||||
end
|
||||
player_wielding[name] = nil
|
||||
end
|
||||
end
|
||||
timer = 0
|
||||
minetest.register_on_joinplayer(function(player)
|
||||
minetest.after(2, add_wield_entity, player)
|
||||
end)
|
||||
|
||||
minetest.register_on_leaveplayer(function(player)
|
||||
local name = player:get_player_name()
|
||||
if name then
|
||||
local wield = player_wielding[name] or {}
|
||||
if wield.object then
|
||||
wield.object:remove()
|
||||
end
|
||||
player_wielding[name] = nil
|
||||
end
|
||||
end)
|
||||
|
||||
|
||||
@ -1,3 +1,29 @@
|
||||
--[[
|
||||
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2019 stujones11, Stuart Jones
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
||||
]]--
|
||||
|
||||
-- Wielded Item Location Overrides - [item_name] = {bone, position, rotation}
|
||||
|
||||
local bone = "Arm_Right"
|
||||
|
||||
@ -1,5 +1,2 @@
|
||||
name = wield3d
|
||||
description = See the items other players are holding
|
||||
release = 842
|
||||
author = stu
|
||||
title = Wield3D
|
||||
description = Adds 3d wield-items that are visible in third person view and to other players.
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 150 KiB After Width: | Height: | Size: 254 KiB |
Loading…
x
Reference in New Issue
Block a user