From e81367d2d0ba28ae4179f429327cb3e0993b8915 Mon Sep 17 00:00:00 2001 From: Aviu00 Date: Sun, 28 Jan 2024 07:24:34 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20=D0=BA=D1=83?= =?UTF-8?q?=D0=BB=D1=8C=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Cult/Runes/Systems/CultSystem.Rune.cs | 6 ++-- .../Cult/Structures/RunicGirderComponent.cs | 11 ------- .../Cult/Structures/RunicGirderSystem.cs | 30 ------------------- .../SolutionContainerManagerComponent.cs | 2 ++ .../Entities/Objects/Weapons/Melee/cult.yml | 3 ++ .../Entities/Structures/Walls/walls.yml | 7 +++-- .../Prototypes/White/Mobs/Species/harpy.yml | 8 +++++ .../_White/Construction/Cult/graphs.yml | 8 ++--- .../_White/Entities/Cult/Items/tome_craft.yml | 18 ++++++----- .../_White/Entities/Cult/other_structures.yml | 1 - .../Prototypes/_White/Object/wetstone.yml | 4 +-- .../Prototypes/_White/tool_qualities.yml | 6 ++++ 12 files changed, 42 insertions(+), 62 deletions(-) delete mode 100644 Content.Server/_White/Cult/Structures/RunicGirderComponent.cs delete mode 100644 Content.Server/_White/Cult/Structures/RunicGirderSystem.cs create mode 100644 Resources/Prototypes/_White/tool_qualities.yml diff --git a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs index 1094fa2b0f..1d9534883e 100644 --- a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs +++ b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs @@ -306,16 +306,14 @@ public sealed partial class CultSystem : EntitySystem private void HandleCollision(EntityUid uid, CultRuneBaseComponent component, ref StartCollideEvent args) { - if (!TryComp(args.OtherEntity, out var solution)) + if (!TryComp(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 diff --git a/Content.Server/_White/Cult/Structures/RunicGirderComponent.cs b/Content.Server/_White/Cult/Structures/RunicGirderComponent.cs deleted file mode 100644 index 3eda55de26..0000000000 --- a/Content.Server/_White/Cult/Structures/RunicGirderComponent.cs +++ /dev/null @@ -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"; -} diff --git a/Content.Server/_White/Cult/Structures/RunicGirderSystem.cs b/Content.Server/_White/Cult/Structures/RunicGirderSystem.cs deleted file mode 100644 index 6b985730a9..0000000000 --- a/Content.Server/_White/Cult/Structures/RunicGirderSystem.cs +++ /dev/null @@ -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(OnInteract); - } - - private void OnInteract(EntityUid uid, RunicGirderComponent component, AfterInteractUsingEvent args) - { - if (!HasComp(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); - } -} diff --git a/Content.Shared/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs b/Content.Shared/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs index 4000a29021..6133f55493 100644 --- a/Content.Shared/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs +++ b/Content.Shared/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs @@ -32,5 +32,7 @@ public sealed partial class SolutionContainerManagerComponent : Component /// Should be null after mapinit. /// [DataField, AutoNetworkedField] + [Access(typeof(SharedSolutionContainerSystem), Friend = AccessPermissions.ReadWriteExecute, + Other = AccessPermissions.ReadExecute)] public Dictionary? Solutions = null; } diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml index 9ff76557bc..da704a9d74 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml @@ -37,6 +37,9 @@ interfaces: - key: enum.ListViewSelectorUiKey.Key type: ListViewSelectorBUI + - type: Tool + qualities: + - Dagger - type: entity name: eldritch blade diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index a8fe807e12..45dd155635 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -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 diff --git a/Resources/Prototypes/White/Mobs/Species/harpy.yml b/Resources/Prototypes/White/Mobs/Species/harpy.yml index 43fafd63a9..b41aa366e9 100644 --- a/Resources/Prototypes/White/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/White/Mobs/Species/harpy.yml @@ -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: diff --git a/Resources/Prototypes/_White/Construction/Cult/graphs.yml b/Resources/Prototypes/_White/Construction/Cult/graphs.yml index 1c6d35405f..ada3b6fb45 100644 --- a/Resources/Prototypes/_White/Construction/Cult/graphs.yml +++ b/Resources/Prototypes/_White/Construction/Cult/graphs.yml @@ -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 diff --git a/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml b/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml index eb5b1c96f1..1f5acb76b8 100644 --- a/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml +++ b/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml @@ -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 diff --git a/Resources/Prototypes/_White/Entities/Cult/other_structures.yml b/Resources/Prototypes/_White/Entities/Cult/other_structures.yml index 4b79ff6ded..db8cdee528 100644 --- a/Resources/Prototypes/_White/Entities/Cult/other_structures.yml +++ b/Resources/Prototypes/_White/Entities/Cult/other_structures.yml @@ -89,4 +89,3 @@ - type: Construction graph: CultGirder node: girder - - type: RunicGirder diff --git a/Resources/Prototypes/_White/Object/wetstone.yml b/Resources/Prototypes/_White/Object/wetstone.yml index 8089b23302..a5cec9df6b 100644 --- a/Resources/Prototypes/_White/Object/wetstone.yml +++ b/Resources/Prototypes/_White/Object/wetstone.yml @@ -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 diff --git a/Resources/Prototypes/_White/tool_qualities.yml b/Resources/Prototypes/_White/tool_qualities.yml new file mode 100644 index 0000000000..fe62ba7f53 --- /dev/null +++ b/Resources/Prototypes/_White/tool_qualities.yml @@ -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 }