forked from MineClone5/MineClone5
Merge testing into compatibility
This commit is contained in:
commit
5a55f50024
|
@ -166,6 +166,7 @@ function boat.on_activate(self, staticdata, dtime_s)
|
||||||
self._last_v = self._v
|
self._last_v = self._v
|
||||||
self._itemstring = data.itemstring
|
self._itemstring = data.itemstring
|
||||||
|
|
||||||
|
if data.textures then
|
||||||
while #data.textures < 5 do
|
while #data.textures < 5 do
|
||||||
table.insert(data.textures, data.textures[1])
|
table.insert(data.textures, data.textures[1])
|
||||||
end
|
end
|
||||||
|
@ -173,6 +174,7 @@ function boat.on_activate(self, staticdata, dtime_s)
|
||||||
self.object:set_properties({textures = data.textures})
|
self.object:set_properties({textures = data.textures})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function boat.get_staticdata(self)
|
function boat.get_staticdata(self)
|
||||||
if not self then return end
|
if not self then return end
|
||||||
|
|
|
@ -385,7 +385,7 @@ minetest.register_tool("mcl_fishing:fishing_rod", {
|
||||||
_doc_items_usagehelp = S("Rightclick to launch the bobber. When it sinks right-click again to reel in an item. Who knows what you're going to catch?"),
|
_doc_items_usagehelp = S("Rightclick to launch the bobber. When it sinks right-click again to reel in an item. Who knows what you're going to catch?"),
|
||||||
groups = { tool=1, fishing_rod=1, enchantability=1 },
|
groups = { tool=1, fishing_rod=1, enchantability=1 },
|
||||||
inventory_image = "mcl_fishing_fishing_rod.png",
|
inventory_image = "mcl_fishing_fishing_rod.png",
|
||||||
wield_image = "mcl_fishing_fishing_rod.png^[transformR270",
|
wield_image = "mcl_fishing_fishing_rod.png^[transformFY^[transformR90",
|
||||||
wield_scale = { x = 1.5, y = 1.5, z = 1 },
|
wield_scale = { x = 1.5, y = 1.5, z = 1 },
|
||||||
stack_max = 1,
|
stack_max = 1,
|
||||||
on_place = fish,
|
on_place = fish,
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 6.2 KiB |
|
@ -321,7 +321,7 @@ minetest.register_tool("mcl_mobitems:carrot_on_a_stick", {
|
||||||
_tt_help = S("Lets you ride a saddled pig"),
|
_tt_help = S("Lets you ride a saddled pig"),
|
||||||
_doc_items_longdesc = S("A carrot on a stick can be used on saddled pigs to ride them."),
|
_doc_items_longdesc = S("A carrot on a stick can be used on saddled pigs to ride them."),
|
||||||
_doc_items_usagehelp = S("Place it on a saddled pig to mount it. You can now ride the pig like a horse. Pigs will also walk towards you when you just wield the carrot on a stick."),
|
_doc_items_usagehelp = S("Place it on a saddled pig to mount it. You can now ride the pig like a horse. Pigs will also walk towards you when you just wield the carrot on a stick."),
|
||||||
wield_image = "mcl_mobitems_carrot_on_a_stick.png",
|
wield_image = "mcl_mobitems_carrot_on_a_stick.png^[transformFY^[transformR90",
|
||||||
inventory_image = "mcl_mobitems_carrot_on_a_stick.png",
|
inventory_image = "mcl_mobitems_carrot_on_a_stick.png",
|
||||||
groups = { transport = 1 },
|
groups = { transport = 1 },
|
||||||
_mcl_toollike_wield = true,
|
_mcl_toollike_wield = true,
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 536 B After Width: | Height: | Size: 6.2 KiB |
|
@ -329,7 +329,7 @@ minetest.register_globalstep(function(dtime)
|
||||||
end
|
end
|
||||||
|
|
||||||
if wielded_def and wielded_def._mcl_toollike_wield then
|
if wielded_def and wielded_def._mcl_toollike_wield then
|
||||||
set_bone_position_conditional(player,"Wield_Item", vector.new(0,4.7,3.1), vector.new(90,-45,90))
|
set_bone_position_conditional(player,"Wield_Item", vector.new(0,4.7,3.1), vector.new(-90,225,90))
|
||||||
elseif string.find(wielded:get_name(), "mcl_bows:bow") then
|
elseif string.find(wielded:get_name(), "mcl_bows:bow") then
|
||||||
set_bone_position_conditional(player,"Wield_Item", vector.new(1,4,0), vector.new(90,130,115))
|
set_bone_position_conditional(player,"Wield_Item", vector.new(1,4,0), vector.new(90,130,115))
|
||||||
elseif string.find(wielded:get_name(), "mcl_bows:crossbow_loaded") then
|
elseif string.find(wielded:get_name(), "mcl_bows:crossbow_loaded") then
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
name = mcl_wieldview
|
name = mcl_wieldview
|
||||||
author = stujones11
|
author = stujones11
|
||||||
description = Makes hand wielded items visible to other players.
|
description = Makes hand wielded items visible to other players.
|
||||||
|
depends = mcl_armor, mcl_playerplus
|
||||||
|
|
Loading…
Reference in New Issue