From 93c4e6068f7992c61c9dff9ea089004c592913f8 Mon Sep 17 00:00:00 2001
From: Nim <128169402+Nimfar11@users.noreply.github.com>
Date: Sun, 12 Jan 2025 16:00:35 +0200
Subject: [PATCH] Balance and fixes (#733)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* issue

* mosquitoes

* 👽
---
 Resources/Prototypes/_CP14/Damage/modifier_sets.yml  | 12 ++++++------
 .../Prototypes/_CP14/Entities/Mobs/NPC/monster.yml   |  2 +-
 .../Prototypes/_CP14/Entities/Mobs/Species/elf.yml   | 10 +++++-----
 .../_CP14/Entities/Mobs/Species/goblin.yml           |  8 ++++++++
 .../_CP14/Entities/Structures/dungeon_entrance.yml   |  4 ++--
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/Resources/Prototypes/_CP14/Damage/modifier_sets.yml b/Resources/Prototypes/_CP14/Damage/modifier_sets.yml
index b25c3845fd..626e41d6be 100644
--- a/Resources/Prototypes/_CP14/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/_CP14/Damage/modifier_sets.yml
@@ -57,11 +57,11 @@
 - type: damageModifierSet
   id: CP14Goblin
   coefficients:
-    Blunt: 1.5
-    Slash: 1.5
-    Piercing: 1.5
-    Heat: 1.5
-    Cold: 1.5
-    Shock: 1.5
+    Blunt: 1.25
+    Slash: 1.25
+    Piercing: 1.25
+    Heat: 1.25
+    Cold: 1.25
+    Shock: 1.25
     Poison: 0.5
     Caustic: 0.5
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/monster.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/monster.yml
index 64c9798dcd..8fae72809d 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/monster.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/monster.yml
@@ -170,7 +170,7 @@
       fix1:
         shape:
           !type:PhysShapeCircle
-          radius: 0.70
+          radius: 0.45
         density: 5
         mask:
         - FlyingMobMask
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml
index 5f4cbc301c..0f9445add8 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml
@@ -21,12 +21,12 @@
     requiredLegs: 2
   - type: Bloodstream
     bloodReagent: CP14BloodElf
-  - type: CP14MagicEnergyContainer #BIG mana container
-    maxEnergy: 500
-    energy: 250
-  - type: CP14MagicEnergyDraw #No passive mana regen
+  - type: CP14MagicEnergyContainer #Increased mana container
+    maxEnergy: 200
+    energy: 200
+  - type: CP14MagicEnergyDraw #Half of standard mana regeneration
     energy: 0.5
-    delay: 10
+    delay: 3
   - type: CP14SpellStorage
     grantAccessToSelf: true
     spells:
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml
index 7e632b4886..5b8d0c4c4e 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml
@@ -41,6 +41,14 @@
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: CP14Goblin #+25% all damage, -50% poison
+  - type: PassiveDamage
+    allowedStates:
+    - Alive
+    damageCap: 80
+    damage:
+      groups:
+        Burn: -0.2
+        Brute: -0.2
   - type: Stamina
     decay: 5 # 3 default
     critThreshold: 120 # 100 default
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/dungeon_entrance.yml b/Resources/Prototypes/_CP14/Entities/Structures/dungeon_entrance.yml
index d6f8bf0756..4ee05dbb35 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/dungeon_entrance.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/dungeon_entrance.yml
@@ -138,7 +138,7 @@
     otherSideProto: CP14LaddersDownWood
 
 
-# Wood
+# Marble
 - type: entity
   parent: CP14LaddersDownBase
   id: CP14LaddersDownMarble
@@ -166,7 +166,7 @@
     otherSideProto: CP14LaddersUpMarble
 
 - type: entity
-  parent: CP14LaddersUpWood
+  parent: CP14LaddersUpMarble
   id: CP14LaddersUpMarbleAutoLink
   suffix: Marble
   components: