Minor fixes and changes

master
Maksim 2021-12-31 12:26:47 +01:00
parent d6c7eeb762
commit 9916136063
11 changed files with 17 additions and 53 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
.DS_Store
Thumbs.db
.idea

View File

@ -293,7 +293,6 @@ armor.update_armor = function(self, player)
local old_stack = ItemStack(stack)
local uses = stack:get_definition().groups["armor_use"]
if uses and uses > 0 then
local item = stack:get_name()
stack:add_wear(65535 / uses)
armor_inv:set_stack("armor", i, stack)
state = state + stack:get_wear()

View File

@ -1,2 +1,3 @@
name = 3d_armor_stand
depends = 3d_armor
depends = 3d_armor, default
optional_depends = mesecons_mvps

Binary file not shown.

Before

Width:  |  Height:  |  Size: 289 B

After

Width:  |  Height:  |  Size: 283 B

View File

@ -52,10 +52,7 @@ local boat = {
-- Compatible for MultiCraft Engine 2.0
local aheight = 11
if minetest.features and minetest.features.object_independent_selectionbox then
aheight = 1
end
local ah = minetest.features.object_independent_selectionbox and 0 or 10
function boat.on_rightclick(self, clicker)
if not clicker or not clicker:is_player() then
return
@ -85,7 +82,7 @@ function boat.on_rightclick(self, clicker)
end
self.driver = name
clicker:set_attach(self.object, "",
{x = 0, y = aheight, z = -2}, {x = 0, y = 0, z = 0})
{x = 0, y = ah + 1, z = -2}, {x = 0, y = 0, z = 0})
player_api.player_attached[name] = true
minetest.after(0.1, function()
if clicker then
@ -325,10 +322,10 @@ minetest.register_craftitem("boats:boat", {
return itemstack
end
pointed_thing.under.y = pointed_thing.under.y + 0.5
boat = minetest.add_entity(pointed_thing.under, "boats:boat")
if boat then
local entity = minetest.add_entity(pointed_thing.under, "boats:boat")
if entity then
if placer then
boat:set_yaw(placer:get_look_horizontal())
entity:set_yaw(placer:get_look_horizontal())
end
local player_name = placer and placer:get_player_name() or ""
if not minetest.is_creative_enabled(player_name) or not sp then

View File

@ -23,40 +23,3 @@ 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.
Licenses of media (textures)
----------------------------
Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
Copyright (C) 2018 paramat
Copyright (C) Neuromancer
Copyright (C) Jean-Patrick Guerrero
You are free to:
Share — copy and redistribute the material in any medium or format.
Adapt — remix, transform, and build upon the material for any purpose, even commercially.
The licensor cannot revoke these freedoms as long as you follow the license terms.
Under the following terms:
Attribution — You must give appropriate credit, provide a link to the license, and
indicate if changes were made. You may do so in any reasonable manner, but not in any way
that suggests the licensor endorses you or your use.
ShareAlike — If you remix, transform, or build upon the material, you must distribute
your contributions under the same license as the original.
No additional restrictions — You may not apply legal terms or technological measures that
legally restrict others from doing anything the license permits.
Notices:
You do not have to comply with the license for elements of the material in the public
domain or where your use is permitted by an applicable exception or limitation.
No warranties are given. The license may not give you all of the permissions necessary
for your intended use. For example, other rights such as publicity, privacy, or moral
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/3.0/

View File

@ -249,8 +249,9 @@ minetest.register_node("default:cement", {
groups = {crumbly = 3, falling_node = 1},
sounds = default.node_sound_dirt_defaults(),
floodable = true,
on_flood = function(pos)
minetest.swap_node(pos, {name = "default:concrete"})
on_flood = function(pos, node)
node.name = "default:concrete"
minetest.swap_node(pos, node)
return true
end
})

View File

@ -59,7 +59,7 @@ minetest.after(2, function()
local aliased_nodes = {}
local aliased_mods = {"default", "farming", "mobs", "wool"}
for node, _ in pairs(workbench.nodes) do
for node in pairs(workbench.nodes) do
if match_any(aliased_mods, node, "(.*):") then
aliased_nodes[node] = true
end
@ -73,7 +73,7 @@ minetest.after(2, function()
{"nanoslab", "microslab"}
}
for node, _ in pairs(aliased_nodes) do
for node in pairs(aliased_nodes) do
for _, d in pairs(workbench.defs) do
register_alias("stairs:" .. d[1] .. "_" .. node:match(":(.*)"), "stairs:" .. d[1] .. "_" .. node:gsub(":", "_"))
register_alias(node .. "_" .. d[1], "stairs:" .. d[1] .. "_" .. node:gsub(":", "_"))

View File

@ -3520,6 +3520,8 @@ function mobs:spawn_specific(name, nodes, neighbors, min_light, max_light, inter
interval = interval,
chance = max(1, chance),
catch_up = false,
min_y = min_height,
max_y = max_height,
action = spawn_action
})
end

View File

@ -70,7 +70,7 @@ local charmap = {
}
local function slugify(str)
for k, _ in pairs(charmap) do
for k in pairs(charmap) do
str = str:gsub(tostring(k), charmap[k])
end

View File

@ -321,7 +321,7 @@ minetest.register_lbm({
for i = 1, #workbench.defs do
local d = workbench.defs[i]
for node, _ in pairs(workbench.nodes) do
for node in pairs(workbench.nodes) do
local def = minetest.registered_nodes[node]
local groups, tiles, mesh, collision_box = {}, {}, {}, {}
local drawtype = "nodebox"