diff --git a/api.lua b/api.lua index 76e65c7..7522b42 100644 --- a/api.lua +++ b/api.lua @@ -46,16 +46,15 @@ adv_vehicles.attach_player_to_veh = function(player, vehicle, seated, model, ani local veh_rot = vehicle.object:get_rotation() local fixed_veh_yaw = vehicle.fixed_veh_rotate_angle local new_seat_pos = adv_vehicles.rotate_point_around_other_point({x=0, y=0, z=0}, vehicle.seats_list[seated].pos, fixed_veh_yaw, math.deg(veh_rot.y)) - minetest.debug(dump(new_seat_pos)) new_seat_pos.y = 9 vehicle.seats_list[seated].pos = new_seat_pos vehicle.fixed_car_rotate_angle = math.deg(veh_rot.y) local meta = player:get_meta() meta:set_string("is_sit", minetest.serialize({veh_name, seated})) - local new_player_rot = {x=math.deg(veh_rot.x), y=veh_rot.y-180, z=math.deg(veh_rot.z)} + local new_player_rot = {x=math.deg(veh_rot.x), y=veh_rot.y+180, z=math.deg(veh_rot.z)} player:set_attach(vehicle.object, "", new_seat_pos, new_player_rot) local eye_offset = player:get_eye_offset() - player:set_eye_offset({x=vehicle.seats_list[seated].pos.x, y=vehicle.seats_list[seated].pos.y, z=vehicle.seats_list[seated].pos.z}, eye_offset) + player:set_eye_offset({x=vehicle.seats_list[seated].pos.x, y=0, z=vehicle.seats_list[seated].pos.z}, eye_offset) --player:set_eye_offset({x=-4.0, y=-3.0, z=3.0}, eye_offset) @@ -301,25 +300,26 @@ adv_vehicles.vehicle_handle = function (player, vehicle, controls, yaw, max_vel) vehicle.object:set_acceleration({x=acc.x*-1, y=acc.y, z=acc.z*-1}) is_acc_set = nil end - if ((math.abs(vel.x) and math.abs(vel.z)) < 0.05) and ((vel.x and vel.z) > 0) then + if ((math.abs(vel.x) and math.abs(vel.z)) < 0.01) and not is_acc_set then vehicle.object:set_acceleration({x=0, y=acc.y, z=0}) vehicle.object:set_velocity({x=0, y=vel.y, z=0}) end end end - if controls.down then vehicle.object:set_acceleration({x=(vector_coords.x/step_acc)*-1, y=acc.y, z=(vector_coords.z/step_acc)*-1}) is_oppos_acc_set = true else local vel = vehicle.object:get_velocity() + minetest.debug(dump({x=vel.x, z=vel.z})) if (vel.x and vel.z) ~= 0 then if is_oppos_acc_set then vehicle.object:set_acceleration({x=acc.x, y=acc.y, z=acc.z}) is_oppos_acc_set = nil end - if ((math.abs(vel.x) and math.abs(vel.z)) > 0.05) and ((vel.x and vel.z) < 0) then + if ((math.abs(vel.x) and math.abs(vel.z)) > 0.01) and not is_oppos_acc_set then + minetest.debug("TRUE") vehicle.object:set_acceleration({x=0, y=acc.y, z=0}) vehicle.object:set_velocity({x=0, y=vel.y, z=0}) end diff --git a/init.lua b/init.lua index 1fcc745..ecf13af 100644 --- a/init.lua +++ b/init.lua @@ -44,15 +44,15 @@ adv_vehicles.register_vehicle("bmw_118_two_seats", { mass = 1.3, max_vel = 5, cbox = {-1.2, -0.5, -3.0, 1.2, 1.5, 3.0}, - model = "bmw_118_two_seats.b3d", - textures = {"bmw_118_two_seats.png"}, - seats = {["driver"]={busy_by=nil, pos={x=-3.5, z=-3.5}}, - ["passenger"]={busy_by=nil, pos={x=3.5, z=-3.5}}}, - player_eye_offset = {x=-3.5, y=0, z=-3.5} + model = "bmw_118_two_seats_redone.b3d", + textures = {"bmw_118_two_seats_new_tex.png"}, + seats = {["driver"]={busy_by=nil, pos={x=-3.5, z=3.5}}, + ["passenger"]={busy_by=nil, pos={x=3.5, z=3.5}}}, + player_eye_offset = {x=-3.5, y=0, z=3.5} }, { description = "BMW 118 two-seater", - inv_image = "bmw_two_seats_inv.png", + inv_image = "bmw_118_two_seats_inv.png", craft_recipe = { {"adv_vehicles:car_frame", "dye:blue", ""}, {"adv_vehicles:wheel", "adv_vehicles:wheel", "adv_vehicles:wheel"}, diff --git a/models/bmw_118_two_seats.blend b/models/bmw_118_two_seats.blend index f3beaed..7cfc041 100644 Binary files a/models/bmw_118_two_seats.blend and b/models/bmw_118_two_seats.blend differ diff --git a/models/bmw_118_two_seats.blend1 b/models/bmw_118_two_seats.blend1 index 66ad440..25495de 100644 Binary files a/models/bmw_118_two_seats.blend1 and b/models/bmw_118_two_seats.blend1 differ diff --git a/models/bmw_118_two_seats_redone.b3d b/models/bmw_118_two_seats_redone.b3d new file mode 100644 index 0000000..ceafa9e Binary files /dev/null and b/models/bmw_118_two_seats_redone.b3d differ diff --git a/models/bmw_118_two_seats_redone.blend b/models/bmw_118_two_seats_redone.blend new file mode 100644 index 0000000..92dd3fb Binary files /dev/null and b/models/bmw_118_two_seats_redone.blend differ diff --git a/models/bmw_118_two_seats_redone.blend1 b/models/bmw_118_two_seats_redone.blend1 new file mode 100644 index 0000000..1fcf64c Binary files /dev/null and b/models/bmw_118_two_seats_redone.blend1 differ diff --git a/textures/bmw_118_two_seats_inv.png b/textures/bmw_118_two_seats_inv.png new file mode 100644 index 0000000..33bdfe7 Binary files /dev/null and b/textures/bmw_118_two_seats_inv.png differ diff --git a/textures/bmw_118_two_seats_new_tex.png b/textures/bmw_118_two_seats_new_tex.png new file mode 100644 index 0000000..7950bcc Binary files /dev/null and b/textures/bmw_118_two_seats_new_tex.png differ