From 85a8dd0f2153e85c139f9a8b0080a6382905fd99 Mon Sep 17 00:00:00 2001 From: no_mad Date: Tue, 13 Feb 2024 19:34:11 +0900 Subject: [PATCH] code... i think --- .../Backmen/SpecForces/SpecForcesSystem.cs | 35 +++++++++++++++++++ .../Backmen/SpecForces/SpecForcesType.cs | 5 +-- .../Prototypes/Backmen/Adminbuse/centFifa.yml | 26 ++++++++++---- 3 files changed, 58 insertions(+), 8 deletions(-) diff --git a/Content.Server/Backmen/SpecForces/SpecForcesSystem.cs b/Content.Server/Backmen/SpecForces/SpecForcesSystem.cs index bfb80187ffc..39b73f17b31 100644 --- a/Content.Server/Backmen/SpecForces/SpecForcesSystem.cs +++ b/Content.Server/Backmen/SpecForces/SpecForcesSystem.cs @@ -235,6 +235,33 @@ private void SpawnGhostRole(SpecForcesType ev, EntityUid shuttle) } } + break; + case SpecForcesType.ERTEpsilon: + SpawnEntity(ErtEpsilonLeader, _random.Pick(spawns)); + + while (countExtra > 0) + { + if (countExtra-- > 0) + { + SpawnEntity(ErtEpsilonSecurity, _random.Pick(spawns)); + } + + if (countExtra-- > 0) + { + SpawnEntity(ErtEpsilonMedical, _random.Pick(spawns)); + } + + if (countExtra-- > 0) + { + SpawnEntity(ErtEpsilonMedical, _random.Pick(spawns)); + } + + if (countExtra-- > 0) + { + SpawnEntity(ErtEpsilonJunitor, _random.Pick(spawns)); + } + } + break; case SpecForcesType.DeathSquad: SpawnEntity(SpestnazOfficer, _random.Pick(spawns)); @@ -266,6 +293,7 @@ private void SpawnGhostRole(SpecForcesType ev, EntityUid shuttle) // todo: cvar SpecForcesType.ERT => EtrShuttlePath, SpecForcesType.ERTAlpha => ErtAplhaShuttlePath, + SpecForcesType.ERTEpsilon => ErtAplhaShuttlePath, SpecForcesType.RXBZZ => RxbzzShuttlePath, SpecForcesType.DeathSquad => SpestnazShuttlePath, _ => EtrShuttlePath @@ -363,6 +391,13 @@ private void OnCleanup(RoundRestartCleanupEvent ev) [ValidatePrototypeId] private const string ErtAplhaLeader = "SpawnMobHumanERTLeaderAlpha1"; [ValidatePrototypeId] private const string ErtAplhaOperative = "SpawnMobHumanERTOperativeAlpha1"; + private const string ErtEpsilonShuttlePath = "Maps/Backmen/Grids/NT-DF-Kolibri-011.yml"; + [ValidatePrototypeId] private const string ErtEpsilonLeader = "ReinforcementRadioMTFLeaderEgg"; + [ValidatePrototypeId] private const string ErtEpsilonSecurity = "ReinforcementRadioMTFSecurityEgg"; + [ValidatePrototypeId] private const string ErtEpsilonEngineer = "ReinforcementRadioMTFEngineerEgg"; + [ValidatePrototypeId] private const string ErtEpsilonJunitor = "ReinforcementRadioMTFJunitorEgg"; + [ValidatePrototypeId] private const string ErtEpsilonMedical = "ReinforcementRadioMTFMedicalEgg"; + private const string RxbzzShuttlePath = "Maps/Backmen/Grids/NT-CC-SRV-013.yml"; [ValidatePrototypeId] private const string RxbzzLeader = "MobHumanRXBZZLeader"; [ValidatePrototypeId] private const string Rxbzz = "SpawnMobHumanRXBZZ"; diff --git a/Content.Server/Backmen/SpecForces/SpecForcesType.cs b/Content.Server/Backmen/SpecForces/SpecForcesType.cs index 84b9180dc26..74548363211 100644 --- a/Content.Server/Backmen/SpecForces/SpecForcesType.cs +++ b/Content.Server/Backmen/SpecForces/SpecForcesType.cs @@ -4,6 +4,7 @@ public enum SpecForcesType { ERT = 0, ERTAlpha = 1, - DeathSquad = 2, - RXBZZ = 3 + ERTEpsilon = 2, + DeathSquad = 3, + RXBZZ = 4 } diff --git a/Resources/Prototypes/Backmen/Adminbuse/centFifa.yml b/Resources/Prototypes/Backmen/Adminbuse/centFifa.yml index ef59e1942c5..6b972389ed9 100644 --- a/Resources/Prototypes/Backmen/Adminbuse/centFifa.yml +++ b/Resources/Prototypes/Backmen/Adminbuse/centFifa.yml @@ -338,7 +338,7 @@ shoes: ClothingShoesBootsNedoSpetsnaz gloves: ClothingHandsGlovesCombat neck: CombatKnifeSpetsnaz - head: ClothingHeadHelmetSwat + head: ClothingHeadHelmetERTLeader outerClothing: ClothingOuterArmorBasic suitstorage: WeaponPistolACP14 ears: ClothingHeadsetCentComCCMTFEPS11 @@ -352,11 +352,11 @@ equipment: jumpsuit: ClothingUniformJumpsuitERTEngineer id: OBRGavnaEngineerIDCard2 - back: WeaponRifleG36 + back: WeaponShotgun39 shoes: ClothingShoesBootsNedoSpetsnaz gloves: ClothingHandsGlovesCombat neck: CombatKnifeSpetsnaz - head: ClothingHeadHelmetSwat + head: ClothingHeadHelmetERTEngineer outerClothing: ClothingOuterArmorBasic suitstorage: WeaponPistolACP14 ears: ClothingHeadsetCentComCCMTFEPS11 @@ -365,6 +365,18 @@ pocket1: ClothingPounchMTFBattleFilled pocket2: ClothingPounchMTFEngineerFilled +- type: entity + noSpawn: true + parent: ClothingPounchMTF + id: ClothingPounchMTFBattleFilled + components: + - type: StorageFill + contents: + - id: BattleMedipen + amount: 2 + - id: MagazineShotgun + amount: 4 + - type: entity noSpawn: true parent: ClothingPounchMTF @@ -390,7 +402,7 @@ shoes: ClothingShoesBootsNedoSpetsnaz gloves: ClothingHandsGlovesCombat neck: CombatKnifeSpetsnaz - head: ClothingHeadHelmetSwat + head: ClothingHeadHelmetERTSecurity outerClothing: ClothingOuterArmorBasic suitstorage: WeaponPistolACP14 ears: ClothingHeadsetCentComCCMTFEPS11 @@ -420,7 +432,7 @@ shoes: ClothingShoesBootsNedoSpetsnaz gloves: ClothingHandsGlovesCombat neck: CombatKnifeSpetsnaz - head: ClothingHeadHelmetSwat + head: ClothingHeadHelmetERTMedic outerClothing: ClothingOuterArmorBasic suitstorage: WeaponPistolACP14 ears: ClothingHeadsetCentComCCMTFEPS11 @@ -450,8 +462,10 @@ - type: StorageFill contents: - id: EpinephrineChemistryBottle + amount: 2 - id: OmnizineChemistryBottle - - id: Hypospray + amount: 3 + - id: SyringeBluespace - id: HandheldHealthAnalyzer - id: MagazinePistol amount: 2