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

Final? fixes

Browse Source
This commit is contained in:
Aviu00
2024-01-28 11:06:48 +03:00
parent f33488a3e2
commit 26cc329b2f
9 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/_White/Cult/GameRule/CultRuleSystem.cs
View File

@@ -480,7 +480,7 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
{
rule.WinCondition = CultWinCondition.CultWin;
}
_roundEndSystem.EndRound();
var query = EntityQuery<MobStateComponent, MindContainerComponent, CultistComponent>().ToList();

8
Content.Server/_White/Cult/Runes/Systems/CultSystem.Constructs.cs
View File

@@ -26,9 +26,11 @@ public partial class CultSystem
private void OnShellSelected(EntityUid uid, ConstructShellComponent component, ConstructFormSelectedEvent args)
{
if (args.Session.AttachedEntity != null)
var ent = args.Session.AttachedEntity;
if (ent != null)
{
var construct = Spawn(args.SelectedForm, Transform(args.Session.AttachedEntity.Value).MapPosition);
var construct = Spawn(args.SelectedForm, Transform(ent.Value).MapPosition);
var mind = Comp<MindContainerComponent>(args.Session.AttachedEntity!.Value);
if(!mind.HasMind)
@@ -37,7 +39,7 @@ public partial class CultSystem
_mindSystem.TransferTo(mind.Mind.Value, construct);
}
Del(args.Session.AttachedEntity);
Del(uid);
}
private void OnShellInit(EntityUid uid, ConstructShellComponent component, ComponentInit args)

2
Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs
View File

@@ -454,7 +454,7 @@ public sealed partial class CultSystem : EntitySystem
if (cultists.Count < offering.SacrificeMinCount)
{
_popupSystem.PopupEntity(Loc.GetString("cult-convert-not-enough-cultists"), user, user);
_popupSystem.PopupEntity(Loc.GetString("cult-sacrifice-not-enough-cultists"), user, user);
return false;
}