Merge pull request AdventureTimeSS14#423 from PyotrIgn/zombie_nerf

Нерф зомби
Ratyyy · Feb 20, 2024 · 9ba8bf5 · 9ba8bf5
2 parents 6cf8f2b + d9a70bb
commit 9ba8bf5
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 24 deletions.
diff --git a/Content.Server/Ame/AmeNodeGroup.cs b/Content.Server/Ame/AmeNodeGroup.cs
@@ -181,7 +181,7 @@ public float CalculatePower(int fuel, int cores)
         // Fuel is squared so more fuel vastly increases power and efficiency
         // We divide by the number of cores so a larger AME is less efficient at the same fuel settings
         // this results in all AMEs having the same efficiency at the same fuel-per-core setting
-        return 40000f * fuel * fuel / cores;
+        return 80000f * fuel * fuel / cores;
     }
 
     public int GetTotalStability()

diff --git a/Content.Shared/Zombies/ZombieComponent.cs b/Content.Shared/Zombies/ZombieComponent.cs
@@ -30,7 +30,7 @@ public sealed partial class ZombieComponent : Component, IAntagStatusIconCompone
     public float MinZombieInfectionChance = 0.20f;
 
     [ViewVariables(VVAccess.ReadWrite)]
-    public float ZombieMovementSpeedDebuff = 1.0f;
+    public float ZombieMovementSpeedDebuff = 0.9f;
 
     /// <summary>
     /// The skin color of the zombie
@@ -108,18 +108,18 @@ public sealed partial class ZombieComponent : Component, IAntagStatusIconCompone
     {
         DamageDict = new ()
         {
-            { "Blunt", -1.5 },
-            { "Slash", -1.5 },
-            { "Heat", -1 },
-            { "Piercing", -1.5 }
+            { "Blunt", -0.8 },
+            { "Slash", -0.6 },
+            { "Heat", -0.6 },
+            { "Piercing", -0.6 }
         }
     };
 
     /// <summary>
     /// A multiplier applied to <see cref="PassiveHealing"/> when the entity is in critical condition.
     /// </summary>
     [DataField("passiveHealingCritMultiplier")]
-    public float PassiveHealingCritMultiplier = 5f;
+    public float PassiveHealingCritMultiplier = 3f;
 
     /// <summary>
     /// Healing given when a zombie bites a living being.
@@ -129,10 +129,10 @@ public sealed partial class ZombieComponent : Component, IAntagStatusIconCompone
     {
         DamageDict = new()
         {
-            { "Blunt", -8 },
-            { "Slash", -8 },
-            { "Heat", -4 },
-            { "Piercing", -8 }
+            { "Blunt", -4 },
+            { "Slash", -4 },
+            { "Heat", -2 },
+            { "Piercing", -4 }
         }
     };
 

diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -1275,3 +1275,17 @@ Entries:
   - {message: "Добавлено огромное кол-во респрайтов шлемов скафов, масок, защитных костюмов под вульп.", type: Add}
   id: 55687 #костыль отображения в Обновлениях
   time: '2024-02-19T08:20:00.0000000+00:00'
+
+- author: Xelasto
+  changes:
+  - {message: "Добавлен внутриигровой ивент с торговцами.", type: Add}
+  id: 55688 #костыль отображения в Обновлениях
+  time: '2024-02-20T20:20:00.0000000+00:00'
+
+- author: Петр Игнатьевич
+  changes:
+  - {message: "Параметры регенерации зомби уменьшены.", type: Tweak}
+  - {message: "Скорость зомби теперь составляет 90% от прижизненной.", type: Tweak}
+  - {message: "Бойцы РХБЗЗ получили обновление снаряжения.", type: Tweak}
+  id: 55690 #костыль отображения в Обновлениях
+  time: '2024-02-20T20:20:00.0000000+00:00'
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -15,21 +15,29 @@
 
 - type: entity
   id: ClothingBackpackDuffelCBURN
-  parent: ClothingBackpackDuffel
+  parent: ClothingBackpackERTSecurity
   name: CBURN duffel bag
   description: A duffel bag containing a variety of biological containment equipment.
   components:
   - type: StorageFill
     contents:
       - id: WeaponShotgunEnforcer
       - id: BoxShotgunIncendiary
-        amount: 3
-      - id: GrenadeFlashBang
+        amount: 2
+      - id: BoxLethalshot
+        amount: 2
       - id: GrenadeFlashBang
         amount: 2
       - id: PillAmbuzolPlus
       - id: PillAmbuzol
         amount: 4
+      - id: AntiPoisonMedipen
+        amount: 2
+      - id: BruteAutoInjector
+        amount: 2
+      - id: BurnAutoInjector
+        amount: 2
+      - id: JawsOfLife
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateMedicalBundle

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -974,12 +974,12 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.4
-        Slash: 0.4
+        Blunt: 0.3
+        Slash: 0.3
         Piercing: 0.5
-        Heat: 0.1
-        Cold: 0.1
-        Shock: 0.1
+        Heat: 0.2
+        Cold: 0.2
+        Shock: 0.2
         Radiation: 0.1
         Caustic: 0.1
         Stun: 0.6

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -787,6 +787,10 @@
     accentVColor: "#447987"
   - type: Icon
     state: pda-ert
+  - type: HealthAnalyzer
+    scanDelay: 1
+    scanningEndSound:
+      path: "/Audio/Items/Medical/healthscanner.ogg"
 
 - type: entity
   parent: ERTLeaderPDA

diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -260,7 +260,7 @@
     shoes: ADTClothingShoesBootsMagERT
     id: CBURNPDA
     pocket1: RadioHandheld
-    pocket2: WeaponLaserGun
+    pocket2: WeaponPulsePistol
     suitstorage: OxygenTankFilled
     belt: ClothingBeltBandolier
     underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear

diff --git a/Resources/Prototypes/secret_weights.yml b/Resources/Prototypes/secret_weights.yml
@@ -2,8 +2,8 @@
   id: Secret
   weights:
     Nukeops: 0.15
-    Traitor: 0.4
-    Zombie: 0.15
-    Survival: 0.15
+    Traitor: 0.55
+    Zombie: 0.10
+    Survival: 0.10
     #Extended: 0.05 # Corvax-MRP
-    Revolutionary: 0.15
+    Revolutionary: 0.10