Mirrorlandia_minetest/rangedweapons
1
0
Fork 1
mirror of https://github.com/lhofhansl/rangedweapons.git synced 2024-07-15 12:19:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix player self-damage

Browse Source
This commit is contained in:
Lars 2022-03-03 15:48:40 -08:00
parent ad59ab40e4
commit da2a8c8b32
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ammo.lua
View File

@ -24,7 +24,7 @@ initial_properties = {
visual_size = {x=0.75, y=0.75}, visual_size = {x=0.75, y=0.75},
textures = {"rangedweapons:shot_bullet_visual"}, textures = {"rangedweapons:shot_bullet_visual"},
lastpos = {}, lastpos = {},
collide_with_objects = false, collide_with_objects = true,
collisionbox = {-0.0025, -0.0025, -0.0025, 0.0025, 0.0025, 0.0025}, collisionbox = {-0.0025, -0.0025, -0.0025, 0.0025, 0.0025, 0.0025},
}, },
} }
@ -60,7 +60,7 @@ end end
self.timer = self.timer + dtime self.timer = self.timer + dtime
if self.timer > 0.06 then if self.timer >= 0 then
self.object:set_properties({collide_with_objects = true}) self.object:set_properties({collide_with_objects = true})
self.object:set_properties({collisionbox = {-size, -size, -size, size, size, size}}) self.object:set_properties({collisionbox = {-size, -size, -size, size, size, size}})
end end
@ -255,7 +255,7 @@ end
end end
if moveresult.collisions[1].type == "object" then if moveresult.collisions[1].type == "object" and (not moveresult.collisions[1].object:is_player() or moveresult.collisions[1].object:get_player_name() ~= self.owner) then
local actualDamage = self.damage or {fleshy=1} local actualDamage = self.damage or {fleshy=1}
@ -270,7 +270,6 @@ local skill = self.skill_value or 1
for _, dmg in pairs(actualDamage) do for _, dmg in pairs(actualDamage) do
damage[_] = actualDamage[_] damage[_] = actualDamage[_]
end end
if moveresult.collisions[1].object:is_player() then if moveresult.collisions[1].object:is_player() then
for _, player_dmg in pairs(damage) do for _, player_dmg in pairs(damage) do
damage[_] = damage[_] * rweapons_player_dmg_multiplier damage[_] = damage[_] * rweapons_player_dmg_multiplier