mirror of
https://github.com/APercy/ap_airship.git
synced 2025-03-15 07:51:20 +00:00
added sit function
This commit is contained in:
Alexsandro Percy
parent
3a45af7c9e
commit
dd35d30229
4 changed files with 158 additions and 30 deletions
111
entities.lua
111
entities.lua
|
|
@ -29,7 +29,7 @@ local function right_click_function(self, clicker)
|
|||
|
||||
--check error after being shot for any other mod
|
||||
if is_attached == false then
|
||||
for i = ap_airship.max_seats,1,-1
|
||||
for i = ap_airship.max_pos,1,-1
|
||||
do
|
||||
if self._passengers[i] == name then
|
||||
self._passengers[i] = nil --clear the wrong information
|
||||
|
|
@ -62,7 +62,7 @@ local function right_click_function(self, clicker)
|
|||
else
|
||||
--first lets clean the boat slots
|
||||
--note that when it happens, the "rescue" function will lost the historic
|
||||
for i = ap_airship.max_seats,1,-1
|
||||
for i = ap_airship.max_pos,1,-1
|
||||
do
|
||||
if self._passengers[i] ~= nil then
|
||||
local old_player = minetest.get_player_by_name(self._passengers[i])
|
||||
|
|
@ -161,7 +161,7 @@ local function right_click_cabin(self, clicker)
|
|||
|
||||
|
||||
if is_attached then
|
||||
--shows pilot formspec
|
||||
--shows pax formspec
|
||||
if name == ship_self.driver_name then
|
||||
return
|
||||
else
|
||||
|
|
@ -170,6 +170,59 @@ local function right_click_cabin(self, clicker)
|
|||
end
|
||||
end
|
||||
|
||||
local function find_chair_index(self, curr_seat)
|
||||
for i = ap_airship.max_seats,1,-1
|
||||
do
|
||||
if self._chairs[i] == curr_seat then
|
||||
return i
|
||||
end
|
||||
end
|
||||
return 0
|
||||
end
|
||||
|
||||
local function right_click_chair(self, clicker)
|
||||
local message = ""
|
||||
if not clicker or not clicker:is_player() then
|
||||
return
|
||||
end
|
||||
|
||||
local name = clicker:get_player_name()
|
||||
local ship_self = nil
|
||||
|
||||
local is_attached = false
|
||||
local seat = clicker:get_attach()
|
||||
if seat then
|
||||
ship_attach = seat:get_attach()
|
||||
if ship_attach then
|
||||
ship_self = ship_attach:get_luaentity()
|
||||
is_attached = true
|
||||
end
|
||||
end
|
||||
|
||||
if is_attached then
|
||||
local index = ap_airship.get_passenger_seat_index(ship_self, name)
|
||||
if index > 0 then
|
||||
local chair_index = find_chair_index(ship_self, self.object)
|
||||
--minetest.chat_send_all("index: "..chair_index)
|
||||
if ship_self._passenger_is_sit[index] ==0 and chair_index then
|
||||
local dest_pos = ship_self._chairs_pos[chair_index]
|
||||
if dest_pos then
|
||||
dest_pos.y = dest_pos.y
|
||||
ship_self._passengers_base_pos[index] = dest_pos
|
||||
ship_self._passengers_base[index]:set_attach(ship_self.object,'',ship_self._passengers_base_pos[index],{x=0,y=0,z=0})
|
||||
if math.floor(dest_pos.z) ~= 84 and math.floor(dest_pos.z) ~= 39 then
|
||||
ship_self._passenger_is_sit[index] = 1
|
||||
else
|
||||
ship_self._passenger_is_sit[index] = 3
|
||||
end
|
||||
end
|
||||
else
|
||||
ship_self._passenger_is_sit[index] = 0
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
--
|
||||
-- entity
|
||||
|
|
@ -241,6 +294,32 @@ minetest.register_entity('ap_airship:cabin_interactor',{
|
|||
|
||||
})
|
||||
|
||||
-- and item just to run the sit function
|
||||
minetest.register_entity('ap_airship:chair_interactor',{
|
||||
initial_properties = {
|
||||
physical = false,
|
||||
collide_with_objects=false,
|
||||
collisionbox = {-0.3, 0, -0.3, 0.3, 1, 0.3},
|
||||
pointable=true,
|
||||
visual = "mesh",
|
||||
mesh = "ap_airship_stand_base.b3d",
|
||||
textures = {"ap_airship_alpha.png",},
|
||||
},
|
||||
dist_moved = 0,
|
||||
|
||||
on_activate = function(self,std)
|
||||
self.sdata = minetest.deserialize(std) or {}
|
||||
if self.sdata.remove then self.object:remove() end
|
||||
end,
|
||||
|
||||
get_staticdata=function(self)
|
||||
self.sdata.remove=true
|
||||
return minetest.serialize(self.sdata)
|
||||
end,
|
||||
|
||||
on_rightclick = right_click_chair,
|
||||
})
|
||||
|
||||
--
|
||||
-- seat pivot
|
||||
--
|
||||
|
|
@ -272,7 +351,7 @@ minetest.register_entity("ap_airship:airship", {
|
|||
physical = true,
|
||||
collide_with_objects = true, --true,
|
||||
collisionbox = {-10, -3.5, -10, 10, 15, 10}, --{-1,0,-1, 1,0.3,1},
|
||||
--selectionbox = {-0.6,0.6,-0.6, 0.6,1,0.6},
|
||||
selectionbox = {-10, -3.5, -10, 10, 0, 10},
|
||||
visual = "mesh",
|
||||
backface_culling = false,
|
||||
mesh = "ap_airship_mesh.b3d",
|
||||
|
|
@ -306,8 +385,11 @@ minetest.register_entity("ap_airship:airship", {
|
|||
_energy = 1.0,--0.001,
|
||||
_boiler_pressure = 1.0, --min 155 max 310
|
||||
_is_going_up = false, --to tell the boiler to lose pressure
|
||||
_chairs={}, --chairs obj ids
|
||||
_chairs_pos={},
|
||||
_passengers = {}, --passengers list
|
||||
_passengers_base = {}, --obj id
|
||||
_passengers_base = {}, --obj ids
|
||||
_passenger_is_sit = {}, -- 0, 1, 2, 3 or 4 ==> stand, 0, 90, 180, 270 --the sit rotation
|
||||
_passengers_base_pos = ap_airship.copy_vector({}),
|
||||
_passengers_locked = false,
|
||||
_disconnection_check_time = 0,
|
||||
|
|
@ -375,6 +457,7 @@ minetest.register_entity("ap_airship:airship", {
|
|||
ap_airship.paint2(self, self.color2)
|
||||
local pos = self.object:get_pos()
|
||||
|
||||
self._passenger_is_sit = ap_airship.copy_vector({[1]=0, [2]=0, [3]=0, [4]=0, [5]=0,})
|
||||
self._passengers_base = ap_airship.copy_vector({[1]=nil, [2]=nil, [3]=nil, [4]=nil, [5]=nil,})
|
||||
self._passengers_base_pos = ap_airship.copy_vector({[1]=nil, [2]=nil, [3]=nil, [4]=nil, [5]=nil,})
|
||||
self._passengers_base_pos = {
|
||||
|
|
@ -405,6 +488,22 @@ minetest.register_entity("ap_airship:airship", {
|
|||
self._cabin_interactor=minetest.add_entity(pos,'ap_airship:cabin_interactor')
|
||||
self._cabin_interactor:set_attach(self.object,'',{x=-6,y=-28,z=115},{x=0,y=0,z=0})
|
||||
|
||||
--chairs
|
||||
self._chairs_pos = ap_airship.copy_vector({
|
||||
[1]={x=-8.17622,y=-29,z=147}, [2]={x=8.17622,y=-29,z=147}, [3]={x=-8.17622,y=-29,z=135}, [4]={x=8.17622,y=-29,z=135}, [5]={x=8.17622,y=-29,z=123},
|
||||
[6]={x=20.176,y=0,z=84.2029}, [7]={x=10.176,y=0,z=84.2029}, [8]={x=20.176,y=0,z=63.005}, [9]={x=10.176,y=0,z=63.005},
|
||||
[10]={x=-20.176,y=0,z=84.2029}, [11]={x=-10.176,y=0,z=84.2029}, [12]={x=-20.176,y=0,z=63.005}, [13]={x=-10.176,y=0,z=63.005},
|
||||
[14]={x=20.176,y=0,z=39.2029}, [15]={x=10.176,y=0,z=39.2029}, [16]={x=20.176,y=0,z=18.005}, [17]={x=10.176,y=0,z=18.005},
|
||||
[18]={x=-20.176,y=0,z=39.2029}, [19]={x=-10.176,y=0,z=39.2029}, [20]={x=-20.176,y=0,z=18.005}, [21]={x=-10.176,y=0,z=18.005},})
|
||||
self._chairs = ap_airship.copy_vector({[1]=nil, [2]=nil, [3]=nil, [4]=nil, [5]=nil, [6]=nil, [7]=nil, [8]=nil, [9]=nil, [10]=nil,
|
||||
[11]=nil, [12]=nil, [13]=nil, [14]=nil, [15]=nil, [16]=nil, [17]=nil, [18]=nil, [19]=nil, [20]=nil, [21]=nil})
|
||||
|
||||
for i = 1,ap_airship.max_seats,1
|
||||
do
|
||||
self._chairs[i] = minetest.add_entity(pos,'ap_airship:chair_interactor')
|
||||
self._chairs[i]:set_attach(self.object,'',self._chairs_pos[i],{x=0,y=0,z=0})
|
||||
end
|
||||
|
||||
--animation load - stoped
|
||||
self.object:set_animation({x = 1, y = 47}, 0, 0, true)
|
||||
|
||||
|
|
@ -645,7 +744,7 @@ minetest.register_entity("ap_airship:airship", {
|
|||
if is_attached == false then
|
||||
local i = 0
|
||||
local has_passengers = false
|
||||
for i = ap_airship.max_seats,1,-1
|
||||
for i = ap_airship.max_pos,1,-1
|
||||
do
|
||||
if self._passengers[i] ~= nil then
|
||||
has_passengers = true
|
||||
|
|
|
|||
3
init.lua
3
init.lua
|
|
@ -8,7 +8,8 @@ ap_airship.rudder_limit = 30
|
|||
ap_airship.iddle_rotation = 50
|
||||
ap_airship.max_engine_acc = 1.5
|
||||
ap_airship.max_speed = 8
|
||||
ap_airship.max_seats = 2
|
||||
ap_airship.max_pos = 5
|
||||
ap_airship.max_seats = 21
|
||||
ap_airship.pilot_base_pos = {x=0.0,y=-29,z=170}
|
||||
ap_airship.passenger_pos = {
|
||||
[1] = {x=0.0,y=0,z=60},
|
||||
|
|
|
|||
|
|
@ -71,10 +71,23 @@ local function do_attach(self, player, slot)
|
|||
end
|
||||
end
|
||||
|
||||
function ap_airship.get_passenger_seat_index(self, name)
|
||||
local index = 0
|
||||
for i = ap_airship.max_pos,1,-1
|
||||
do
|
||||
if self._passengers[i] == name then
|
||||
index = i
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
return index
|
||||
end
|
||||
|
||||
function ap_airship.check_passenger_is_attached(self, name)
|
||||
local is_attached = false
|
||||
if is_attached == false then
|
||||
for i = 5,1,-1
|
||||
for i = ap_airship.max_pos,1,-1
|
||||
do
|
||||
if self._passengers[i] == name then
|
||||
is_attached = true
|
||||
|
|
@ -91,7 +104,7 @@ function ap_airship.rescueConnectionFailedPassengers(self)
|
|||
if self._disconnection_check_time > 1 then
|
||||
--minetest.chat_send_all(dump(self._passengers))
|
||||
self._disconnection_check_time = 0
|
||||
for i = 5,1,-1
|
||||
for i = ap_airship.max_pos,1,-1
|
||||
do
|
||||
if self._passengers[i] then
|
||||
local player = minetest.get_player_by_name(self._passengers[i])
|
||||
|
|
@ -173,7 +186,7 @@ function ap_airship.dettach_pax(self, player, side)
|
|||
ap_airship.remove_hud(player)
|
||||
|
||||
-- passenger clicked the object => driver gets off the vehicle
|
||||
for i = 5,1,-1
|
||||
for i = ap_airship.max_pos,1,-1
|
||||
do
|
||||
if self._passengers[i] == name then
|
||||
self._passengers[i] = nil
|
||||
|
|
@ -275,11 +288,16 @@ function ap_airship.destroy(self, overload)
|
|||
end
|
||||
|
||||
local pos = self.object:get_pos()
|
||||
if self._passengers_base[1] then self._passengers_base[1]:remove() end
|
||||
if self._passengers_base[2] then self._passengers_base[2]:remove() end
|
||||
if self._passengers_base[3] then self._passengers_base[3]:remove() end
|
||||
if self._passengers_base[4] then self._passengers_base[4]:remove() end
|
||||
if self._passengers_base[5] then self._passengers_base[5]:remove() end
|
||||
for i = ap_airship.max_pos,1,-1
|
||||
do
|
||||
if self._passengers_base[i] then self._passengers_base[i]:remove() end
|
||||
end
|
||||
|
||||
for i = ap_airship.max_seats,1,-1
|
||||
do
|
||||
if self._chairs[i] then self._chairs[i]:remove() end
|
||||
end
|
||||
|
||||
if self._cabin_interactor then self._cabin_interactor:remove() end
|
||||
if self._control_interactor then self._control_interactor:remove() end
|
||||
|
||||
|
|
@ -346,7 +364,7 @@ function ap_airship.checkAttach(self, player)
|
|||
if player then
|
||||
local player_attach = player:get_attach()
|
||||
if player_attach then
|
||||
for i = 5,1,-1
|
||||
for i = ap_airship.max_pos,1,-1
|
||||
do
|
||||
if player_attach == self._passengers_base[i] then
|
||||
retVal = true
|
||||
|
|
|
|||
10
walk_map.lua
10
walk_map.lua
|
|
@ -233,6 +233,7 @@ function ap_airship.move_persons(self)
|
|||
--minetest.chat_send_all("pass: "..dump(self._passengers[i]))
|
||||
--the rest of the passengers
|
||||
if player then
|
||||
if self._passenger_is_sit[i] == 0 then
|
||||
local result_pos = get_result_pos(self, player, i)
|
||||
local y_rot = 0
|
||||
if result_pos then
|
||||
|
|
@ -248,6 +249,15 @@ function ap_airship.move_persons(self)
|
|||
end
|
||||
--minetest.chat_send_all(dump(self._passengers_base_pos[i]))
|
||||
player:set_attach(self._passengers_base[i], "", {x = 0, y = 0, z = 0}, {x = 0, y = y_rot, z = 0})
|
||||
else
|
||||
local y_rot = 0
|
||||
if self._passenger_is_sit[i] == 1 then y_rot = 0 end
|
||||
if self._passenger_is_sit[i] == 2 then y_rot = 90 end
|
||||
if self._passenger_is_sit[i] == 3 then y_rot = 180 end
|
||||
if self._passenger_is_sit[i] == 4 then y_rot = 270 end
|
||||
player:set_attach(self._passengers_base[i], "", {x = 0, y = 3.6, z = 0}, {x = 0, y = y_rot, z = 0})
|
||||
airutils.sit(player)
|
||||
end
|
||||
else
|
||||
--self._passengers[i] = nil
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue