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

part fixes

Browse Source
This commit is contained in:
EnefFlow
2023-11-15 19:15:07 +03:00
committed by Aviu00
parent 4fab8188f0
commit eea0e86d87
14 changed files with 210 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/_White/Cult/ConstructComponent.cs
View File

@@ -1,11 +1,8 @@
using Content.Shared.Actions.ActionTypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
namespace Content.Server.White.Cult;
namespace Content.Server.White.Cult;
[RegisterComponent]
public sealed partial class ConstructComponent : Component
{
[DataField("actions", customTypeSerializer: typeof(PrototypeIdListSerializer<InstantActionPrototype>))]
[DataField("actions")]
public List<string> Actions = new();
}

2
Content.Server/_White/Cult/HolyWater/HolyWaterSystem.cs
View File

@@ -1,6 +1,6 @@
using System.Linq;
using Content.Server.Chemistry.Components.SolutionManager;
using Content.Server.Stunnable;
using Content.Shared.Chemistry.Components.SolutionManager;
using Content.Shared.Interaction;
using Content.Shared.Mobs.Components;
using Content.Shared.Popups;

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

@@ -1,9 +1,9 @@
using System.Linq;
using Content.Server.Body.Components;
using Content.Server.Chemistry.EntitySystems;
using Content.Server.Emp;
using Content.Server.EUI;
using Content.Server.White.Cult.UI;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;

4
Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs
View File

