mirror of
https://github.com/APercy/automobiles_pck
synced 2025-06-20 07:48:01 +02:00
fixed motorcycle too
This commit is contained in:
parent
7153935a4a
commit
634f461a1d
@ -727,6 +727,10 @@ function automobiles_lib.on_step(self, dtime)
|
||||
local turn_effect_speed = longit_speed
|
||||
if turn_effect_speed > 10 then turn_effect_speed = 10 end
|
||||
newroll = (-self._steering_angle/100)*(turn_effect_speed/10)
|
||||
|
||||
if is_attached == false and stop == true then
|
||||
newroll = self._stopped_roll
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -25,9 +25,7 @@ dofile(minetest.get_modpath("automobiles_lib") .. DIR_DELIM .. "custom_physics.l
|
||||
dofile(minetest.get_modpath("automobiles_lib") .. DIR_DELIM .. "control.lua")
|
||||
dofile(minetest.get_modpath("automobiles_lib") .. DIR_DELIM .. "fuel_management.lua")
|
||||
dofile(minetest.get_modpath("automobiles_lib") .. DIR_DELIM .. "ground_detection.lua")
|
||||
dofile(minetest.get_modpath("automobiles_motorcycle") .. DIR_DELIM .. "motorcycle_forms.lua")
|
||||
dofile(minetest.get_modpath("automobiles_motorcycle") .. DIR_DELIM .. "motorcycle_player.lua")
|
||||
dofile(minetest.get_modpath("automobiles_motorcycle") .. DIR_DELIM .. "motorcycle_utilities.lua")
|
||||
dofile(minetest.get_modpath("automobiles_motorcycle") .. DIR_DELIM .. "motorcycle_entities.lua")
|
||||
dofile(minetest.get_modpath("automobiles_motorcycle") .. DIR_DELIM .. "motorcycle_crafts.lua")
|
||||
|
||||
|
@ -1,7 +1,56 @@
|
||||
--
|
||||
-- entity
|
||||
--
|
||||
local S = motorcycle.S
|
||||
|
||||
|
||||
minetest.register_entity('automobiles_motorcycle:front_suspension',{
|
||||
initial_properties = {
|
||||
physical = true,
|
||||
collide_with_objects=true,
|
||||
collisionbox = {-0.5, 0, -0.5, 0.5, 1, 0.5},
|
||||
pointable=false,
|
||||
visual = "mesh",
|
||||
mesh = "automobiles_pivot_mesh.b3d",
|
||||
textures = {"automobiles_alpha.png",},
|
||||
},
|
||||
|
||||
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_step = function(self, dtime, moveresult)
|
||||
minetest.chat_send_all(dump(moveresult))
|
||||
end,]]--
|
||||
|
||||
})
|
||||
|
||||
minetest.register_entity('automobiles_motorcycle:rear_suspension',{
|
||||
initial_properties = {
|
||||
physical = true,
|
||||
collide_with_objects=true,
|
||||
pointable=false,
|
||||
visual = "mesh",
|
||||
mesh = "automobiles_pivot_mesh.b3d",
|
||||
textures = {"automobiles_alpha.png",},
|
||||
},
|
||||
|
||||
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,
|
||||
|
||||
})
|
||||
|
||||
minetest.register_entity('automobiles_motorcycle:lights',{
|
||||
initial_properties = {
|
||||
@ -49,50 +98,6 @@ initial_properties = {
|
||||
|
||||
})
|
||||
|
||||
minetest.register_entity('automobiles_motorcycle:pivot_mesh',{
|
||||
initial_properties = {
|
||||
physical = false,
|
||||
collide_with_objects=false,
|
||||
pointable=false,
|
||||
visual = "mesh",
|
||||
mesh = "automobiles_pivot_mesh.b3d",
|
||||
textures = {"automobiles_black.png",},
|
||||
},
|
||||
|
||||
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,
|
||||
|
||||
})
|
||||
|
||||
minetest.register_entity('automobiles_motorcycle:pointer',{
|
||||
initial_properties = {
|
||||
physical = false,
|
||||
collide_with_objects=false,
|
||||
pointable=false,
|
||||
visual = "mesh",
|
||||
mesh = "automobiles_pointer.b3d",
|
||||
visual_size = {x = 0.8, y = 0.8, z = 0.8},
|
||||
textures = {"automobiles_white.png"},
|
||||
},
|
||||
|
||||
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,
|
||||
})
|
||||
|
||||
minetest.register_entity("automobiles_motorcycle:motorcycle", {
|
||||
initial_properties = {
|
||||
physical = true,
|
||||
@ -126,7 +131,7 @@ minetest.register_entity("automobiles_motorcycle:motorcycle", {
|
||||
sound_handle = nil,
|
||||
owner = "",
|
||||
static_save = true,
|
||||
infotext = S("A very nice motorcycle!"),
|
||||
infotext = "A very nice motorcycle!",
|
||||
hp = 50,
|
||||
buoyancy = 2,
|
||||
physics = automobiles_lib.physics,
|
||||
@ -146,137 +151,81 @@ minetest.register_entity("automobiles_motorcycle:motorcycle", {
|
||||
_roll = math.rad(0),
|
||||
_pitch = 0,
|
||||
_longit_speed = 0,
|
||||
_show_rag = false,
|
||||
_show_lights = false,
|
||||
_light_old_pos = nil,
|
||||
_last_ground_check = 0,
|
||||
_last_light_move = 0,
|
||||
_last_engine_sound_update = 0,
|
||||
_turn_light_timer = 0,
|
||||
_inv = nil,
|
||||
_inv_id = "",
|
||||
_change_color = automobiles_lib.paint,
|
||||
_intensity = 2,
|
||||
_base_pitch = 0.5,
|
||||
_trunk_slots = 0,
|
||||
_engine_sound = "motorcycle_engine",
|
||||
_max_fuel = 5,
|
||||
_formspec_function = motorcycle.driver_formspec,
|
||||
_destroy_function = motorcycle.destroy,
|
||||
_base_pitch = 0.5,
|
||||
|
||||
_vehicle_name = "Motorcycle",
|
||||
_drive_wheel_pos = {x=-4.26,y=6.01,z=14.18},
|
||||
_drive_wheel_angle = 0,
|
||||
_seat_pos = {{x=0.0,y=-1.1,z=5.5},{x=0.0,y=-0.3,z=0.09}},
|
||||
|
||||
_front_suspension_ent = 'automobiles_motorcycle:front_suspension',
|
||||
_front_suspension_pos = {x=0,y=1.5,z=14.5},
|
||||
--_front_wheel_ent = 'automobiles_lib:wheel',
|
||||
_front_wheel_xpos = 0,
|
||||
_front_wheel_frames = {x = 1, y = 49},
|
||||
_rear_suspension_ent = 'automobiles_motorcycle:rear_suspension',
|
||||
_rear_suspension_pos = {x=0,y=1.5,z=0},
|
||||
--_rear_wheel_ent = 'automobiles_lib:wheel',
|
||||
_rear_wheel_xpos = 0,
|
||||
_rear_wheel_frames = {x = 1, y = 49},
|
||||
|
||||
--_fuel_gauge_pos = {x=0,y=6.2,z=15.8},
|
||||
_front_lights = 'automobiles_motorcycle:lights',
|
||||
_rear_lights = 'automobiles_motorcycle:r_lights',
|
||||
|
||||
_LONGIT_DRAG_FACTOR = 0.14*0.14,
|
||||
_LATER_DRAG_FACTOR = 100.0,
|
||||
_max_acc_factor = 8,
|
||||
_max_speed = 20,
|
||||
_min_later_speed = 5,
|
||||
_have_transmission = false,
|
||||
_is_motorcycle = true,
|
||||
|
||||
_attach = motorcycle.attach_driver_stand,
|
||||
_dettach = motorcycle.dettach_driver_stand,
|
||||
_attach_pax = motorcycle.attach_pax_stand,
|
||||
_dettach_pax = motorcycle.dettach_pax_stand,
|
||||
_LONGIT_DRAG_FACTOR = motorcycle._LONGIT_DRAG_FACTOR,
|
||||
_LATER_DRAG_FACTOR = motorcycle._LATER_DRAG_FACTOR,
|
||||
|
||||
get_staticdata = function(self) -- unloaded/unloads ... is now saved
|
||||
return minetest.serialize({
|
||||
stored_owner = self.owner,
|
||||
stored_hp = self.hp,
|
||||
stored_color = self._color,
|
||||
stored_steering = self._steering_angle,
|
||||
stored_energy = self._energy,
|
||||
--race data
|
||||
stored_last_checkpoint = self._last_checkpoint,
|
||||
stored_total_laps = self._total_laps,
|
||||
stored_race_id = self._race_id,
|
||||
stored_rag = self._show_rag,
|
||||
stored_pitch = self._pitch,
|
||||
stored_light_old_pos = self._light_old_pos,
|
||||
stored_inv_id = self._inv_id,
|
||||
})
|
||||
end,
|
||||
get_staticdata = automobiles_lib.get_staticdata,
|
||||
|
||||
on_deactivate = function(self)
|
||||
automobiles_lib.save_inventory(self)
|
||||
end,
|
||||
|
||||
on_activate = function(self, staticdata, dtime_s)
|
||||
if staticdata ~= "" and staticdata ~= nil then
|
||||
local data = minetest.deserialize(staticdata) or {}
|
||||
self.owner = data.stored_owner
|
||||
self.hp = data.stored_hp
|
||||
self._color = data.stored_color
|
||||
self._steering_angle = data.stored_steering
|
||||
self._energy = data.stored_energy
|
||||
--minetest.debug("loaded: ", self.energy)
|
||||
--race data
|
||||
self._last_checkpoint = data.stored_last_checkpoint
|
||||
self._total_laps = data.stored_total_laps
|
||||
self._race_id = data.stored_race_id
|
||||
self._show_rag = data.stored_rag
|
||||
self._pitch = data.stored_pitch
|
||||
self._light_old_pos = data.stored_light_old_pos
|
||||
self._inv_id = data.stored_inv_id
|
||||
automobiles_lib.setText(self, "Motorcycle")
|
||||
end
|
||||
|
||||
self.object:set_animation({x = 1, y = 41}, 0, 0, true)
|
||||
|
||||
automobiles_lib.paint(self, self._color)
|
||||
local pos = self.object:get_pos()
|
||||
|
||||
local lights = minetest.add_entity(pos,'automobiles_motorcycle:lights')
|
||||
lights:set_attach(self.object,'',{x=0,y=0,z=0},{x=0,y=0,z=0})
|
||||
self.lights = lights
|
||||
self.lights:set_properties({is_visible=true})
|
||||
|
||||
local rlights = minetest.add_entity(pos,'automobiles_motorcycle:r_lights')
|
||||
rlights:set_attach(self.object,'',{x=0,y=0,z=0},{x=0,y=0,z=0})
|
||||
self.rlights = rlights
|
||||
self.rlights:set_properties({is_visible=true})
|
||||
|
||||
local driver_seat=minetest.add_entity(pos,'automobiles_motorcycle:pivot_mesh')
|
||||
driver_seat:set_attach(self.object,'',{x=0.0,y=-1.1,z=5.5},{x=0,y=0,z=0})
|
||||
self.driver_seat = driver_seat
|
||||
|
||||
local passenger_seat=minetest.add_entity(pos,'automobiles_motorcycle:pivot_mesh')
|
||||
passenger_seat:set_attach(self.object,'',{x=0.0,y=-0.3,z=0.09},{x=0,y=0,z=0})
|
||||
self.passenger_seat = passenger_seat
|
||||
|
||||
self.object:set_armor_groups({immortal=1})
|
||||
|
||||
local inv = minetest.get_inventory({type = "detached", name = self._inv_id})
|
||||
-- if the game was closed the inventories have to be made anew, instead of just reattached
|
||||
if not inv then
|
||||
automobiles_lib.create_inventory(self, self._trunk_slots)
|
||||
else
|
||||
self.inv = inv
|
||||
end
|
||||
on_activate = function(self, staticdata, dtime_s)
|
||||
automobiles_lib.on_activate(self, staticdata, dtime_s)
|
||||
|
||||
self.object:set_bone_position("guidao", {x=0, y=0, z=17.5}, {x=30, y=180, z=0})
|
||||
self.lights:set_bone_position("guidao", {x=0, y=0, z=17.5}, {x=30, y=180, z=0})
|
||||
|
||||
automobiles_lib.actfunc(self, staticdata, dtime_s)
|
||||
end,
|
||||
self.object:set_animation(self._rear_wheel_frames, 0, 0, true)
|
||||
end,
|
||||
|
||||
on_step = function(self, dtime)
|
||||
automobiles_lib.stepfunc(self, dtime)
|
||||
--sound play control--
|
||||
self._last_time_collision_snd = self._last_time_collision_snd + dtime
|
||||
if self._last_time_collision_snd > 1 then self._last_time_collision_snd = 1 end
|
||||
--end sound control--
|
||||
automobiles_lib.on_step(self, dtime)
|
||||
self._stopped_roll = 0
|
||||
|
||||
local rotation = self.object:get_rotation()
|
||||
local yaw = rotation.y
|
||||
local newyaw=yaw
|
||||
local pitch = rotation.x
|
||||
|
||||
local hull_direction = minetest.yaw_to_dir(yaw)
|
||||
local nhdir = {x=hull_direction.z,y=0,z=-hull_direction.x} -- lateral unit vector
|
||||
local velocity = self.object:get_velocity()
|
||||
|
||||
local longit_speed = automobiles_lib.dot(velocity,hull_direction)
|
||||
local fuel_weight_factor = (5 - self._energy)/5000
|
||||
local longit_drag = vector.multiply(hull_direction,(longit_speed*longit_speed) *
|
||||
(self._LONGIT_DRAG_FACTOR - fuel_weight_factor) * -1 * automobiles_lib.sign(longit_speed))
|
||||
|
||||
local later_speed = automobiles_lib.dot(velocity,nhdir)
|
||||
local later_drag = vector.multiply(nhdir,later_speed*
|
||||
later_speed*self._LATER_DRAG_FACTOR*-1*automobiles_lib.sign(later_speed))
|
||||
|
||||
local accel = vector.add(longit_drag,later_drag)
|
||||
local stop = nil
|
||||
local curr_pos = self.object:get_pos()
|
||||
local angle_factor = self._steering_angle / 10
|
||||
local anim_speed = self._longit_speed * (10 - angle_factor)
|
||||
--core.chat_send_all(dump(anim_speed))
|
||||
self.object:set_animation_frame_speed(anim_speed)
|
||||
--whell turn
|
||||
self.object:set_bone_position("eixo_direcao", {x=0, y=0, z=0}, {x=0, y=-self._steering_angle-angle_factor, z=0})
|
||||
self.lights:set_bone_position("eixo_direcao", {x=0, y=0, z=0}, {x=0, y=-self._steering_angle-angle_factor, z=0})
|
||||
|
||||
local player = nil
|
||||
local is_attached = false
|
||||
@ -290,218 +239,34 @@ minetest.register_entity("automobiles_motorcycle:motorcycle", {
|
||||
if player_attach == self.driver_seat then is_attached = true end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local is_breaking = false
|
||||
if is_attached then
|
||||
local ctrl = player:get_player_control()
|
||||
if ctrl.aux1 then
|
||||
--sets the engine running - but sets a delay also, cause keypress
|
||||
if self._last_time_command > 0.8 then
|
||||
self._last_time_command = 0
|
||||
--minetest.sound_play({name = "automobiles_horn"},
|
||||
-- {object = self.object, gain = 0.6, pitch = 1.0, max_hear_distance = 32, loop = false,})
|
||||
local steering_angle_max = 30
|
||||
-- -30 direita -> steering_angle_max
|
||||
-- +30 esquerda
|
||||
local arm_range = 2
|
||||
local range = steering_angle_max * 2
|
||||
local armZ = -((self._steering_angle+steering_angle_max) * arm_range) / 60
|
||||
|
||||
--player:set_bone_position("Arm_Left", {x=3.0, y=5, z=-arm_range-armZ}, {x=240-(self._steering_angle/2), y=0, z=0})
|
||||
--player:set_bone_position("Arm_Right", {x=-3.0, y=5, z=armZ}, {x=240+(self._steering_angle/2), y=0, z=0})
|
||||
if self.driver_mesh then
|
||||
self.driver_mesh:set_bone_position("Arm_Left", {x=3.0, y=5, z=-armZ-2}, {x=60-(self._steering_angle/2), y=0, z=0})
|
||||
self.driver_mesh:set_bone_position("Arm_Right", {x=-3.0, y=5, z=armZ}, {x=60+(self._steering_angle/2), y=0, z=0})
|
||||
end
|
||||
end
|
||||
if ctrl.down then
|
||||
is_breaking = true
|
||||
self.lights:set_properties({textures={"automobiles_motorcycle_lights.png",}, glow=32})
|
||||
self.rlights:set_properties({textures={"automobiles_motorcycle_rear_lights_full.png",}, glow=32})
|
||||
end
|
||||
|
||||
else
|
||||
--desligado
|
||||
self.lights:set_properties({textures={"automobiles_grey.png",}, glow=0})
|
||||
self.rlights:set_properties({textures={"automobiles_rear_lights_off.png",}, glow=0})
|
||||
end
|
||||
|
||||
self._last_light_move = self._last_light_move + dtime
|
||||
if self._last_light_move > 0.15 then
|
||||
self._last_light_move = 0
|
||||
if self._show_lights == true then
|
||||
--self.lights:set_properties({is_visible=true})
|
||||
self.lights:set_properties({textures={"automobiles_motorcycle_lights.png",}, glow=32})
|
||||
self.rlights:set_properties({textures={"automobiles_motorcycle_rear_lights_full.png",}, glow=32})
|
||||
if is_breaking == false then
|
||||
self.lights:set_properties({textures={"automobiles_motorcycle_lights.png",}, glow=32})
|
||||
self.rlights:set_properties({textures={"automobiles_motorcycle_rear_lights_full.png",}, glow=10})
|
||||
end
|
||||
|
||||
--turn the light on just when needed to avoid lag
|
||||
local target_pos = self.object:get_pos()
|
||||
target_pos.y = target_pos.y + 2
|
||||
local light_now = minetest.get_node_light(target_pos)
|
||||
if light_now < 12 then
|
||||
automobiles_lib.put_light(self)
|
||||
end
|
||||
else
|
||||
if is_breaking == false then
|
||||
--desligado
|
||||
self.lights:set_properties({textures={"automobiles_grey.png",}, glow=0})
|
||||
self.rlights:set_properties({textures={"automobiles_rear_lights_off.png",}, glow=0})
|
||||
end
|
||||
automobiles_lib.remove_light(self)
|
||||
end
|
||||
end
|
||||
|
||||
local steering_angle_max = 30
|
||||
self.object:move_to(curr_pos)
|
||||
if is_attached then --and self.driver_name == self.owner then
|
||||
self._show_lights = true
|
||||
if self.driver_mesh then self.driver_mesh:set_properties({is_visible=true}) end
|
||||
local impact = automobiles_lib.get_hipotenuse_value(velocity, self.lastvelocity)
|
||||
if impact > 1 then
|
||||
--self.damage = self.damage + impact --sum the impact value directly to damage meter
|
||||
if self._last_time_collision_snd > 0.3 then
|
||||
self._last_time_collision_snd = 0
|
||||
minetest.sound_play("automobiles_collision", {
|
||||
to_player = self.driver_name,
|
||||
--pos = curr_pos,
|
||||
--max_hear_distance = 5,
|
||||
gain = 1.0,
|
||||
fade = 0.0,
|
||||
pitch = 1.0,
|
||||
})
|
||||
end
|
||||
--if self.damage > 100 then --if acumulated damage is greater than 100, adieu
|
||||
--automobiles_lib.destroy(self)
|
||||
--end
|
||||
end
|
||||
|
||||
--control
|
||||
local steering_speed = 80
|
||||
if math.abs(longit_speed) > 3 then
|
||||
local mid_speed = (steering_speed/2)
|
||||
steering_speed = mid_speed + mid_speed / math.abs(longit_speed*0.25)
|
||||
end
|
||||
|
||||
local control = automobiles_lib.control
|
||||
if self._control_function then
|
||||
control = self._control_function
|
||||
end
|
||||
accel, stop = control(self, dtime, hull_direction, longit_speed, longit_drag, later_drag, accel, motorcycle.max_acc_factor, motorcycle.max_speed, steering_angle_max, steering_speed)
|
||||
else
|
||||
if self.driver_mesh then self.driver_mesh:set_properties({is_visible=false}) end
|
||||
self._show_lights = false
|
||||
if self.sound_handle ~= nil then
|
||||
minetest.sound_stop(self.sound_handle)
|
||||
self.sound_handle = nil
|
||||
end
|
||||
end
|
||||
|
||||
local angle_factor = self._steering_angle / 10
|
||||
self.object:set_animation_frame_speed(longit_speed * (10 - angle_factor))
|
||||
|
||||
--whell turn
|
||||
self.object:set_bone_position("eixo_direcao", {x=0, y=0, z=0}, {x=0, y=-self._steering_angle-angle_factor, z=0})
|
||||
self.lights:set_bone_position("eixo_direcao", {x=0, y=0, z=0}, {x=0, y=-self._steering_angle-angle_factor, z=0})
|
||||
|
||||
if player then
|
||||
-- -30 direita -> steering_angle_max
|
||||
-- +30 esquerda
|
||||
local arm_range = 2
|
||||
local range = steering_angle_max * 2
|
||||
local armZ = -((self._steering_angle+steering_angle_max) * arm_range) / 60
|
||||
|
||||
--player:set_bone_position("Arm_Left", {x=3.0, y=5, z=-arm_range-armZ}, {x=240-(self._steering_angle/2), y=0, z=0})
|
||||
--player:set_bone_position("Arm_Right", {x=-3.0, y=5, z=armZ}, {x=240+(self._steering_angle/2), y=0, z=0})
|
||||
if self.driver_mesh then
|
||||
self.driver_mesh:set_bone_position("Arm_Left", {x=3.0, y=5, z=-armZ-2}, {x=60-(self._steering_angle/2), y=0, z=0})
|
||||
self.driver_mesh:set_bone_position("Arm_Right", {x=-3.0, y=5, z=armZ}, {x=60+(self._steering_angle/2), y=0, z=0})
|
||||
end
|
||||
end
|
||||
|
||||
if math.abs(self._steering_angle)>5 then
|
||||
local turn_rate = math.rad(40)
|
||||
newyaw = yaw + dtime*(1 - 1 / (math.abs(longit_speed) + 1)) *
|
||||
(self._steering_angle / 20) * turn_rate * automobiles_lib.sign(longit_speed)
|
||||
end
|
||||
|
||||
--
|
||||
--accell correction
|
||||
--under some circunstances the acceleration exceeds the max value accepted by set_acceleration and
|
||||
--the game crashes with an overflow, so limiting the max acceleration in each axis prevents the crash
|
||||
--
|
||||
local max_factor = 25
|
||||
local acc_adjusted = 10
|
||||
if accel.x > max_factor then accel.x = acc_adjusted end
|
||||
if accel.x < -max_factor then accel.x = -acc_adjusted end
|
||||
if accel.z > max_factor then accel.z = acc_adjusted end
|
||||
if accel.z < -max_factor then accel.z = -acc_adjusted end
|
||||
-- end correction
|
||||
|
||||
-- calculate energy consumption --
|
||||
----------------------------------
|
||||
if self._energy > 0 then
|
||||
local zero_reference = vector.new()
|
||||
local acceleration = automobiles_lib.get_hipotenuse_value(accel, zero_reference)
|
||||
--minetest.chat_send_all(acceleration)
|
||||
if automobiles_lib.is_drift_game == false then
|
||||
local consumed_power = acceleration/100000
|
||||
self._energy = self._energy - consumed_power;
|
||||
else
|
||||
self._energy = 5
|
||||
end
|
||||
end
|
||||
if self._energy <= 0 then
|
||||
self._engine_running = false
|
||||
if self.sound_handle then minetest.sound_stop(self.sound_handle) end
|
||||
--minetest.chat_send_player(self.driver_name, "Out of fuel")
|
||||
else
|
||||
self._last_engine_sound_update = self._last_engine_sound_update + dtime
|
||||
if self._last_engine_sound_update > 0.300 then
|
||||
self._last_engine_sound_update = 0
|
||||
automobiles_lib.engine_set_sound_and_animation(self, longit_speed)
|
||||
end
|
||||
end
|
||||
|
||||
local energy_indicator_angle = automobiles_lib.get_gauge_angle(self._energy)
|
||||
----------------------------
|
||||
-- end energy consumption --
|
||||
|
||||
accel.y = -automobiles_lib.gravity
|
||||
|
||||
if stop ~= true then
|
||||
--self.object:set_velocity(velocity)
|
||||
self.object:add_velocity(vector.multiply(accel,dtime))
|
||||
--self.object:set_acceleration(accel)
|
||||
else
|
||||
if stop == true then
|
||||
self.object:set_acceleration({x=0,y=0,z=0})
|
||||
self.object:set_velocity({x=0,y=0,z=0})
|
||||
if self._longit_speed > 0 then automobiles_lib.engineSoundPlay(self) end
|
||||
end
|
||||
end
|
||||
|
||||
self._last_ground_check = self._last_ground_check + dtime
|
||||
if self._last_ground_check > 0.18 then
|
||||
self._last_ground_check = 0
|
||||
automobiles_lib.ground_get_distances(self, 0.6, 1.63)
|
||||
end
|
||||
local newpitch = self._pitch --velocity.y * math.rad(6)
|
||||
|
||||
local turn_effect_speed = longit_speed
|
||||
if turn_effect_speed > 10 then turn_effect_speed = 10 end
|
||||
local newroll = (-self._steering_angle/100)*(turn_effect_speed/10)
|
||||
|
||||
if is_attached == false then
|
||||
newroll = math.rad(-12)
|
||||
self._stopped_roll = math.rad(-12)
|
||||
self.object:set_bone_position("descanso", {x=0, y=-2.55, z=5.9}, {x=-90, y=0, z=0})
|
||||
else
|
||||
self.object:set_bone_position("descanso", {x=0, y=-2.55, z=5.9}, {x=0, y=0, z=0})
|
||||
end
|
||||
|
||||
self.object:set_rotation({x=newpitch,y=newyaw,z=newroll})
|
||||
|
||||
--saves last velocity for collision detection (abrupt stop)
|
||||
self.lastvelocity = self.object:get_velocity()
|
||||
self._longit_speed = longit_speed
|
||||
|
||||
end,
|
||||
end,
|
||||
|
||||
on_punch = automobiles_lib.on_punch,
|
||||
on_rightclick = automobiles_lib.on_rightclick,
|
||||
on_rightclick = automobiles_lib.on_rightclick,
|
||||
})
|
||||
|
||||
|
||||
|
@ -1,52 +0,0 @@
|
||||
local S = motorcycle.S
|
||||
|
||||
function motorcycle.driver_formspec(name)
|
||||
local player = minetest.get_player_by_name(name)
|
||||
local vehicle_obj = automobiles_lib.getCarFromPlayer(player)
|
||||
if vehicle_obj == nil then
|
||||
return
|
||||
end
|
||||
local ent = vehicle_obj:get_luaentity()
|
||||
|
||||
local basic_form = table.concat({
|
||||
"formspec_version[3]",
|
||||
"size[6,6]",
|
||||
}, "")
|
||||
|
||||
local yaw = "false"
|
||||
if ent._yaw_by_mouse then yaw = "true" end
|
||||
|
||||
basic_form = basic_form.."button[1,1.0;4,1;go_out;" .. S("Go Offboard") .. "]"
|
||||
basic_form = basic_form.."checkbox[1,3.0;yaw;" .. S("Direction by mouse") .. ";" ..yaw.."]"
|
||||
|
||||
minetest.show_formspec(name, "motorcycle:driver_main", basic_form)
|
||||
end
|
||||
|
||||
minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||
if formname == "motorcycle:driver_main" then
|
||||
local name = player:get_player_name()
|
||||
local car_obj = automobiles_lib.getCarFromPlayer(player)
|
||||
if car_obj then
|
||||
local ent = car_obj:get_luaentity()
|
||||
if ent then
|
||||
if fields.go_out then
|
||||
|
||||
if ent._passenger then --any pax?
|
||||
local pax_obj = minetest.get_player_by_name(ent._passenger)
|
||||
motorcycle.dettach_pax_stand(ent, pax_obj)
|
||||
end
|
||||
|
||||
motorcycle.dettach_driver_stand(ent, player)
|
||||
end
|
||||
if fields.yaw then
|
||||
if ent._yaw_by_mouse == true then
|
||||
ent._yaw_by_mouse = false
|
||||
else
|
||||
ent._yaw_by_mouse = true
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
minetest.close_formspec(name, "motorcycle:driver_main")
|
||||
end
|
||||
end)
|
@ -34,7 +34,8 @@ function motorcycle.attach_driver_stand(self, player)
|
||||
--minetest.chat_send_all(dump(self.driver_properties))
|
||||
|
||||
-- attach the driver
|
||||
player:set_attach(self.driver_seat, "", {x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0})
|
||||
local x_pos = -4 --WHY?! because after the 5.9.1 version the motorcycle got an strange shaking. But when I move it from the center, it ceases. Then I use the camera center bug.
|
||||
player:set_attach(self.driver_seat, "", {x = x_pos, y = 0, z = 0}, {x = 0, y = 0, z = 0})
|
||||
player:set_eye_offset({x = 0, y = 0, z = 1.5}, {x = 0, y = 3, z = -30})
|
||||
player_api.player_attached[name] = true
|
||||
|
||||
@ -45,7 +46,7 @@ function motorcycle.attach_driver_stand(self, player)
|
||||
--create the dummy mesh
|
||||
local pos = player:get_pos()
|
||||
local driver_mesh=minetest.add_entity(pos,'automobiles_motorcycle:player_mesh')
|
||||
driver_mesh:set_attach(player,'',{x=0.0,y=-0.0,z=0.0},{x=0,y=0,z=0})
|
||||
driver_mesh:set_attach(player,'',{x=x_pos*-1,y=-0.0,z=0.0},{x=0,y=0,z=0})
|
||||
self.driver_mesh = driver_mesh
|
||||
self.driver_mesh:set_properties({is_visible=false})
|
||||
|
||||
@ -121,7 +122,8 @@ function motorcycle.attach_pax_stand(self, player)
|
||||
self._passenger = name
|
||||
|
||||
-- attach the driver
|
||||
player:set_attach(self.passenger_seat, "", {x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0})
|
||||
local x_pos = -4 --WHY?! because after the 5.9.1 version the motorcycle got an strange shaking. But when I move it from the center, it ceases. Then I use the camera center bug.
|
||||
player:set_attach(self.passenger_seat, "", {x = x_pos, y = 0, z = 0}, {x = 0, y = 0, z = 0})
|
||||
player:set_eye_offset({x = 0, y = 3, z = 0}, {x = 0, y = 3, z = -30})
|
||||
player_api.player_attached[name] = true
|
||||
|
||||
@ -131,7 +133,7 @@ function motorcycle.attach_pax_stand(self, player)
|
||||
--create the dummy mesh
|
||||
local pos = player:get_pos()
|
||||
local pax_mesh=minetest.add_entity(pos,'automobiles_motorcycle:player_mesh')
|
||||
pax_mesh:set_attach(player,'',{x=0.0,y=-0.0,z=0.0},{x=0,y=0,z=0})
|
||||
pax_mesh:set_attach(player,'',{x=x_pos*-1,y=-0.0,z=0.0},{x=0,y=0,z=0})
|
||||
self.pax_mesh = pax_mesh
|
||||
self.pax_mesh:set_properties({is_visible=false})
|
||||
|
||||
|
@ -1,70 +0,0 @@
|
||||
--dofile(minetest.get_modpath("automobiles_motorcycle") .. DIR_DELIM .. "motorcycle_global_definitions.lua")
|
||||
--dofile(minetest.get_modpath("automobiles_motorcycle") .. DIR_DELIM .. "motorcycle_hud.lua")
|
||||
|
||||
-- destroy the motorcycle
|
||||
function motorcycle.destroy(self, puncher)
|
||||
automobiles_lib.remove_light(self)
|
||||
if self.sound_handle then
|
||||
minetest.sound_stop(self.sound_handle)
|
||||
self.sound_handle = nil
|
||||
end
|
||||
|
||||
if self.driver_name then
|
||||
-- detach the driver first (puncher must be driver)
|
||||
if puncher then
|
||||
puncher:set_detach()
|
||||
puncher:set_eye_offset({x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0})
|
||||
if minetest.global_exists("player_api") then
|
||||
player_api.player_attached[self.driver_name] = nil
|
||||
-- player should stand again
|
||||
player_api.set_animation(puncher, "stand")
|
||||
end
|
||||
end
|
||||
self.driver_name = nil
|
||||
end
|
||||
|
||||
local pos = self.object:get_pos()
|
||||
|
||||
if self.driver_seat then self.driver_seat:remove() end
|
||||
if self.passenger_seat then self.passenger_seat:remove() end
|
||||
if self.lights then self.lights:remove() end
|
||||
if self.rlights then self.rlights:remove() end
|
||||
if self.driver_mesh then self.driver_mesh:remove() end
|
||||
if self.pax_mesh then self.pax_mesh:remove() end
|
||||
|
||||
automobiles_lib.destroy_inventory(self)
|
||||
|
||||
pos.y=pos.y+2
|
||||
|
||||
if automobiles_lib.can_collect_car == false then
|
||||
--minetest.add_item({x=pos.x+math.random()-0.5,y=pos.y,z=pos.z+math.random()-0.5},'automobiles_motorcycle:motorcycle')
|
||||
minetest.add_item({x=pos.x+math.random()-0.5,y=pos.y,z=pos.z+math.random()-0.5},'automobiles_lib:engine')
|
||||
minetest.add_item({x=pos.x+math.random()-0.5,y=pos.y,z=pos.z+math.random()-0.5},'automobiles_motorcycle:wheel')
|
||||
minetest.add_item({x=pos.x+math.random()-0.5,y=pos.y,z=pos.z+math.random()-0.5},'automobiles_motorcycle:wheel')
|
||||
else
|
||||
local lua_ent = self.object:get_luaentity()
|
||||
local staticdata = lua_ent:get_staticdata(self)
|
||||
local obj_name = lua_ent.name
|
||||
local player = puncher
|
||||
|
||||
local stack = ItemStack(obj_name)
|
||||
local stack_meta = stack:get_meta()
|
||||
stack_meta:set_string("staticdata", staticdata)
|
||||
|
||||
if player then
|
||||
local inv = player:get_inventory()
|
||||
if inv then
|
||||
if inv:room_for_item("main", stack) then
|
||||
inv:add_item("main", stack)
|
||||
else
|
||||
minetest.add_item({x=pos.x+math.random()-0.5,y=pos.y,z=pos.z+math.random()-0.5}, stack)
|
||||
end
|
||||
end
|
||||
else
|
||||
minetest.add_item({x=pos.x+math.random()-0.5,y=pos.y,z=pos.z+math.random()-0.5}, stack)
|
||||
end
|
||||
end
|
||||
|
||||
self.object:remove()
|
||||
end
|
||||
|
@ -164,32 +164,25 @@ minetest.register_entity("automobiles_vespa:vespa", {
|
||||
|
||||
_vehicle_name = "Vespa",
|
||||
_drive_wheel_pos = {x=-4.26,y=6.01,z=14.18},
|
||||
_drive_wheel_angle = 15,
|
||||
_drive_wheel_angle = 0,
|
||||
_seat_pos = {{x=0.0,y=-1.1,z=5.5},{x=0.0,y=1,z=0.09}},
|
||||
--_seat_pos = {{x=-4.25,y=-1.1,z=5.5},{x=4.25,y=1,z=5.5}},
|
||||
|
||||
_front_suspension_ent = 'automobiles_coupe:front_suspension',
|
||||
_front_suspension_ent = 'automobiles_vespa:front_suspension',
|
||||
_front_suspension_pos = {x=0,y=1.5,z=14.5},
|
||||
--_front_wheel_ent = 'automobiles_lib:wheel',
|
||||
_front_wheel_xpos = 0,
|
||||
_front_wheel_frames = {x = 1, y = 49},
|
||||
_rear_suspension_ent = 'automobiles_coupe:rear_suspension',
|
||||
_rear_suspension_ent = 'automobiles_vespa:rear_suspension',
|
||||
_rear_suspension_pos = {x=0,y=1.5,z=0},
|
||||
--_rear_wheel_ent = 'automobiles_lib:wheel',
|
||||
_rear_wheel_xpos = 0,
|
||||
_rear_wheel_frames = {x = 1, y = 49},
|
||||
|
||||
--_fuel_gauge_pos = {x=0,y=6.2,z=15.8},
|
||||
_front_lights = 'automobiles_vespa:lights',
|
||||
_rear_lights = 'automobiles_vespa:r_lights',
|
||||
--_reverse_lights = 'automobiles_coupe:reverse_lights',
|
||||
--_turn_left_lights = 'automobiles_coupe:turn_left_light',
|
||||
--_turn_right_lights = 'automobiles_coupe:turn_right_light',
|
||||
--_textures_turn_lights_off = {"automobiles_turn.png", },
|
||||
--_textures_turn_lights_on = { "automobiles_turn_on.png", },
|
||||
|
||||
_LONGIT_DRAG_FACTOR = 0.15*0.15,
|
||||
_LATER_DRAG_FACTOR = 50.0,
|
||||
_LATER_DRAG_FACTOR = 100.0,
|
||||
_max_acc_factor = 6,
|
||||
_max_speed = 15,
|
||||
_min_later_speed = 5,
|
||||
@ -200,7 +193,6 @@ minetest.register_entity("automobiles_vespa:vespa", {
|
||||
_dettach = vespa.dettach_driver_stand,
|
||||
_attach_pax = vespa.attach_pax_stand,
|
||||
_dettach_pax = vespa.dettach_pax_stand,
|
||||
_formspec_function = vespa.driver_formspec,
|
||||
|
||||
get_staticdata = automobiles_lib.get_staticdata,
|
||||
|
||||
@ -240,6 +232,21 @@ minetest.register_entity("automobiles_vespa:vespa", {
|
||||
if player_attach == self.driver_seat then is_attached = true end
|
||||
end
|
||||
end
|
||||
|
||||
local steering_angle_max = 30
|
||||
-- -30 direita -> steering_angle_max
|
||||
-- +30 esquerda
|
||||
local arm_range = 2
|
||||
local range = steering_angle_max * 2
|
||||
local armZ = -((self._steering_angle+steering_angle_max) * arm_range) / 60
|
||||
|
||||
--player:set_bone_position("Arm_Left", {x=3.0, y=5, z=-arm_range-armZ}, {x=240-(self._steering_angle/2), y=0, z=0})
|
||||
--player:set_bone_position("Arm_Right", {x=-3.0, y=5, z=armZ}, {x=240+(self._steering_angle/2), y=0, z=0})
|
||||
if self.driver_mesh then
|
||||
self.driver_mesh:set_bone_position("Arm_Left", {x=3.0, y=5, z=-armZ-0.5}, {x=76-(self._steering_angle/2), y=0, z=0})
|
||||
self.driver_mesh:set_bone_position("Arm_Right", {x=-3.0, y=5, z=armZ+1.5}, {x=76+(self._steering_angle/2), y=0, z=0})
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -46,7 +46,7 @@ function vespa.attach_driver_stand(self, player)
|
||||
--create the dummy mesh
|
||||
local pos = player:get_pos()
|
||||
local driver_mesh=minetest.add_entity(pos,'automobiles_vespa:player_mesh')
|
||||
driver_mesh:set_attach(player,'',{x=4.0,y=-0.0,z=0.0},{x=0,y=0,z=0})
|
||||
driver_mesh:set_attach(player,'',{x=x_pos*-1,y=-0.0,z=0.0},{x=0,y=0,z=0})
|
||||
self.driver_mesh = driver_mesh
|
||||
self.driver_mesh:set_properties({is_visible=false})
|
||||
|
||||
@ -122,7 +122,8 @@ function vespa.attach_pax_stand(self, player)
|
||||
self._passenger = name
|
||||
|
||||
-- attach the driver
|
||||
player:set_attach(self.passenger_seat, "", {x = 4, y = 0, z = 0}, {x = 0, y = 0, z = 0})
|
||||
local x_pos = -4 --WHY?! because after the 5.9.1 version the motorcycle got an strange shaking. But when I move it from the center, it ceases. Then I use the camera center bug.
|
||||
player:set_attach(self.passenger_seat, "", {x = x_pos, y = 0, z = 0}, {x = 0, y = 0, z = 0})
|
||||
player:set_eye_offset({x = 0, y = 3, z = 0}, {x = 0, y = 3, z = -30})
|
||||
player_api.player_attached[name] = true
|
||||
|
||||
@ -131,9 +132,8 @@ function vespa.attach_pax_stand(self, player)
|
||||
|
||||
--create the dummy mesh
|
||||
local pos = player:get_pos()
|
||||
local pax_mesh=minetest.add_entity(pos,'automobiles_vespa:player_mesh')
|
||||
local x_pos = -4 --WHY?! because after the 5.9.1 version the motorcycle got an strange shaking. But when I move it from the center, it ceases. Then I use the camera center bug.
|
||||
pax_mesh:set_attach(player,'',{x=x_pos,y=-0.0,z=0.0},{x=0,y=0,z=0})
|
||||
local pax_mesh=minetest.add_entity(pos,'automobiles_vespa:player_mesh')
|
||||
pax_mesh:set_attach(player,'',{x=x_pos*-1,y=-0.0,z=0.0},{x=0,y=0,z=0})
|
||||
self.pax_mesh = pax_mesh
|
||||
self.pax_mesh:set_properties({is_visible=false})
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user