diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index b65522fa7b2ed8..c950d7910d47bf 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/Resources/Prototypes/GameRules/roundstart.yml @@ -314,13 +314,13 @@ - !type:NestedSelector tableId: SpicyPestEventsTable +- type: entityTable + id: SpaceTrafficControlTable + table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp + children: + - !type:NestedSelector + tableId: UnknownShuttlesFriendlyTable # SS220-NoUnknownShuttles begin -# - type: entityTable -# id: SpaceTrafficControlTable -# table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp -# children: -# - !type:NestedSelector -# tableId: UnknownShuttlesFriendlyTable # - !type:NestedSelector # tableId: UnknownShuttlesFreelanceTable # - !type:NestedSelector @@ -355,19 +355,19 @@ # max: 7200 # 120 mins # you probably arent getting a second visitor shuttle in one round, but it is possible. # scheduledGameRules: !type:NestedSelector # tableId: SpaceTrafficControlTable +# SS220-NoUnknownShuttles end -# - type: entity -# id: SpaceTrafficControlFriendlyEventScheduler -# parent: BaseGameRule -# components: -# - type: BasicStationEventScheduler -# minimumTimeUntilFirstEvent: 1200 # 20 mins -# minMaxEventTiming: -# min: 600 # 10 mins -# max: 1800 # 30 mins -# scheduledGameRules: !type:NestedSelector -# tableId: UnknownShuttlesFriendlyTable -# SS220-NoUnknownShuttles begin end +- type: entity + id: SpaceTrafficControlFriendlyEventScheduler + parent: BaseGameRule + components: + - type: BasicStationEventScheduler + minimumTimeUntilFirstEvent: 1200 # 20 mins + minMaxEventTiming: + min: 600 # 10 mins + max: 1800 # 30 mins + scheduledGameRules: !type:NestedSelector + tableId: UnknownShuttlesFriendlyTable # variation passes - type: entity diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml index 61b2a9fa2d0880..b629e785e2937c 100644 --- a/Resources/Prototypes/GameRules/unknown_shuttles.yml +++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml @@ -8,7 +8,7 @@ - id: UnknownShuttleTravelingCuisine - id: UnknownShuttleDisasterEvacPod - id: UnknownShuttleHonki -#SS220-LostSoulsRevive begin (hide non using shuttles) +#SS220-NoUnknownShuttles begin # - id: UnknownShuttleNTQuark # - id: UnknownShuttleCruiser # - id: UnknownShuttleCryptid @@ -35,7 +35,8 @@ # - id: LoneOpsSpawn # - id: UnknownShuttleManOWar # - id: UnknownShuttleInstigator -#SS220-LostSoulsRevive end +#SS220-NoUnknownShuttles end + # # Shuttle Game Rules @@ -60,7 +61,7 @@ id: UnknownShuttleCargoLost components: - type: StationEvent - maxOccurrences: 2 # should be the same as [copies] in shuttle_incoming_event.yml + maxOccurrences: 1 # should be the same as [copies] in shuttle_incoming_event.yml #SS220 Lost Souls Revive - type: LoadMapRule preloadedGrid: ShuttleCargoLost @@ -70,7 +71,7 @@ components: - type: StationEvent startAnnouncement: station-event-unknown-shuttle-incoming - maxOccurrences: 2 # should be the same as [copies] in shuttle_incoming_event.yml + maxOccurrences: 1 # should be the same as [copies] in shuttle_incoming_event.yml #SS220 Lost Souls Revive - type: LoadMapRule preloadedGrid: TravelingCuisine @@ -80,7 +81,7 @@ components: - type: StationEvent startAnnouncement: station-event-unknown-shuttle-incoming - maxOccurrences: 3 # should be the same as [copies] in shuttle_incoming_event.yml + maxOccurrences: 2 # should be the same as [copies] in shuttle_incoming_event.yml #SS220 Lost Souls Revive - type: LoadMapRule preloadedGrid: DisasterEvacPod @@ -90,12 +91,12 @@ id: UnknownShuttleHonki components: - type: StationEvent - startAnnouncement: station-event-unknown-shuttle-incoming #!! + startAnnouncement: station-event-unknown-shuttle-incoming #SS220 Lost Souls Revive weight: 2 - type: LoadMapRule preloadedGrid: Honki -# SS220-NoUnknownShuttles-Begin +#SS220-NoUnknownShuttles begin # - type: entity # parent: BaseUnknownShuttleRule # id: UnknownShuttleSyndieEvacPod