mirror of
https://github.com/sys4-fr/server-nalc.git
synced 2024-09-22 20:50:17 +02:00
[boats] Define custom callback only once
- boats: Update, move the callback functions out of register_boat - default: Update character.png
This commit is contained in:
LeMagnesium
parent
de33f83779
commit
61bfb3ae55
293
minetestforfun_game/mods/boats/init.lua
Executable file → Normal file
293
minetestforfun_game/mods/boats/init.lua
Executable file → Normal file
|
|
@ -27,62 +27,65 @@ function boats.get_v(v)
|
||||||
return math.sqrt(v.x ^ 2 + v.z ^ 2)
|
return math.sqrt(v.x ^ 2 + v.z ^ 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
boats.register_boat = function(parameters)
|
function boats.on_rightclick(self, clicker)
|
||||||
local boat = {
|
if not clicker or not clicker:is_player() then
|
||||||
physical = true,
|
return
|
||||||
collisionbox = {-0.6, -0.4, -0.6, 0.6, 0.3, 0.6},
|
end
|
||||||
visual = "mesh",
|
local name = clicker:get_player_name()
|
||||||
mesh = "boat.obj",
|
if self.driver and clicker == self.driver then
|
||||||
textures = {parameters.texture or "default_wood.png"},
|
self.driver = nil
|
||||||
driver = nil,
|
clicker:set_detach()
|
||||||
v = 0,
|
default.player_attached[name] = false
|
||||||
last_v = 0,
|
default.player_set_animation(clicker, "stand" , 30)
|
||||||
removed = false
|
local pos = clicker:getpos()
|
||||||
}
|
pos = {x = pos.x, y = pos.y + 0.2, z = pos.z}
|
||||||
|
minetest.after(0.1, function()
|
||||||
function boat.on_rightclick(self, clicker)
|
clicker:setpos(pos)
|
||||||
if not clicker or not clicker:is_player() then
|
end)
|
||||||
return
|
elseif not self.driver then
|
||||||
end
|
local attach = clicker:get_attach()
|
||||||
local name = clicker:get_player_name()
|
if attach and attach:get_luaentity() then
|
||||||
if self.driver and clicker == self.driver then
|
local luaentity = attach:get_luaentity()
|
||||||
self.driver = nil
|
if luaentity.driver then
|
||||||
clicker:set_detach()
|
luaentity.driver = nil
|
||||||
default.player_attached[name] = false
|
|
||||||
default.player_set_animation(clicker, "stand" , 30)
|
|
||||||
elseif not self.driver then
|
|
||||||
if not default.player_attached[name] == true then
|
|
||||||
self.driver = clicker
|
|
||||||
clicker:set_attach(self.object, "", {x = 0, y = 11, z = -3}, {x = 0, y = 0, z = 0})
|
|
||||||
default.player_attached[name] = true
|
|
||||||
minetest.after(0.2, function()
|
|
||||||
default.player_set_animation(clicker, "sit" , 30)
|
|
||||||
end)
|
|
||||||
self.object:setyaw(clicker:get_look_yaw() - math.pi / 2)
|
|
||||||
else
|
|
||||||
minetest.chat_send_player(name, "You're already on a boat")
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
clicker:set_detach()
|
||||||
end
|
end
|
||||||
|
self.driver = clicker
|
||||||
|
clicker:set_attach(self.object, "", {x = 0, y = 11, z = -3}, {x = 0, y = 0, z = 0})
|
||||||
|
default.player_attached[name] = true
|
||||||
|
minetest.after(0.2, function()
|
||||||
|
default.player_set_animation(clicker, "sit" , 30)
|
||||||
|
end)
|
||||||
|
self.object:setyaw(clicker:get_look_yaw() - math.pi / 2)
|
||||||
|
end
|
||||||
|
|
||||||
function boat.on_activate(self, staticdata, dtime_s)
|
|
||||||
self.object:set_armor_groups({immortal = 1})
|
function boats.on_activate(self, staticdata, dtime_s)
|
||||||
if staticdata then
|
self.object:set_armor_groups({immortal = 1})
|
||||||
self.v = tonumber(staticdata)
|
if staticdata then
|
||||||
end
|
self.v = tonumber(staticdata)
|
||||||
self.last_v = self.v
|
|
||||||
end
|
end
|
||||||
|
self.last_v = self.v
|
||||||
|
end
|
||||||
|
|
||||||
function boat.get_staticdata(self)
|
|
||||||
return tostring(self.v)
|
function boats.get_staticdata(self)
|
||||||
|
return tostring(self.v)
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
function boats.on_punch(self, puncher)
|
||||||
|
if not puncher or not puncher:is_player() or self.removed then
|
||||||
|
return
|
||||||
end
|
end
|
||||||
|
if self.driver and puncher == self.driver then
|
||||||
function boat.on_punch(self, puncher, time_from_last_punch, tool_capabilities, direction)
|
self.driver = nil
|
||||||
if not puncher or not puncher:is_player() or self.removed then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
puncher:set_detach()
|
puncher:set_detach()
|
||||||
default.player_attached[puncher:get_player_name()] = false
|
default.player_attached[puncher:get_player_name()] = false
|
||||||
|
end
|
||||||
|
if not self.driver then
|
||||||
self.removed = true
|
self.removed = true
|
||||||
-- delay remove to ensure player is detached
|
-- delay remove to ensure player is detached
|
||||||
minetest.after(0.1, function()
|
minetest.after(0.1, function()
|
||||||
|
|
@ -90,103 +93,127 @@ boats.register_boat = function(parameters)
|
||||||
end)
|
end)
|
||||||
if not minetest.setting_getbool("creative_mode") then
|
if not minetest.setting_getbool("creative_mode") then
|
||||||
local inv = puncher:get_inventory()
|
local inv = puncher:get_inventory()
|
||||||
if inv:room_for_item("main", "boats:" .. parameters.name) then
|
if inv:room_for_item("main", "boats:" .. self.parameters.name) then
|
||||||
inv:add_item("main", "boats:" .. parameters.name)
|
inv:add_item("main", "boats:" .. self.parameters.name)
|
||||||
else
|
else
|
||||||
minetest.add_item(self.object:getpos(), "boats:" .. parameters.name)
|
minetest.add_item(self.object:getpos(), "boats:" .. self.parameters.name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function boat.on_step(self, dtime)
|
function boats.on_step(self, dtime)
|
||||||
self.v = boats.get_v(self.object:getvelocity()) * boats.get_sign(self.v)
|
self.v = boats.get_v(self.object:getvelocity()) * boats.get_sign(self.v)
|
||||||
if self.driver then
|
if self.driver then
|
||||||
local ctrl = self.driver:get_player_control()
|
local ctrl = self.driver:get_player_control()
|
||||||
local yaw = self.object:getyaw()
|
local yaw = self.object:getyaw()
|
||||||
if ctrl.up then
|
if ctrl.up then
|
||||||
self.v = self.v + parameters.controls.up or 0.1
|
self.v = self.v + self.parameters.controls.up or 0.1
|
||||||
|
elseif ctrl.down then
|
||||||
|
self.v = self.v - self.parameters.controls.down or 0.08
|
||||||
|
end
|
||||||
|
if ctrl.left then
|
||||||
|
if self.v < 0 then
|
||||||
|
self.object:setyaw(yaw - (1 + dtime) * (0.03 * (self.parameters.controls.rotate or 1)))
|
||||||
|
else
|
||||||
|
self.object:setyaw(yaw + (1 + dtime) * (0.03 * (self.parameters.controls.rotate or 1)))
|
||||||
end
|
end
|
||||||
if ctrl.down then
|
elseif ctrl.right then
|
||||||
self.v = self.v - parameters.controls.down or 0.08
|
if self.v < 0 then
|
||||||
end
|
self.object:setyaw(yaw + (1 + dtime) * (0.03 * (self.parameters.controls.rotate or 1)))
|
||||||
if ctrl.left then
|
else
|
||||||
if ctrl.down then
|
self.object:setyaw(yaw - (1 + dtime) * (0.03 * (self.parameters.controls.rotate or 1)))
|
||||||
self.object:setyaw(yaw - (1 + dtime) * (0.03 * (parameters.controls.rotate or 1)))
|
|
||||||
else
|
|
||||||
self.object:setyaw(yaw + (1 + dtime) * (0.03 * (parameters.controls.rotate or 1)))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if ctrl.right then
|
|
||||||
if ctrl.down then
|
|
||||||
self.object:setyaw(yaw + (1 + dtime) * (0.03 * (parameters.controls.rotate or 1)))
|
|
||||||
else
|
|
||||||
self.object:setyaw(yaw - (1 + dtime) * (0.03 * (parameters.controls.rotate or 1)))
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
local velo = self.object:getvelocity()
|
end
|
||||||
if self.v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then
|
local velo = self.object:getvelocity()
|
||||||
return
|
if self.v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then
|
||||||
end
|
self.object:setpos(self.object:getpos())
|
||||||
local s = boats.get_sign(self.v)
|
return
|
||||||
self.v = self.v - 0.02 * s
|
end
|
||||||
if s ~= boats.get_sign(self.v) then
|
local s = boats.get_sign(self.v)
|
||||||
self.object:setvelocity({x = 0, y = 0, z = 0})
|
self.v = self.v - 0.02 * s
|
||||||
|
if s ~= boats.get_sign(self.v) then
|
||||||
|
self.object:setvelocity({x = 0, y = 0, z = 0})
|
||||||
|
self.v = 0
|
||||||
|
return
|
||||||
|
end
|
||||||
|
if math.abs(self.v) > 4.5 then
|
||||||
|
self.v = 4.5 * boats.get_sign(self.v)
|
||||||
|
end
|
||||||
|
|
||||||
|
local p = self.object:getpos()
|
||||||
|
p.y = p.y - 0.5
|
||||||
|
local new_velo = {x = 0, y = 0, z = 0}
|
||||||
|
local new_acce = {x = 0, y = 0, z = 0}
|
||||||
|
if not boats.is_water(p) then
|
||||||
|
local nodedef = minetest.registered_nodes[minetest.get_node(p).name]
|
||||||
|
if (not nodedef) or nodedef.walkable then
|
||||||
self.v = 0
|
self.v = 0
|
||||||
return
|
new_acce = {x = 0, y = 1, z = 0}
|
||||||
end
|
|
||||||
if math.abs(self.v) > 4.5 then
|
|
||||||
self.v = 4.5 * boats.get_sign(self.v)
|
|
||||||
end
|
|
||||||
|
|
||||||
local p = self.object:getpos()
|
|
||||||
p.y = p.y - 0.5
|
|
||||||
local new_velo = {x = 0, y = 0, z = 0}
|
|
||||||
local new_acce = {x = 0, y = 0, z = 0}
|
|
||||||
if not boats.is_water(p) then
|
|
||||||
local nodedef = minetest.registered_nodes[minetest.get_node(p).name]
|
|
||||||
if (not nodedef) or nodedef.walkable then
|
|
||||||
self.v = 0
|
|
||||||
new_acce = {x = 0, y = 1, z = 0}
|
|
||||||
else
|
|
||||||
new_acce = {x = 0, y = -9.8, z = 0} -- freefall in air -9.81
|
|
||||||
end
|
|
||||||
new_velo = boats.get_velocity(self.v, self.object:getyaw(), self.object:getvelocity().y)
|
|
||||||
else
|
else
|
||||||
p.y = p.y + 1
|
new_acce = {x = 0, y = -9.8, z = 0} -- freefall in air -9.81
|
||||||
if boats.is_water(p) then
|
end
|
||||||
new_acce = {x = 0, y = 3, z = 0}
|
new_velo = boats.get_velocity(self.v, self.object:getyaw(),
|
||||||
local y = self.object:getvelocity().y
|
self.object:getvelocity().y)
|
||||||
if y > 2 then
|
self.object:setpos(self.object:getpos())
|
||||||
y = 2
|
else
|
||||||
end
|
p.y = p.y + 1
|
||||||
if y < 0 then
|
if boats.is_water(p) then
|
||||||
self.object:setacceleration({x = 0, y = 10, z = 0})
|
local y = self.object:getvelocity().y
|
||||||
end
|
if y >= 4.5 then
|
||||||
new_velo = boats.get_velocity(self.v, self.object:getyaw(), y)
|
y = 4.5
|
||||||
|
elseif y < 0 then
|
||||||
|
new_acce = {x = 0, y = 20, z = 0}
|
||||||
else
|
else
|
||||||
new_acce = {x = 0, y = 0, z = 0}
|
new_acce = {x = 0, y = 5, z = 0}
|
||||||
if math.abs(self.object:getvelocity().y) <= 2 then
|
end
|
||||||
local pos = self.object:getpos()
|
new_velo = get_velocity(self.v, self.object:getyaw(), y)
|
||||||
pos.y = math.floor(pos.y) + 0.5
|
self.object:setpos(self.object:getpos())
|
||||||
self.object:setpos(pos)
|
else
|
||||||
new_velo = boats.get_velocity(self.v, self.object:getyaw(), 0)
|
new_acce = {x = 0, y = 0, z = 0}
|
||||||
else
|
if math.abs(self.object:getvelocity().y) < 1 then
|
||||||
new_velo = boats.get_velocity(self.v, self.object:getyaw(), self.object:getvelocity().y)
|
local pos = self.object:getpos()
|
||||||
end
|
pos.y = math.floor(pos.y) + 0.5
|
||||||
|
self.object:setpos(pos)
|
||||||
|
new_velo = boats.get_velocity(self.v, self.object:getyaw(), 0)
|
||||||
|
else
|
||||||
|
new_velo = boats.get_velocity(self.v, self.object:getyaw(),
|
||||||
|
self.object:getvelocity().y)
|
||||||
|
self.object:setpos(self.object:getpos())
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
self.object:setvelocity(new_velo)
|
|
||||||
self.object:setacceleration(new_acce)
|
|
||||||
end
|
end
|
||||||
|
self.object:setvelocity(new_velo)
|
||||||
|
self.object:setacceleration(new_acce)
|
||||||
|
end
|
||||||
|
|
||||||
minetest.register_entity("boats:"..parameters.name, boat)
|
boats.register_boat = function(parameters)
|
||||||
|
minetest.register_entity("boats:" .. parameters.name, {
|
||||||
|
physical = true,
|
||||||
|
collisionbox = {-0.5, -0.35, -0.5, 0.5, 0.3, 0.5},
|
||||||
|
visual = "mesh",
|
||||||
|
mesh = "boat.obj",
|
||||||
|
textures = {parameters.texture or "default_wood.png"},
|
||||||
|
|
||||||
minetest.register_craftitem("boats:"..parameters.name, {
|
parameters = parameters,
|
||||||
|
driver = nil,
|
||||||
|
v = 0,
|
||||||
|
last_v = 0,
|
||||||
|
removed = false,
|
||||||
|
|
||||||
|
on_rightclick = boats.on_rightclick,
|
||||||
|
on_activate = boats.on_activate,
|
||||||
|
get_staticdata = boats.get_staticdata,
|
||||||
|
on_punch = boats.on_punch,
|
||||||
|
on_step = boats.on_step
|
||||||
|
})
|
||||||
|
|
||||||
|
minetest.register_craftitem("boats:" .. parameters.name, {
|
||||||
description = parameters.description or "Boat",
|
description = parameters.description or "Boat",
|
||||||
inventory_image = "boats_"..parameters.name.."_inventory.png",
|
inventory_image = "boats_" .. parameters.name .. "_inventory.png",
|
||||||
wield_image = "boats_"..parameters.name.."_wield.png",
|
wield_image = "boats_" .. parameters.name .. "_wield.png",
|
||||||
wield_scale = {x=2, y=2, z=1},
|
wield_scale = {x = 2, y = 2, z = 1},
|
||||||
liquids_pointable = true,
|
liquids_pointable = true,
|
||||||
|
|
||||||
on_place = function(itemstack, placer, pointed_thing)
|
on_place = function(itemstack, placer, pointed_thing)
|
||||||
|
|
@ -196,14 +223,17 @@ boats.register_boat = function(parameters)
|
||||||
if not boats.is_water(pointed_thing.under) then
|
if not boats.is_water(pointed_thing.under) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
pointed_thing.under.y = pointed_thing.under.y+0.5
|
pointed_thing.under.y = pointed_thing.under.y + 0.5
|
||||||
minetest.env:add_entity(pointed_thing.under, "boats:"..parameters.name)
|
minetest.add_entity(pointed_thing.under, "boats:"..parameters.name)
|
||||||
itemstack:take_item()
|
if not minetest.setting_getbool("creative_mode") then
|
||||||
|
itemstack:take_item()
|
||||||
|
end
|
||||||
return itemstack
|
return itemstack
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
boats.register_boat({
|
boats.register_boat({
|
||||||
name = "boat",
|
name = "boat",
|
||||||
texture = "default_wood.png",
|
texture = "default_wood.png",
|
||||||
|
|
@ -298,7 +328,8 @@ minetest.register_craft({
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
output = "boats:boat",
|
output = "boats:boat",
|
||||||
recipe = {
|
recipe = {
|
||||||
{"group:wood", "", "group:wood"},
|
{"", "", "" },
|
||||||
|
{"group:wood", "", "group:wood"},
|
||||||
{"group:wood", "group:wood", "group:wood"},
|
{"group:wood", "group:wood", "group:wood"},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
|
||||||
BIN
minetestforfun_game/mods/default/models/character.png
Executable file → Normal file
BIN
minetestforfun_game/mods/default/models/character.png
Executable file → Normal file
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 2.7 KiB |
Loading…
Reference in New Issue
Block a user