Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Baisc Bot "Commission Emote" Tweak #2835

Merged
merged 1 commit into from
Apr 11, 2024
Merged

[MIRROR] Baisc Bot "Commission Emote" Tweak #2835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions code/modules/mob/living/basic/bots/bot_ai.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
blackboard = list(
BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
BB_SALUTE_MESSAGES = list(
"salutes",
"performs an elaborate salute for",
"nods in appreciation towards",
"fist bumps",
),
BB_UNREACHABLE_LIST_COOLDOWN = 45 SECONDS,
)
Expand Down Expand Up @@ -205,7 +204,7 @@

/datum/ai_behavior/find_and_set/valid_authority
behavior_flags = AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION
action_cooldown = 30 SECONDS
action_cooldown = BOT_COMMISSIONED_SALUTE_DELAY

/datum/ai_behavior/find_and_set/valid_authority/search_tactic(datum/ai_controller/controller, locate_path, search_range)
for(var/mob/living/nearby_mob in oview(search_range, controller.pawn))
Expand All @@ -231,7 +230,7 @@
if(our_hat)
salute_list += "tips [our_hat] at "

bot_pawn.manual_emote(pick(salute_list) + " [controller.blackboard[target_key]]")
bot_pawn.manual_emote(pick(salute_list) + " [controller.blackboard[target_key]]!")
finish_action(controller, TRUE, target_key)
return

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/bot/bot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@
COOLDOWN_START(src, next_salute_check, BOT_COMMISSIONED_SALUTE_DELAY)
for(var/mob/living/simple_animal/bot/B in view(5, src))
if(!HAS_TRAIT(B, TRAIT_COMMISSIONED) && B.bot_mode_flags & BOT_MODE_ON)
visible_message("<b>[B]</b> performs an elaborate salute for [src]!")
manual_emote("performs an elaborate salute for [src]!")
break

switch(mode) //High-priority overrides are processed first. Bots can do nothing else while under direct command.
Expand Down
Loading