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

Fixed harvesters vision not making them shoot at opaque turfs on non-vertical alignments (#20104)

Browse Source 
Fixed harvesters vision not making them shoot at opaque turfs on
non-vertical alignments.
Some code QoL changes.

Fixes #19684
This commit is contained in:
Fluffy
2024-10-25 20:38:42 +00:00
committed by GitHub
parent 1119236ea8
commit 67b8b58e91
4 changed files with 83 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/hivebots/hivebot_beacon.dm
+1 -1
View File
@@ -185,7 +185,7 @@
stop_automated_movement = 1
if(QDELETED(target_mob) || SA_attackable(target_mob))
LoseTarget()
if(!see_target())
if(!see_target(target_mob))
LoseTarget()
if(target_mob in targets)
if(get_dist(src, target_mob) <= 6)
code/modules/mob/living/simple_animal/hostile/hivebots/hivebot_harvester.dm
+2 -4
View File
@@ -253,9 +253,8 @@
return
if(istype(T, /turf/simulated/wall))
var/turf/simulated/wall/W = T
rapid = 1
OpenFire(W)
OpenFire(T, ignore_visibility = TRUE)
rapid = 0
return
@@ -337,7 +336,6 @@
/mob/living/simple_animal/hostile/retaliate/hivebotharvester/shoot_wrapper(target, location, user)
target_mob = target
if(see_target())
Shoot(target, location, user)
Shoot(target, location, user)
target_mob = null
return
code/modules/mob/living/simple_animal/hostile/hostile.dm
+21 -7
View File
@@ -156,14 +156,20 @@ ABSTRACT_TYPE(/mob/living/simple_animal/hostile)
/mob/living/simple_animal/hostile/proc/FoundTarget()
return
/mob/living/simple_animal/hostile/proc/see_target()
return is_in_sight(src, target_mob)
/mob/living/simple_animal/hostile/proc/see_target(atom/target)
SHOULD_NOT_SLEEP(TRUE)
if(!target)
stack_trace("see_target() called with null target!")
return FALSE
return is_in_sight(src, target)
/mob/living/simple_animal/hostile/proc/MoveToTarget()
stop_automated_movement = 1
if(QDELETED(target_mob) || SA_attackable(target_mob))
LoseTarget()
if(!see_target())
if(!see_target(target_mob))
LoseTarget()
if(target_mob in targets)
if(ranged)
@@ -188,7 +194,7 @@ ABSTRACT_TYPE(/mob/living/simple_animal/hostile)
if(!(target_mob in targets))
LoseTarget()
return 0
if(!see_target())
if(!see_target(target_mob))
LoseTarget()
if(ON_ATTACK_COOLDOWN(src))
return
@@ -210,7 +216,7 @@ ABSTRACT_TYPE(/mob/living/simple_animal/hostile)
return
if(!canmove)
return
if(!see_target())
if(!see_target(target_mob))
LoseTarget()
for(var/grab in grabbed_by)
var/obj/item/grab/G = grab
@@ -323,11 +329,19 @@ ABSTRACT_TYPE(/mob/living/simple_animal/hostile)
return TRUE
/mob/living/simple_animal/hostile/proc/OpenFire(target_mob)
/**
* Handles the logic of firing at a target for the hostile mob
*
* * target_mob - The mob to fire at
* * ignore_visibility - Whether or not to ignore the visibility check
*/
/mob/living/simple_animal/hostile/proc/OpenFire(target_mob, ignore_visibility = FALSE)
set waitfor = FALSE
if(!see_target())
if(!ignore_visibility && !see_target(target_mob))
LoseTarget()
return
var/target = target_mob
// This code checks if we are not going to hit our target
if(smart_ranged && !check_fire(target_mob))