From e9f0b869ee7ad1216d8400ebfbe847948d16f19c Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Tue, 24 Sep 2024 07:15:17 +0000 Subject: [PATCH] make cats attack mouse toy (#1877) * make cats attack mouse toy * make toy mouse bit work * pro * pro --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Prototypes/DeltaV/ai_factions.yml | 5 +++++ Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 6 ++++++ Resources/Prototypes/Entities/Mobs/NPCs/pets.yml | 2 ++ Resources/Prototypes/Entities/Objects/Fun/toys.yml | 11 +++++++++++ 4 files changed, 24 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/ai_factions.yml diff --git a/Resources/Prototypes/DeltaV/ai_factions.yml b/Resources/Prototypes/DeltaV/ai_factions.yml new file mode 100644 index 00000000000..783fc9d9889 --- /dev/null +++ b/Resources/Prototypes/DeltaV/ai_factions.yml @@ -0,0 +1,5 @@ +- type: npcFaction + id: Cat + hostile: + - Mouse + - SimpleHostile diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index e7d9f6f6364..8be302a5e2c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2867,6 +2867,12 @@ - type: Tag tags: - VimPilot + - type: HTN # DeltaV - make all cats eat mice + rootTask: + task: SimpleHostileCompound + - type: NpcFactionMember # DeltaV - give cats faction so they fight mice + factions: + - Cat - type: entity name: calico cat diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 3fe80c75c56..7733f0a4be6 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -135,6 +135,7 @@ - type: NpcFactionMember factions: - PetsNT + - Cat # DeltaV - type: HTN rootTask: task: SimpleHostileCompound @@ -158,6 +159,7 @@ - type: NpcFactionMember factions: - PetsNT + - Cat # DeltaV - type: Grammar attributes: proper: true diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 476f3e6cdfa..65ba53fcccf 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -666,6 +666,17 @@ equippedPrefix: mouse slots: - HEAD + # Begin DeltaV additions: make cats attack mouse toys to play with them + - type: Damageable + damageContainer: StructuralInorganic # not actually destructible, just lets it be attacked + - type: MobState + - type: MobThresholds + thresholds: + 0: Alive # always be considered alive + - type: NpcFactionMember + factions: + - Mouse + # End DeltaV additions - type: entity parent: BasePlushie