Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- fix: Expedition

Browse Source 
Daite deneg
This commit is contained in:
Jabkas
2024-03-31 02:38:57 +03:00
parent 887bf14a45
commit 6e58250369
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
View File

@@ -1,3 +1,4 @@
using System.Linq;
using Content.Shared.Procedural; using Content.Shared.Procedural;
using Content.Shared.Salvage.Expeditions; using Content.Shared.Salvage.Expeditions;
@@ -15,6 +16,11 @@ public sealed partial class SalvageSystem
if (!data.Missions.TryGetValue(args.Index, out var missionparams)) if (!data.Missions.TryGetValue(args.Index, out var missionparams))
return; return;
if (data.Missions.Values.Any(m => m.Index == args.Index))
{
return;
}
SpawnMission(missionparams, station.Value); SpawnMission(missionparams, station.Value);
data.ActiveMission = args.Index; data.ActiveMission = args.Index;

4
Content.Server/Salvage/SalvageSystem.Expeditions.cs
View File

@@ -157,7 +157,9 @@ public sealed partial class SalvageSystem
private SalvageExpeditionConsoleState GetState(SalvageExpeditionDataComponent component) private SalvageExpeditionConsoleState GetState(SalvageExpeditionDataComponent component)
{ {
var missions = component.Missions.Values.ToList();
var missions = component.Missions.Values.Distinct().ToList();
return new SalvageExpeditionConsoleState(component.NextOffer, component.Claimed, component.Cooldown, component.ActiveMission, missions); return new SalvageExpeditionConsoleState(component.NextOffer, component.Claimed, component.Cooldown, component.ActiveMission, missions);
} }

6
Resources/Locale/ru-RU/procedural/expeditions.ftl
View File

@@ -5,6 +5,7 @@ salvage-expedition-structure-remaining =
*[other] { $count } структур осталось. *[other] { $count } структур осталось.
} }
salvage-expedition-megafauna-remaining = { $count } мегафауны остаётся. salvage-expedition-megafauna-remaining = { $count } мегафауны остаётся.
salvage-expedition-difficulty-players = Рекомендовано утилизаторов:
salvage-expedition-window-title = Экспедиции salvage-expedition-window-title = Экспедиции
salvage-expedition-window-difficulty = Сложность: salvage-expedition-window-difficulty = Сложность:
salvage-expedition-window-details = Подробности: salvage-expedition-window-details = Подробности:
@@ -15,8 +16,9 @@ salvage-expedition-window-modifiers = Модификаторы:
salvage-expedition-window-rewards = Награды: salvage-expedition-window-rewards = Награды:
salvage-expedition-window-loot = Добыча: salvage-expedition-window-loot = Добыча:
salvage-expedition-window-none = Н/А salvage-expedition-window-none = Н/А
salvage-expedition-window-claimed = Получено offering-window-claimed = = Получено
salvage-expedition-window-claim = Получить offering-window-claim = Получить
salvage-expedition-type = Миссии
salvage-expedition-window-next = Следующее предложение salvage-expedition-window-next = Следующее предложение
# Expedition descriptions # Expedition descriptions
salvage-expedition-desc-mining = Собирайте ресурсы внутри этого района. salvage-expedition-desc-mining = Собирайте ресурсы внутри этого района.