tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More salvage fixes (#15618)

Browse Source
This commit is contained in:
metalgearsloth
2023-04-21 17:16:49 +10:00
committed by GitHub
parent 21c05f75ae
commit 39be1723d2
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Server/Salvage/Expeditions/SalvageExpeditionComponent.cs
View File

@@ -46,5 +46,6 @@ public enum ExpeditionStage : byte
Added,
Running,
Countdown,
MusicCountdown,
FinalCountdown,
}

15
Content.Server/Salvage/SalvageSystem.Runner.cs
View File

@@ -126,12 +126,17 @@ public sealed partial class SalvageSystem
comp.Stage = ExpeditionStage.FinalCountdown;
Announce(uid, Loc.GetString("salvage-expedition-announcement-countdown-seconds", ("duration", TimeSpan.FromSeconds(30).Seconds)));
}
else if (comp.Stage < ExpeditionStage.Countdown && remaining < TimeSpan.FromMinutes(2))
else if (comp.Stage < ExpeditionStage.Countdown && remaining < TimeSpan.FromMinutes(5))
{
comp.Stage = ExpeditionStage.Countdown;
Announce(uid, Loc.GetString("salvage-expedition-announcement-countdown-minutes", ("duration", TimeSpan.FromMinutes(5).Minutes)));
}
else if (comp.Stage < ExpeditionStage.MusicCountdown && remaining < TimeSpan.FromMinutes(2))
{
// TODO: Some way to play audio attached to a map for players.
comp.Stream = _audio.PlayGlobal(new SoundPathSpecifier("/Audio/Misc/salvage.ogg"),
Filter.BroadcastMap(Comp<MapComponent>(uid).MapId), true, AudioParams.Default.WithVolume(-7));
comp.Stage = ExpeditionStage.Countdown;
comp.Stage = ExpeditionStage.MusicCountdown;
Announce(uid, Loc.GetString("salvage-expedition-announcement-countdown-minutes", ("duration", TimeSpan.FromMinutes(2).Minutes)));
}
// Auto-FTL out any shuttles
@@ -192,6 +197,12 @@ public sealed partial class SalvageSystem
{
Announce(uid, Loc.GetString("salvage-expedition-structure-remaining", ("count", structure.Structures.Count)));
}
if (structure.Structures.Count == 0)
{
comp.Completed = true;
Announce(uid, Loc.GetString("salvage-expedition-completed"));
}
}
}
}

13
Resources/Locale/en-US/procedural/expeditions.ftl
View File

@@ -1,5 +1,8 @@
salvage-expedition-structure-examine = This is a [color=#B02E26]destruction[/color] objective
salvage-expedition-structure-remaining = {$count} structures remaining.
salvage-expedition-structure-remaining = {$count ->
[one] {$count} structure remaining.
*[other] {$count} structures remaining.
}
salvage-expedition-window-title = Salvage expeditions
salvage-expedition-window-difficulty = Difficulty:
@@ -18,12 +21,15 @@ salvage-expedition-window-next = Next offer
# Expedition descriptions
salvage-expedition-desc-mining = Collect resources inside the area.
# You will be taxed {$tax}% of the resources collected.
salvage-expedition-desc-structure = Destroy {$count} {$structure} inside the area.
salvage-expedition-desc-structure = {$count ->
[one] Destroy {$count} {$structure} inside the area.
*[other] Destroy {$count} {$structure}s inside the area.
}
salvage-expedition-type-Mining = Mining
salvage-expedition-type-Destruction = Destruction
salvage-expedition-difficulty-None = Minimal
salvage-expedition-difficulty-Minimal = Minimal
salvage-expedition-difficulty-Minor = Minor
salvage-expedition-difficulty-Moderate = Moderate
salvage-expedition-difficulty-Hazardous = Hazardous
@@ -33,3 +39,4 @@ salvage-expedition-difficulty-Extreme = Extreme
salvage-expedition-announcement-countdown-minutes = {$duration} minutes remaining to complete the expedition.
salvage-expedition-announcement-countdown-seconds = {$duration} seconds remaining to complete the expedition.
salvage-expedition-announcement-dungeon = Dungeon is located {$direction}.
salvage-expedition-completed = Expedition is completed.