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

Фиксы культа

Browse Source
This commit is contained in:
Aviu00
2024-01-28 07:24:34 +03:00
parent 0b5f9625ba
commit e81367d2d0
12 changed files with 42 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -306,16 +306,14 @@ public sealed partial class CultSystem : EntitySystem
private void HandleCollision(EntityUid uid, CultRuneBaseComponent component, ref StartCollideEvent args)
{
if (!TryComp<SolutionContainerManagerComponent>(args.OtherEntity, out var solution))
if (!TryComp<SolutionContainerManagerComponent>(args.OtherEntity, out var solution) || solution.Solutions == null)
{
return;
}
#pragma warning disable RA0002
if (solution.Solutions!.TryGetValue("vapor", out var vapor) && vapor.Contents.Any(x => x.Reagent.Prototype == "HolyWater"))
if (solution.Solutions.TryGetValue("vapor", out var vapor) && vapor.Contents.Any(x => x.Reagent.Prototype == "HolyWater"))
{
Del(uid);
}
#pragma warning restore RA0002
}
//Erasing end

11
Content.Server/_White/Cult/Structures/RunicGirderComponent.cs
View File

@@ -1,11 +0,0 @@
namespace Content.Server.White.Cult.Structures;
[RegisterComponent]
public sealed partial class RunicGirderComponent : Component
{
[ViewVariables(VVAccess.ReadOnly)]
public string UsedItemID = "RitualDagger";
[ViewVariables(VVAccess.ReadOnly)]
public string DropItemID = "CultRunicMetal1";
}

30
Content.Server/_White/Cult/Structures/RunicGirderSystem.cs
View File

@@ -1,30 +0,0 @@
using Content.Shared.Interaction;
using Content.Shared.White.Cult;
namespace Content.Server.White.Cult.Structures;
public sealed class RunicGirderSystem : EntitySystem
{
[Dependency] private readonly EntityManager _entMan = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<RunicGirderComponent, AfterInteractUsingEvent>(OnInteract);
}
private void OnInteract(EntityUid uid, RunicGirderComponent component, AfterInteractUsingEvent args)
{
if (!HasComp<CultistComponent>(args.User))
return;
if (MetaData(args.Used).EntityPrototype?.ID != component.UsedItemID)
return;
if (args.Target == null)
return;
var pos = Transform(args.Target.Value).Coordinates;
_entMan.DeleteEntity(args.Target.Value);
_entMan.SpawnEntity(component.DropItemID, pos);
}
}

2
Content.Shared/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs
View File

@@ -32,5 +32,7 @@ public sealed partial class SolutionContainerManagerComponent : Component
/// Should be null after mapinit.
/// </remarks>
[DataField, AutoNetworkedField]
[Access(typeof(SharedSolutionContainerSystem), Friend = AccessPermissions.ReadWriteExecute,
Other = AccessPermissions.ReadExecute)]
public Dictionary<string, Solution>? Solutions = null;
}

3
Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
View File

@@ -37,6 +37,9 @@
interfaces:
- key: enum.ListViewSelectorUiKey.Key
type: ListViewSelectorBUI
- type: Tool
qualities:
- Dagger
- type: entity
name: eldritch blade

7
Resources/Prototypes/Entities/Structures/Walls/walls.yml
View File

@@ -198,11 +198,11 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 300
damage: 600
behaviors:
- !type:SpawnEntitiesBehavior
spawn:
Girder:
CultGirder:
min: 1
max: 1
- !type:DoActsBehavior
@@ -210,6 +210,9 @@
- type: IconSmooth
key: walls
base: cult
- type: Construction
graph: CultGirder
node: wall
- type: entity
parent: BaseWall

8
Resources/Prototypes/White/Mobs/Species/harpy.yml
View File

@@ -30,6 +30,14 @@
type: HumanoidMarkingModifierBoundUserInterface
- key: enum.StrippingUiKey.Key
type: StrippableBoundUserInterface
# WD-EDIT
- key: enum.NameSelectorUIKey.Key
type: NameSelectorBUI
- key: enum.RuneTeleporterUiKey.Key
type: TeleportRunesListWindowBUI
- key: enum.SummonCultistUiKey.Key
type: SummonCultistListWindowBUI
# WD-EDIT END
- type: Sprite
scale: 0.9, 0.9
layers:

8
Resources/Prototypes/_White/Construction/Cult/graphs.yml
View File

@@ -1,4 +1,4 @@
- type: constructionGraph
- type: constructionGraph
id: CultGirder
start: start
graph:
@@ -24,8 +24,7 @@
conditions:
- !type:EntityAnchored
steps:
- tool: Screwing
doAfter: 2
- tool: Dagger
- to: wall
completed:
- !type:SnapToGrid
@@ -45,8 +44,7 @@
prototype: CultRunicMetal1
amount: 1
steps:
- tool: Welding
doAfter: 10
- tool: Dagger
- type: constructionGraph
id: AirlockGlassCult

18
Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml
View File

@@ -35,6 +35,16 @@
sprite: Clothing/Eyes/Misc/blindfold.rsi
- type: FlashImmunity
- type: EyeProtection
- type: ClothingGrantComponent
component:
- type: NightVision
color: White
- type: ShowWhiteHealthBars
damageContainers:
- Biological
- type: ShowHealthIcons
damageContainers:
- Biological
- type: entity
name: veil shifter
@@ -148,7 +158,6 @@
- runic
- runic_2
- runic_3
sizeMultiplier: 0.17
- type: Appearance
- type: RunicMetal
- type: UserInterface
@@ -156,6 +165,7 @@
- key: enum.CultStructureCraftUiKey.Key
type: StructureCraftBoundUserInterface
- type: Item
size: Normal
- type: entity
parent: CultRunicMetal
@@ -166,9 +176,6 @@
state: runic
- type: Stack
count: 1
sizeMultiplier: 0.17
- type: Item
size: 1
- type: entity
parent: CultRunicMetal
@@ -179,6 +186,3 @@
state: runic
- type: Stack
count: 20
sizeMultiplier: 0.17
- type: Item
size: 3

1
Resources/Prototypes/_White/Entities/Cult/other_structures.yml
View File

@@ -89,4 +89,3 @@
- type: Construction
graph: CultGirder
node: girder
- type: RunicGirder

4
Resources/Prototypes/_White/Object/wetstone.yml
View File

@@ -1,4 +1,4 @@
- type: entity
- type: entity
id: WetStone
parent: BaseItem
name: wet stone
@@ -11,7 +11,7 @@
size: 1
state: sharpener
- type: Item
size: 10
size: Small
sprite: White/Items/Misc/wetstone.rsi
- type: entity

6
Resources/Prototypes/_White/tool_qualities.yml Normal file
View File

@@ -0,0 +1,6 @@
- type: tool
id: Dagger
name: ritual dagger
toolName: ritual dagger
spawn: RitualDagger
icon: { sprite: Objects/Weapons/Melee/cult_dagger.rsi, state: icon }