From d857bfeca464a853169f7cdce800894b744b6785 Mon Sep 17 00:00:00 2001
From: iertis <kanopus952@gmail.com>
Date: Sat, 2 Nov 2024 20:27:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D1=80=D1=84=20=D0=B4=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dragon/Components/DragonRiftComponent.cs  |  4 ++--
 .../Entities/Mobs/Player/dragon.yml           |  6 +++--
 .../Entities/Structures/Specific/dragon.yml   | 24 ++++++++++++-------
 .../Prototypes/_Sunrise/Damage/containers.yml |  5 ++++
 .../_Sunrise/Damage/modifier_sets.yml         |  9 ++++++-
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/Content.Server/Dragon/Components/DragonRiftComponent.cs b/Content.Server/Dragon/Components/DragonRiftComponent.cs
index f01c35cbbb0..fa49b1f1f18 100644
--- a/Content.Server/Dragon/Components/DragonRiftComponent.cs
+++ b/Content.Server/Dragon/Components/DragonRiftComponent.cs
@@ -21,7 +21,7 @@ public sealed partial class DragonRiftComponent : SharedDragonRiftComponent
     /// <summary>
     /// The maximum amount we can accumulate before becoming impervious.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("maxAccumuluator")] public float MaxAccumulator = 200f;
+    [ViewVariables(VVAccess.ReadWrite), DataField("maxAccumuluator")] public float MaxAccumulator = 300f;
 
     /// <summary>
     /// Accumulation of the spawn timer.
@@ -33,7 +33,7 @@ public sealed partial class DragonRiftComponent : SharedDragonRiftComponent
     /// How long it takes for a new spawn to be added.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("spawnCooldown")]
-    public float SpawnCooldown = 20f;
+    public float SpawnCooldown = 30f;
 
     [ViewVariables(VVAccess.ReadWrite), DataField("spawn", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
     public string SpawnPrototype = "MobCarpDragon";
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index 3517be67f73..1792fd842c5 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -133,8 +133,8 @@
       path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
     damage:
       types:
-        Piercing: 25 #Sunrise-edit
-        Slash: 25 #Sunrise-edit
+        Piercing: 15
+        Slash: 15
   - type: Devourer
     foodPreference: Humanoid
     shouldStoreDevoured: true
@@ -165,6 +165,8 @@
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Dragon
+  - type: TTS
+    voice: HearthstoneLordOfThunder
   # Sunrise-End
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Specific/dragon.yml b/Resources/Prototypes/Entities/Structures/Specific/dragon.yml
index bc475341185..1a7d71e58ad 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/dragon.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/dragon.yml
@@ -10,8 +10,20 @@
     anchored: true
   - type: Physics
     bodyType: Static
-    canCollide: false
+    canCollide: true #Sunrise-edit
   - type: Fixtures
+#Sunrise-start
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.48,0.25,0.48"
+        density: 75
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+#Sunrise-end
   - type: Sprite
     layers:
     - sprite: Structures/Specific/carp_rift.rsi
@@ -32,8 +44,8 @@
     # only show after making the announcement at 50%
     enabled: false
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: Rift #Sunrise-edit
+    damageModifierSet: Rift #Sunrise-edit
   - type: Destructible
     thresholds:
     - trigger:
@@ -46,9 +58,5 @@
     sound:
       path: /Audio/Weapons/Guns/Gunshots/rocket_launcher.ogg
 #Sunrise-start
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.70
-        Slash: 0.70
+  - type: DamageOverlay
 #Sunrise-end
diff --git a/Resources/Prototypes/_Sunrise/Damage/containers.yml b/Resources/Prototypes/_Sunrise/Damage/containers.yml
index ec3ca0e8a61..025f2da6cc4 100644
--- a/Resources/Prototypes/_Sunrise/Damage/containers.yml
+++ b/Resources/Prototypes/_Sunrise/Damage/containers.yml
@@ -15,3 +15,8 @@
   - Heat
   - Shock
   - Caustic
+
+- type: damageContainer
+  id: Rift
+  supportedGroups:
+  - Brute
diff --git a/Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml b/Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml
index 3e2cf07e6c3..b53b9144d77 100644
--- a/Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml
@@ -42,4 +42,11 @@
     Blunt: 0.8
     Slash: 0.8
     Piercing: 0.8
-    Heat: 0.3
+    Heat: 0.6
+
+- type: damageModifierSet
+  id: Rift
+  coefficients:
+    Blunt: 0.6
+    Slash: 0.6
+    Piercing: 0.6