Add survive objective and fixes

SerbiaStrong-220 · Sep 14, 2024 · 67697fd · 67697fd
1 parent 81af714
commit 67697fd
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 2 deletions.
diff --git a/Content.Shared/SS220/SpiderQueen/Components/SpiderQueenComponent.cs b/Content.Shared/SS220/SpiderQueen/Components/SpiderQueenComponent.cs
@@ -24,7 +24,7 @@ public sealed partial class SpiderQueenComponent : Component
     /// How much mana will be generated in a second
     /// </summary>
     [DataField]
-    public FixedPoint2 PassiveGeneration = 0.5f;
+    public FixedPoint2 PassiveGeneration = FixedPoint2.New(0.5);
 
     [ViewVariables]
     public TimeSpan NextSecond = TimeSpan.Zero;
@@ -51,5 +51,11 @@ public sealed partial class SpiderQueenComponent : Component
     /// Coefficient that indicating how much the bonus from each subsequent cocoon will decrease
     /// </summary>
     [DataField]
-    public FixedPoint2 CocoonsBonusCoefficient = 1f;
+    public FixedPoint2 CocoonsBonusCoefficient = FixedPoint2.New(1);
+
+    /// <summary>
+    /// The minimum distance between cocoons for their spawn
+    /// </summary>
+    [DataField]
+    public float CocoonsMinDistance = 0.5f;
 }
diff --git a/Content.Shared/SS220/SpiderQueen/Systems/SharedSpiderQueenSystem.cs b/Content.Shared/SS220/SpiderQueen/Systems/SharedSpiderQueenSystem.cs
@@ -19,6 +19,7 @@ public abstract class SharedSpiderQueenSystem : EntitySystem
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
 
     public override void Initialize()
     {
@@ -65,6 +66,15 @@ private void OnCocooningAction(Entity<SpiderQueenComponent> entity, ref SpiderCo
         var performer = args.Performer;
         var target = args.Target;
 
+        foreach (var entityInRange in _entityLookup.GetEntitiesInRange(target, entity.Comp.CocoonsMinDistance))
+        {
+            if (!HasComp<SpiderCocoonComponent>(entityInRange))
+                continue;
+
+            _popup.PopupEntity(Loc.GetString("cocooning-too-close"), performer, performer);
+            return;
+        }
+
         if (!_mobState.IsDead(target))
         {
             _popup.PopupEntity(Loc.GetString("cocooning-target-not-dead"), performer, performer);

diff --git a/.../objectives/conditions/create-cocoons.ftl → ...e/ru-RU/ss220/objectives/spider-queen.ftl b/.../objectives/conditions/create-cocoons.ftl → ...e/ru-RU/ss220/objectives/spider-queen.ftl
@@ -1,3 +1,10 @@
+ent-BaseSpiderQueenObjective = { ent-BaseObjective }
+    .desc = { ent-BaseObjective.desc }
+ent-CreateCocoonsObjective= { ent-BaseSpiderQueenObjective }
+    .desc = { ent-BaseSpiderQueenObjective.desc }
+ent-SpiderQueenSurviveObjective = Выжить
+    .desc = Вы должны оставаться в живых, чтобы сохранять контроль.
+
 objective-create-cocoons-title =
     Создать { $count } { $count ->
         [one] кокон

diff --git a/Resources/Locale/ru-RU/ss220/spider-queen/spider-queen.ftl b/Resources/Locale/ru-RU/ss220/spider-queen/spider-queen.ftl
@@ -1,6 +1,7 @@
 spider-queen-mana-amount = У вас [color=yellow]{ $current } маны[/color]. Ваш максимум — [color=yellow]{ $max } маны[/color].
 spider-queen-not-enough-mana = Недостаточно маны
 
+cocooning-too-close = Слишком близко к другому кокону
 cocooning-target-not-dead = Цель должна быть мертва
 cocooning-target-not-humanoid = Цель должна быть гуманоидом
 

diff --git a/Resources/Prototypes/SS220/GameRules/midround_antags.yml b/Resources/Prototypes/SS220/GameRules/midround_antags.yml
@@ -54,6 +54,7 @@
   - type: AntagObjectives
     objectives:
     - CreateCocoonsObjective
+    - SpiderQueenSurviveObjective
   - type: AntagSelection
     definitions:
     - prefRoles: [ SpiderQueen ]

diff --git a/Resources/Prototypes/SS220/Objectives/spider_queen.yml b/Resources/Prototypes/SS220/Objectives/spider_queen.yml
@@ -26,3 +26,14 @@
     title: objective-create-cocoons-title
     description: objective-create-cocoons-description
   - type: CreateCocoonsCondition
+
+- type: entity
+  parent: [BaseSpiderQueenObjective, BaseSurviveObjective]
+  id: SpiderQueenSurviveObjective
+  name: Survive
+  description: You have to stay alive to maintain control.
+  components:
+  - type: Objective
+    icon:
+      sprite: Mobs/Animals/spider.rsi
+      state: midwife