- add: Runes can't be examined by crew. (#129)
* - add: Runes can't be examined by crew. * - add: No rune pointing.
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Content.Server._White.Cult;
|
||||||
using Content.Server.Administration.Logs;
|
using Content.Server.Administration.Logs;
|
||||||
using Content.Server.Pointing.Components;
|
using Content.Server.Pointing.Components;
|
||||||
using Content.Shared.Database;
|
using Content.Shared.Database;
|
||||||
@@ -12,6 +13,7 @@ using Content.Shared.Mind;
|
|||||||
using Content.Shared.Pointing;
|
using Content.Shared.Pointing;
|
||||||
using Content.Shared.Popups;
|
using Content.Shared.Popups;
|
||||||
using Content.Shared._White.Administration;
|
using Content.Shared._White.Administration;
|
||||||
|
using Content.Shared._White.Cult.Components;
|
||||||
using JetBrains.Annotations;
|
using JetBrains.Annotations;
|
||||||
using Robust.Server.GameObjects;
|
using Robust.Server.GameObjects;
|
||||||
using Robust.Server.Player;
|
using Robust.Server.Player;
|
||||||
@@ -126,11 +128,20 @@ namespace Content.Server.Pointing.EntitySystems
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (TryComp(pointed, out InvisibilityComponent? invisibility) && invisibility.Invisible) // WD
|
// WD START
|
||||||
|
if (TryComp(pointed, out InvisibilityComponent? invisibility) && invisibility.Invisible)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (HasComp<CultRuneComponent>(pointed) && !(HasComp<GhostComponent>(player) ||
|
||||||
|
HasComp<CultistComponent>(player) ||
|
||||||
|
HasComp<ConstructComponent>(player)))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
// WD END
|
||||||
|
|
||||||
if (HasComp<PointingArrowComponent>(pointed))
|
if (HasComp<PointingArrowComponent>(pointed))
|
||||||
{
|
{
|
||||||
// this is a pointing arrow. no pointing here...
|
// this is a pointing arrow. no pointing here...
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
namespace Content.Shared._White.Cult.Components;
|
||||||
|
|
||||||
|
[RegisterComponent]
|
||||||
|
public sealed partial class CultRuneComponent : Component
|
||||||
|
{
|
||||||
|
}
|
||||||
23
Content.Shared/_White/Cult/Systems/CultRuneSystem.cs
Normal file
23
Content.Shared/_White/Cult/Systems/CultRuneSystem.cs
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
using Content.Shared._White.Cult.Components;
|
||||||
|
using Content.Shared.Examine;
|
||||||
|
using Content.Shared.Ghost;
|
||||||
|
|
||||||
|
namespace Content.Shared._White.Cult.Systems;
|
||||||
|
|
||||||
|
public sealed class CultRuneSystem : EntitySystem
|
||||||
|
{
|
||||||
|
public override void Initialize()
|
||||||
|
{
|
||||||
|
base.Initialize();
|
||||||
|
|
||||||
|
SubscribeLocalEvent<CultRuneComponent, ExamineAttemptEvent>(OnExamine);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnExamine(Entity<CultRuneComponent> ent, ref ExamineAttemptEvent args)
|
||||||
|
{
|
||||||
|
if (HasComp<GhostComponent>(args.Examiner) || HasComp<CultistComponent>(args.Examiner))
|
||||||
|
return;
|
||||||
|
|
||||||
|
args.Cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,6 +13,7 @@
|
|||||||
- type: CultRuneBase
|
- type: CultRuneBase
|
||||||
invokePhrase: "Mah'weyh pleggh at e'ntrath!"
|
invokePhrase: "Mah'weyh pleggh at e'ntrath!"
|
||||||
- type: CultRuneOffering
|
- type: CultRuneOffering
|
||||||
|
- type: CultRune
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: CollideRune
|
parent: CollideRune
|
||||||
@@ -29,6 +30,7 @@
|
|||||||
- type: CultRuneBase
|
- type: CultRuneBase
|
||||||
invokePhrase: "Qu'laris ver'don, thal'sorin mik'thar!"
|
invokePhrase: "Qu'laris ver'don, thal'sorin mik'thar!"
|
||||||
- type: CultRuneBuff
|
- type: CultRuneBuff
|
||||||
|
- type: CultRune
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: CollideRune
|
parent: CollideRune
|
||||||
@@ -49,6 +51,7 @@
|
|||||||
interfaces:
|
interfaces:
|
||||||
- key: enum.CultEmpowerUiKey.Key
|
- key: enum.CultEmpowerUiKey.Key
|
||||||
type: SpellSelectorBUI
|
type: SpellSelectorBUI
|
||||||
|
- type: CultRune
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: CollideRune
|
parent: CollideRune
|
||||||
@@ -67,6 +70,7 @@
|
|||||||
gatherInvokers: false
|
gatherInvokers: false
|
||||||
- type: CultRuneTeleport
|
- type: CultRuneTeleport
|
||||||
label: "безымянная метка"
|
label: "безымянная метка"
|
||||||
|
- type: CultRune
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: CollideRune
|
parent: CollideRune
|
||||||
@@ -84,6 +88,7 @@
|
|||||||
invokePhrase: "N'ath reth sh'yro eth d'rekkathnor!"
|
invokePhrase: "N'ath reth sh'yro eth d'rekkathnor!"
|
||||||
gatherInvokers: true
|
gatherInvokers: true
|
||||||
- type: CultRuneSummoning
|
- type: CultRuneSummoning
|
||||||
|
- type: CultRune
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: CollideRune
|
parent: CollideRune
|
||||||
@@ -100,6 +105,7 @@
|
|||||||
- type: CultRuneBase
|
- type: CultRuneBase
|
||||||
invokePhrase: "Pasnar val'keriam usinar. Savrae ines amutan. Yam'toth remium il'tarat!"
|
invokePhrase: "Pasnar val'keriam usinar. Savrae ines amutan. Yam'toth remium il'tarat!"
|
||||||
- type: CultRuneRevive
|
- type: CultRuneRevive
|
||||||
|
- type: CultRune
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: CollideRune
|
parent: CollideRune
|
||||||
@@ -116,6 +122,7 @@
|
|||||||
- type: CultRuneBase
|
- type: CultRuneBase
|
||||||
invokePhrase: "Khari'd! Eske'te tannin!"
|
invokePhrase: "Khari'd! Eske'te tannin!"
|
||||||
- type: CultRuneBarrier
|
- type: CultRuneBarrier
|
||||||
|
- type: CultRune
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: CollideRune
|
parent: CollideRune
|
||||||
@@ -133,6 +140,7 @@
|
|||||||
invokePhrase: "Dedo ol'btoh!"
|
invokePhrase: "Dedo ol'btoh!"
|
||||||
- type: CultRuneBloodBoil
|
- type: CultRuneBloodBoil
|
||||||
projectilePrototype: ProjectileCult
|
projectilePrototype: ProjectileCult
|
||||||
|
- type: CultRune
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: BaseRune
|
parent: BaseRune
|
||||||
|
|||||||
Reference in New Issue
Block a user