Browse Source

quick capture fix

Taislin 6 months ago
parent
commit
4382a792a9

+ 1 - 1
Content.Server/GameTicking/GameTicker.Spawning.cs

@@ -161,7 +161,7 @@ private List<EntityUid> GetSpawnableStations()
                         if (_gameTiming.CurTime < time)
                         {
                             _chatManager.DispatchServerMessage(player,
-                                Loc.GetString("rule-respawn-blocked", ("seconds", time.TotalSeconds - _gameTiming.CurTime.TotalSeconds)));
+                                Loc.GetString("rule-respawn-blocked", ("seconds", Math.Ceiling(time.TotalSeconds - _gameTiming.CurTime.TotalSeconds))));
                             return;
                         }
                     }

+ 1 - 1
Resources/Maps/civ/tdm/camp_ww2.yml

@@ -10526,7 +10526,7 @@ entities:
     - type: Transform
       pos: 100.5,15.5
       parent: 2
-- proto: MarkerKOTHCamp
+- proto: MarkerKOTHCampWW2
   entities:
   - uid: 3554
     components:

+ 17 - 1
Resources/Prototypes/Civ14/Entities/Markers/capturable_areas.yml

@@ -28,6 +28,22 @@
         - England
         - France
 
+- type: entity
+  name: capturable area - KOTH Camp WW2
+  id: MarkerKOTHCampWW2
+  parent: MarkerCapturableArea
+  components:
+    - type: Sprite
+      sprite: Civ14/Markers/areas.rsi
+      state: capture_green
+    - type: CaptureArea
+      name: "the Castle"
+      captureDuration: 240 # 4 min
+      captureRadius: 6
+      capturableFactions:
+        - Soviet
+        - Germany
+
 - type: entity
   name: capturable area - KOTH Opushka
   id: MarkerKOTHOpushka
@@ -42,4 +58,4 @@
       captureRadius: 3
       capturableFactions:
         - Soviet
-        - Germany       
+        - Germany