mirror of
https://codeberg.org/SumianVoice/sum_airship.git
synced 2025-04-30 06:01:43 -04:00
fix indentation inconsistency, remove unnecessary code, fix initial properties
This commit is contained in:
parent
29f7f2b2c5
commit
86642b96ea
1 changed files with 128 additions and 125 deletions
43
balloon.lua
43
balloon.lua
|
@ -10,15 +10,17 @@ local me = {
|
|||
}
|
||||
|
||||
local ship = {
|
||||
initial_properties = {
|
||||
physical = true,
|
||||
pointable = true,
|
||||
collisionbox = {-0.6, -0.2, -0.6, 0.6, 0.3, 0.6},
|
||||
selectionbox = {-0.7, -0.35, -0.7, 0.7, 0.3, 0.7},
|
||||
collisionbox = {-0.9, -0.0, -0.9, 0.9, 0.9, 0.9},
|
||||
selectionbox = {-0.7, -0.0, -0.7, 0.7, 0.9, 0.7},
|
||||
hp_max = 3,
|
||||
visual = "mesh",
|
||||
backface_culling = false,
|
||||
backface_culling = true,
|
||||
mesh = "sum_airship.b3d",
|
||||
textures = {"sum_airship_texture.png"},
|
||||
},
|
||||
_animations = {
|
||||
idle = {x= 10, y= 90},
|
||||
fly = {x= 91, y= 170},
|
||||
|
@ -128,14 +130,16 @@ function ship.on_activate(self, staticdata, dtime_s)
|
|||
self._vel = data.v
|
||||
self._itemstring = data.itemstring
|
||||
self._fuel = data.fuel
|
||||
if data._driver then
|
||||
self._driver = minetest.get_player_by_name((data._driver))
|
||||
else
|
||||
self._driver = nil
|
||||
end
|
||||
self._flags = data._flags
|
||||
if self._driver then me.detach(self) end
|
||||
end
|
||||
self.object:set_armor_groups({
|
||||
pierce=100,
|
||||
slash=100,
|
||||
blunt=100,
|
||||
magic=100,
|
||||
poison=100,
|
||||
fleshy=100,
|
||||
})
|
||||
self.object:set_animation(ship._animations.idle, 24)
|
||||
self._sounds = { -- workaround for copy vs reference issue
|
||||
engine = {
|
||||
|
@ -156,8 +160,6 @@ end
|
|||
function ship.get_staticdata(self)
|
||||
return minetest.serialize({
|
||||
itemstring = self._itemstring,
|
||||
_driver = ((self._driver and self._driver:is_player())
|
||||
and self._driver:get_player_name()) or nil,
|
||||
_flags = self._flags,
|
||||
v = self._vel,
|
||||
fuel = self._fuel,
|
||||
|
@ -170,7 +172,7 @@ function me.attach(self, player)
|
|||
end
|
||||
self._driver = player
|
||||
self._driver:set_attach(self.object, "",
|
||||
{x = 0, y = -3.0, z = 0}, {x = 0, y = 0, z = 0})
|
||||
{x = 0, y = -0.0, z = -2}, {x = 0, y = 0, z = 0})
|
||||
self._driver:set_look_horizontal(self.object:get_yaw())
|
||||
end
|
||||
|
||||
|
@ -260,16 +262,16 @@ function me.get_balloon_collide(self)
|
|||
for _, check in pairs(balloon_nodes) do
|
||||
local n = minetest.get_node(vector.add(check.p, o))
|
||||
if n and minetest.registered_nodes[n.name]
|
||||
and minetest.registered_nodes[n.name].walkable then
|
||||
and (minetest.registered_nodes[n.name] or {}).walkable then
|
||||
force = vector.add(force, check.dir)
|
||||
end
|
||||
end
|
||||
return force
|
||||
end
|
||||
|
||||
me.chimney_dist = -1.0
|
||||
me.chimney_dist = -0.8
|
||||
me.chimney_yaw = 0.13
|
||||
me.chimney_height = 0.9
|
||||
me.chimney_height = 1.5
|
||||
function me.get_chimney_pos(self)
|
||||
local p = self.object:get_pos()
|
||||
local yaw = self.object:get_yaw()
|
||||
|
@ -300,7 +302,7 @@ function ship.on_step(self, dtime, moveresult)
|
|||
local v = self.object:get_velocity()
|
||||
local p = self.object:get_pos()
|
||||
local node_below = minetest.get_node(vector.offset(p, 0, -0.8, 0)).name
|
||||
local is_on_floor = minetest.registered_nodes[node_below].walkable
|
||||
local is_on_floor = (minetest.registered_nodes[node_below] or {}).walkable
|
||||
local in_water = minetest.get_item_group(minetest.get_node(p).name, "liquid") ~= 0
|
||||
local on_water = (minetest.get_item_group(minetest.get_node(vector.offset(p, 0, -0.2, 0)).name, "liquid") ~= 0 and not in_water)
|
||||
|
||||
|
@ -339,7 +341,7 @@ function ship.on_step(self, dtime, moveresult)
|
|||
v.y = v.y - dtime
|
||||
end
|
||||
|
||||
if sum_air_currents ~= nil then
|
||||
if minetest.get_modpath("sum_air_currents") then
|
||||
if self._driver or not is_on_floor then
|
||||
local wind_vel = sum_air_currents.get_wind(p)
|
||||
wind_vel = vector.multiply(wind_vel, dtime)
|
||||
|
@ -415,11 +417,12 @@ minetest.register_craftitem("sum_airship:boat", {
|
|||
end
|
||||
local node = minetest.get_node(pointed_thing.under)
|
||||
if placer and not placer:get_player_control().sneak then
|
||||
if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
|
||||
return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack
|
||||
local def = minetest.registered_nodes[node.name]
|
||||
if def and def.on_rightclick then
|
||||
return def.on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack
|
||||
end
|
||||
end
|
||||
local pos = vector.offset(pointed_thing.above, 0, 0.5, 0)
|
||||
local pos = vector.offset(pointed_thing.above, 0, 0, 0)
|
||||
local self = minetest.add_entity(pos, "sum_airship:boat"):get_luaentity()
|
||||
if not minetest.is_creative_enabled(placer:get_player_name()) then
|
||||
itemstack:take_item()
|
||||
|
|
Loading…
Add table
Reference in a new issue