dragons despawn in 10 minutes

DeltaV-Station · Feb 22, 2025 · 72a972f · 72a972f
1 parent 294b3ef
commit 72a972f
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 11 deletions.
diff --git a/Content.Server/Dragon/Components/DragonComponent.cs b/Content.Server/Dragon/Components/DragonComponent.cs
@@ -21,7 +21,7 @@ public sealed partial class DragonComponent : Component
         /// When any rift is destroyed how long is the dragon weakened for
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite), DataField("weakenedDuration")]
-        public float WeakenedDuration = 120f;
+        public float WeakenedDuration = 60f; // DeltaV - buff dragon
 
         /// <summary>
         /// Has a rift been destroyed and the dragon in a temporary weakened state?
@@ -35,7 +35,7 @@ public sealed partial class DragonComponent : Component
         /// <summary>
         /// Maximum time the dragon can go without spawning a rift before they die.
         /// </summary>
-        [ViewVariables(VVAccess.ReadWrite), DataField("maxAccumulator")] public float RiftMaxAccumulator = 300f;
+        [ViewVariables(VVAccess.ReadWrite), DataField("maxAccumulator")] public float RiftMaxAccumulator = 600f; // DeltaV - 10 mins to die
 
         [DataField("spawnRiftAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string SpawnRiftAction = "ActionSpawnRift";

diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
@@ -97,13 +97,19 @@ public override void Update(float frameTime)
             if (!_mobState.IsDead(uid))
                 comp.RiftAccumulator += frameTime;
 
-            /* DeltaV - Dragons can stay alive
-            // Delete it, naughty dragon!
-            if (comp.RiftAccumulator >= comp.RiftMaxAccumulator)
+          	// DeltaV - begin Dragon changes
+            if (comp.RiftAccumulator = .5 * comp.RiftMaxAccumulator) // dragon has half the time left
             {
                 Roar(uid, comp);
-                QueueDel(uid);
-            }*/
+				_popup.PopupEntity(Loc.GetString("deltav-dragon-halftime-popup"), uid, uid);
+			}
+
+            if (comp.RiftAccumulator >= comp.RiftMaxAccumulator)  // dragon is out of time
+            {
+                Roar(uid, comp);
+                Damageable.TryChangeDamage(uid, new DamageSpecifier(DamageType.Blunt, 400)); // gib time
+            }
+			// DeltaV - end Dragon changes
         }
     }
 

diff --git a/Resources/Locale/en-US/_DV/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_DV/ghost/roles/ghost-role-component.ftl
@@ -61,4 +61,4 @@ deltav-ghost-role-information-salvageantag-rules =  You are a salvage mob.
                                                     You are allowed to attack the salvage shuttle.
                                                     You are NOT allowed to go to the station. If the salvagers go to the station, you can't follow them.
 
-deltav-ghost-role-information-space-dragon-description = Call in 3 carp rifts and take over this quadrant!
+deltav-ghost-role-information-space-dragon-description = Call in 3 carp rifts and take over this quadrant! You must place a rift every 10 minutes or suffer the consequences!
diff --git a/Resources/Locale/en-US/_DV/objectives/conditions/carp-rifts.ftl b/Resources/Locale/en-US/_DV/objectives/conditions/carp-rifts.ftl
@@ -1 +1,2 @@
-deltav-objective-carp-rifts-description = Use the rift action to open {$count} rifts and ensure they do not get destroyed.
+deltav-objective-carp-rifts-description = Use the rift action to open {$count} rifts and ensure they do not get destroyed. You must place one every 10 minutes until you have three!
+deltav-dragon-halftime-popup = You only have five minutes left to place a rift!
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -167,7 +167,7 @@
   components:
   - type: GhostRole
     name: ghost-role-information-space-dragon-name
-    description: deltav-ghost-role-information-space-dragon-description # DeltaV - Dragons do not despawn
+    description: deltav-ghost-role-information-space-dragon-description # DeltaV - Dragons despawn in 10 mins
     rules: ghost-role-information-space-dragon-rules
     mindRoles:
     - MindRoleGhostRoleTeamAntagonist

diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -15,7 +15,7 @@
     allowSpeech: true
     makeSentient: true
     name: ghost-role-information-space-dragon-name
-    description: deltav-ghost-role-information-space-dragon-description # DeltaV - Dragons do not despawn
+    description: deltav-ghost-role-information-space-dragon-description # DeltaV - Dragons despawn in 10 minutes
     rules: ghost-role-information-space-dragon-rules
     mindRoles:
     - MindRoleGhostRoleTeamAntagonist

diff --git a/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml b/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
@@ -50,6 +50,8 @@
   - Your [color=orange][italic]Dragon's Breath[/italic][/color] is a [bold]flaming projectile[/bold] which travels a straight flight path, exploding multiple times and igniting things along the way. Try not to hit your carps with this!
   - You have the ability to [color=#4b7fcc][italic]Summon a Carp Rift[/italic][/color]. Rifts periodically spawn [bold]space carp[/bold] and charge up energy over a period of 5 minutes, [bold]which is when it's vulnerable.[/bold] After 5 minutes, it becomes invulnerable and will continue summoning carp as long as the dragon lives.
   - You'll suffer a [bold]temporary debilitating feedback effect[/bold] if one of your rifts are destroyed before it's done charging.
+  - If a period of ten minutes passes since your spawn or since the last time a rift was charging, [bold]you'll die.[/bold]
+  - Dragons who have the maximum of 3 fully charged rifts will [bold]never disappear[/bold], but they are still mortal.
 
   # Slimes and Spiders