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.

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

Already on GitHub? Sign in to your account

Dogs now flee from mobs with tongs #78797

Merged
merged 7 commits into from Oct 6, 2023
Merged

Conversation

optimumtact
Copy link
Member

AI dogs with the dog controller behaviour will flee from a target with tongs in hand.

Untested because I literally cannot play byond.

Why It's Good For The Game

https://www.youtube.com/watch?v=cXIAZtwvgz0

Changelog

馃啈 oranges
add: Dogs now react to centrist grillers more realistically
/:cl:

AI dogs with the dog controller behaviour will flee from a target with
tongs in hand.
@tgstation-server tgstation-server added the Feature Exposes new bugs in interesting ways label Oct 5, 2023
Copy link
Contributor

@Jacquerel Jacquerel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked it out and it doesnt work but it almost does
and one of them is just because we put a footgun in there

@@ -20,6 +20,8 @@
BB_DOG_HARASS_HARM = TRUE,
BB_VISION_RANGE = AI_DOG_VISION_RANGE,
BB_PET_TARGETTING_DATUM = new /datum/targetting_datum/not_friends(),
// Find nearby mobs with tongs in hand.
BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/holding_object(/obj/item/kitchen/tongs),
BB_BABIES_PARTNER_TYPES = list(/mob/living/basic/pet/dog),
Copy link
Contributor

@Jacquerel Jacquerel Oct 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
BB_BABIES_PARTNER_TYPES = list(/mob/living/basic/pet/dog),
BB_BASIC_MOB_FLEEING = TRUE,
BB_BABIES_PARTNER_TYPES = list(/mob/living/basic/pet/dog),

It won't trigger the flee behaviour unless this flag is present (designed in case we want to turn it on and off but the default being "doesn't work" isn't good)

code/datums/ai/basic_mobs/targetting_datums/with_object.dm Outdated Show resolved Hide resolved
@Kapu1178
Copy link
Contributor

Kapu1178 commented Oct 5, 2023

SPEED MERGE

@github-actions
Copy link
Contributor

github-actions bot commented Oct 6, 2023

This pull request was test merged in 70 round(s).

Round list

manuel

sybil

terry

@Jacquerel Jacquerel merged commit d70462a into tgstation:master Oct 6, 2023
19 checks passed
comfyorange added a commit that referenced this pull request Oct 6, 2023
github-actions bot added a commit that referenced this pull request Oct 6, 2023
Jolly-66 added a commit to TaleStation/TaleStation that referenced this pull request Oct 8, 2023
Original PR: tgstation/tgstation#78797
-----
AI dogs with the dog controller behaviour will flee from a target with
tongs in hand.

Untested because I literally cannot play byond.

## Why It's Good For The Game
https://www.youtube.com/watch?v=cXIAZtwvgz0

## Changelog
:cl: oranges
add: Dogs now react to centrist grillers more realistically
/:cl:

---------

Co-authored-by: oranges <email@oranges.net.nz>
Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>
dwasint pushed a commit to dwasint/Monkestation2.0 that referenced this pull request Nov 19, 2023
AI dogs with the dog controller behaviour will flee from a target with
tongs in hand.

Untested because I literally cannot play byond.

## Why It's Good For The Game
https://www.youtube.com/watch?v=cXIAZtwvgz0

## Changelog
:cl: oranges
add: Dogs now react to centrist grillers more realistically
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Exposes new bugs in interesting ways
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants