mirror of
https://github.com/APercy/automobiles_pck
synced 2025-06-17 22:38:01 +02:00
fixes on some variables
This commit is contained in:
parent
6084a16de9
commit
b5b5933afa
@ -2,8 +2,8 @@
|
|||||||
-- constants
|
-- constants
|
||||||
--
|
--
|
||||||
motorcycle={}
|
motorcycle={}
|
||||||
motorcycle.LONGIT_DRAG_FACTOR = 0.14*0.14
|
motorcycle._LONGIT_DRAG_FACTOR = 0.14*0.14
|
||||||
motorcycle.LATER_DRAG_FACTOR = 25.0
|
motorcycle._LATER_DRAG_FACTOR = 25.0
|
||||||
motorcycle.gravity = automobiles_lib.gravity
|
motorcycle.gravity = automobiles_lib.gravity
|
||||||
motorcycle.max_speed = 20
|
motorcycle.max_speed = 20
|
||||||
motorcycle.max_acc_factor = 8
|
motorcycle.max_acc_factor = 8
|
||||||
|
@ -165,6 +165,8 @@ minetest.register_entity("automobiles_motorcycle:motorcycle", {
|
|||||||
_dettach = motorcycle.dettach_driver_stand,
|
_dettach = motorcycle.dettach_driver_stand,
|
||||||
_attach_pax = motorcycle.attach_pax_stand,
|
_attach_pax = motorcycle.attach_pax_stand,
|
||||||
_dettach_pax = motorcycle.dettach_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
|
get_staticdata = function(self) -- unloaded/unloads ... is now saved
|
||||||
return minetest.serialize({
|
return minetest.serialize({
|
||||||
@ -249,10 +251,10 @@ minetest.register_entity("automobiles_motorcycle:motorcycle", {
|
|||||||
|
|
||||||
on_step = function(self, dtime)
|
on_step = function(self, dtime)
|
||||||
automobiles_lib.stepfunc(self, dtime)
|
automobiles_lib.stepfunc(self, dtime)
|
||||||
--[[sound play control]]--
|
--sound play control--
|
||||||
self._last_time_collision_snd = self._last_time_collision_snd + dtime
|
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
|
if self._last_time_collision_snd > 1 then self._last_time_collision_snd = 1 end
|
||||||
--[[end sound control]]--
|
--end sound control--
|
||||||
|
|
||||||
local rotation = self.object:get_rotation()
|
local rotation = self.object:get_rotation()
|
||||||
local yaw = rotation.y
|
local yaw = rotation.y
|
||||||
@ -266,14 +268,15 @@ minetest.register_entity("automobiles_motorcycle:motorcycle", {
|
|||||||
local longit_speed = automobiles_lib.dot(velocity,hull_direction)
|
local longit_speed = automobiles_lib.dot(velocity,hull_direction)
|
||||||
local fuel_weight_factor = (5 - self._energy)/5000
|
local fuel_weight_factor = (5 - self._energy)/5000
|
||||||
local longit_drag = vector.multiply(hull_direction,(longit_speed*longit_speed) *
|
local longit_drag = vector.multiply(hull_direction,(longit_speed*longit_speed) *
|
||||||
(motorcycle.LONGIT_DRAG_FACTOR - fuel_weight_factor) * -1 * automobiles_lib.sign(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_speed = automobiles_lib.dot(velocity,nhdir)
|
||||||
local later_drag = vector.multiply(nhdir,later_speed*
|
local later_drag = vector.multiply(nhdir,later_speed*
|
||||||
later_speed*motorcycle.LATER_DRAG_FACTOR*-1*automobiles_lib.sign(later_speed))
|
later_speed*self._LATER_DRAG_FACTOR*-1*automobiles_lib.sign(later_speed))
|
||||||
|
|
||||||
local accel = vector.add(longit_drag,later_drag)
|
local accel = vector.add(longit_drag,later_drag)
|
||||||
local stop = nil
|
local stop = nil
|
||||||
|
local curr_pos = self.object:get_pos()
|
||||||
|
|
||||||
local player = nil
|
local player = nil
|
||||||
local is_attached = false
|
local is_attached = false
|
||||||
@ -297,8 +300,8 @@ minetest.register_entity("automobiles_motorcycle:motorcycle", {
|
|||||||
--sets the engine running - but sets a delay also, cause keypress
|
--sets the engine running - but sets a delay also, cause keypress
|
||||||
if self._last_time_command > 0.8 then
|
if self._last_time_command > 0.8 then
|
||||||
self._last_time_command = 0
|
self._last_time_command = 0
|
||||||
--[[minetest.sound_play({name = "automobiles_horn"},
|
--minetest.sound_play({name = "automobiles_horn"},
|
||||||
{object = self.object, gain = 0.6, pitch = 1.0, max_hear_distance = 32, loop = false,})]]--
|
-- {object = self.object, gain = 0.6, pitch = 1.0, max_hear_distance = 32, loop = false,})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if ctrl.down then
|
if ctrl.down then
|
||||||
@ -342,7 +345,6 @@ minetest.register_entity("automobiles_motorcycle:motorcycle", {
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local curr_pos = self.object:get_pos()
|
|
||||||
local steering_angle_max = 30
|
local steering_angle_max = 30
|
||||||
self.object:move_to(curr_pos)
|
self.object:move_to(curr_pos)
|
||||||
if is_attached then --and self.driver_name == self.owner then
|
if is_attached then --and self.driver_name == self.owner then
|
||||||
@ -362,9 +364,9 @@ minetest.register_entity("automobiles_motorcycle:motorcycle", {
|
|||||||
pitch = 1.0,
|
pitch = 1.0,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
--[[if self.damage > 100 then --if acumulated damage is greater than 100, adieu
|
--if self.damage > 100 then --if acumulated damage is greater than 100, adieu
|
||||||
automobiles_lib.destroy(self)
|
--automobiles_lib.destroy(self)
|
||||||
end]]--
|
--end
|
||||||
end
|
end
|
||||||
|
|
||||||
--control
|
--control
|
||||||
@ -408,14 +410,14 @@ minetest.register_entity("automobiles_motorcycle:motorcycle", {
|
|||||||
if math.abs(self._steering_angle)>5 then
|
if math.abs(self._steering_angle)>5 then
|
||||||
local turn_rate = math.rad(40)
|
local turn_rate = math.rad(40)
|
||||||
newyaw = yaw + dtime*(1 - 1 / (math.abs(longit_speed) + 1)) *
|
newyaw = yaw + dtime*(1 - 1 / (math.abs(longit_speed) + 1)) *
|
||||||
self._steering_angle / 20 * turn_rate * automobiles_lib.sign(longit_speed)
|
(self._steering_angle / 20) * turn_rate * automobiles_lib.sign(longit_speed)
|
||||||
end
|
end
|
||||||
|
|
||||||
--[[
|
--
|
||||||
accell correction
|
--accell correction
|
||||||
under some circunstances the acceleration exceeds the max value accepted by set_acceleration and
|
--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
|
--the game crashes with an overflow, so limiting the max acceleration in each axis prevents the crash
|
||||||
]]--
|
--
|
||||||
local max_factor = 25
|
local max_factor = 25
|
||||||
local acc_adjusted = 10
|
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
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
-- constants
|
-- constants
|
||||||
--
|
--
|
||||||
vespa={}
|
vespa={}
|
||||||
vespa.LONGIT_DRAG_FACTOR = 0.15*0.15
|
vespa._LONGIT_DRAG_FACTOR = 0.15*0.15
|
||||||
vespa.LATER_DRAG_FACTOR = 30.0
|
vespa._LATER_DRAG_FACTOR = 30.0
|
||||||
vespa.gravity = automobiles_lib.gravity
|
vespa.gravity = automobiles_lib.gravity
|
||||||
vespa.max_speed = 20
|
vespa.max_speed = 20
|
||||||
vespa.max_acc_factor = 6
|
vespa.max_acc_factor = 6
|
||||||
|
@ -160,6 +160,8 @@ minetest.register_entity("automobiles_vespa:vespa", {
|
|||||||
_dettach = vespa.dettach_driver_stand,
|
_dettach = vespa.dettach_driver_stand,
|
||||||
_attach_pax = vespa.attach_pax_stand,
|
_attach_pax = vespa.attach_pax_stand,
|
||||||
_dettach_pax = vespa.dettach_pax_stand,
|
_dettach_pax = vespa.dettach_pax_stand,
|
||||||
|
_LONGIT_DRAG_FACTOR = vespa._LONGIT_DRAG_FACTOR,
|
||||||
|
_LATER_DRAG_FACTOR = vespa._LATER_DRAG_FACTOR,
|
||||||
|
|
||||||
get_staticdata = function(self) -- unloaded/unloads ... is now saved
|
get_staticdata = function(self) -- unloaded/unloads ... is now saved
|
||||||
return minetest.serialize({
|
return minetest.serialize({
|
||||||
@ -261,11 +263,11 @@ minetest.register_entity("automobiles_vespa:vespa", {
|
|||||||
local longit_speed = automobiles_lib.dot(velocity,hull_direction)
|
local longit_speed = automobiles_lib.dot(velocity,hull_direction)
|
||||||
local fuel_weight_factor = (5 - self._energy)/5000
|
local fuel_weight_factor = (5 - self._energy)/5000
|
||||||
local longit_drag = vector.multiply(hull_direction,(longit_speed*longit_speed) *
|
local longit_drag = vector.multiply(hull_direction,(longit_speed*longit_speed) *
|
||||||
(vespa.LONGIT_DRAG_FACTOR - fuel_weight_factor) * -1 * automobiles_lib.sign(longit_speed))
|
(vespa._LONGIT_DRAG_FACTOR - fuel_weight_factor) * -1 * automobiles_lib.sign(longit_speed))
|
||||||
|
|
||||||
local later_speed = automobiles_lib.dot(velocity,nhdir)
|
local later_speed = automobiles_lib.dot(velocity,nhdir)
|
||||||
local later_drag = vector.multiply(nhdir,later_speed*
|
local later_drag = vector.multiply(nhdir,later_speed*
|
||||||
later_speed*vespa.LATER_DRAG_FACTOR*-1*automobiles_lib.sign(later_speed))
|
later_speed*vespa._LATER_DRAG_FACTOR*-1*automobiles_lib.sign(later_speed))
|
||||||
|
|
||||||
local accel = vector.add(longit_drag,later_drag)
|
local accel = vector.add(longit_drag,later_drag)
|
||||||
local stop = nil
|
local stop = nil
|
||||||
|
Loading…
Reference in New Issue
Block a user