cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

raptor retaliate targetting fix (#86925)

Browse Source 
## About The Pull Request
raptors werent meant to retaliate against each other or against their
owner. this was initially handled by their targeting strategy, however
some changes to it at some point broke this. raptors would now
over-escalate conflicts against troublemaker raptors, locking both into
a deathmatch. this fixes that

## Why It's Good For The Game
fixes raptor retaliate targetting

## Changelog
🆑
fix: fixes raptors retaliating against each other and their owners
/🆑
This commit is contained in:
Ben10Omintrix
2024-09-28 04:18:57 +02:00
committed by GitHub
parent 12ffd52fdb
commit 5b8358cb74
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/lavaland/raptor/raptor_ai_controller.dm
+5 -11
View File
@@ -8,8 +8,8 @@
"wags their tail against",
"playfully leans against"
),
BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/raptor,
BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/raptor,
BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
BB_BABIES_PARTNER_TYPES = list(/mob/living/basic/raptor),
BB_BABIES_CHILD_TYPES = list(/mob/living/basic/raptor/baby_raptor),
BB_MAX_CHILDREN = 5,
@@ -23,7 +23,7 @@
/datum/ai_planning_subtree/find_and_hunt_target/heal_raptors,
/datum/ai_planning_subtree/random_speech/blackboard,
/datum/ai_planning_subtree/pet_planning,
/datum/ai_planning_subtree/target_retaliate,
/datum/ai_planning_subtree/target_retaliate/check_faction,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
/datum/ai_planning_subtree/find_and_hunt_target/raptor_trough,
@@ -41,19 +41,13 @@
RegisterSignal(new_pawn, COMSIG_MOB_ATE, PROC_REF(post_eat))
/datum/ai_controller/basic_controller/raptor/proc/post_eat()
SIGNAL_HANDLER
clear_blackboard_key(BB_RAPTOR_TROUGH_TARGET)
set_blackboard_key(BB_RAPTOR_EAT_COOLDOWN, world.time + NEXT_EAT_COOLDOWN)
/datum/targeting_strategy/basic/raptor
//dont attack anyone that shares our factions.
/datum/targeting_strategy/basic/raptor/faction_check(datum/ai_controller/controller, mob/living/living_mob, mob/living/the_target)
. = ..()
return .
/datum/ai_controller/basic_controller/baby_raptor
blackboard = list(
BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/raptor,
BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
BB_FIND_MOM_TYPES = list(/mob/living/basic/raptor),
BB_IGNORE_MOM_TYPES = list(/mob/living/basic/raptor/baby_raptor),
)