From ad7e8bea56d23271e52a367792b63f25aa2488ed Mon Sep 17 00:00:00 2001
From: Kit <nikkiestes0@gmail.com>
Date: Tue, 7 Oct 2025 05:14:43 -0400
Subject: [PATCH] various changes part 3 or smth (#1825)

* yippie

* minor spelling error

* refix
---
 .../_CP14/Entities/Actions/Spells/Lurker/Fear.yml     |  3 ++-
 .../Entities/Actions/Spells/Vampire/hypnosys.yml      |  8 +++++---
 .../Prototypes/_CP14/Entities/Mobs/NPC/bone_hound.yml | 11 +++++++++++
 .../_CP14/Entities/Mobs/Species/skeleton.yml          | 11 +++++++++++
 .../Prototypes/_CP14/Loadouts/Jobs/adventure.yml      |  2 +-
 .../Procedural/Demiplane/Modifiers/Danger/mobs.yml    |  4 ++--
 Resources/Prototypes/_CP14/ai_factions.yml            |  4 ----
 7 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml
index 945d2a74b3..e635227457 100644
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml
@@ -17,9 +17,10 @@
     range: 15
     interactOnMiss: false
   - type: DoAfterArgs
-    delay: 1.5
+    delay: 1
     hidden: true
     breakOnDamage: true
+    repeat: true
   - type: EntityTargetAction
     canTargetSelf: false
     whitelist:
diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/hypnosys.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/hypnosys.yml
index 584cfd85c7..c3cb0e24b3 100644
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/hypnosys.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/hypnosys.yml
@@ -1,19 +1,21 @@
 - type: entity
   id: CP14ActionSpellVampireHypnosys
   parent: CP14ActionSpellBase
-  name: Hypnosys
+  name: Hypnosis
   description: You focus on the target, mesmerizing and lulling it to sleep.
   components:
   - type: CP14ActionDoAfterSlowdown
     speedMultiplier: 0.4
   - type: CP14MagicEffectVampire
   - type: CP14ActionManaCost
-    manaCost: 5
+    manaCost: 2.5
   - type: CP14ActionDoAfterVisuals
     proto: CP14RuneVampireHypnosis
   - type: DoAfterArgs
-    delay: 3
+    delay: 1
     breakOnMove: true
+    breakOnDamage: true
+    repeat: true
   - type: Action
     useDelay: 120
     icon:
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/bone_hound.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/bone_hound.yml
index 29c0ea017f..0f43e85aa8 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/bone_hound.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/bone_hound.yml
@@ -53,6 +53,17 @@
   - type: SlowOnDamage
     speedModifierThresholds:
       40: 0.8
+  - type: PassiveDamage
+    allowedStates:
+    - Alive
+    damageCap: 40
+    damage:
+      types:
+        CP14ManaDepletion: -0.05
+      groups:
+        Brute: -0.07
+        Burn: -0.05
+        Toxin: -0.03
   - type: CombatMode
   - type: MeleeWeapon
     angle: 0
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml
index 9b6e1d0c18..bb2e394064 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml
@@ -76,6 +76,17 @@
     speedModifierThresholds:
       70: 0.7
       90: 0.5
+  - type: PassiveDamage
+    allowedStates:
+    - Alive
+    damageCap: 80
+    damage:
+      types:
+        CP14ManaDepletion: -0.05
+      groups:
+        Brute: -0.07
+        Burn: -0.05
+        Toxin: -0.03
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml
index d1e8636c75..e99264e904 100644
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml
@@ -43,7 +43,7 @@
   id: CP14WeaponSkimitarIron
   dummyEntity: CP14WeaponSkimitarIron
   equipment:
-    neck: CP14WeaponShieldBuckler
+    neck: CP14WeaponSkimitarIron
   inhand:
     - CP14WeaponSkimitarIron
 
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
index cae3e99e8f..9671ba33e5 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
@@ -436,8 +436,8 @@
   - !type:CP14OreDunGen
     entity: CP14MobSpiderBlackHunter
     count: 12
-    minGroupSize: 2
-    maxGroupSize: 5
+    minGroupSize: 4
+    maxGroupSize: 7
   - !type:CP14OreDunGen
     entity: CP14WebCocoon
     count: 15
diff --git a/Resources/Prototypes/_CP14/ai_factions.yml b/Resources/Prototypes/_CP14/ai_factions.yml
index adf4399b1f..8861e58e3c 100644
--- a/Resources/Prototypes/_CP14/ai_factions.yml
+++ b/Resources/Prototypes/_CP14/ai_factions.yml
@@ -67,7 +67,6 @@
   - CP14Adventurers
   - CP14HostileEveryone
   - CP14AggressiveAnimals
-  - CP14PeacefulAnimals
   - CP14Cat
   - CP14Rodent
 
@@ -76,7 +75,6 @@
   hostile:
   - CP14Adventurers
   - CP14AggressiveAnimals
-  - CP14PeacefulAnimals
   - CP14Fishies
 
 - type: npcFaction
@@ -84,7 +82,6 @@
   hostile:
   - CP14Adventurers
   - CP14HostileEveryone
-  - CP14PeacefulAnimals
   - CP14AggressiveAnimals
   - CP14Cat
   - CP14Rodent
@@ -94,7 +91,6 @@
   hostile:
   - CP14Adventurers
   - CP14HostileEveryone
-  - CP14PeacefulAnimals
   - CP14AggressiveAnimals
   - CP14Insects
   - CP14Undead