@@ -6,7 +6,6 @@ using Content.Server.Popups;
using Content.Server.White.Cult.GameRule;
using Content.Server.White.IncorporealSystem;
using Content.Shared.Actions;
using Content.Shared.Actions.ActionTypes;
using Content.Shared.Coordinates.Helpers;
using Content.Shared.Interaction.Events;
using Content.Shared.Maps;
@@ -48,8 +47,7 @@ public partial class CultSystem
{
foreach (var action in component.Actions)
{
var actionPrototype = _prototypeManager.Index<InstantActionPrototype>(action);
_actionsSystem.AddAction(uid, new InstantAction(actionPrototype), uid);
_actionsSystem.AddAction(uid, action, uid);
}
var query = EntityQueryEnumerator<CultRuleComponent, GameRuleComponent>();

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

@@ -5,14 +5,13 @@ using Content.Server.Atmos.EntitySystems;
using Content.Server.Body.Components;
using Content.Server.Chat.Systems;
using Content.Server.Body.Systems;
using Content.Server.Chemistry.Components.SolutionManager;
using Content.Server.DoAfter;
using Content.Server.Hands.Systems;
using Content.Server.Weapons.Ranged.Systems;
using Content.Server.White.Cult.GameRule;
using Content.Server.White.Cult.Runes.Comps;
using Content.Shared.Actions;
using Content.Shared.Actions.ActionTypes;
using Content.Shared.Chemistry.Components.SolutionManager;
using Content.Shared.Cuffs.Components;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
@@ -147,7 +146,7 @@ public sealed partial class CultSystem : EntitySystem
if (_ui.TryGetUi(uid, ListViewSelectorUiKey.Key, out var bui))
{
UserInterfaceSystem.SetUiState(bui, new ListViewBUIState(component.RunePrototypes, false));
_ui.SetUiState(bui, new ListViewBUIState(component.RunePrototypes, false));
_ui.OpenUi(bui, actorComponent.PlayerSession);
}
}
@@ -166,8 +165,8 @@ public sealed partial class CultSystem : EntitySystem
if (!TryDraw(whoCalled, runePrototype))
return;
if (component.UserInterface != null)
_ui.CloseUi(component.UserInterface, actorComponent.PlayerSession);
/*if (component.UserInterface != null)
_ui.CloseUi(component.UserInterface, actorComponent.PlayerSession);*/
}
private bool TryDraw(EntityUid whoCalled, string runePrototype)
@@ -192,7 +191,7 @@ public sealed partial class CultSystem : EntitySystem
Rune = runePrototype
};
var argsDoAfterEvent = new DoAfterArgs(whoCalled, _timeToDraw, ev, whoCalled)
var argsDoAfterEvent = new DoAfterArgs(_entityManager, whoCalled, _timeToDraw, ev, whoCalled)
{
BreakOnUserMove = true,
NeedHand = true
@@ -280,7 +279,7 @@ public sealed partial class CultSystem : EntitySystem
TargetEntityId = target
};
var argsDoAfterEvent = new DoAfterArgs(user, time, ev, target)
var argsDoAfterEvent = new DoAfterArgs(_entityManager, user, time, ev, target)
{
BreakOnUserMove = true,
NeedHand = true
@@ -632,7 +631,7 @@ public sealed partial class CultSystem : EntitySystem
providerComponent.Targets = victims;
providerComponent.BaseRune = rune;
UserInterfaceSystem.SetUiState(ui, new TeleportRunesListWindowBUIState(list, labels));
_ui.SetUiState(ui, new TeleportRunesListWindowBUIState(list, labels));
if (_ui.IsUiOpen(user, ui.UiKey))
return false;
@@ -724,7 +723,7 @@ public sealed partial class CultSystem : EntitySystem
var ev = new SummonNarsieDoAfterEvent();
var argsDoAfterEvent = new DoAfterArgs(user, TimeSpan.FromSeconds(40), ev, user)
var argsDoAfterEvent = new DoAfterArgs(_entityManager, user, TimeSpan.FromSeconds(40), ev, user)
{
BreakOnUserMove = true
};
@@ -920,7 +919,7 @@ public sealed partial class CultSystem : EntitySystem
_entityManager.EnsureComponent<CultRuneSummoningProviderComponent>(user, out var providerComponent);
providerComponent.BaseRune = rune;
UserInterfaceSystem.SetUiState(ui, new SummonCultistListWindowBUIState(list, labels));
_ui.SetUiState(ui, new SummonCultistListWindowBUIState(list, labels));
if (_ui.IsUiOpen(user, ui.UiKey))
return false;
@@ -1115,17 +1114,25 @@ public sealed partial class CultSystem : EntitySystem
{
var playerEntity = args.Session.AttachedEntity;
if (!playerEntity.HasValue || !TryComp<CultistComponent>(playerEntity, out _) ||
if (!playerEntity.HasValue || !TryComp<CultistComponent>(playerEntity, out var comp) ||
!TryComp<ActionsComponent>(playerEntity, out var actionsComponent))
return;
var cultistsActions = actionsComponent.Actions.Intersect(CultistComponent.CultistActions).Count();
var cultistsActions = 0;
foreach (var userAction in actionsComponent.Actions)
{
var entityPrototypeId = MetaData(userAction).EntityPrototype?.ID;
if (entityPrototypeId != null && CultistComponent.CultistActions.Contains(entityPrototypeId))
cultistsActions++;
}
var action = CultistComponent.CultistActions.FirstOrDefault(x => x.Equals(args.ActionType));
if (action == null)
return;
EntityUid? actionId = null;
if (component.IsRune)
{
if (cultistsActions > component.MaxAllowedCultistActions)
@@ -1134,11 +1141,11 @@ public sealed partial class CultSystem : EntitySystem
return;
}
_actionsSystem.AddAction(playerEntity.Value, (ActionType) action.Clone(), null!);
_actionsSystem.AddAction(playerEntity.Value, ref actionId, action);
}
else if (cultistsActions < component.MinRequiredCultistActions)
{
_actionsSystem.AddAction(playerEntity.Value, (ActionType) action.Clone(), null!);
_actionsSystem.AddAction(playerEntity.Value, ref actionId, action);
}
}

2
Content.Server/_White/IncorporealSystem/IncorporealSystem.cs
View File

@@ -1,5 +1,5 @@
using System.Linq;
using Content.Server.Visible;
using Content.Shared.Eye;
using Content.Shared.Movement.Systems;
using Content.Shared.Physics;
using Robust.Server.GameObjects;