diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index b65522fa7b2ed8..8c31ce7e4febb2 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/Resources/Prototypes/GameRules/roundstart.yml @@ -314,18 +314,18 @@ - !type:NestedSelector tableId: SpicyPestEventsTable -# 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 +#SS220 Lost Souls Revive 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 # tableId: UnknownShuttlesHostileTable -# SS220-NoUnknownShuttles end +#SS220 Lost Souls Revive end - type: entity id: BasicStationEventScheduler @@ -356,18 +356,19 @@ # scheduledGameRules: !type:NestedSelector # tableId: SpaceTrafficControlTable -# - 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 +#SS220 Lost Souls Revive +- 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 Lost Souls Revive end # variation passes - type: entity diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml index b1db0d3a514235..321c93b19eb138 100644 --- a/Resources/Prototypes/GameRules/unknown_shuttles.yml +++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml @@ -1,14 +1,15 @@ # Shuttle Game Rule Tables -- If you dont add your rules to these they wont be used by the games schedulers. -# SS220-NoUnknownShuttles-Begin -#- type: entityTable -# id: UnknownShuttlesFriendlyTable -# table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp -# children: -# - id: UnknownShuttleCargoLost -# - id: UnknownShuttleTravelingCuisine -# - id: UnknownShuttleDisasterEvacPod -# - id: UnknownShuttleHonki +#SS220-LostSoulsRevive begin +- type: entityTable + id: UnknownShuttlesFriendlyTable + table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp + children: + - id: UnknownShuttleCargoLost + - id: UnknownShuttleTravelingCuisine + - id: UnknownShuttleDisasterEvacPod + - id: UnknownShuttleHonki +#SS220-LostSoulsRevive end # - id: UnknownShuttleNTQuark # - id: UnknownShuttleCruiser # - id: UnknownShuttleCryptid @@ -38,61 +39,61 @@ # # Shuttle Game Rules -# - type: entity -# abstract: true -# parent: BaseGameRule -# id: BaseUnknownShuttleRule -# components: -# - type: StationEvent -# startAnnouncement: station-event-unknown-shuttle-incoming -# startAudio: -# path: /Audio/Announcements/attention.ogg -# weight: 10 # 10 default -# reoccurrenceDelay: 30 -# duration: 1 -# maxOccurrences: 1 # should be the same as [copies] in shuttle_incoming_event.yml -# - type: RuleGrids -# - type: LoadMapRule +- type: entity + abstract: true + parent: BaseGameRule + id: BaseUnknownShuttleRule + components: + - type: StationEvent + startAnnouncement: station-event-unknown-shuttle-incoming + startAudio: + path: /Audio/Announcements/attention.ogg + weight: 10 # 10 default + reoccurrenceDelay: 30 + duration: 1 + maxOccurrences: 1 # should be the same as [copies] in shuttle_incoming_event.yml + - type: RuleGrids + - type: LoadMapRule -# - type: entity -# parent: BaseUnknownShuttleRule -# id: UnknownShuttleCargoLost -# components: -# - type: StationEvent -# maxOccurrences: 2 # should be the same as [copies] in shuttle_incoming_event.yml -# - type: LoadMapRule -# preloadedGrid: ShuttleCargoLost +- type: entity + parent: BaseUnknownShuttleRule + id: UnknownShuttleCargoLost + components: + - type: StationEvent + maxOccurrences: 1 # should be the same as [copies] in shuttle_incoming_event.yml + - type: LoadMapRule + preloadedGrid: ShuttleCargoLost -# - type: entity -# parent: BaseUnknownShuttleRule -# id: UnknownShuttleTravelingCuisine -# components: -# - type: StationEvent -# startAnnouncement: station-event-unknown-shuttle-incoming -# maxOccurrences: 2 # should be the same as [copies] in shuttle_incoming_event.yml -# - type: LoadMapRule -# preloadedGrid: TravelingCuisine +- type: entity + parent: BaseUnknownShuttleRule + id: UnknownShuttleTravelingCuisine + components: + - type: StationEvent + startAnnouncement: station-event-unknown-shuttle-incoming + maxOccurrences: 1 # should be the same as [copies] in shuttle_incoming_event.yml + - type: LoadMapRule + preloadedGrid: TravelingCuisine -# - type: entity -# parent: BaseUnknownShuttleRule -# id: UnknownShuttleDisasterEvacPod -# components: -# - type: StationEvent -# startAnnouncement: station-event-unknown-shuttle-incoming -# maxOccurrences: 3 # should be the same as [copies] in shuttle_incoming_event.yml -# - type: LoadMapRule -# preloadedGrid: DisasterEvacPod +- type: entity + parent: BaseUnknownShuttleRule + id: UnknownShuttleDisasterEvacPod + components: + - type: StationEvent + startAnnouncement: station-event-unknown-shuttle-incoming + maxOccurrences: 2 # should be the same as [copies] in shuttle_incoming_event.yml + - type: LoadMapRule + preloadedGrid: DisasterEvacPod -# # The power of 3 clowns proved too strong for the players and may need to be 1984'ed. Replace this with a more engaging clown shuttle. -# - type: entity -# parent: BaseUnknownShuttleRule -# id: UnknownShuttleHonki -# components: -# - type: StationEvent -# startAnnouncement: station-event-unknown-shuttle-incoming #!! -# weight: 2 -# - type: LoadMapRule -# preloadedGrid: Honki +# The power of 3 clowns proved too strong for the players and may need to be 1984'ed. Replace this with a more engaging clown shuttle. +- type: entity + parent: BaseUnknownShuttleRule + id: UnknownShuttleHonki + components: + - type: StationEvent + startAnnouncement: station-event-unknown-shuttle-incoming #!! + weight: 1 + - type: LoadMapRule + preloadedGrid: Honki # - type: entity # parent: BaseUnknownShuttleRule