cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 14:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing mobs and turrets (#6444)

Browse Source
This commit is contained in:
Mykhailo Bykhovtsev
2019-05-13 10:15:57 -07:00
committed by Werner
parent 5bd5eea6ed
commit 71a03e3775
3 changed files with 59 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/game/machinery/portable_turret.dm
View File

@@ -430,8 +430,14 @@
var/list/targets = list() //list of primary targets
var/list/secondarytargets = list() //targets that are least important
for(var/mob/M in mobs_in_view(world.view, src))
assess_and_assign(M, targets, secondarytargets)
for(var/v in view(world.view, src))
if(isliving(v))
var/mob/living/L = v
assess_and_assign(L, targets, secondarytargets)
else if(istype(v, /obj/mecha))
var/obj/mecha/M = v
if(M.occupant)
secondarytargets += M
if(!tryToShootAt(targets))
if(!tryToShootAt(secondarytargets)) // if no valid targets, go for secondary targets
@@ -452,10 +458,10 @@
if(!istype(L))
return TURRET_NOT_TARGET
if(L.invisibility >= INVISIBILITY_LEVEL_ONE) // Cannot see him. see_invisible is a mob-var
if(!L)
return TURRET_NOT_TARGET
if(!L)
if(L.invisibility >= INVISIBILITY_LEVEL_ONE) // Cannot see him. see_invisible is a mob-var
return TURRET_NOT_TARGET
if(!emagged && issilicon(L)) // Don't target silica
@@ -467,7 +473,11 @@
if(get_dist(src, L) > 7) //if it's too far away, why bother?
return TURRET_NOT_TARGET
if(!(L in check_trajectory(L, src))) //check if we have true line of sight
var/flags = PASSTABLE
if(ispath(projectile, /obj/item/projectile/beam) || ispath(eprojectile, /obj/item/projectile/beam))
flags |= PASSTABLE|PASSGLASS|PASSGRILLE
if(!(L in check_trajectory(L, src, pass_flags=flags))) //check if we have true line of sight
return TURRET_NOT_TARGET
if(emagged) // If emagged not even the dead get a rest

4
code/modules/mob/living/simple_animal/hostile/hostile.dm
View File

@@ -251,9 +251,7 @@ mob/living/simple_animal/hostile/hitby(atom/movable/AM as mob|obj,var/speed = TH
return FALSE
var/target_hit = FALSE
var/flags = PASSTABLE
if(istype(projectiletype, /obj/item/projectile/beam))
flags |= (PASSGLASS|PASSGRILLE)
var/flags = ispath(projectiletype, /obj/item/projectile/beam) ? PASSTABLE|PASSGLASS|PASSGRILLE : PASSTABLE
for(var/mob/M in check_trajectory(target_mob, src, pass_flags=flags))
if(M == target_mob)
target_hit = TRUE