Regnum 3.5.4 upload
parent
037062578b
commit
52fa59ea46
|
@ -2711,7 +2711,7 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- add weapon wear
|
-- add weapon wear
|
||||||
punch_interval = tool_capabilities.full_punch_interval or 1.4
|
--punch_interval = tool_capabilities.full_punch_interval or 1.4
|
||||||
|
|
||||||
-- toolrank support
|
-- toolrank support
|
||||||
local wear = floor((punch_interval / 75) * 9000)
|
local wear = floor((punch_interval / 75) * 9000)
|
||||||
|
@ -2824,7 +2824,9 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
|
||||||
|
|
||||||
-- use tool knockback value or default
|
-- use tool knockback value or default
|
||||||
kb = tool_capabilities.damage_groups["knockback"] or kb -- (kb * 1.5)
|
kb = tool_capabilities.damage_groups["knockback"] or kb -- (kb * 1.5)
|
||||||
|
if kb > 10 then
|
||||||
|
kb = 10
|
||||||
|
end
|
||||||
self.object:set_velocity({
|
self.object:set_velocity({
|
||||||
x = dir.x * kb,
|
x = dir.x * kb,
|
||||||
y = up,
|
y = up,
|
||||||
|
@ -3293,12 +3295,12 @@ function mob_class:on_step(dtime)
|
||||||
if minetest.get_player_by_name(self.owner) then
|
if minetest.get_player_by_name(self.owner) then
|
||||||
local inv = minetest.get_player_by_name(self.owner):get_inventory()
|
local inv = minetest.get_player_by_name(self.owner):get_inventory()
|
||||||
inv:set_size("dog",8)
|
inv:set_size("dog",8)
|
||||||
for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, 15)) do
|
for _,object in ipairs(minetest.get_objects_inside_radius(pos, 15)) do
|
||||||
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
|
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
|
||||||
if inv and inv:room_for_item("dog", ItemStack(object:get_luaentity().itemstring)) then
|
if inv and inv:room_for_item("dog", ItemStack(object:get_luaentity().itemstring)) then
|
||||||
if ItemStack(object:get_luaentity().itemstring):get_name() == "tutorial:geschenkpapier" or ItemStack(object:get_luaentity().itemstring):get_name() == "tutorial:geschenkpapier_death" or ItemStack(object:get_luaentity().itemstring):get_name() == "tutorial:dna_string" then
|
if ItemStack(object:get_luaentity().itemstring):get_name() == "tutorial:geschenkpapier" or ItemStack(object:get_luaentity().itemstring):get_name() == "tutorial:geschenkpapier_death" or ItemStack(object:get_luaentity().itemstring):get_name() == "tutorial:dna_string" then
|
||||||
object:remove()
|
|
||||||
inv:add_item("dog", ItemStack(object:get_luaentity().itemstring))
|
inv:add_item("dog", ItemStack(object:get_luaentity().itemstring))
|
||||||
|
object:remove()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -3310,12 +3312,12 @@ function mob_class:on_step(dtime)
|
||||||
if minetest.get_player_by_name(self.owner) then
|
if minetest.get_player_by_name(self.owner) then
|
||||||
local inv = minetest.get_player_by_name(self.owner):get_inventory()
|
local inv = minetest.get_player_by_name(self.owner):get_inventory()
|
||||||
inv:set_size("cat",8)
|
inv:set_size("cat",8)
|
||||||
for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, 15)) do
|
for _,object in ipairs(minetest.get_objects_inside_radius(pos, 15)) do
|
||||||
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
|
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
|
||||||
if inv and inv:room_for_item("cat", ItemStack(object:get_luaentity().itemstring)) then
|
if inv and inv:room_for_item("cat", ItemStack(object:get_luaentity().itemstring)) then
|
||||||
if ItemStack(object:get_luaentity().itemstring):get_name() == "tutorial:geschenkpapier" or ItemStack(object:get_luaentity().itemstring):get_name() == "tutorial:geschenkpapier_death" or ItemStack(object:get_luaentity().itemstring):get_name() == "tutorial:dna_string" then
|
if ItemStack(object:get_luaentity().itemstring):get_name() == "tutorial:geschenkpapier" or ItemStack(object:get_luaentity().itemstring):get_name() == "tutorial:geschenkpapier_death" or ItemStack(object:get_luaentity().itemstring):get_name() == "tutorial:dna_string" then
|
||||||
object:remove()
|
|
||||||
inv:add_item("cat", ItemStack(object:get_luaentity().itemstring))
|
inv:add_item("cat", ItemStack(object:get_luaentity().itemstring))
|
||||||
|
object:remove()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -14,7 +14,7 @@ minetest.register_on_joinplayer(function(player)
|
||||||
offset = {x=0, y=30},
|
offset = {x=0, y=30},
|
||||||
alignment = {x=1, y=0},
|
alignment = {x=1, y=0},
|
||||||
number = 0xFFFFFF ,
|
number = 0xFFFFFF ,
|
||||||
text = "Game Version : 3.5.3",
|
text = "Game Version : 3.5.4",
|
||||||
})
|
})
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue