some balance tweaks

SerbiaStrong-220 · Jan 11, 2025 · 6288554 · 6288554
1 parent dfa8f5d
commit 6288554
Show file tree

Hide file tree

Showing 11 changed files with 111 additions and 108 deletions.
diff --git a/Content.Server/SS220/FractWar/FractWarRuleSystem.cs b/Content.Server/SS220/FractWar/FractWarRuleSystem.cs
@@ -26,13 +26,19 @@ protected override void AppendRoundEndText(EntityUid uid, FractWarRuleComponent
             }
         }
 
+        if (fractionsWinPoints.Count <= 0)
+            return;
+
+        fractionsWinPoints = fractionsWinPoints.OrderByDescending(pair => pair.Value).ToDictionary(pair => pair.Key, pair => pair.Value);
+
+        args.AddLine("");
         foreach (var (fraction, winPoints) in fractionsWinPoints)
         {
             args.AddLine(Loc.GetString("fractwar-round-end-fraction-points", ("fraction", Loc.GetString(fraction)), ("points", (int)winPoints)));
         }
 
         //Sort by value
-        fractionsWinPoints = fractionsWinPoints.OrderByDescending(pair => pair.Value).ToDictionary(pair => pair.Key, pair => pair.Value);
+        args.AddLine("");
         args.AddLine(Loc.GetString("fractwar-round-end-winner", ("fraction", Loc.GetString(fractionsWinPoints.First().Key))));
     }
 }
diff --git a/Content.Shared/SS220/EventCapturePoint/EventCapturePointComponent.cs b/Content.Shared/SS220/EventCapturePoint/EventCapturePointComponent.cs
@@ -20,16 +20,16 @@ public sealed partial class EventCapturePointComponent : Component
     public float FlagRemovalImpulse = 35;
 
     /// <summary>
-    /// How many points does this pedestal give
+    /// How many points does this pedestal give per <see cref="RetentionTimeForWP"/>
     /// </summary>
     [DataField]
     public float WinPoints = 1f;
 
     /// <summary>
-    /// Time to hold a capture point to get win points
+    /// How many seconds need to hold a capture point to get win points
     /// </summary>
     [DataField]
-    public TimeSpan RetentionTimeForWP = TimeSpan.FromSeconds(300);
+    public float RetentionTimeForWP = 60;
 
     [ViewVariables]
     public Dictionary<string, TimeSpan> PointRetentionTime = new();

diff --git a/Resources/Locale/ru-RU/ss220/game-ticking/game-presets/preset-FractWar.ftl b/Resources/Locale/ru-RU/ss220/game-ticking/game-presets/preset-FractWar.ftl
@@ -1,6 +1,6 @@
 fractwar-preset-name = Война фракций
 fractwar-preset-description = Ввиду неизвестных никому обстоятельств на бедной космической станции столкнутся три силы: Синдикат, НТ и СССП. Приведите свою фракцию к победе!
 
-fractwar-round-end-score-points = [color=yellow][font size=16]Итоговые очки![/font][/color]
+fractwar-round-end-score-points = [color=yellow][font size=18]Итоговые очки![/font][/color]
 fractwar-round-end-fraction-points = { $fraction } - { $points }
-fractwar-round-end-winner = { $fraction } становится победителем!
+fractwar-round-end-winner = [font size=14]{ $fraction } становится победителем![/font]
diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/structures/specific/flags.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/structures/specific/flags.ftl
@@ -10,6 +10,6 @@ ent-EventCaptureFlagSynd = флаг Синдиката
 ent-EventCaptureFlagUssp = флаг СССП
     .desc = { ent-EventCaptureFlagBase.desc }
 
-flag-fraction-NT = [color=#046094]Нанотрейзен[/color]
-flag-fraction-Synd = [color=crimson]Синдикат[/color]
+flag-fraction-NT = [color=#0c82c7]Нанотрейзен[/color]
+flag-fraction-Synd = [color=#8f4a4b]Синдикат[/color]
 flag-fraction-Ussp = [color=#e30000]СССП[/color]
diff --git a/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/Weapons/Guns/turrets.yml b/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/Weapons/Guns/turrets.yml
@@ -12,29 +12,48 @@
   - type: NpcFactionMember
     factions:
     - EbentUssp
+  - type: Damageable
+    damageModifierSet: FractWarTurret
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 500
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalGlassBreak
+          - !type:SpawnEntitiesBehavior
+            spawn:
+              SheetSteel1:
+                min: 3
+                max: 5
 
 - type: entity
-  parent: BaseWeaponTurret
+  parent: WeaponTurretFractWarUssp
   id: WeaponTurretFractWarNanoTrasen
   suffix: Shitspawn, Ebent, FractWar, NanoTrasen
   name: Баллистическая турель ССО
   description: Автоматическая турель с баллистическим пулемётом.
   components:
-  - type: BallisticAmmoProvider
-    capacity: 250
   - type: NpcFactionMember
     factions:
     - EbentNanoTrasen
 
 - type: entity
-  parent: BaseWeaponTurret
+  parent: WeaponTurretFractWarUssp
   id: WeaponTurretFractWarIronSquad
   suffix: Shitspawn, Ebent, FractWar, IronSquad
   name: Баллистическая турель Железного отряда
   description: Автоматическая турель с баллистическим пулемётом.
   components:
-  - type: BallisticAmmoProvider
-    capacity: 250
   - type: NpcFactionMember
     factions:
     - EbentIronSquad
+
+- type: damageModifierSet
+  id: FractWarTurret
+  coefficients:
+    Piercing: 0.7
diff --git a/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/Weapons/Melee/admirals_weapon.yml b/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/Weapons/Melee/admirals_weapon.yml
@@ -1,4 +1,29 @@
 # © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+- type: entity
+  parent: EnergySwordDouble
+  id: EnergySwordDoubleIronSquad
+  suffix: Shitspawn, Ebent, FractWar
+  components:
+  - type: ItemToggleMeleeWeapon
+    activatedDamage:
+        types:
+            Slash: 12
+            Heat: 12
+            Structural: 15
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    attackRate: 1.5
+    angle: 100
+    damage:
+      types:
+  - type: Reflect
+    reflectProb: 0.80 #ss220 ttkTweaks
+    reflects:
+      - NonEnergy
+      - Energy #SS220-FixReflects
+    spread: 45
+    reflectProbProjectile: 0.70 #ss220lowTTKUpdate
+    spreadProjectile: 180
 
 # USSP
 - type: entity
@@ -36,25 +61,6 @@
     reflects: Energy
     reflectProb: .95
     spread: 75
-  - type: Blocking
-    passiveBlockModifier:
-      coefficients:
-        Blunt: 0.3
-        Slash: 0.3
-        Piercing: 0.3
-        Heat: 0.3
-        Stamina: 0.3
-    activeBlockModifier:
-      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.9
-        Heat: 0.9
-        Stamina: 0.9
-      flatReductions:
-        Heat: 1
-        Piercing: 1
-    activeBlockFraction: 0.75 #ss220-revorkblock
   - type: UseDelay
     delay: 1
   - type: ItemToggleMeleeWeapon
@@ -117,25 +123,6 @@
     reflects: Energy
     reflectProb: .95
     spread: 75
-  - type: Blocking
-    passiveBlockModifier:
-      coefficients:
-        Blunt: 0.3
-        Slash: 0.3
-        Piercing: 0.3
-        Heat: 0.3
-        Stamina: 0.3
-    activeBlockModifier:
-      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.9
-        Heat: 0.9
-        Stamina: 0.9
-      flatReductions:
-        Heat: 1
-        Piercing: 1
-    activeBlockFraction: 0.75 #ss220-revorkblock
   - type: UseDelay
     delay: 1
   - type: ItemToggleMeleeWeapon

diff --git a/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/ert/jobs_ERT.yml b/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/ert/jobs_ERT.yml
@@ -44,7 +44,6 @@
     - id: WeaponRevolverMatebaSouvenir
     - id: ClothingUniformJumpsuitColorBlack
     - id: ClothingUniformJumpsuitCentcomOfficerBlack
-    - id: ClothingBackpackERTLeader
     - id: ClothingNeckPolarIMedal
       amount: 2
     - id: ClothingNeckPolarIIMedal
@@ -65,7 +64,6 @@
     access: [[ Command ]]
   - type: StorageFill
     contents:
-    - id: WeaponRevolverMatebaSouvenir
     - id: ClothingHeadHatBeretCmo
     - id: BoxBeaker
       amount: 2
@@ -76,7 +74,6 @@
     - id: ClothingOuterCoatLabCmo
     - id: ClothingCloakCmo
     - id: ClothingNeckCloakNanotrasen
-    - id: ClothingBackpackERTMedical
     - id: ClothingUniformJumpsuitColorBlack
     - id: ClothingNeckMantleERTLeader
     - id: ClothingEyesHudMedSec
@@ -93,19 +90,18 @@
     access: [[ Command ]]
   - type: StorageFill
     contents:
-    - id: WeaponRevolverMatebaSouvenir
     - id: JetpackVoidFilled
     - id: ClothingNeckMantleERTLeader
     - id: ClothingEyesGlassesMeson
     - id: ClothingNeckEarthPin
     - id: ClothingNeckCloakCe
     - id: ClothingNeckCloakNanotrasen
     - id: ClothingBeltChiefEngineerFilled
-    - id: ClothingBackpackERTEngineer
     - id: ClothingUniformJumpsuitColorBlack
     - id: JawsOfLife
     - id: RCD
     - id: RCDAmmo
+      amount: 4
     - id: JobIconChangerNT
 
 - type: entity
@@ -135,13 +131,13 @@
     back: ClothingBackpackSpecOpsFilled
     shoes: ClothingShoesBootsMagBlinding
     mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingEyesGlassesMeson
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTAdmiral
     suitstorage: OxygenTankFilled
     neck: ClothingNeckCloakCentcomBlack
     id: SpecOpsPDALeader
-    ears: ClothingHeadsetAltCentCom
+    ears: ClothingHeadsetAltCentComm
     belt: ClothingBeltWebbingSpecOpsFilled
     pocket1: WeaponRevolverDeckardAP
     pocket2: EnergySaberNT
@@ -170,6 +166,8 @@
     - type: NpcFactionMember
       factions:
       - EbentNanoTrasen
+    - type: RandomHumanoidAppearance
+      randomizeName: false
 
 - type: job
   id: SpecOpsLeader
@@ -197,7 +195,7 @@
     outerClothing: ClothingOuterHardsuitERTCE
     suitstorage: OxygenTankFilled
     id: SpecOpsPDAEngineer
-    ears: ClothingHeadsetAltCentCom
+    ears: ClothingHeadsetAltCentComm
     belt: ClothingBeltWebbingSpecOpsFilled
     pocket1: WeaponRevolverDeckardAP
     pocket2: EnergySaberNT
@@ -226,6 +224,8 @@
     - type: NpcFactionMember
       factions:
       - EbentNanoTrasen
+    - type: RandomHumanoidAppearance
+      randomizeName: false
 
 - type: job
   id: SpecOpsEngineer
@@ -249,11 +249,11 @@
     shoes: ClothingShoesBootsMagBlinding
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesNitrile
+    gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTMed
     suitstorage: OxygenTankFilled
     id: SpecOpsPDACorpsman
-    ears: ClothingHeadsetAltCentCom
+    ears: ClothingHeadsetAltCentComm
     belt: ClothingBeltWebbingSpecOpsFilled
     pocket1: WeaponRevolverDeckardAP
     pocket2: EnergySaberNT
@@ -279,13 +279,16 @@
     - type: GhostRole
       makeSentient: true
       name: Парамедик Специальных Операций
+      job: SpecOpsCorpsman
     - type: GhostTakeoverAvailable
     - type: EventRole
       roleGroupKey: SpecOps
       statusIcon: NTMedic
     - type: NpcFactionMember
       factions:
       - EbentNanoTrasen
+    - type: RandomHumanoidAppearance
+      randomizeName: false
 
 - type: job
   id: SpecOpsCorpsman
@@ -309,11 +312,11 @@
     shoes: ClothingShoesBootsMagBlinding
     mask: ClothingMaskGasERT
     eyes: ClothingEyesHudMedical
-    gloves: ClothingHandsGlovesNitrile
+    gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTCMO
     suitstorage: OxygenTankFilled
     id: SpecOpsPDACMO
-    ears: ClothingHeadsetAltCentCom
+    ears: ClothingHeadsetAltCentComm
     belt: ClothingBeltWebbingSpecOpsFilled
     pocket1: WeaponRevolverDeckardAP
     pocket2: EnergySaberNT
@@ -339,6 +342,8 @@
     - type: EventRole
       roleGroupKey: SpecOps
       statusIcon: NTMedicalOfficer
+    - type: RandomHumanoidAppearance
+      randomizeName: false
     - type: NpcFactionMember
       factions:
       - EbentNanoTrasen
@@ -364,12 +369,11 @@
     back: ClothingBackpackSpecOpsFilled
     shoes: ClothingShoesBootsMagBlinding
     mask: ClothingMaskGasERT
-    eyes: ClothingEyesHudMedical
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTSoldier
     suitstorage: OxygenTankFilled
     id: SpecOpsPDAFigher
-    ears: ClothingHeadsetAltCentCom
+    ears: ClothingHeadsetAltCentComm
     belt: ClothingBeltWebbingSpecOpsFilled
     pocket1: WeaponRevolverDeckardAP
     pocket2: EnergySaberNT
@@ -395,7 +399,10 @@
     - type: GhostRole
       makeSentient: true
       name: Рядовой Специальных Операций
+      job: SpecOpsFighter
     - type: GhostTakeoverAvailable
+    - type: RandomHumanoidAppearance
+      randomizeName: false
     - type: EventRole
       roleGroupKey: SpecOps
       statusIcon: NTCombatant

diff --git a/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/ert/other_Items_ERT.yml b/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/ert/other_Items_ERT.yml
@@ -46,7 +46,6 @@
       - id: FlashlightSeclite
       - id: PowerCellHyper
       - id: WeaponBlaster
-      - id: MedicatedSuture
       - id: WeaponPulsePistol
       - id: Stimpack
     - type: ExplosionResistance