From 02cfcd620cd3b28fb07b3c39fc93f1b209bf0d11 Mon Sep 17 00:00:00 2001
From: Nim <128169402+Nimfar11@users.noreply.github.com>
Date: Wed, 15 Jan 2025 16:34:38 +0200
Subject: [PATCH] Inter-Monster tolerance (#761)

* Insects ai

* monster
---
 .../Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml |  2 +-
 .../Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml  |  2 +-
 .../Prototypes/_CP14/Entities/Mobs/NPC/xeno_test.yml | 12 ++++++------
 .../Prototypes/_CP14/Entities/Mobs/NPC/zombie.yml    |  2 +-
 Resources/Prototypes/_CP14/ai_factions.yml           |  8 ++++++++
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml
index 9cb2ee1413..3426db1b5e 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml
@@ -6,7 +6,7 @@
   components:
   - type: NpcFactionMember
     factions:
-    - CP14AggressiveAnimals
+    - CP14Monster
   - type: Sprite
     drawdepth: Mobs
   - type: ReplacementAccent
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml
index f96cf6c5fc..9cbf47660e 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml
@@ -7,7 +7,7 @@
   components:
   - type: NpcFactionMember
     factions:
-    - CP14Undead
+    - CP14Monster
   - type: Loadout
     prototypes: 
     - CP14MobSkeleton
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/xeno_test.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/xeno_test.yml
index 0f321b32bb..30eb20cfc0 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/xeno_test.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/xeno_test.yml
@@ -5,7 +5,7 @@
   components:
   - type: NpcFactionMember
     factions:
-    - CP14HostileEveryone
+    - CP14Monster
 
 - type: entity
   id: CP14MobXenoDrone
@@ -14,7 +14,7 @@
   components:
   - type: NpcFactionMember
     factions:
-    - CP14HostileEveryone
+    - CP14Monster
 
 - type: entity
   id: CP14MobSpaceCobra
@@ -24,7 +24,7 @@
   components:
   - type: NpcFactionMember
     factions:
-    - CP14HostileEveryone
+    - CP14Monster
   - type: MeleeChemicalInjector
     transferAmount: 2
   - type: MeleeWeapon
@@ -45,7 +45,7 @@
   components:
   - type: NpcFactionMember
     factions:
-    - CP14HostileEveryone
+    - CP14Monster
   - type: MeleeWeapon
     angle: 0
     animation: WeaponArcBite
@@ -62,7 +62,7 @@
   components:
   - type: NpcFactionMember
     factions:
-    - CP14HostileEveryone
+    - CP14Monster
   - type: SolutionTransfer
     maxTransferAmount: 0.2
   - type: MeleeWeapon
@@ -81,4 +81,4 @@
   components:
   - type: NpcFactionMember
     factions:
-    - CP14HostileEveryone
+    - CP14Monster
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/zombie.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/zombie.yml
index d41870d0b8..3f5af7a2c0 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/zombie.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/zombie.yml
@@ -15,7 +15,7 @@
         true
   - type: NpcFactionMember
     factions:
-    - CP14Undead
+    - CP14Monster
 
 - type: entity
   id: CP14MobUndeadZombieGearEasy1
diff --git a/Resources/Prototypes/_CP14/ai_factions.yml b/Resources/Prototypes/_CP14/ai_factions.yml
index 65b0419a26..d77b6ca2b5 100644
--- a/Resources/Prototypes/_CP14/ai_factions.yml
+++ b/Resources/Prototypes/_CP14/ai_factions.yml
@@ -5,6 +5,7 @@
   - CP14Undead
   - CP14HostileEveryone
   - CP14Monster
+  - CP14Insects
 
 - type: npcFaction
   id: CP14HostileEveryone
@@ -41,3 +42,10 @@
   - CP14HostileEveryone
   - CP14AggressiveAnimals
   - CP14PeacefulAnimals
+
+- type: npcFaction
+  id: CP14Insects
+  hostile:
+  - CP14Adventurers
+  - CP14AggressiveAnimals
+  - CP14PeacefulAnimals