diff --git a/Resources/Maps/_NF/Bluespace/vault.yml b/Resources/Maps/_NF/Bluespace/vault.yml index 2c8792b3494..b108b8cbf6a 100644 --- a/Resources/Maps/_NF/Bluespace/vault.yml +++ b/Resources/Maps/_NF/Bluespace/vault.yml @@ -7594,13 +7594,6 @@ entities: - type: Transform pos: -5.5,-13.5 parent: 1 -- proto: VendingMachineCentDrobe - entities: - - uid: 1162 - components: - - type: Transform - pos: 6.5,3.5 - parent: 1 - proto: WallPlastitanium entities: - uid: 3 diff --git a/Resources/Prototypes/_NF/Events/events.yml b/Resources/Prototypes/_NF/Events/events.yml index 0d6972a9e7f..e29b3384d9a 100644 --- a/Resources/Prototypes/_NF/Events/events.yml +++ b/Resources/Prototypes/_NF/Events/events.yml @@ -21,6 +21,9 @@ # - id: SpiderClownSpawn # - id: SpiderSpawn - id: VentClog + - id: BluespaceMcCargoCrate # Frontier + - id: BluespaceSyndicateCrate # Frontier + - id: BluespaceBrokenMcDelivery # Frontier - type: entityTable id: BasicAntagEventsTable @@ -245,11 +248,10 @@ parent: BaseGameRule components: - type: StationEvent - weight: 15 + weight: 2 # Frontier: 15<2 earliestStart: 15 duration: 1 - reoccurrenceDelay: 180 # Frontier - maxOccurrences: 2 # Frontier - People dont like too many false alarms + reoccurrenceDelay: 240 # Frontier: 4 hours - type: FalseAlarmRule - type: entity diff --git a/Resources/Prototypes/_NF/Events/nf_events.yml b/Resources/Prototypes/_NF/Events/nf_events.yml index 994c1454922..745438428c4 100644 --- a/Resources/Prototypes/_NF/Events/nf_events.yml +++ b/Resources/Prototypes/_NF/Events/nf_events.yml @@ -11,12 +11,12 @@ - type: entity id: BluespaceCargoCrate parent: BaseStationEventNFModerateDelay - categories: [ HideSpawnMenu ] components: - type: StationEvent startAnnouncement: bluespace-cargo-event-announcement weight: 5 duration: 35 + reoccurrenceDelay: 120 - type: BluespaceCargoRule spawnerPrototype: RandomCargoSpawner requireSafeAtmosphere: true @@ -26,7 +26,6 @@ - type: entity id: BluespaceMcCargoCrate parent: BaseStationEventNFModerateDelay - categories: [ HideSpawnMenu ] components: - type: StationEvent startAnnouncement: bluespace-cargo-event-announcement @@ -43,7 +42,6 @@ - type: entity id: BluespaceSyndicateCrate parent: BaseStationEventNFModerateDelay - categories: [ HideSpawnMenu ] components: - type: StationEvent startAnnouncement: bluespace-syndicate-crate-event-announcement @@ -53,7 +51,7 @@ duration: 35 earliestStart: 90 minimumPlayers: 20 - maxOccurrences: 1 # Only once per shift possible + reoccurrenceDelay: 480 # 8 hours - type: BluespaceCargoRule spawnerPrototype: CrateSyndicateLightSurplusBundle maximumSpawns: 2 diff --git a/Resources/Prototypes/_NF/Events/nf_events_bluespace.yml b/Resources/Prototypes/_NF/Events/nf_events_bluespace.yml index 261855d8895..ef144c6a0c9 100644 --- a/Resources/Prototypes/_NF/Events/nf_events_bluespace.yml +++ b/Resources/Prototypes/_NF/Events/nf_events_bluespace.yml @@ -1,7 +1,6 @@ - type: entity id: BluespaceCacheError parent: BaseStationEventShortDelay - categories: [ HideSpawnMenu ] components: - type: StationEvent startAnnouncement: station-event-bluespace-cache-start-announcement @@ -13,16 +12,15 @@ weight: 5 duration: 1350 maxDuration: 1560 - maxOccurrences: 1 # Only once per shift possible + reoccurrenceDelay: 480 # 8 hours - type: BluespaceErrorRule gridPaths: - /Maps/_NF/Bluespace/cache.yml - rewardFactor: 3.3 + rewardFactor: 1 - type: entity id: BluespaceVaultError parent: BaseStationEventShortDelay - categories: [ HideSpawnMenu ] components: - type: StationEvent startAnnouncement: station-event-bluespace-vault-start-announcement @@ -34,16 +32,15 @@ weight: 5 duration: 1020 maxDuration: 1350 - maxOccurrences: 1 # Only once per shift possible + reoccurrenceDelay: 480 # 8 hours - type: BluespaceErrorRule gridPaths: - /Maps/_NF/Bluespace/vault.yml - rewardFactor: 0.7 + rewardFactor: 1 - type: entity id: BluespaceVaultSmallError parent: BaseStationEventShortDelay - categories: [ HideSpawnMenu ] components: - type: StationEvent startAnnouncement: station-event-bluespace-vault-start-announcement @@ -56,16 +53,15 @@ weight: 5 duration: 590 maxDuration: 780 - maxOccurrences: 1 # Only once per shift possible + reoccurrenceDelay: 480 # 8 hours - type: BluespaceErrorRule gridPaths: - /Maps/_NF/Bluespace/vaultsmall.yml - rewardFactor: 3 + rewardFactor: 1 # - type: entity # Need rework # id: BluespaceAsteroid # parent: BaseStationEventShortDelay - # categories: [ HideSpawnMenu ] # components: # - type: StationEvent # startAnnouncement: station-event-bluespace-asteroid-start-announcement @@ -77,15 +73,13 @@ # weight: 2 # duration: 1500 # maxDuration: 1800 - # maxOccurrences: 1 # Only once per shift possible + # reoccurrenceDelay: 480 # 8 hours # - type: BluespaceErrorRule # gridPath: /Maps/_NF/Bluespace/asteroidvault.yml - # rewardFactor: 0.5 # Filler to make the bank go up # - type: entity # Need rework # id: BluespaceAsteroidBunker # parent: BaseStationEventShortDelay - # categories: [ HideSpawnMenu ] # components: # - type: StationEvent # startAnnouncement: station-event-bluespace-asteroid-start-announcement @@ -97,15 +91,13 @@ # weight: 2 # duration: 2100 # maxDuration: 2400 - # maxOccurrences: 1 # Only once per shift possible + # reoccurrenceDelay: 480 # 8 hours # - type: BluespaceErrorRule # gridPath: /Maps/_NF/Bluespace/asteroidbunker.yml - # rewardFactor: 0.5 # Filler to make the bank go up # - type: entity # Need rework # id: BluespaceCargoniaShip # parent: BaseStationEventShortDelay - # categories: [ HideSpawnMenu ] # components: # - type: StationEvent # startAnnouncement: station-event-bluespace-generic-ftl-start-announcement @@ -117,15 +109,13 @@ # weight: 2 # duration: 900 # maxDuration: 1200 - # maxOccurrences: 1 # Only once per shift possible + # reoccurrenceDelay: 480 # 8 hours # - type: BluespaceErrorRule # gridPath: /Maps/_NF/Bluespace/cargoniaship.yml - # rewardFactor: 0.5 # Filler to make the bank go up - type: entity id: BluespaceDataCarrier parent: BaseStationEventShortDelay - categories: [ HideSpawnMenu ] components: - type: StationEvent startAnnouncement: station-event-bluespace-generic-ftl-start-announcement @@ -137,16 +127,14 @@ weight: 2 duration: 2100 maxDuration: 2400 - maxOccurrences: 1 # Only once per shift possible + reoccurrenceDelay: 480 # 8 hours - type: BluespaceErrorRule gridPaths: - /Maps/_NF/Bluespace/datacarrier.yml - rewardFactor: 0.5 # Filler to make the bank go up - type: entity id: BluespaceSyndicateFTLInterception parent: BaseStationEventShortDelay - categories: [ HideSpawnMenu ] components: - type: StationEvent startAnnouncement: station-event-bluespace-generic-ftl-start-announcement @@ -158,16 +146,14 @@ weight: 1 duration: 1800 maxDuration: 2400 - maxOccurrences: 1 # Only once per shift possible + reoccurrenceDelay: 480 # Only once per shift possible - type: BluespaceErrorRule gridPaths: - /Maps/_NF/Bluespace/syndieftlintercept.yml - rewardFactor: 0.5 # Filler to make the bank go up - type: entity id: BluespaceWizardFederationScout parent: BaseStationEventShortDelay - categories: [ HideSpawnMenu ] components: - type: StationEvent startAnnouncement: station-event-bluespace-generic-ftl-start-announcement @@ -179,16 +165,14 @@ weight: 1 duration: 900 maxDuration: 1200 - maxOccurrences: 1 # Only once per shift possible + reoccurrenceDelay: 480 # 8 hours - type: BluespaceErrorRule gridPaths: - /Maps/_NF/Bluespace/wizardprobealt.yml - rewardFactor: 0.5 # Filler to make the bank go up - type: entity id: BluespaceBloodMoon parent: BaseStationEventShortDelay - categories: [ HideSpawnMenu ] components: - type: StationEvent startAnnouncement: station-event-bluespace-generic-ftl-start-announcement @@ -200,16 +184,14 @@ weight: 1 duration: 1800 maxDuration: 2400 - maxOccurrences: 1 # Only once per shift possible + reoccurrenceDelay: 480 # 8 hours - type: BluespaceErrorRule gridPaths: - /Maps/_NF/Bluespace/bloodmoon.yml - rewardFactor: 0.5 # Filler to make the bank go up - type: entity id: BluespaceBrokenMcDelivery parent: BaseStationEventShortDelay - categories: [ HideSpawnMenu ] components: - type: StationEvent startAnnouncement: station-event-bluespace-generic-ftl-start-announcement @@ -221,7 +203,7 @@ weight: 5 duration: 900 maxDuration: 1800 - reoccurrenceDelay: 180 + reoccurrenceDelay: 240 # once per 4 hours - type: BluespaceErrorRule gridPaths: - /Maps/_NF/Bluespace/mcevent.yml diff --git a/Resources/Prototypes/_NF/GameRules/roundstart.yml b/Resources/Prototypes/_NF/GameRules/roundstart.yml index 5147c20e0d1..db906c73af0 100644 --- a/Resources/Prototypes/_NF/GameRules/roundstart.yml +++ b/Resources/Prototypes/_NF/GameRules/roundstart.yml @@ -4,3 +4,30 @@ categories: [ HideSpawnMenu ] components: - type: AdventureRule + +- type: entity + id: BluespaceEventScheduler + parent: BaseGameRule + components: + - type: BasicStationEventScheduler + scheduledGameRules: !type:NestedSelector + tableId: MajorBluespaceEventsTable + minimumTimeUntilFirstEvent: 2700 # 45 minutes + minMaxEventTiming: + min: 2700 # 45 minutes between events + max: 4500 # 75 minutes between events + +- type: entityTable + id: MajorBluespaceEventsTable + table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp + children: + - id: BluespaceCacheError + - id: BluespaceVaultError + - id: BluespaceVaultSmallError + # - id: BluespaceAsteroid + # - id: BluespaceAsteroidBunker + # - id: BluespaceCargoniaShip + # - id: BluespaceDataCarrier + - id: BluespaceSyndicateFTLInterception + - id: BluespaceWizardFederationScout + - id: BluespaceBloodMoon diff --git a/Resources/Prototypes/_NF/game_presets.yml b/Resources/Prototypes/_NF/game_presets.yml index f600d777045..6fc0ae34d0a 100644 --- a/Resources/Prototypes/_NF/game_presets.yml +++ b/Resources/Prototypes/_NF/game_presets.yml @@ -8,4 +8,5 @@ rules: - Adventure - BasicStationEventScheduler + - BluespaceEventScheduler - BasicRoundstartVariation