From 04507973a750a09e9819f4dbe2afa00e76d676f8 Mon Sep 17 00:00:00 2001 From: Alexsandro Percy Date: Thu, 4 Aug 2022 19:42:04 -0300 Subject: [PATCH] fix acceleration crash and added touch sound --- sounds/{collision.ogg => trike_collision.ogg} | Bin sounds/{engine.ogg => trike_engine.ogg} | Bin sounds/trike_touch.ogg | Bin 0 -> 17479 bytes trike_control.lua | 6 ++-- trike_entities.lua | 2 +- trike_utilities.lua | 26 ++++++++++++++---- 6 files changed, 25 insertions(+), 9 deletions(-) rename sounds/{collision.ogg => trike_collision.ogg} (100%) rename sounds/{engine.ogg => trike_engine.ogg} (100%) create mode 100644 sounds/trike_touch.ogg diff --git a/sounds/collision.ogg b/sounds/trike_collision.ogg similarity index 100% rename from sounds/collision.ogg rename to sounds/trike_collision.ogg diff --git a/sounds/engine.ogg b/sounds/trike_engine.ogg similarity index 100% rename from sounds/engine.ogg rename to sounds/trike_engine.ogg diff --git a/sounds/trike_touch.ogg b/sounds/trike_touch.ogg new file mode 100644 index 0000000000000000000000000000000000000000..90d35c428fda608680896dfbaa3257332f2db61b GIT binary patch literal 17479 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 0 then self._engine_running = true -- sound and animation - self.sound_handle = minetest.sound_play({name = "engine"}, + self.sound_handle = minetest.sound_play({name = "trike_engine"}, {object = self.object, gain = 2.0, pitch = 0.5 + ((self._power_lever/100)/2),max_hear_distance = 32, loop = true,}) @@ -75,7 +75,7 @@ function trike.control(self, dtime, hull_direction, longit_speed, --sound if self.sound_handle then minetest.sound_stop(self.sound_handle) - self.sound_handle = minetest.sound_play({name = "engine"}, + self.sound_handle = minetest.sound_play({name = "trike_engine"}, {object = self.object, gain = 2.0, pitch = 0.5 + ((self._power_lever/100)/2),max_hear_distance = 32, loop = true,}) @@ -104,7 +104,7 @@ function trike.control(self, dtime, hull_direction, longit_speed, else --sound minetest.sound_stop(self.sound_handle) - self.sound_handle = minetest.sound_play({name = "engine"}, + self.sound_handle = minetest.sound_play({name = "trike_engine"}, {object = self.object, gain = 2.0, pitch = 0.5 + ((self._power_lever/100)/2), max_hear_distance = 32, loop = true,}) diff --git a/trike_entities.lua b/trike_entities.lua index 4942795..27f28dd 100644 --- a/trike_entities.lua +++ b/trike_entities.lua @@ -334,7 +334,7 @@ minetest.register_entity("trike:trike", { --airutils.hurt(self,toolcaps.damage_groups.fleshy - 1) --airutils.make_sound(self,'hit') self.hp_max = self.hp_max - 10 - minetest.sound_play("collision", { + minetest.sound_play("trike_collision", { object = self.object, max_hear_distance = 5, gain = 1.0, diff --git a/trike_utilities.lua b/trike_utilities.lua index c8f9f8e..488f69e 100644 --- a/trike_utilities.lua +++ b/trike_utilities.lua @@ -216,13 +216,27 @@ function trike.testImpact(self, velocity) end end + if impact > 0.5 and self._longit_speed > 2 then + local noded = airutils.nodeatpos(airutils.pos_shift(p,{y=-0.1})) + if (noded and noded.drawtype ~= 'airlike') then + minetest.sound_play("trike_touch", { + --to_player = self.driver_name, + object = self.object, + max_hear_distance = 15, + gain = 1.0, + fade = 0.0, + pitch = 1.0, + }, true) + end + end + if collision then --self.object:set_velocity({x=0,y=0,z=0}) local damage = impact / 2 self.hp_max = self.hp_max - damage --subtract the impact value directly to hp meter if self.driver_name then - minetest.sound_play("collision", { + minetest.sound_play("trike_collision", { to_player = self.driver_name, --pos = curr_pos, --max_hear_distance = 5, @@ -399,10 +413,12 @@ function trike.flightstep(self) if self.isinliquid then self._engine_running = false end - --[[if player then - trike.attach(self, player) - end]]-- - self.object:set_acceleration(new_accel) + --added accell check to avoid mercurio server problem + if new_accel then + if new_accel.x ~= nil and new_accel.y ~= nil and new_accel.z ~= nil then + self.object:set_acceleration(new_accel) + end + end -- end lift --adjust wing pitch (3d model)