cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4563 from VOREStation/upstream-merge-5756

Browse Source 
[MIRROR] Fixes a few AI bugs
This commit is contained in:
Spades
2019-03-02 08:24:15 -05:00
committed by GitHub
parent d47c2366de 0aac0a8ebb
commit af14eaef05
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/ai/ai_holder_combat.dm
View File

@@ -1,7 +1,7 @@
// This file is for actual fighting. Targeting is in a seperate file. // This file is for actual fighting. Targeting is in a seperate file.
/datum/ai_holder /datum/ai_holder
var/firing_lanes = FALSE // If ture, tries to refrain from shooting allies or the wall. var/firing_lanes = TRUE // If ture, tries to refrain from shooting allies or the wall.
var/conserve_ammo = FALSE // If true, the mob will avoid shooting anything that does not have a chance to hit a mob. Requires firing_lanes to be true. var/conserve_ammo = FALSE // If true, the mob will avoid shooting anything that does not have a chance to hit a mob. Requires firing_lanes to be true.
var/pointblank = FALSE // If ranged is true, and this is true, people adjacent to the mob will suffer the ranged instead of using a melee attack. var/pointblank = FALSE // If ranged is true, and this is true, people adjacent to the mob will suffer the ranged instead of using a melee attack.

5
code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm
View File

@@ -22,6 +22,7 @@
ai_holder_type = /datum/ai_holder/simple_mob/melee/nurse_spider ai_holder_type = /datum/ai_holder/simple_mob/melee/nurse_spider
var/fed = 0 // Counter for how many egg laying 'charges' the spider has. var/fed = 0 // Counter for how many egg laying 'charges' the spider has.
var/laying_eggs = FALSE // Only allow one set of eggs to be laid at once.
var/egg_inject_chance = 25 // One in four chance to get eggs. var/egg_inject_chance = 25 // One in four chance to get eggs.
var/egg_type = /obj/effect/spider/eggcluster/small var/egg_type = /obj/effect/spider/eggcluster/small
var/web_type = /obj/effect/spider/stickyweb/dark var/web_type = /obj/effect/spider/stickyweb/dark
@@ -45,6 +46,7 @@
/mob/living/simple_mob/animal/giant_spider/nurse/attack_target(atom/A) /mob/living/simple_mob/animal/giant_spider/nurse/attack_target(atom/A)
if(isturf(A)) if(isturf(A))
if(fed) if(fed)
if(!laying_eggs)
return lay_eggs(A) return lay_eggs(A)
return web_tile(A) return web_tile(A)
@@ -161,6 +163,8 @@
visible_message(span("notice", "\The [src] begins to lay a cluster of eggs.") ) visible_message(span("notice", "\The [src] begins to lay a cluster of eggs.") )
// Get our AI to stay still. // Get our AI to stay still.
set_AI_busy(TRUE) set_AI_busy(TRUE)
// Stop players from spamming eggs.
laying_eggs = TRUE
if(!do_mob(src, T, 5 SECONDS)) if(!do_mob(src, T, 5 SECONDS))
set_AI_busy(FALSE) set_AI_busy(FALSE)
@@ -174,6 +178,7 @@
set_AI_busy(FALSE) set_AI_busy(FALSE)
new egg_type(T) new egg_type(T)
fed-- fed--
laying_eggs = FALSE
return TRUE return TRUE