From b3cf460bda13761a5e12439b68ee9f196559fa0c Mon Sep 17 00:00:00 2001 From: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Date: Wed, 12 Aug 2026 20:17:03 -0500 Subject: [PATCH] Fix and Tweak Random Shuttle Spawns (#6401) * Fix and slightly alter random shuttle spawns * Few more tweaks. Twice as many shuttles. * Tweaked to be max every 90 min --- Resources/Prototypes/GameRules/events.yml | 1 - Resources/Prototypes/GameRules/roundstart.yml | 4 ++-- Resources/Prototypes/GameRules/unknown_shuttles.yml | 6 ++++-- Resources/Prototypes/_DV/GameRules/events.yml | 7 +++++-- .../Prototypes/_DV/GameRules/unknown_shuttles.yml | 12 +++++++----- Resources/Prototypes/_Mono/GameRules/asakim.yml | 2 +- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 9078684715e..36792f00832 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -34,7 +34,6 @@ - !type:NestedSelector # DeltaV tableId: BasicAntagEventsTableDeltaV - id: DragonSpawn - - id: ColossusSpawn # DeltaV #- id: ClosetSkeleton # DeltaV - replaced with MenaceSkeleton #- id: KingRatMigration # DeltaV - disabled - id: RevenantSpawn diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index f137925856e..085629169fa 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/Resources/Prototypes/GameRules/roundstart.yml @@ -623,9 +623,9 @@ maximumSpanUntilFirstEvent: 900 # At longest takes an hour to show up. minMaxEventTiming: min: 1200 # 20 mins - max: 7200 # 120 mins # you probably arent getting a second visitor shuttle in one round, but it is possible. + max: 5400 # 120 mins # you probably arent getting a second visitor shuttle in one round, but it is possible. # DeltaV - was 7200, now 90min scheduledGameRules: !type:NestedSelector - prob: 0.05 # Only 1 in 20 rounds... + #prob: 0.05 # Only 1 in 20 rounds... # DeltaV - remove 1/20 tableId: SpaceTrafficControlTable # variation passes diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml index f906facc0df..32fbe46f511 100644 --- a/Resources/Prototypes/GameRules/unknown_shuttles.yml +++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml @@ -4,7 +4,9 @@ id: UnknownShuttlesHostileTable table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp children: - #- id: LoneOpsSpawn # DeltaV: This is already in antag events table + - !type:NestedSelector # DeltaV + tableId: UnknownShuttlesTableDeltaV + - id: LoneOpsSpawn - id: UnknownShuttleManOWar #- id: UnknownShuttleInstigator # DeltaV: remove random ops @@ -48,7 +50,7 @@ id: UnknownShuttleSyndieEvacPod components: - type: StationEvent - weight: 5 # lower because weird freelance roles + weight: 6 maxOccurrences: 2 - type: LoadMapRule gridPath: /Maps/_DV/Shuttles/Event/syndie_evacpod.yml # DeltaV - Switched to our version, was /Maps/Shuttles/ShuttleEvent/syndie_evacpod.yml diff --git a/Resources/Prototypes/_DV/GameRules/events.yml b/Resources/Prototypes/_DV/GameRules/events.yml index 517f9c576aa..b852a84426d 100644 --- a/Resources/Prototypes/_DV/GameRules/events.yml +++ b/Resources/Prototypes/_DV/GameRules/events.yml @@ -19,6 +19,9 @@ - id: SkiaSpawn - id: RatKingSpawn - id: NTAgentSleeper + - id: ColossusSpawn + - id: AsakimShuttle + - id: HitmanShuttle # Replaces upstream meteor events until they're good - type: entity @@ -240,7 +243,7 @@ id: RoboNeuroticist components: - type: StationEvent - weight: 1 + weight: 2 minimumPlayers: 35 #big threat, but has to have ghosts to matter reoccurrenceDelay: 30 duration: null # so it shows up in round end @@ -502,7 +505,7 @@ startAnnouncement: station-event-pitbull-start-announcement startAudio: path: /Audio/_DV/Announcements/attention.ogg - earliestStart: 1 + earliestStart: 30 minimumPlayers: 10 weight: 1 duration: 15 diff --git a/Resources/Prototypes/_DV/GameRules/unknown_shuttles.yml b/Resources/Prototypes/_DV/GameRules/unknown_shuttles.yml index 5f43e329df0..0b85c271674 100644 --- a/Resources/Prototypes/_DV/GameRules/unknown_shuttles.yml +++ b/Resources/Prototypes/_DV/GameRules/unknown_shuttles.yml @@ -1,5 +1,5 @@ - type: entityTable - id: UnknownShuttlesFreelanceTableDeltaV + id: UnknownShuttlesTableDeltaV table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp children: - id: SyndicateRecruiter @@ -7,13 +7,15 @@ - id: SyndicateArmsdealer - id: AsakimShuttle - id: HitmanShuttle + - id: RoboNeuroticist + - id: UnknownShuttleSyndieEvacPod - type: entity parent: BaseUnknownShuttleRule id: SyndicateRecruiter components: - type: StationEvent - weight: 4 + weight: 6 minimumPlayers: 20 maxOccurrences: 1 duration: null @@ -58,7 +60,7 @@ id: SynthesisSpecialist components: - type: StationEvent - weight: 4 + weight: 6 minimumPlayers: 20 maxOccurrences: 1 duration: null @@ -102,7 +104,7 @@ id: SyndicateArmsdealer components: - type: StationEvent - weight: 2 + weight: 6 minimumPlayers: 25 maxOccurrences: 1 duration: null @@ -147,7 +149,7 @@ id: HitmanShuttle components: - type: StationEvent - weight: 2 + weight: 6 minimumPlayers: 25 maxOccurrences: 1 duration: null diff --git a/Resources/Prototypes/_Mono/GameRules/asakim.yml b/Resources/Prototypes/_Mono/GameRules/asakim.yml index aee4b0c5b91..0d1f3893db8 100644 --- a/Resources/Prototypes/_Mono/GameRules/asakim.yml +++ b/Resources/Prototypes/_Mono/GameRules/asakim.yml @@ -17,7 +17,7 @@ #startAnnouncement: station-event-asakim-shuttle-detected # DeltaV - no # startAudio: # path: /Audio/Misc/notice1.ogg - weight: 1.5 # DeltaV - was 2, now less common then Arms Dealer. rare role + weight: 3 minimumPlayers: 25 # DeltaV maxOccurrences: 1 # DeltaV - was 4 duration: null # DeltaV