From 4bb614981fca8558549eb808bf29a3df7e4ca217 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 24 Apr 2025 17:10:52 +0300 Subject: [PATCH] Keys & Locks crafting (#1207) * keeye * random locks for demiplanes * blank keys, material keys * craft blank keys * key file * fix skill tree UIScaling * fix audio and sounds and prediction * delete crowbar, merge its into pickaxe * QoL key shaping * lock introdusing * QoL progress lockpicking * examinable lock * lock insert * mithril lockkpick * Update wall_dirt.yml --- .../Ui/CP14SkillTreeGraphControl.xaml.cs | 12 +- .../LockKey/CP14KeyholeGenerationSystem.cs | 42 +- Content.Shared/Verbs/VerbCategory.cs | 38 +- .../LockKey/Components/CP14KeyComponent.cs | 5 +- .../Components/CP14KeyFileComponent.cs | 20 + .../LockKey/Components/CP14LockComponent.cs | 37 +- .../Components/CP14LockEditerComponent.cs | 28 ++ .../Components/CP14LockpickComponent.cs | 4 +- .../_CP14/LockKey/SharedCP14LockKeySystem.cs | 388 +++++++++++++++--- .../Locale/en-US/_CP14/lockKey/keyring.ftl | 18 +- .../Locale/ru-RU/_CP14/lockKey/keyring.ftl | 18 +- .../Prototypes/_CP14/Catalog/Fills/crates.yml | 2 +- .../Objects/Keys/{ => Catalog}/alchemist.yml | 6 +- .../Objects/Keys/{ => Catalog}/blacksmith.yml | 6 +- .../Objects/Keys/{ => Catalog}/guard.yml | 8 +- .../Keys/{ => Catalog}/guildmaster.yml | 4 +- .../Objects/Keys/{ => Catalog}/merchant.yml | 8 +- .../Keys/{ => Catalog}/personalHouse.yml | 36 +- .../Objects/Keys/{ => Catalog}/tavern.yml | 16 +- .../_CP14/Entities/Objects/Keys/base.yml | 62 --- .../_CP14/Entities/Objects/Keys/key.yml | 78 ++++ .../_CP14/Entities/Objects/Keys/locks.yml | 76 ++++ .../_CP14/Entities/Objects/Keys/tools.yml | 43 ++ .../Entities/Objects/Tools/screwdriver.yml | 13 + .../Objects/Weapons/Melee/Tools/crowbar.yml | 38 -- .../Structures/Doors/Locked/random.yml | 50 +++ .../_CP14/Entities/Structures/Doors/base.yml | 1 + .../Structures/Specific/Alchemy/heater.yml | 1 + .../Structures/Storage/Crates/base_chest.yml | 4 +- .../_CP14/LockCategories/lockTypes.yml | 30 +- .../_CP14/ModularCraft/Blade/pickaxe.yml | 17 +- .../Graphs/Structures/Walls/wall_dirt.yml | 2 +- .../_CP14/Recipes/Workbench/Anvil/misc.yml | 121 +++++- .../metall_pickaxe.rsi/equipped-BELT1.png | Bin 255 -> 229 bytes .../metall_pickaxe.rsi/equipped-BELT2.png | Bin 257 -> 225 bytes .../metall_pickaxe.rsi/equipped-NECK.png | Bin 230 -> 245 bytes .../Blade/Pickaxe/metall_pickaxe.rsi/icon.png | Bin 228 -> 270 bytes .../metall_pickaxe.rsi/inhand-left.png | Bin 463 -> 447 bytes .../metall_pickaxe.rsi/inhand-right.png | Bin 479 -> 451 bytes .../wielded-inhand-left.png | Bin 451 -> 410 bytes .../wielded-inhand-right.png | Bin 451 -> 437 bytes .../_CP14/Objects/Tools/crowbar.rsi/icon.png | Bin 434 -> 0 bytes .../Objects/Tools/crowbar.rsi/inhand-left.png | Bin 410 -> 0 bytes .../Tools/crowbar.rsi/inhand-right.png | Bin 415 -> 0 bytes .../_CP14/Objects/Tools/crowbar.rsi/meta.json | 22 - .../Textures/_CP14/Objects/keys.rsi/file.png | Bin 0 -> 327 bytes .../Textures/_CP14/Objects/keys.rsi/key1.png | Bin 259 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key10.png | Bin 248 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key11.png | Bin 236 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key12.png | Bin 235 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key13.png | Bin 276 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key14.png | Bin 247 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key15.png | Bin 251 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key16.png | Bin 245 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key17.png | Bin 230 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key18.png | Bin 261 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key2.png | Bin 260 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key3.png | Bin 257 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key4.png | Bin 263 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key5.png | Bin 257 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key6.png | Bin 247 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key7.png | Bin 254 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key8.png | Bin 235 -> 0 bytes .../Textures/_CP14/Objects/keys.rsi/key9.png | Bin 249 -> 0 bytes .../_CP14/Objects/keys.rsi/key_copper.png | Bin 0 -> 260 bytes .../keys.rsi/{vault_key.png => key_gold.png} | Bin .../_CP14/Objects/keys.rsi/key_iron.png | Bin 0 -> 254 bytes .../_CP14/Objects/keys.rsi/key_mithril.png | Bin 0 -> 256 bytes .../Textures/_CP14/Objects/keys.rsi/lock.png | Bin 332 -> 0 bytes .../_CP14/Objects/keys.rsi/lock_copper.png | Bin 0 -> 371 bytes .../_CP14/Objects/keys.rsi/lock_gold.png | Bin 0 -> 369 bytes .../_CP14/Objects/keys.rsi/lock_iron.png | Bin 0 -> 361 bytes .../_CP14/Objects/keys.rsi/lock_mithril.png | Bin 0 -> 357 bytes .../_CP14/Objects/keys.rsi/lockpick.png | Bin 255 -> 0 bytes .../_CP14/Objects/keys.rsi/lockpick_iron.png | Bin 0 -> 273 bytes .../Objects/keys.rsi/lockpick_mithril.png | Bin 0 -> 269 bytes .../Textures/_CP14/Objects/keys.rsi/meta.json | 52 +-- Resources/migration.yml | 1 + 78 files changed, 949 insertions(+), 358 deletions(-) create mode 100644 Content.Shared/_CP14/LockKey/Components/CP14KeyFileComponent.cs create mode 100644 Content.Shared/_CP14/LockKey/Components/CP14LockEditerComponent.cs rename Resources/Prototypes/_CP14/Entities/Objects/Keys/{ => Catalog}/alchemist.yml (82%) rename Resources/Prototypes/_CP14/Entities/Objects/Keys/{ => Catalog}/blacksmith.yml (83%) rename Resources/Prototypes/_CP14/Entities/Objects/Keys/{ => Catalog}/guard.yml (82%) rename Resources/Prototypes/_CP14/Entities/Objects/Keys/{ => Catalog}/guildmaster.yml (83%) rename Resources/Prototypes/_CP14/Entities/Objects/Keys/{ => Catalog}/merchant.yml (83%) rename Resources/Prototypes/_CP14/Entities/Objects/Keys/{ => Catalog}/personalHouse.yml (83%) rename Resources/Prototypes/_CP14/Entities/Objects/Keys/{ => Catalog}/tavern.yml (82%) delete mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Keys/base.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Keys/key.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Keys/locks.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Keys/tools.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Tools/screwdriver.yml delete mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/crowbar.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/random.yml delete mode 100644 Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/icon.png delete mode 100644 Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/inhand-left.png delete mode 100644 Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/inhand-right.png delete mode 100644 Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/file.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key1.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key10.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key11.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key12.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key13.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key14.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key15.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key16.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key17.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key18.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key2.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key3.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key4.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key5.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key6.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key7.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key8.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key9.png create mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key_copper.png rename Resources/Textures/_CP14/Objects/keys.rsi/{vault_key.png => key_gold.png} (100%) create mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key_iron.png create mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/key_mithril.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/lock.png create mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/lock_copper.png create mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/lock_gold.png create mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/lock_iron.png create mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/lock_mithril.png delete mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/lockpick.png create mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/lockpick_iron.png create mode 100644 Resources/Textures/_CP14/Objects/keys.rsi/lockpick_mithril.png diff --git a/Content.Client/_CP14/Skill/Ui/CP14SkillTreeGraphControl.xaml.cs b/Content.Client/_CP14/Skill/Ui/CP14SkillTreeGraphControl.xaml.cs index 735ca4c858..0afafe3ec7 100644 --- a/Content.Client/_CP14/Skill/Ui/CP14SkillTreeGraphControl.xaml.cs +++ b/Content.Client/_CP14/Skill/Ui/CP14SkillTreeGraphControl.xaml.cs @@ -165,14 +165,14 @@ public sealed partial class CP14SkillTreeGraphControl : BoxContainer // Base skill icon var baseTexture = skill.Icon.Frame0(); - var baseSize = new Vector2(baseTexture.Width, baseTexture.Height) * 2; + var baseSize = new Vector2(baseTexture.Width, baseTexture.Height) * 1.5f * UIScale; var baseQuad = new UIBox2(pos - baseSize / 2, pos + baseSize / 2); var hovered = (cursor - pos).LengthSquared() <= (baseSize.X / 2) * (baseSize.X / 2); // Frame var frameTexture = Tree.FrameIcon.Frame0(); - var frameSize = new Vector2(frameTexture.Width, frameTexture.Height) * 2; + var frameSize = new Vector2(frameTexture.Width, frameTexture.Height) * 1.5f * UIScale; var frameQuad = new UIBox2(pos - frameSize / 2, pos + frameSize / 2); handle.DrawTextureRect(frameTexture, frameQuad, canBeLearned ? Color.White : Color.FromSrgb(new Color(0.7f, 0.7f, 0.7f))); @@ -180,7 +180,7 @@ public sealed partial class CP14SkillTreeGraphControl : BoxContainer if (_selectedNode == skill) { var selectedTexture = Tree.SelectedIcon.Frame0(); - var selectedSize = new Vector2(selectedTexture.Width, selectedTexture.Height) * 2; + var selectedSize = new Vector2(selectedTexture.Width, selectedTexture.Height) * 1.5f * UIScale; var selectedQuad = new UIBox2(pos - selectedSize / 2, pos + selectedSize / 2); handle.DrawTextureRect(selectedTexture, selectedQuad, Color.White); } @@ -190,7 +190,7 @@ public sealed partial class CP14SkillTreeGraphControl : BoxContainer { _hoveredNode = skill; var hoveredTexture = Tree.HoveredIcon.Frame0(); - var hoveredSize = new Vector2(hoveredTexture.Width, hoveredTexture.Height) * 2; + var hoveredSize = new Vector2(hoveredTexture.Width, hoveredTexture.Height) * 1.5f * UIScale; var hoveredQuad = new UIBox2(pos - hoveredSize / 2, pos + hoveredSize / 2); handle.DrawTextureRect(hoveredTexture, hoveredQuad, Color.White); } @@ -202,14 +202,14 @@ public sealed partial class CP14SkillTreeGraphControl : BoxContainer if (learned) { var learnedTexture = Tree.LearnedIcon.Frame0(); - var learnedSize = new Vector2(learnedTexture.Width, learnedTexture.Height) * 2; + var learnedSize = new Vector2(learnedTexture.Width, learnedTexture.Height) * 1.5f * UIScale; var learnedQuad = new UIBox2(pos - learnedSize / 2, pos + learnedSize / 2); handle.DrawTextureRect(learnedTexture, learnedQuad, Color.White); } else if (canBeLearned) { var availableTexture = Tree.AvailableIcon.Frame0(); - var availableSize = new Vector2(availableTexture.Width, availableTexture.Height) * 2; + var availableSize = new Vector2(availableTexture.Width, availableTexture.Height) * 1.5f * UIScale; var availableQuad = new UIBox2(pos - availableSize / 2, pos + availableSize / 2); handle.DrawTextureRect(availableTexture, availableQuad, Color.White); } diff --git a/Content.Server/_CP14/LockKey/CP14KeyholeGenerationSystem.cs b/Content.Server/_CP14/LockKey/CP14KeyholeGenerationSystem.cs index 5aab8135c1..77362bcf07 100644 --- a/Content.Server/_CP14/LockKey/CP14KeyholeGenerationSystem.cs +++ b/Content.Server/_CP14/LockKey/CP14KeyholeGenerationSystem.cs @@ -2,7 +2,6 @@ using System.Linq; using Content.Server.Labels; using Content.Shared._CP14.LockKey; using Content.Shared._CP14.LockKey.Components; -using Content.Shared.Examine; using Content.Shared.GameTicking; using Robust.Shared.Prototypes; using Robust.Shared.Random; @@ -15,7 +14,7 @@ public sealed partial class CP14KeyholeGenerationSystem : EntitySystem [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly LabelSystem _label = default!; - private Dictionary, List> _roundKeyData = new(); + private Dictionary, List> _roundKeyData = new(); //TODO: it won't survive saving and loading. This data must be stored in some component. public override void Initialize() { @@ -25,8 +24,6 @@ public sealed partial class CP14KeyholeGenerationSystem : EntitySystem SubscribeLocalEvent(OnLockInit); SubscribeLocalEvent(OnKeyInit); - - SubscribeLocalEvent(OnKeyExamine); } #region Init @@ -49,28 +46,13 @@ public sealed partial class CP14KeyholeGenerationSystem : EntitySystem { SetShape(lockEnt, lockEnt.Comp.AutoGenerateShape.Value); } + else if (lockEnt.Comp.AutoGenerateRandomShape != null) + { + SetRandomShape(lockEnt, lockEnt.Comp.AutoGenerateRandomShape.Value); + } } #endregion - private void OnKeyExamine(Entity key, ref ExaminedEvent args) - { - var parent = Transform(key).ParentUid; - if (parent != args.Examiner) - return; - - if (key.Comp.LockShape == null) - return; - - var markup = Loc.GetString("cp14-lock-examine-key", ("item", MetaData(key).EntityName)); - markup += " ("; - foreach (var item in key.Comp.LockShape) - { - markup += $"{item} "; - } - markup += ")"; - args.PushMarkup(markup); - } - private List GetKeyLockData(ProtoId category) { if (_roundKeyData.ContainsKey(category)) @@ -84,6 +66,7 @@ public sealed partial class CP14KeyholeGenerationSystem : EntitySystem public void SetShape(Entity keyEnt, ProtoId type) { keyEnt.Comp.LockShape = GetKeyLockData(type); + DirtyField(keyEnt, keyEnt.Comp, nameof(CP14KeyComponent.LockShape)); var indexedType = _proto.Index(type); if (indexedType.Name is not null) @@ -97,6 +80,19 @@ public sealed partial class CP14KeyholeGenerationSystem : EntitySystem var indexedType = _proto.Index(type); if (indexedType.Name is not null) _label.Label(lockEnt, Loc.GetString(indexedType.Name.Value)); + + DirtyField(lockEnt, lockEnt.Comp, nameof(CP14LockComponent.LockShape)); + } + + public void SetRandomShape(Entity lockEnt, int complexity) + { + lockEnt.Comp.LockShape = new List(); + for (var i = 0; i < complexity; i++) + { + lockEnt.Comp.LockShape.Add(_random.Next(-SharedCP14LockKeySystem.DepthComplexity, SharedCP14LockKeySystem.DepthComplexity)); + } + + DirtyField(lockEnt, lockEnt.Comp, nameof(CP14LockComponent.LockShape)); } private List GenerateNewUniqueLockData(ProtoId category) diff --git a/Content.Shared/Verbs/VerbCategory.cs b/Content.Shared/Verbs/VerbCategory.cs index 936130a9d0..880f21f58d 100644 --- a/Content.Shared/Verbs/VerbCategory.cs +++ b/Content.Shared/Verbs/VerbCategory.cs @@ -35,6 +35,28 @@ namespace Content.Shared.Verbs IconsOnly = iconsOnly; } + //CP14 verbs + public static readonly VerbCategory CP14LockPick = + new("verb-categories-lock-pick", "/Textures/Interface/VerbIcons/lock.svg.192dpi.png"); + public static readonly VerbCategory CP14KeyFile = + new("verb-categories-key-file", "/Textures/Interface/VerbIcons/lock.svg.192dpi.png"); + public static readonly VerbCategory CP14EditLock = + new("verb-categories-edit-lock", "/Textures/Interface/VerbIcons/lock.svg.192dpi.png"); + + public static readonly VerbCategory CP14ModularCraft = + new("verb-categories-modular-craft", "/Textures/Interface/AdminActions/unbolt.png"); + + public static readonly VerbCategory CP14RitualBook = new("cp14-verb-categories-ritual-book", null); + + public static readonly VerbCategory CP14CurrencyConvert = new("cp14-verb-categories-currency-converter", null); //CP14 + + public static readonly VerbCategory CP14AdminSkillAdd = + new ("cp14-verb-categories-admin-skill-add", null, iconsOnly: true) { Columns = 6 }; + + public static readonly VerbCategory CP14AdminSkillRemove = + new ("cp14-verb-categories-admin-skill-remove", null, iconsOnly: true) { Columns = 6 }; + //CP14 verbs + public static readonly VerbCategory Admin = new("verb-categories-admin", "/Textures/Interface/character.svg.192dpi.png"); @@ -76,12 +98,6 @@ namespace Content.Shared.Verbs public static readonly VerbCategory InstrumentStyle = new("verb-categories-instrument-style", null); - public static readonly VerbCategory CP14LockPick = - new("verb-categories-lock-pick", "/Textures/Interface/VerbIcons/lock.svg.192dpi.png"); - - public static readonly VerbCategory CP14ModularCraft = - new("verb-categories-modular-craft", "/Textures/Interface/AdminActions/unbolt.png"); - public static readonly VerbCategory ChannelSelect = new("verb-categories-channel-select", null); public static readonly VerbCategory SetSensor = new("verb-categories-set-sensor", null); @@ -91,15 +107,5 @@ namespace Content.Shared.Verbs public static readonly VerbCategory SelectType = new("verb-categories-select-type", null); public static readonly VerbCategory PowerLevel = new("verb-categories-power-level", null); - - public static readonly VerbCategory CP14RitualBook = new("cp14-verb-categories-ritual-book", null); //CP14 - - public static readonly VerbCategory CP14CurrencyConvert = new("cp14-verb-categories-currency-converter", null); //CP14 - - public static readonly VerbCategory CP14AdminSkillAdd = - new ("cp14-verb-categories-admin-skill-add", null, iconsOnly: true) { Columns = 6 }; //CP14 - - public static readonly VerbCategory CP14AdminSkillRemove = - new ("cp14-verb-categories-admin-skill-remove", null, iconsOnly: true) { Columns = 6 }; //CP14 } } diff --git a/Content.Shared/_CP14/LockKey/Components/CP14KeyComponent.cs b/Content.Shared/_CP14/LockKey/Components/CP14KeyComponent.cs index e63ff3666b..96ade36502 100644 --- a/Content.Shared/_CP14/LockKey/Components/CP14KeyComponent.cs +++ b/Content.Shared/_CP14/LockKey/Components/CP14KeyComponent.cs @@ -1,3 +1,4 @@ +using Robust.Shared.GameStates; using Robust.Shared.Prototypes; namespace Content.Shared._CP14.LockKey.Components; @@ -5,10 +6,10 @@ namespace Content.Shared._CP14.LockKey.Components; /// /// a key component that can be used to unlock and lock locks from CPLockComponent /// -[RegisterComponent] +[RegisterComponent, AutoGenerateComponentState(fieldDeltas: true), NetworkedComponent] public sealed partial class CP14KeyComponent : Component { - [DataField] + [DataField, AutoNetworkedField] public List? LockShape = null; /// diff --git a/Content.Shared/_CP14/LockKey/Components/CP14KeyFileComponent.cs b/Content.Shared/_CP14/LockKey/Components/CP14KeyFileComponent.cs new file mode 100644 index 0000000000..fe77f175e3 --- /dev/null +++ b/Content.Shared/_CP14/LockKey/Components/CP14KeyFileComponent.cs @@ -0,0 +1,20 @@ +using Robust.Shared.Audio; + +namespace Content.Shared._CP14.LockKey.Components; + +/// +/// Allows, when interacting with keys, to mill different teeth, changing the shape of the key +/// +[RegisterComponent] +public sealed partial class CP14KeyFileComponent : Component +{ + /// + /// sound when used + /// + [DataField] + public SoundSpecifier UseSound = + new SoundPathSpecifier("/Audio/_CP14/Items/sharpening_stone.ogg") + { + Params = AudioParams.Default.WithVariation(0.02f), + }; +} diff --git a/Content.Shared/_CP14/LockKey/Components/CP14LockComponent.cs b/Content.Shared/_CP14/LockKey/Components/CP14LockComponent.cs index f33cde7ac3..bfc7a7d1a1 100644 --- a/Content.Shared/_CP14/LockKey/Components/CP14LockComponent.cs +++ b/Content.Shared/_CP14/LockKey/Components/CP14LockComponent.cs @@ -1,3 +1,5 @@ +using Robust.Shared.Audio; +using Robust.Shared.GameStates; using Robust.Shared.Prototypes; namespace Content.Shared._CP14.LockKey.Components; @@ -5,30 +7,43 @@ namespace Content.Shared._CP14.LockKey.Components; /// /// A component of a lock that stores its keyhole shape, complexity, and current state. /// -[RegisterComponent, AutoGenerateComponentState] +[RegisterComponent, AutoGenerateComponentState(fieldDeltas: true), NetworkedComponent] public sealed partial class CP14LockComponent : Component { [DataField, AutoNetworkedField] public List? LockShape = null; - [DataField] - public float LockPickDamageChance = 0.2f; - /// /// On which element of the shape sequence the lock is now located. It's necessary for the mechanics of breaking and entering. /// - [DataField] + [DataField, AutoNetworkedField] public int LockPickStatus = 0; - /// - /// after a lock is broken into, it leaves a description on it that it's been tampered with. - /// - [DataField] - public bool LockPickedFailMarkup = false; - /// /// If not null, automatically generates a lock for the specified category on initialization. This ensures that the lock will be opened with a key of the same category. /// [DataField] public ProtoId? AutoGenerateShape = null; + + /// + /// If not null, the lock will automatically generate a random shape on initialization with selected numbers of elements. Useful for random dungeons doors or chests for example. + /// + [DataField] + public int? AutoGenerateRandomShape = null; + + /// + /// This component is used for two types of items: Entities themselves that are locked (doors, chests), + /// and a portable lock item that can be built into other entities. This variable determines whether + /// using this entity on another entity can overwrite the lock properties of the target entity. + /// + [DataField] + public bool CanEmbedded = false; + + [DataField] + public SoundSpecifier EmbedSound = new SoundPathSpecifier("/Audio/_CP14/Items/lockpick_use.ogg") + { + Params = AudioParams.Default + .WithVariation(0.05f) + .WithVolume(0.5f), + }; } diff --git a/Content.Shared/_CP14/LockKey/Components/CP14LockEditerComponent.cs b/Content.Shared/_CP14/LockKey/Components/CP14LockEditerComponent.cs new file mode 100644 index 0000000000..d09c5e5e2f --- /dev/null +++ b/Content.Shared/_CP14/LockKey/Components/CP14LockEditerComponent.cs @@ -0,0 +1,28 @@ +using Robust.Shared.Audio; + +namespace Content.Shared._CP14.LockKey.Components; + +/// +/// Allows, when interacting with keys, to mill different teeth, changing the shape of the key +/// +[RegisterComponent] +public sealed partial class CP14LockEditerComponent : Component +{ + /// + /// sound when used + /// + [DataField] + public SoundSpecifier UseSound = + new SoundCollectionSpecifier("Screwdriver") + { + Params = AudioParams.Default.WithVariation(0.02f), + }; +} + +//Ed: maybe this component should be removed, and logic be attached to "Screwing" tool? +//CP14KeyFileComponent too, but with different tool prototype + +// ／l、 meow +// （ﾟ､ ｡ ７ +// l ~ヽ +// じしf_,)ノ diff --git a/Content.Shared/_CP14/LockKey/Components/CP14LockpickComponent.cs b/Content.Shared/_CP14/LockKey/Components/CP14LockpickComponent.cs index d2676df32b..bc2338477b 100644 --- a/Content.Shared/_CP14/LockKey/Components/CP14LockpickComponent.cs +++ b/Content.Shared/_CP14/LockKey/Components/CP14LockpickComponent.cs @@ -9,10 +9,10 @@ namespace Content.Shared._CP14.LockKey.Components; public sealed partial class CP14LockpickComponent : Component { [DataField] - public int Health = 3; + public int Health = 10; [DataField] - public TimeSpan HackTime = TimeSpan.FromSeconds(1.5f); + public TimeSpan HackTime = TimeSpan.FromSeconds(1.0f); [DataField] public SoundSpecifier SuccessSound = new SoundPathSpecifier("/Audio/_CP14/Items/lockpick_use.ogg") diff --git a/Content.Shared/_CP14/LockKey/SharedCP14LockKeySystem.cs b/Content.Shared/_CP14/LockKey/SharedCP14LockKeySystem.cs index 323ca62678..d421e8f030 100644 --- a/Content.Shared/_CP14/LockKey/SharedCP14LockKeySystem.cs +++ b/Content.Shared/_CP14/LockKey/SharedCP14LockKeySystem.cs @@ -1,3 +1,5 @@ +using System.Linq; +using System.Text; using Content.Shared._CP14.LockKey.Components; using Content.Shared.DoAfter; using Content.Shared.Interaction; @@ -6,9 +8,14 @@ using Content.Shared.Popups; using Content.Shared.Storage; using Content.Shared.Verbs; using Content.Shared.Doors.Components; +using Content.Shared.Examine; +using Content.Shared.IdentityManagement; +using Content.Shared.Timing; using Robust.Shared.Audio.Systems; +using Robust.Shared.Network; using Robust.Shared.Random; using Robust.Shared.Serialization; +using Robust.Shared.Timing; namespace Content.Shared._CP14.LockKey; @@ -19,6 +26,9 @@ public sealed class SharedCP14LockKeySystem : EntitySystem [Dependency] private readonly LockSystem _lock = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly INetManager _net = default!; + [Dependency] private readonly UseDelaySystem _useDelay = default!; private EntityQuery _lockQuery; private EntityQuery _cp14LockQuery; @@ -36,12 +46,22 @@ public sealed class SharedCP14LockKeySystem : EntitySystem _keyQuery = GetEntityQuery(); _doorQuery = GetEntityQuery(); + //Interact SubscribeLocalEvent(OnKeyInteract); SubscribeLocalEvent(OnKeyRingInteract); - SubscribeLocalEvent>(OnKeyToLockVerb); + SubscribeLocalEvent(OnLockInteract); + + //Verbs + SubscribeLocalEvent>(GetKeysVerbs); + SubscribeLocalEvent>(GetKeyFileVerbs); + SubscribeLocalEvent>(GetLockpickVerbs); + SubscribeLocalEvent>(GetLockEditerVerbs); - SubscribeLocalEvent>(OnLockPickToLockVerb); SubscribeLocalEvent(OnLockHacked); + SubscribeLocalEvent(OnLockInserted); + + SubscribeLocalEvent(OnKeyExamine); + SubscribeLocalEvent(OnLockExamine); } private void OnKeyRingInteract(Entity keyring, ref AfterInteractEvent args) @@ -61,6 +81,11 @@ public sealed class SharedCP14LockKeySystem : EntitySystem if (!_cp14LockQuery.TryComp(args.Target, out var cp14LockComp)) return; + if (!_timing.IsFirstTimePredicted) + return; + + args.Handled = true; + foreach (var (key, _) in storageComp.StoredItems) { if (!_keyQuery.TryComp(key, out var keyComp)) @@ -69,12 +94,15 @@ public sealed class SharedCP14LockKeySystem : EntitySystem if (keyComp.LockShape != cp14LockComp.LockShape) continue; - TryUseKeyOnLock(args.User, new Entity(args.Target.Value, cp14LockComp), new Entity(key, keyComp)); + TryUseKeyOnLock(args.User, + new Entity(args.Target.Value, cp14LockComp), + new Entity(key, keyComp)); args.Handled = true; return; } - _popup.PopupEntity(Loc.GetString("cp14-lock-key-no-fit"), args.Target.Value, args.User); + if (_timing.IsFirstTimePredicted) + _popup.PopupPredicted(Loc.GetString("cp14-lock-key-no-fit"), args.Target.Value, args.User); } private void OnKeyInteract(Entity key, ref AfterInteractEvent args) @@ -91,48 +119,85 @@ public sealed class SharedCP14LockKeySystem : EntitySystem if (!_cp14LockQuery.TryComp(args.Target, out var cp14LockComp)) return; + if (!_timing.IsFirstTimePredicted) + return; + + args.Handled = true; + TryUseKeyOnLock(args.User, new Entity(args.Target.Value, cp14LockComp), key); args.Handled = true; } - private void OnLockPickToLockVerb(Entity lockPick, ref GetVerbsEvent args) + private void OnLockInteract(Entity ent, ref AfterInteractEvent args) { - if (!args.CanInteract || !args.CanAccess) + if (args.Handled) return; - if (!_lockQuery.TryComp(args.Target, out var lockComp) || !lockComp.Locked) + if (!_timing.IsFirstTimePredicted) return; - if (!_cp14LockQuery.TryComp(args.Target, out _)) + if (!ent.Comp.CanEmbedded) return; - var target = args.Target; - var user = args.User; + if (!_lockQuery.TryComp(args.Target, out _)) + return; - for (var i = DepthComplexity; i >= -DepthComplexity; i--) + if (!_cp14LockQuery.TryComp(args.Target, out var targetCp14LockComp)) + return; + + args.Handled = true; + + if (targetCp14LockComp.LockShape is not null) { - var height = i; - var verb = new UtilityVerb() - { - Act = () => - { - _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, lockPick.Comp.HackTime, new LockPickHackDoAfterEvent(height), target, target, lockPick) - { - BreakOnDamage = true, - BreakOnMove = true, - BreakOnDropItem = true, - BreakOnHandChange = true, - }); - }, - Text = Loc.GetString("cp14-lock-verb-lock-pick-use-text") + $" {height}", - Message = Loc.GetString("cp14-lock-verb-lock-pick-use-message"), - Category = VerbCategory.CP14LockPick, - Priority = height, - CloseMenu = false, - }; - - args.Verbs.Add(verb); + _popup.PopupPredicted(Loc.GetString("cp14-lock-insert-fail-have-lock", + ("name", MetaData(args.Target.Value).EntityName)), + ent, + args.User); + return; } + + //Ok, all checks passed, we ready to install lock into entity + + args.Handled = true; + + _popup.PopupPredicted(Loc.GetString("cp14-lock-insert-start", ("name", MetaData(args.Target.Value).EntityName), ("player", Identity.Name(args.User, EntityManager))), + ent, + args.User); + + _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, + args.User, + TimeSpan.FromSeconds(2f), //Boo, hardcoding + new LockInsertDoAfterEvent(), + args.Target, + args.Target, + ent) + { + BreakOnDamage = true, + BreakOnMove = true, + BreakOnDropItem = true, + BreakOnHandChange = true, + }); + } + + private void OnLockInserted(Entity ent, ref LockInsertDoAfterEvent args) + { + if (args.Cancelled || args.Handled) + return; + + if (!_cp14LockQuery.TryComp(args.Used, out var usedLock)) + return; + + ent.Comp.LockShape = usedLock.LockShape; + DirtyField(ent, ent.Comp, nameof(CP14LockComponent.LockShape)); + + _popup.PopupPredicted(Loc.GetString("cp14-lock-insert-success", ("name", MetaData(ent).EntityName)), + ent, + args.User); + + _audio.PlayPredicted(usedLock.EmbedSound, ent, args.User); + + if (_net.IsServer) + QueueDel(args.Used); } private void OnLockHacked(Entity ent, ref LockPickHackDoAfterEvent args) @@ -149,53 +214,72 @@ public sealed class SharedCP14LockKeySystem : EntitySystem if (!TryComp(args.Used, out var lockPick)) return; + if (!_timing.IsFirstTimePredicted) + return; + if (args.Height == ent.Comp.LockShape[ent.Comp.LockPickStatus]) //Success { - _audio.PlayPvs(lockPick.SuccessSound, ent); + _audio.PlayPredicted(lockPick.SuccessSound, ent, args.User); ent.Comp.LockPickStatus++; + DirtyField(ent, ent.Comp, nameof(CP14LockComponent.LockPickStatus)); if (ent.Comp.LockPickStatus >= ent.Comp.LockShape.Count) // Final success { if (lockComp.Locked) { _lock.TryUnlock(ent, args.User, lockComp); - _popup.PopupEntity(Loc.GetString("cp14-lock-unlock", ("lock", MetaData(ent).EntityName)), ent, args.User); + _popup.PopupPredicted(Loc.GetString("cp14-lock-unlock", ("lock", MetaData(ent).EntityName)), + ent, + args.User); + ent.Comp.LockPickStatus = 0; + DirtyField(ent, ent.Comp, nameof(CP14LockComponent.LockPickStatus)); return; } _lock.TryLock(ent, args.User, lockComp); - _popup.PopupEntity(Loc.GetString("cp14-lock-lock", ("lock", MetaData(ent).EntityName)), ent, args.User); + + _popup.PopupPredicted(Loc.GetString("cp14-lock-lock", ("lock", MetaData(ent).EntityName)), + ent, + args.User); ent.Comp.LockPickStatus = 0; + + DirtyField(ent, ent.Comp, nameof(CP14LockComponent.LockPickStatus)); return; } - _popup.PopupEntity(Loc.GetString("cp14-lock-lock-pick-success"), ent, args.User); + + _popup.PopupClient(Loc.GetString("cp14-lock-lock-pick-success") + + $" ({ent.Comp.LockPickStatus}/{ent.Comp.LockShape.Count})", + ent, + args.User); } else //Fail { - _audio.PlayPvs(lockPick.FailSound, ent); - if (_random.Prob(ent.Comp.LockPickDamageChance)) // Damage lock pick + _audio.PlayPredicted(lockPick.FailSound, ent, args.User); + if (_net.IsServer) { lockPick.Health--; if (lockPick.Health > 0) { - _popup.PopupEntity(Loc.GetString("cp14-lock-lock-pick-failed-damage", ("lock", MetaData(ent).EntityName)), ent, args.User); + _popup.PopupEntity(Loc.GetString("cp14-lock-lock-pick-failed", ("lock", MetaData(ent).EntityName)), + ent, + args.User); } else { - _popup.PopupEntity(Loc.GetString("cp14-lock-lock-pick-failed-break", ("lock", MetaData(ent).EntityName)), ent, args.User); + _popup.PopupEntity( + Loc.GetString("cp14-lock-lock-pick-failed-break", ("lock", MetaData(ent).EntityName)), + ent, + args.User); QueueDel(args.Used); } } - else - { - _popup.PopupEntity(Loc.GetString("cp14-lock-lock-pick-failed", ("lock", MetaData(ent).EntityName)), ent, args.User); - } - ent.Comp.LockPickedFailMarkup = true; + ent.Comp.LockPickStatus = 0; + DirtyField(ent, ent.Comp, nameof(CP14LockComponent.LockPickStatus)); } } - private void OnKeyToLockVerb(Entity key, ref GetVerbsEvent args) + private void GetKeysVerbs(Entity key, ref GetVerbsEvent args) { if (!args.CanInteract || !args.CanAccess) return; @@ -216,13 +300,167 @@ public sealed class SharedCP14LockKeySystem : EntitySystem TryUseKeyOnLock(user, new Entity(target, cp14LockComponent), key); }, IconEntity = GetNetEntity(key), - Text = Loc.GetString(lockComp.Locked ? "cp14-lock-verb-use-key-text-open" : "cp14-lock-verb-use-key-text-close", ("item", MetaData(args.Target).EntityName)), + Text = Loc.GetString( + lockComp.Locked ? "cp14-lock-verb-use-key-text-open" : "cp14-lock-verb-use-key-text-close", + ("item", MetaData(args.Target).EntityName)), Message = Loc.GetString("cp14-lock-verb-use-key-message", ("item", MetaData(args.Target).EntityName)), }; args.Verbs.Add(verb); } + private void GetKeyFileVerbs(Entity ent, ref GetVerbsEvent args) + { + if (!args.CanInteract || !args.CanAccess) + return; + + if (!_keyQuery.TryComp(args.Target, out var keyComp)) + return; + + if (keyComp.LockShape == null) + return; + + var target = args.Target; + var user = args.User; + + var lockShapeCount = keyComp.LockShape.Count; + for (var i = 0; i <= lockShapeCount - 1; i++) + { + var i1 = i; + var verb = new UtilityVerb + { + Act = () => + { + if (keyComp.LockShape[i1] <= -DepthComplexity) + return; + + if (!_timing.IsFirstTimePredicted) + return; + + if (TryComp(ent, out var useDelayComp) && + _useDelay.IsDelayed((ent, useDelayComp))) + return; + + if (!_net.IsServer) + return; + + keyComp.LockShape[i1]--; + DirtyField(target, keyComp, nameof(CP14KeyComponent.LockShape)); + _audio.PlayPvs(ent.Comp.UseSound, Transform(target).Coordinates); + Spawn("EffectSparks", Transform(target).Coordinates); + var shapeString = "[" + string.Join(", ", keyComp.LockShape) + "]"; + _popup.PopupEntity(Loc.GetString("cp14-lock-key-file-updated") + shapeString, target, user); + _useDelay.TryResetDelay(ent); + }, + IconEntity = GetNetEntity(ent), + Category = VerbCategory.CP14KeyFile, + Priority = -i, + Disabled = keyComp.LockShape[i] <= -DepthComplexity, + Text = Loc.GetString("cp14-lock-key-file-use-hint", ("num", i)), + CloseMenu = false, + }; + args.Verbs.Add(verb); + } + } + + private void GetLockpickVerbs(Entity lockPick, ref GetVerbsEvent args) + { + if (!args.CanInteract || !args.CanAccess) + return; + + if (!_lockQuery.TryComp(args.Target, out var lockComp) || !lockComp.Locked) + return; + + if (!_cp14LockQuery.HasComp(args.Target)) + return; + + var target = args.Target; + var user = args.User; + + for (var i = DepthComplexity; i >= -DepthComplexity; i--) + { + var height = i; + var verb = new UtilityVerb() + { + Act = () => + { + _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, + user, + lockPick.Comp.HackTime, + new LockPickHackDoAfterEvent(height), + target, + target, + lockPick) + { + BreakOnDamage = true, + BreakOnMove = true, + BreakOnDropItem = true, + BreakOnHandChange = true, + }); + }, + Text = Loc.GetString("cp14-lock-verb-lock-pick-use-text") + $" {height}", + Message = Loc.GetString("cp14-lock-verb-lock-pick-use-message"), + Category = VerbCategory.CP14LockPick, + Priority = height, + CloseMenu = false, + }; + + args.Verbs.Add(verb); + } + } + + private void GetLockEditerVerbs(Entity ent, ref GetVerbsEvent args) + { + if (!args.CanInteract || !args.CanAccess) + return; + + if (!_cp14LockQuery.TryComp(args.Target, out var lockComp) || !lockComp.CanEmbedded) + return; + + if (lockComp.LockShape is null) + return; + + var target = args.Target; + var user = args.User; + + var lockShapeCount = lockComp.LockShape.Count; + for (var i = 0; i <= lockShapeCount - 1; i++) + { + var i1 = i; + var verb = new UtilityVerb + { + Act = () => + { + if (!_timing.IsFirstTimePredicted) + return; + + if (TryComp(ent, out var useDelayComp) && + _useDelay.IsDelayed((ent, useDelayComp))) + return; + + if (!_net.IsServer) + return; + + lockComp.LockShape[i1]--; + if (lockComp.LockShape[i1] < -DepthComplexity) + lockComp.LockShape[i1] = DepthComplexity; //Cycle back to max + + DirtyField(target, lockComp, nameof(CP14LockComponent.LockShape)); + _audio.PlayPvs(ent.Comp.UseSound, Transform(target).Coordinates); + var shapeString = "[" + string.Join(", ", lockComp.LockShape) + "]"; + _popup.PopupEntity(Loc.GetString("cp14-lock-editor-updated") + shapeString, target, user); + _useDelay.TryResetDelay(ent); + }, + IconEntity = GetNetEntity(ent), + Category = VerbCategory.CP14EditLock, + Priority = -i, + Text = Loc.GetString("cp14-lock-editor-use-hint", ("num", i)), + CloseMenu = false, + }; + args.Verbs.Add(verb); + } + } + private void TryUseKeyOnLock(EntityUid user, Entity target, Entity key) { if (!TryComp(target, out var lockComp)) @@ -237,24 +475,65 @@ public sealed class SharedCP14LockKeySystem : EntitySystem if (keyShape == null || lockShape == null) return; - if (keyShape == lockShape) + if (keyShape.SequenceEqual(lockShape)) { if (lockComp.Locked) { - if(_lock.TryUnlock(target, user)) - _popup.PopupEntity(Loc.GetString("cp14-lock-unlock", ("lock", MetaData(target).EntityName)), target, user); + _lock.TryUnlock(target, user); } else { - if (_lock.TryLock(target, user)) - _popup.PopupEntity(Loc.GetString("cp14-lock-lock", ("lock", MetaData(target).EntityName)), target, user); + _lock.TryLock(target, user); } } else { - _popup.PopupEntity(Loc.GetString("cp14-lock-key-no-fit"), target, user); + _popup.PopupClient(Loc.GetString("cp14-lock-key-no-fit"), target, user); } } + + private void OnKeyExamine(Entity ent, ref ExaminedEvent args) + { + var parent = Transform(ent).ParentUid; + if (parent != args.Examiner) + return; + + if (ent.Comp.LockShape == null) + return; + + var sb = new StringBuilder(Loc.GetString("cp14-lock-examine-key", ("item", MetaData(ent).EntityName))); + sb.Append(" ("); + foreach (var item in ent.Comp.LockShape) + { + sb.Append($"{item} "); + } + + sb.Append(")"); + args.PushMarkup(sb.ToString()); + } + + private void OnLockExamine(Entity ent, ref ExaminedEvent args) + { + if (!ent.Comp.CanEmbedded) + return; + + var parent = Transform(ent).ParentUid; + if (parent != args.Examiner) + return; + + if (ent.Comp.LockShape == null) + return; + + var sb = new StringBuilder(Loc.GetString("cp14-lock-examine-key", ("item", MetaData(ent).EntityName))); + sb.Append(" ("); + foreach (var item in ent.Comp.LockShape) + { + sb.Append($"{item} "); + } + + sb.Append(")"); + args.PushMarkup(sb.ToString()); + } } [Serializable, NetSerializable] @@ -270,3 +549,6 @@ public sealed partial class LockPickHackDoAfterEvent : DoAfterEvent public override DoAfterEvent Clone() => this; } + +[Serializable, NetSerializable] +public sealed partial class LockInsertDoAfterEvent : SimpleDoAfterEvent; diff --git a/Resources/Locale/en-US/_CP14/lockKey/keyring.ftl b/Resources/Locale/en-US/_CP14/lockKey/keyring.ftl index 826acf4f77..864bde11b2 100644 --- a/Resources/Locale/en-US/_CP14/lockKey/keyring.ftl +++ b/Resources/Locale/en-US/_CP14/lockKey/keyring.ftl @@ -1,16 +1,14 @@ verb-categories-lock-pick = Pick the lock +verb-categories-key-file = Modify key +verb-categories-edit-lock = Edit lock cp14-lock-verb-lock-pick-use-text = Push: cp14-lock-verb-lock-pick-use-message = If you engage the lock prongs in the correct sequence, you can unlock the lock. cp14-lock-key-no-fit = The key does not fit! -cp14-lock-unlock = You have opened {$lock} -cp14-lock-lock = You closed {$lock} - cp14-lock-lock-pick-success = One of the lock elements clicks quietly. cp14-lock-lock-pick-failed = {$lock} is reset to its original position. -cp14-lock-lock-pick-failed-damage = {$lock} is reset to its original position, damaging your lockpick. cp14-lock-lock-pick-failed-break = {$lock} resets to its original position, breaking your lockpick. cp14-lock-verb-use-key-text-open = Open the lock with {$item}. @@ -20,4 +18,14 @@ cp14-lock-verb-use-key-message = Use {$item} to lock or unlock the lock. cp14-lock-examine-lock-slot = {$lock} is hanging here. cp14-lock-examine-lock-lockpicked = {$lock} looks shabby. -cp14-lock-examine-key = The {$item} has prongs of the following shape: \ No newline at end of file +cp14-lock-examine-key = The {$item} has prongs of the following shape: + +cp14-lock-key-file-use-hint = Grind tooth: {$num} +cp14-lock-key-file-updated = New key shape: + +cp14-lock-editor-use-hint = Edit tooth: {$num} +cp14-lock-editor-updated = New lock shape: + +cp14-lock-insert-start = {$player} starts installing a lock on {$name}. +cp14-lock-insert-fail-have-lock = {$name} already has a lock installed! +cp14-lock-insert-success = The new lock has been successfully installed in {$name}! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/lockKey/keyring.ftl b/Resources/Locale/ru-RU/_CP14/lockKey/keyring.ftl index 7a056a3164..8894336330 100644 --- a/Resources/Locale/ru-RU/_CP14/lockKey/keyring.ftl +++ b/Resources/Locale/ru-RU/_CP14/lockKey/keyring.ftl @@ -1,16 +1,14 @@ verb-categories-lock-pick = Взломать замок +verb-categories-key-file = Подточить ключ +verb-categories-edit-lock = Настроить замок cp14-lock-verb-lock-pick-use-text = Надавить: cp14-lock-verb-lock-pick-use-message = Если вы в правильной последовательности заденете зубчики замка, вы сможете разблокировать его. cp14-lock-key-no-fit = Ключ не подходит! -cp14-lock-unlock = Вы открыли {$lock} -cp14-lock-lock = Вы закрыли {$lock} - cp14-lock-lock-pick-success = Один из элементов замка тихо щелкает. cp14-lock-lock-pick-failed = {$lock} сбрасывается в исходное положение. -cp14-lock-lock-pick-failed-damage = {$lock} сбрасывается в исходное положение, повреждая вашу отмычку. cp14-lock-lock-pick-failed-break = {$lock} сбрасывается в исходное положение, ломая вашу отмычку. cp14-lock-verb-use-key-text-open = Открыть замок при помощи {$item} @@ -20,4 +18,14 @@ cp14-lock-verb-use-key-message = Использовать {$item} чтобы з cp14-lock-examine-lock-slot = Здесь висит {$lock} cp14-lock-examine-lock-lockpicked = {$lock} выглядит потрепанным. -cp14-lock-examine-key = {$item} имеет зубцы следующей формы: \ No newline at end of file +cp14-lock-examine-key = {$item} имеет зубцы следующей формы: + +cp14-lock-key-file-use-hint = Сточить зубец: {$num} +cp14-lock-key-file-updated = Новая форма ключа: + +cp14-lock-editor-use-hint = Настроить зубец: {$num} +cp14-lock-editor-updated = Новая форма замка: + +cp14-lock-insert-start = {$player} начинает устанавливать замок в {$name}. +cp14-lock-insert-fail-have-lock = В {$name} уже установлен замок! +cp14-lock-insert-success = Новый замок успешно установлен в {$name}! \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index 1fda2bf7dc..4dd53f0ba7 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -44,7 +44,7 @@ children: - !type:GroupSelector children: - - id: CP14BaseCrowbar + - id: CP14Screwdriver weight: 2 - id: CP14BaseWrench weight: 2 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/alchemist.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/alchemist.yml similarity index 82% rename from Resources/Prototypes/_CP14/Entities/Objects/Keys/alchemist.yml rename to Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/alchemist.yml index 07769ee89f..5f1510b293 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/alchemist.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/alchemist.yml @@ -1,5 +1,5 @@ - type: entity - parent: CP14BaseKey + parent: CP14KeyIronBlank id: CP14KeyTavernAlchemistAbstract suffix: Abstract Alchemist components: @@ -7,7 +7,7 @@ group: Alchemist - type: entity - parent: CP14BaseKey + parent: CP14KeyIronBlank id: CP14KeyAlchemy1 suffix: Alchemy 1 components: @@ -15,7 +15,7 @@ autoGenerateShape: Alchemy1 - type: entity - parent: CP14BaseKey + parent: CP14KeyIronBlank id: CP14KeyAlchemy2 suffix: Alchemy 2 components: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/blacksmith.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/blacksmith.yml similarity index 83% rename from Resources/Prototypes/_CP14/Entities/Objects/Keys/blacksmith.yml rename to Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/blacksmith.yml index d2badc2260..3a5e25d0df 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/blacksmith.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/blacksmith.yml @@ -1,5 +1,5 @@ - type: entity - parent: CP14BaseKey + parent: CP14KeyIronBlank id: CP14KeyTavernBlacksmithAbstract suffix: Abstract Blacksmith components: @@ -7,7 +7,7 @@ group: Blacksmith - type: entity - parent: CP14BaseKey + parent: CP14KeyIronBlank id: CP14KeyBlacksmith suffix: Blacksmith 1 components: @@ -15,7 +15,7 @@ autoGenerateShape: Blacksmith1 - type: entity - parent: CP14BaseKey + parent: CP14KeyIronBlank id: CP14KeyBlacksmith2 suffix: Blacksmith 2 components: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/guard.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/guard.yml similarity index 82% rename from Resources/Prototypes/_CP14/Entities/Objects/Keys/guard.yml rename to Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/guard.yml index 54f91ee896..f75ab34927 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/guard.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/guard.yml @@ -1,5 +1,5 @@ - type: entity - parent: CP14BaseKey + parent: CP14KeyIronBlank id: CP14KeyGuardEntrance suffix: Guard Entrance components: @@ -7,7 +7,7 @@ autoGenerateShape: GuardEntrance - type: entity - parent: CP14BaseKey + parent: CP14KeyIronBlank id: CP14KeyGuard suffix: Guard components: @@ -15,7 +15,7 @@ autoGenerateShape: Guard - type: entity - parent: CP14BaseKey + parent: CP14KeyMithrilBlank id: CP14KeyGuardCommander suffix: Guard Commander components: @@ -23,7 +23,7 @@ autoGenerateShape: GuardCommander - type: entity - parent: CP14BaseKey + parent: CP14KeyMithrilBlank id: CP14KeyGuardWeaponStorage suffix: Guard Weapon Storage components: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/guildmaster.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/guildmaster.yml similarity index 83% rename from Resources/Prototypes/_CP14/Entities/Objects/Keys/guildmaster.yml rename to Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/guildmaster.yml index 2d040c6671..70c49164ca 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/guildmaster.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/guildmaster.yml @@ -1,5 +1,5 @@ - type: entity - parent: CP14BaseKey + parent: CP14KeyGoldBlank id: CP14KeyGuildmaster suffix: Guildmaster components: @@ -7,7 +7,7 @@ autoGenerateShape: Guildmaster - type: entity - parent: CP14BaseKey + parent: CP14KeyGoldBlank id: CP14KeyDemiplaneCrystal suffix: Demiplane Crystal components: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/merchant.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/merchant.yml similarity index 83% rename from Resources/Prototypes/_CP14/Entities/Objects/Keys/merchant.yml rename to Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/merchant.yml index 6e9aa51056..cf59bfcadd 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/merchant.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/merchant.yml @@ -1,5 +1,5 @@ - type: entity - parent: CP14BaseKey + parent: CP14KeyIronBlank id: CP14KeyTavernMerchantShopAbstract suffix: Abstract Merchant shop components: @@ -7,7 +7,7 @@ group: Merchant - type: entity - parent: CP14BaseKey + parent: CP14KeyIronBlank id: CP14KeyMercantShop1 suffix: Merchant shop 1 components: @@ -15,7 +15,7 @@ autoGenerateShape: Shop1 - type: entity - parent: CP14BaseKey + parent: CP14KeyIronBlank id: CP14KeyMercantShop2 suffix: Merchant shop 2 components: @@ -23,7 +23,7 @@ autoGenerateShape: Shop2 - type: entity - parent: CP14BaseKey + parent: CP14KeyIronBlank id: CP14KeyMercantShop3 suffix: Merchant shop 3 components: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/personalHouse.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/personalHouse.yml similarity index 83% rename from Resources/Prototypes/_CP14/Entities/Objects/Keys/personalHouse.yml rename to Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/personalHouse.yml index 1331ab2fd1..9a11ed7d67 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/personalHouse.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/personalHouse.yml @@ -1,5 +1,5 @@ - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouseAbstract suffix: Abstract Personal house components: @@ -7,12 +7,12 @@ group: PersonalHouse - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouseAbstractLoadoutDummy name: a key to a random personal home (limited per map) - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse1 suffix: PersonalHouse1 components: @@ -20,7 +20,7 @@ autoGenerateShape: PersonalHouse1 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse2 suffix: PersonalHouse2 components: @@ -28,7 +28,7 @@ autoGenerateShape: PersonalHouse2 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse3 suffix: PersonalHouse3 components: @@ -36,7 +36,7 @@ autoGenerateShape: PersonalHouse3 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse4 suffix: PersonalHouse4 components: @@ -44,7 +44,7 @@ autoGenerateShape: PersonalHouse4 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse5 suffix: PersonalHouse5 components: @@ -52,7 +52,7 @@ autoGenerateShape: PersonalHouse5 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse6 suffix: PersonalHouse6 components: @@ -60,7 +60,7 @@ autoGenerateShape: PersonalHouse6 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse7 suffix: PersonalHouse7 components: @@ -68,7 +68,7 @@ autoGenerateShape: PersonalHouse7 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse8 suffix: PersonalHouse8 components: @@ -76,7 +76,7 @@ autoGenerateShape: PersonalHouse8 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse9 suffix: PersonalHouse9 components: @@ -84,7 +84,7 @@ autoGenerateShape: PersonalHouse9 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse10 suffix: PersonalHouse10 components: @@ -92,7 +92,7 @@ autoGenerateShape: PersonalHouse10 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse11 suffix: PersonalHouse11 components: @@ -100,7 +100,7 @@ autoGenerateShape: PersonalHouse11 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse12 suffix: PersonalHouse12 components: @@ -108,7 +108,7 @@ autoGenerateShape: PersonalHouse12 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse13 suffix: PersonalHouse13 components: @@ -116,7 +116,7 @@ autoGenerateShape: PersonalHouse13 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse14 suffix: PersonalHouse14 components: @@ -124,7 +124,7 @@ autoGenerateShape: PersonalHouse14 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse15 suffix: PersonalHouse15 components: @@ -132,7 +132,7 @@ autoGenerateShape: PersonalHouse15 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse16 suffix: PersonalHouse16 components: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/tavern.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/tavern.yml similarity index 82% rename from Resources/Prototypes/_CP14/Entities/Objects/Keys/tavern.yml rename to Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/tavern.yml index 207e28bc5d..b25417e6a4 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/tavern.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/tavern.yml @@ -1,5 +1,5 @@ - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyTavernHall suffix: Tavern Hall components: @@ -7,7 +7,7 @@ autoGenerateShape: TavernHall - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyTavernStaff suffix: Tavern Staff components: @@ -15,7 +15,7 @@ autoGenerateShape: TavernStaff - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyTavernDormsAbstract suffix: Abstract Tavern Dorms components: @@ -23,7 +23,7 @@ group: TavernDorms - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyTavernDorms1 suffix: Tavern Dorms 1 components: @@ -31,7 +31,7 @@ autoGenerateShape: TavernDorms1 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyTavernDorms2 suffix: Tavern Dorms 2 components: @@ -39,7 +39,7 @@ autoGenerateShape: TavernDorms2 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyTavernDorms3 suffix: Tavern Dorms 3 components: @@ -47,7 +47,7 @@ autoGenerateShape: TavernDorms3 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyTavernDorms4 suffix: Tavern Dorms 4 components: @@ -55,7 +55,7 @@ autoGenerateShape: TavernDorms4 - type: entity - parent: CP14BaseKey + parent: CP14KeyCopperBlank id: CP14KeyTavernDorms5 suffix: Tavern Dorms 5 components: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/base.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/base.yml deleted file mode 100644 index 554779cee4..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/base.yml +++ /dev/null @@ -1,62 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14BaseKey - abstract: true - categories: [ ForkFiltered ] - name: key - description: A small, intricate piece of metal that opens some locks. Don't give it to anyone! - components: - - type: Tag - tags: - - CP14Key - - type: Item - size: Tiny - - type: Sprite - sprite: _CP14/Objects/keys.rsi - layers: - - state: key1 - map: [ "random" ] - - type: RandomSprite - available: - - random: - key1: "" - key2: "" - key3: "" - key4: "" - key5: "" - key6: "" - key7: "" - key8: "" - key9: "" - key10: "" - key11: "" - key12: "" - key13: "" - key14: "" - key15: "" - key16: "" - key17: "" - key18: "" - - type: CP14Key - - type: EmitSoundOnLand - sound: - path: /Audio/_CP14/Items/key_drop.ogg - params: - variation: 0.05 - -- type: entity - parent: BaseItem - id: CP14BaseLockpick - name: lockpick - description: A thief's tool that, with proper skill and skill, allows you to pick any lock. - categories: [ ForkFiltered ] - components: - - type: Item - storedRotation: -90 - - type: Sprite - sprite: _CP14/Objects/keys.rsi - state: lockpick - - type: CP14Lockpick - - type: Tag - tags: - - CP14Lockpick diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/key.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/key.yml new file mode 100644 index 0000000000..9cab00731e --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/key.yml @@ -0,0 +1,78 @@ +- type: entity + parent: BaseItem + id: CP14BaseKey + abstract: true + categories: [ ForkFiltered ] + name: key + description: A small, intricate piece of metal that opens some locks. Don't give it to anyone! + components: + - type: Tag + tags: + - CP14Key + - type: Item + size: Tiny + - type: Sprite + sprite: _CP14/Objects/keys.rsi + - type: CP14Key + - type: EmitSoundOnLand + sound: + path: /Audio/_CP14/Items/key_drop.ogg + params: + variation: 0.05 + +- type: entity + parent: CP14BaseKey + id: CP14KeyCopperBlank + components: + - type: Sprite + state: key_copper + - type: CP14Key + lockShape: + - 2 + - 2 + - 2 + +- type: entity + parent: CP14BaseKey + id: CP14KeyIronBlank + components: + - type: Sprite + state: key_iron + - type: CP14Key + lockShape: + - 2 + - 2 + - 2 + - 2 + - 2 + +- type: entity + parent: CP14BaseKey + id: CP14KeyGoldBlank + components: + - type: Sprite + state: key_gold + - type: CP14Key + lockShape: + - 2 + - 2 + - 2 + - 2 + - 2 + - 2 + +- type: entity + parent: CP14BaseKey + id: CP14KeyMithrilBlank + components: + - type: Sprite + state: key_mithril + - type: CP14Key + lockShape: + - 2 + - 2 + - 2 + - 2 + - 2 + - 2 + - 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/locks.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/locks.yml new file mode 100644 index 0000000000..4063fe761a --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/locks.yml @@ -0,0 +1,76 @@ +- type: entity + parent: BaseItem + id: CP14BaseLock + abstract: true + categories: [ ForkFiltered ] + name: lock + description: A small device customized only for a specific key shape. Attach it to doors or chests that have no lock and feel the spirit of security. + components: + - type: Item + size: Tiny + - type: Sprite + sprite: _CP14/Objects/keys.rsi + - type: EmitSoundOnLand + sound: + path: /Audio/Items/welder_drop.ogg + params: + variation: 0.05 + - type: CP14Lock + canEmbedded: true + +- type: entity + parent: CP14BaseLock + id: CP14LockCopper + components: + - type: Sprite + state: lock_copper + - type: CP14Lock + lockShape: + - 2 + - 2 + - 2 + +- type: entity + parent: CP14BaseLock + id: CP14LockIron + components: + - type: Sprite + state: lock_iron + - type: CP14Lock + lockShape: + - 2 + - 2 + - 2 + - 2 + - 2 + +- type: entity + parent: CP14BaseLock + id: CP14LockGold + components: + - type: Sprite + state: lock_gold + - type: CP14Lock + lockShape: + - 2 + - 2 + - 2 + - 2 + - 2 + - 2 + +- type: entity + parent: CP14BaseLock + id: CP14LockMithril + components: + - type: Sprite + state: lock_mithril + - type: CP14Lock + lockShape: + - 2 + - 2 + - 2 + - 2 + - 2 + - 2 + - 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/tools.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/tools.yml new file mode 100644 index 0000000000..39ea6a1124 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/tools.yml @@ -0,0 +1,43 @@ +- type: entity + parent: BaseItem + id: CP14BaseLockpick + name: iron lockpick + description: A thief's tool that, with proper skill and skill, allows you to pick any lock. + categories: [ ForkFiltered ] + components: + - type: Item + storedRotation: -90 + - type: Sprite + sprite: _CP14/Objects/keys.rsi + state: lockpick_iron + - type: CP14Lockpick + health: 10 + - type: Tag + tags: + - CP14Lockpick + +- type: entity + parent: CP14BaseLockpick + id: CP14LockpickMithril + name: mithril lockpick + components: + - type: CP14Lockpick + health: 50 + - type: Sprite + state: lockpick_mithril + +- type: entity + parent: BaseItem + id: CP14KeyFile + name: key file + description: A file, ideal for sharpening keys, and reshaping them. + categories: [ ForkFiltered ] + components: + - type: Item + storedRotation: -45 + - type: Sprite + sprite: _CP14/Objects/keys.rsi + state: file + - type: CP14KeyFile + - type: UseDelay + delay: 1.0 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/screwdriver.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/screwdriver.yml new file mode 100644 index 0000000000..f55fca4d36 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/screwdriver.yml @@ -0,0 +1,13 @@ +- type: entity + parent: Screwdriver + id: CP14Screwdriver + categories: [ ForkFiltered ] + components: + - type: CP14LockEditer + - type: UseDelay + delay: 1.0 + - type: MeleeWeapon + attackRate: 1 + damage: + types: + Piercing: 4 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/crowbar.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/crowbar.yml deleted file mode 100644 index 6a0850d1d0..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/crowbar.yml +++ /dev/null @@ -1,38 +0,0 @@ -- type: entity - id: CP14BaseCrowbar - parent: - - BaseItem - - CP14BaseWeaponDestructible - - CP14BaseWeaponChemical - name: crowbar - description: A versatile and useful iron, for taking apart floors or other objects. - components: - - type: EmitSoundOnLand - sound: - path: /Audio/Items/crowbar_drop.ogg - - type: Tag - tags: - - Crowbar - - type: MeleeWeapon - wideAnimationRotation: -135 - damage: - types: - Blunt: 7 - soundHit: - collection: MetalThud - - type: Tool - qualities: - - Prying - useSound: - path: /Audio/Items/crowbar.ogg - - type: ToolTileCompatible - - type: Prying - - type: Sprite - sprite: _CP14/Objects/Tools/crowbar.rsi - layers: - - state: icon - - type: Item - sprite: _CP14/Objects/Tools/crowbar.rsi - size: Normal - shape: - - 0,0,0,1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/random.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/random.yml new file mode 100644 index 0000000000..2b6a6056fe --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/random.yml @@ -0,0 +1,50 @@ + +- type: entity + parent: CP14WoodenDoor + id: CP14WoodenDoorRandomLocked + suffix: Random Locked (Complex 3) + components: + - type: CP14Lock + autoGenerateRandomShape: 3 + - type: Lock + locked: true + +- type: entity + parent: CP14WoodenDoorWindowed + id: CP14WoodenDoorWindowedRandomLocked + suffix: Random Locked (Complex 3) + components: + - type: CP14Lock + autoGenerateRandomShape: 3 + - type: Lock + locked: true + +- type: entity + parent: CP14IronDoor + id: CP14IronDoorRandomLocked + suffix: Random Locked (Complex 5) + components: + - type: CP14Lock + autoGenerateRandomShape: 5 + - type: Lock + locked: true + +- type: entity + parent: CP14IronDoorWindowed + id: CP14IronDoorWindowedRandomLocked + suffix: Random Locked (Complex 5) + components: + - type: CP14Lock + autoGenerateRandomShape: 5 + - type: Lock + locked: true + +- type: entity + parent: CP14FenceGateBigIron + id: CP14FenceGateBigIronRandomLocked + suffix: Random Locked (Complex 5) + components: + - type: CP14Lock + autoGenerateRandomShape: 5 + - type: Lock + locked: true \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/base.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/base.yml index 66951b3481..a919441895 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/base.yml @@ -17,6 +17,7 @@ openDrawDepth: Mobs - type: Lock locked: false + - type: CP14Lock #Empty, for installing new locks - type: PlacementReplacement key: walls - type: CP14DoorInteractionPopup diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml index 15ba236926..7ccd947473 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml @@ -99,6 +99,7 @@ sprite: _CP14/Structures/Specific/Alchemy/alchemy_furnace.rsi normalState: burning - type: Climbable + - type: Anchorable - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml index 0fd390980d..e2f6379861 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml @@ -67,4 +67,6 @@ - type: ItemSlots - type: StaticPrice price: 50 - + - type: CP14Lock #Empty, for installing new locks + - type: Lock + locked: false diff --git a/Resources/Prototypes/_CP14/LockCategories/lockTypes.yml b/Resources/Prototypes/_CP14/LockCategories/lockTypes.yml index 5884721e52..a3b8cf4f1b 100644 --- a/Resources/Prototypes/_CP14/LockCategories/lockTypes.yml +++ b/Resources/Prototypes/_CP14/LockCategories/lockTypes.yml @@ -45,67 +45,67 @@ - type: CP14LockType id: Alchemy1 group: Alchemist - complexity: 4 + complexity: 5 name: cp14-lock-shape-alchemist1 - type: CP14LockType id: Alchemy2 group: Alchemist - complexity: 4 + complexity: 5 name: cp14-lock-shape-alchemist2 - type: CP14LockType id: Alchemy3 group: Alchemist - complexity: 4 + complexity: 5 name: cp14-lock-shape-alchemist3 - type: CP14LockType id: Blacksmith1 group: Blacksmith - complexity: 4 + complexity: 5 name: cp14-lock-shape-blacksmith1 - type: CP14LockType id: Blacksmith2 group: Blacksmith - complexity: 4 + complexity: 5 name: cp14-lock-shape-blacksmith2 - type: CP14LockType id: Blacksmith3 group: Blacksmith - complexity: 4 + complexity: 5 name: cp14-lock-shape-blacksmith3 - type: CP14LockType id: Shop1 group: Merchant - complexity: 6 + complexity: 5 name: cp14-lock-shape-merchant1 - type: CP14LockType id: Shop2 group: Merchant - complexity: 6 + complexity: 5 name: cp14-lock-shape-merchant2 - type: CP14LockType id: Shop3 group: Merchant - complexity: 6 + complexity: 5 name: cp14-lock-shape-merchant3 # Mercenary - type: CP14LockType id: Guildmaster - complexity: 5 + complexity: 6 name: cp14-lock-shape-guildmaster - type: CP14LockType id: DemiplaneCrystal - complexity: 5 + complexity: 6 name: cp14-lock-shape-demiplane-crystal # Personal house @@ -210,20 +210,20 @@ - type: CP14LockType id: GuardEntrance - complexity: 3 + complexity: 5 name: cp14-lock-shaper-guard-entrance - type: CP14LockType id: Guard - complexity: 4 + complexity: 5 name: cp14-lock-shaper-guard-staff - type: CP14LockType id: GuardCommander - complexity: 5 + complexity: 7 name: cp14-lock-shaper-guard-commander - type: CP14LockType id: GuardWeaponStorage - complexity: 5 + complexity: 7 name: cp14-lock-shaper-guard-weapon-storage \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml index fea8644c57..3f031afbd6 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml @@ -1,17 +1,30 @@ - type: modularPart id: BaseBladePickaxe modifiers: + - !type:AddComponents + override: true + components: + - type: Tool + qualities: + - Prying + useSound: + path: /Audio/Items/crowbar.ogg + - type: ToolTileCompatible + - type: Prying + - type: EmitSoundOnLand + sound: + path: /Audio/Items/crowbar_drop.ogg #Add to all modular weapons? - !type:EditMeleeWeapon attackRateMultiplier: 0.55 angleMultiplier: 1.2 bonusDamage: types: Piercing: 10 - Structural: 6 + Structural: 4 - !type:EditIncreaseDamageOnWield bonusDamage: types: - Piercing: 8 + Piercing: 6 Structural: 17 - !type:EditItem newSize: Normal diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_dirt.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_dirt.yml index e49ee3e9de..21a2b4d9ae 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_dirt.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_dirt.yml @@ -10,7 +10,7 @@ southRotation: true steps: - material: CP14Dirt - amount: 3 + amount: 5 doAfter: 2 - node: WallDirt entity: CP14WallDirt \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml index 5ec0b0a80c..eb6427cd66 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml @@ -11,16 +11,6 @@ count: 2 result: CP14BaseShield -- type: CP14Recipe - id: CP14BaseCrowbar - tag: CP14RecipeAnvil - craftTime: 4 - requirements: - - !type:StackResource - stack: CP14IronBar - count: 2 - result: CP14BaseCrowbar - - type: CP14Recipe id: CP14BaseWrench tag: CP14RecipeAnvil @@ -31,6 +21,16 @@ count: 2 result: CP14BaseWrench +- type: CP14Recipe + id: CP14Screwdriver + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + result: CP14Screwdriver + - type: CP14Recipe id: CP14PlatePie tag: CP14RecipeAnvil @@ -148,6 +148,16 @@ count: 1 result: CP14BaseLockpick +- type: CP14Recipe + id: CP14LockpickMithril + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14MithrilBar + count: 1 + result: CP14LockpickMithril + - type: CP14Recipe id: CP14BaseLightCrossbow tag: CP14RecipeAnvil @@ -173,3 +183,94 @@ stack: CP14IronBar count: 2 result: CP14ClothingMaskSteelMask + +- type: CP14Recipe + id: CP14KeyCopperBlank + tag: CP14RecipeAnvil + craftTime: 3 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 1 + result: CP14KeyCopperBlank + +- type: CP14Recipe + id: CP14KeyIronBlank + tag: CP14RecipeAnvil + craftTime: 3 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + result: CP14KeyIronBlank + +- type: CP14Recipe + id: CP14KeyGoldBlank + tag: CP14RecipeAnvil + craftTime: 3 + requirements: + - !type:StackResource + stack: CP14GoldBar + count: 1 + result: CP14KeyGoldBlank + +- type: CP14Recipe + id: CP14KeyMithrilBlank + tag: CP14RecipeAnvil + craftTime: 3 + requirements: + - !type:StackResource + stack: CP14MithrilBar + count: 1 + result: CP14KeyMithrilBlank + +- type: CP14Recipe + id: CP14KeyFile + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + result: CP14KeyFile + +- type: CP14Recipe + id: CP14LockCopper + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 1 + result: CP14LockCopper + +- type: CP14Recipe + id: CP14LockIron + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + result: CP14LockIron + +- type: CP14Recipe + id: CP14LockGold + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14GoldBar + count: 1 + result: CP14LockGold + +- type: CP14Recipe + id: CP14LockMithril + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14MithrilBar + count: 1 + result: CP14LockMithril + diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT1.png index ec4c89e2822ba56bd66a91799f979feac1b6a2a7..950cd509a98933f4e674bb44953e0d083bea12c4 100644 GIT binary patch delta 188 zcmV;t07L)(0p$UZF@K*)L_t(|obB2%Y64*p2GCFNFfKvS!p5Az8z|UlZ>2}j%08{0 zz#JqYr?B!0zm*`{EGa}>-s@(Vf$8T<00000fV=r@T_&H?(yPYhv0ty>S*K}WK3kWM zewFk2JJ;(aNwQchv)!y3ci%y`Y2bJ|bdqGZ|0;vwC`t17`!)0Avj6}900000c%3%p q1^)fxZ(ClVF&|JTF8}~QJKO-V-!S#i|6xP`0000sWsP delta 214 zcmaFL_@8ltVf{`|7srr_Id5+%@*OgeIQsFp=&CeM4lyRijm8rS+Ri>&?l2)Uph9O( zf($d`!G?x}bP0l+XkK$^%`5 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT2.png index 5d895578cded304f3af5c0cc080ce74f5cb35c2c..51f6f42c97ce1082f432a0a30137c12df04cacd0 100644 GIT binary patch delta 184 zcmV;p07w6U0^tFWF@Kv$L_t(|obB4N3Bphi2H+E%AeAHN0BMo|1RPO*3Z0000Tg`#TAbThFD-ljIPA@N^D=iP1~8CX8d{Ppa_rs5J*RK^Y=8an@tk?` z7RffHw_@LZn|-MKkMqjou8D7cF~?_CP1rh9<)noFX_bpl18XiN*{%NaA?PGS(dw_) zc-T)$|~9^6FgpC zj-2^2&~?fQj;1+(;_EN%o}4Pk00NWJ)?B`E=9hT;k`yy$k$qQe$}jGWB2yBFk& xFRK6lB(!vKtN!%Jx{#}9i%v6xErAnzKC{eNq!a8=9CQgJ=IQF^vd$@?2>@u+RPF!( delta 189 zcmey$_>6IaVf_M67srr_Id88TavgFIV7+j4c88f#+ma2QdsFn*Sh`ulA#O_S?<}>e zdUkhCpMUClb8YzS4Y%_Te=d}stNx1j#o_Ji)l@RgUiNC3CrIouTen`(b8~@}oLXvU o7Q^BEb@mm(*W`evLqJ3Q2eyI;SpgA44rh>vr>mdKI;Vst07iyPYXATM diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/icon.png index 33db4a0e43fea245178abc691a867c19182a951c..ba7a88d0e2d03c73fa6c9767103a87e15eeb7be0 100644 GIT binary patch delta 229 zcmVAK11bo$X*n3U1G5E8@p@4JU|cQ=cpsae f1z0Q=%T&Ao4;Q_O3uu8tOss*UF?f)0 z^+XH9$;5CVJ7HE6oOhn=`#V1wa2&_^cM_|I%Ayj0VSEBGO)mf*eYfh^9H4Gmx!-!V z*d)NGTr1v8-L!JKc9NgYa>$PI73nVJs=k(;TlAf3hOOnG*fc;{RAMa${Cm_voQHu)iYt{HSGnN3)o8ayB#Z>rSdkAW4(-~4nQ7S1)C2^EU(ZuY_7M0%C}-!Fy$+;J55ZpT(d;20A|fKH;T!8^q7m=fM|1E10000TF0t1F>))Eqzc=P z%hgJaPEH&2aDSV5oiK{|?R7z)Umx`HJQVw!A|0?fd6g#AY_+v&G+S*_X+qUXO|%no zO?LOhegB4$I000000Dk}gWaD4o85?cwOXRWmYW2Q-ka_4t0$8uVCCZ8r31GQUrR8!}h%OMD z4NfLc+EXEu3OgRpYg|^?0P<4U0P@;HAQnKUb3yajRH{4?ncG80001hjD7&xS&&Z& Sb>{5=0000$zH6{=jTx1Ns9~R%(Lh2aR34(jS=8^Ml+qoPX^*==p)%tWy|98c+Ai+3oajnj{bpJP`Uv{^Y^OW-(E2sp4av9GP} zh&0_0wiWK|a1`@wI-y?gj?B|D<+EXZ;huLznr_hLg(;kGuEqF4$V5c_{^0AHN`Y9< z(Da2TN_zkR0Dk}g00000P@mWCN;#P>L}|@{66o5SS_f5^F6KXWhrH=6@ zmhEt>+2OQsDw7|CT&tVv{0RM~{=O}x($P-F5lVNxRxvl(4?-S};+?(yy>^#nd~I_5 iT%i6A00026hdu!#`;AW@r0k&p0000~;giKw<4mre0Zb{q);kqly>Yhn| zLNaxaOQHS)L2y@>B8sJSQT!>NLpjmGSi#Gk$@^@b-rm;_a^x*QL_|bHL_|c?GXvKF zvC^XV4*&qO%Zc;6&yv*0cx(Uw=Vzy_W`7YYE!Q`52{C)C&3`WwqE-eFMMFG4J+=`Q zR5pP13YJyvZT)}BcD?~oG{kbTavc*~_J=$xy!`sUvx$g^h=_=Yi2BLbyTIRY_D-;@ zYFRE;@YM%w%E}-#)yQlp2 zb3P@h5uXJ~lWSJ0vHQELfo+I;ElEv3H^7J9w?eVf!Xbpv4*Qa%Mr=FWG=xq*m+jr- zI6naZ93AR!&)K;Ru!o;N+yZDmeCOC}cUjdNU%fjq9eckB;xBPTL`46`JF&um=Q_2^ QF#rGn07*qoM6N<$g1i8+Y5)KL delta 412 zcmV;N0b~A}1H%K5F@JqYL_t(|obB2%Yr;Sj2k@8DPmn2VX@`W;V2~_{d!cZCf&^UJ zJ(K+i`W5^dg5a($K@>$?6j!Hwh3h0(C}|RMuj%>!&3C!Wy9as43lRVS00000K<(lv zk(~3&x>LQt@pPcUa8&AL2E&m&o(`(E^o{ZWWZ9YAmRD+y+kf&X%g%~+^ap}a$jLM< zlm(M%DuYn4q(2cu1`tu{)8ssTmH;#vO8`vMqRo0$XzXUaBGa@K?}(A@__E4Zz;=8+ zK7*!d(QdmhHD|Zo>yrgdFN6R900000007|D79#=3|3MNWa}F+!)bP5DHnP zLBfHhHMW?K4Zq#tSgP4L+ulXpM0dD}foGK$0PQm%juLq(%6_7C0D@4+bUDi%qiuC| zsYah)oZNC;%M7?K#ee%lO{)y3atF~O0RQn83IG7m02N==3V=B*R_KWU0000{rdfWlPZwP`MmKu{ zuw2X`g!Lb7X^jvTmW%o64@7ZdOc>aXE2B6$+LwbNP!^Rjt3U_~Wl=SMQ0)fi&Xj%- z5fKp)5fKsfN8NeeU(otkJk4@h7FDZ*pzQ#tLdJTt!esK?ud_W>oeKO=4o98@w#VCT z41$)mzbH;*S$|YmZ&vvHm}%L@)~KS4n)$YAnFHLL+y2eG($&l>C#`^9W#CZR$pb)=?nmj3<)A4q8|AHfBur^&xi)#00000Ne4wvM6N<$g3(5{CjbBd delta 412 zcmV;N0b~BP1H%K5F@JqYL_t(|obB4ZZh}x02k_I{E*+U%n|6RfBQY%ME8r98L-+ZoAwVjD)a2T%CA@+X;u3FB?E}@BcTFTyoC2Cl~ZU1ONa40001Rv0SY9 ztz&3HRUVId7cJZ2$ti9pqK+k}m@L~VEJAJph9jNQ^xR%l9e+yGGYv<2{ROVa_+)Ad z(f*mq)a0(ma&yY<08w^7Qc9?chafN0+cTuqh&6n4OTZb~s%D?J3+ekXh|~-|yt2bwlk$+Wu7r0001;`xODKwv_ws)OdaX0000Px$Y)M2xR9J=Wm9b93P!xuLjZe^t!G*xkYC>S>Qg)rntcfNpIxwlTVIU4=a__27 zP?9En0A20?!4w=Iq$x?Ac!lF&dQ%4Fw)cj`{@ZEVet*w@&Mi=?)PL83%9mMfn>rnv z*Pb`R``bt<<5&3sBR^oI8z$+7NzTwEKVWoybx(USV6|-ykK$y@%w7znCZaf@C{8$h zmjR{u_yMESlVe<7+yVeLn=gFM*`JIgm)GZ9T`e3znz;152|>91FX0iiF^4U@Xv8(ue>Ej--ylyu@q~Y>t^fc407*qoM6N<$f@>zc`~Uy| diff --git a/Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/inhand-left.png deleted file mode 100644 index 2c2c5583f43a7cbf8d747021200ede54d3a29f77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmV;L0cHM)P)Px$R7pfZRCt{2+C6TQ)b6g;8@C~b)Tw}d(AJx6r^cnj0H>3&Mx&eHjhohm?ERF~ z_}%_VQIsxblY+V*} z%UfrGjAQkK9;`Zu>0~TP!8gB60~t~7jP3o6&%{SPkddUB^Rcb=&i6LizB5Uhxh~g? z7LxL@P4*ecFn{YY`GxO5#>EL0$Y>pqh>bu7007>70t4}z{Ouuw9RL6T07*qoM6N<$ Eg0oS;pa1{> diff --git a/Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/inhand-right.png deleted file mode 100644 index fe48c72399007f93b1d03d10d980aec4cbf3fbc2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zBRyRlLn`LH zy=CZk*g=5xLjDxzh)vbEu9QtQ%AC{Gq^wZLWZ_iAv_z({Nhx!Z5$l!PyZo2jNz%CB zlAZD<;o2JUf7x$bwrw@GE;D8p5Cnt2@yDh-s^+zGsoE5=j)fuZGUu_!uV1{5{x{8Q zf%*3DMOJbK^Tin&j<@el5T5w7mEpkc*UJpsCjNc=^rt3MgN5hQ5}P^yufO8ZRNU3c zpyGF_IA?yW$b>ZGBd0E$jb3lQ!u!Z}rj5dev;7zpX1s4TT$)o}&2W|X&6bM4VJo(M z&++KdJbH3jrs)gAknq_2p2=H^RFn{a>sCOUn%L>78Ivz>JtjBv{X)*&o4LPSZqBKF zkk9X%aW%L6cN}xLxP651!tR&J8He(=nDLtOI876u^t5$HjeTv&9QU`=uWUXQ)X?Ac zfeS3j3^P6-&0p`}nri)7Kkkyv{O; z*;_L=@#CbrMPDB?=^W9rDJwBnW@bKIpY1ITR^xKa&CtNW;Lq|af-2eDHhue>pPPC3 z!=t0zt6EqhrB=S=*c99MhJ%xnvrSw-Zo*TJMVA?@9Q=gc`{ff2>MCdJ6l?e$4ZF7Q z|5Ulyv?- zHh=G*x;1^pp{_S34ZL?IUrwE{WlQ3Yl7}{?y{fzsk-vrB{th(YayzIYA;Q3L;c-sT U#)K13fg!`->FVdQ&MBb@01-QhJpcdz literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/key1.png b/Resources/Textures/_CP14/Objects/keys.rsi/key1.png deleted file mode 100644 index f1cbbc5907dd9d61f633a38c0dbd0791c6dcb85e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}dp%toLn2y} z6C_v{Cy4Yk1sZUZS6~0r&&8{F%10tW z$!+4KNkYvlrkH>+kbQX5)$D)z(R-iSp9zwvefukyEyXa2A#mN=%&hYh zn&ar^Hp$UDc%<|{Ln2z= zUNGc3WFW%!VE+SA8LpXJl9N8ac;w4cC~)xZT0f`EXgI&j|0FsuB`<_0IaujJw}1JJJ6AFb9K2 z=%OF8jC{+zZREeZzH*+iAcQmf%N$SVwHIHs3toG%o^^VM9z#vtT((vN#THJ61tFbV wt~~zP6twgQ*CW-Le(8`J%F?7^S{Dyobx=TB>~7 z$;&sqrpax$_G^!2W%!*uKiMZ>RisnxjBwQ@4<9ix*va)9Djs8D01BR4dgna%o`0{Z iEW;nMC@C$f|IWgr9iXDpfB!wu#SEUVelF{r5}E+g5?*Tn diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/key12.png b/Resources/Textures/_CP14/Objects/keys.rsi/key12.png deleted file mode 100644 index ecfa6ab9a297c1a05458c253919d405d53f36289..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}OFdm2Ln2z= zo;T!bF%V$A@P1SHhJfI+x<_tt=RFVOPLi^1R9ew~;gHz_!%d+smvY{0`>~$WhwYzy zLq|skQ%GrY>Fvn7W!qLszyAMv+ve-v``k}V>QL}AK9b2M*r@&3>3S|Z!+x9Rp7(8n*WM^<#$?|uD!^$UfTDkNJ_P+RB h=ej)zXv@Ew;%6emh0D9bxq%L5@O1TaS?83{1OUbTUiAO~ diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/key13.png b/Resources/Textures/_CP14/Objects/keys.rsi/key13.png deleted file mode 100644 index 3ccfd054371facb6a4e91b8a1ab69baafc1cfbd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmV+v0qg#WP)Px#&PhZ;R9J=W(J^YnFcik|zeAu|GJ3GBN#MagPqQ>+?imW9LkVQhmQ00GFZK!2 zEr+lNuL2*SOFJo(ib{qkkRg!wn}qbF_elaFgb?E1MIlAok54z*nxVC(svBF?jrE(iU5}gd*Ukw_ynI{R)$2>-#>NaNl~5Kr z0BzU*)s{t0+x3)1PRNUlLzB8&xn{-;7&8E%RDuh&|2m*l@-Ng?0{92M?=~0zwGcuG aakGw!Mn-w69+Z>-0000Px#u}MThR9J=W(y9R!q8N~wPrNkZGh(T|1$0Is(?)5%zLPogIYS!;>Yj5y7( z){+;c&x_J`Wkdbb`MbU(bUB?_EoKqGe7W|{wHT9hK2p^Uc~SbRZX~T`1Hf~m(Ac>a x=UM=aNeDxQnv{5e*NyhO&DZ{bQc5ZHa}V$JJ>9AwFtPvu002ovPDHLkV1nSUY61WN diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/key15.png b/Resources/Textures/_CP14/Objects/keys.rsi/key15.png deleted file mode 100644 index 18a372694fefdd3a435fb9e28ad009ca255f8909..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}TRmMILn2z= zUfjra$UxxO$9mTbM>jg(_Ni2h6-l4(D8Mdw=WdD65xuwC9KVFDcCh_o(6c(K85Ho4 zjs4(nU-un%$`uz(3G({8+vC!fTkmR?-(`AGwcA*V&+gvo?n~dRV=u-uv@JOql5r`-5Dm|JY*f7=<`V^h@by!xEP1?YsGV+ z7U7HuK28x@b38l6SM1N&9M|pfi@Ln2y} z6C_v{Cy4Yk1sZU+qymlxuwgBlX7 b%zO+gQ(a5d`X@dEI-SAO)z4*}Q$iB})Gbpr diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/key17.png b/Resources/Textures/_CP14/Objects/keys.rsi/key17.png deleted file mode 100644 index 124b5c012e473a477c028812a72d91d774ceb0c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}3p`yMLn2z= zUNGcpHV|QZV81lH;Nsi6PILAqm|Ke;(K*Q(#qw6Mq=2`gr^Jg>^@50u)t~#HoIXAH ztIr@PD46=<*TL-My=K?S|2_z|y%jNk)%`g|vs_qQBNu9DcW^k(sJO5x&*Q2y)0xLD z+g66&zLF)Uen;M4=QUgI8h%s0$-8YC<`hfYo0sOb7ytfkJLmCkXXYdERlDP^_y>1% cbo{%?ZR{43c)dkB5a?D0Pgg&ebxsLQ0EUuT-T(jq diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/key18.png b/Resources/Textures/_CP14/Objects/keys.rsi/key18.png deleted file mode 100644 index a60de847dd78eb525162364ac1cd03b846332ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}`#oJ8Ln2z= zUNq!7WFT_vW4+^rqs$_k$}-L`?tb(}lBH1K;9XyJ$2XVe9ms2{V3v(pEGrXR(iObr zQ9@VugWtXB{S?7-H6$@0$DV^j-^3UWe5;3toj=Ic&Q* z>(Rd&t0eYgo>^tTnHd5lY_irR&f)voo@^}j#b)<4D|gNL8ax{g>qc)*wEMbl2TQ|q zure_J_hd{|?q`S-dLhvJd*yO`gwx-OZQQvvcGgQu&X J%Q~loCIAJ}bo^Mo|Z)c;Yr5xI8p>&|8w7N3fH-DL3P#rIuHBKZQoe$D!9~`T@J6A8VtTz%+>ebdZsqF@z;UBd7nSd=T>YHuz$|DGSrjtq|)&$pidY)UHx3v IIVCg!0Onz5ga7~l diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/key3.png b/Resources/Textures/_CP14/Objects/keys.rsi/key3.png deleted file mode 100644 index 96d8786e2422c1fe03ee3e36148913e30ee4b325..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}yFFbTLn2z= zUb5youOW~ zAzdc1bJx!tIKyYWL7_#!>5ujCWtr6$*Y@VIH@tp(uEc0tRr=!8%S)yl`pO(*@1W^A zDXnx;+SZk`|JdHzuq$O>%=Ohr&lv8!CYty{@Vhd@r$s97+~o^RWNPN#-*)#(%v5nz zhN$q2SVn<1x#gdqs?OSXOsqm~$NgNX-^@-Nibu}dGDLAXRmvEjlmvQ%!PC{xWt~$( F69532WvT!G diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/key4.png b/Resources/Textures/_CP14/Objects/keys.rsi/key4.png deleted file mode 100644 index 0aa950808da1890c1bd42447963715465053dfe4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}2R&UJLn2z= zUNYo5WFT_vW4*(Lqs$_k$}-Mh))P%Xuh7xV@h;DbGfBLfX*cI1-dhW^w=^&A_A8w* ztxuMTZ{PhX6TW}i=itDh*z%)%mG{N8`W0=>b`0mQ&pugkW###(hA%~HZ~Z?0m(4+h zjZ48!EmVX}%TCQVwl+=mK+eWh(>||Ub^X|sjJFS}^%x@KfMjHxiS54UWn33u3o-0l zzowm0A~?y1v*8-w@-IEt_)2$_NoX_P5`VWXJG&li=}vy;1$Il4&b^oq^bCWitDnm{ Hr-UW|e5GoL diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/key5.png b/Resources/Textures/_CP14/Objects/keys.rsi/key5.png deleted file mode 100644 index 6d16265fc34d45a28777c0fe4954d3fbfe485d3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}yFFbTLn2z= zUNGc3WFT_vW4+^rqZb!W(44T)wqLJnbGpD0N0xH)xhxyI=Q)`3U*wBrwr%M4D>c03 zc~5KK{V6R^_D<)Y66CeAUffeJ_gnj}+nLM-yX|N6xX0g5JsxZ;^Tl;*^d#?Vx4!TC zp2Z+AtEJZBbazmYn1Gr=^qN;sYouDYeiuDk)5BL2p_?$wf`SsV|b+ znwsBlSE*Fdk5^D=5peorExIXlSH!NWwOj|@{#$T6lYOqXuEVz5*7db}=P+iNN^AKA zJwI=seZMN)i7Drk>0(EJ#xL#3={>HmJ1ji!KCED>IQuuMV*$faRtDGNWSwIX3|sml uQg3hH_=Vx$>SvohGwU5V6kC4mR6ly!qtJBK(;q;`GkCiCxvXPx#xJg7oR9J=W(Y*@7Fc84;e?`#6u|q$mJd-Ypv(F%ig9z?!ItgNy<`o2eiFW83 z=mWUu6ep!BVg?7n`z@D)OYV+<5JCv??*gBq)pqAP?G^y1^M%oH@b;e0jO+KhUhe`l ze2SD(gmFR`Cn%-RnQ=NZ?zu5QUX%~{CrzKCQ<@=A@jh+eMBzu~hGl;8eW*CeHDKw~FhnR@-9{YjZy2vvPNTH#KJF zPh(S1Qd-25d%b(3Ur*_!vb{E^C0;+d`{$IB`jV|~k>(n&*`l(KBwspX;J5i`;lGrb z!n@|_-^dMPWmvPl`lFr0%B*is4g3tQc}CTjF?{$j^E=}`c7}$at9$!R!@n`UbYK2> i;g2kCLBWgmyBS|+_+S1T-}eLPUPx#vq?ljR9J=W(yv3&(tmzXP-e32NB%ebP~ia?JEfS67A46 zkOy$lDNc zNPswweLZ+GATLUnrHRUm(p7a6(l$K6>2PE*n<#+keCdp_XdU?=09D=a>G0qHaNoKe zV2s5W3xL*chw00000NkvXXu0mjfM%HMU diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/key_copper.png b/Resources/Textures/_CP14/Objects/keys.rsi/key_copper.png new file mode 100644 index 0000000000000000000000000000000000000000..6075f6f97fbcfd68a609acbe88ceb8b5ac82567f GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}`#fD7Ln2z= zUQpy~b`W5_;2+G>wcwg#fC@|hBeodE%|n5l$3l^pJ~s$z3NQO*0AY2_g3wHy5P3NE?b$8E-$`K*txb&eofm0 z;Us?v=j|Ikl1nFT4P3JEm7DN9Q$@kE;S3BOF3njS6FS&l{@iH!e}y!|4D;1(KkxLa z?J{FxsJPamdSz+vgUHL)0edZr!y8ghzka*!Z?TJuOZ|J+Mkd?&QeO_W0e!;Y>FVdQ I&MBb@0HqgaB>(^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/vault_key.png b/Resources/Textures/_CP14/Objects/keys.rsi/key_gold.png similarity index 100% rename from Resources/Textures/_CP14/Objects/keys.rsi/vault_key.png rename to Resources/Textures/_CP14/Objects/keys.rsi/key_gold.png diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/key_iron.png b/Resources/Textures/_CP14/Objects/keys.rsi/key_iron.png new file mode 100644 index 0000000000000000000000000000000000000000..fc1d66a82b7893d390cda27c29d025192da493cb GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}J3L(+Ln2z= zUNq!7WFT_vWBpNM4p}dA_lpOOIpQ4W*!FEMHnDVAc)_?NBXcFI`AUU~PAd=ZT}vM* z{HVLlt^dAOMWIE&>5ujKr7xH0UpzOW}x=G*Rrdo4Vp8{Ve9HOVh&sQ#SucGoVu z7h=aeZ;4g19Z1^w>U_*$pO{%aeH_g9xtZ@9TOHEyotS>(bmPIu?^^Mk4D-{swTGql z2F_Zw=C{-Vjl1oIhNZj-{2|XDzt}J4#GzPsO`6xxf8KH@~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/lock.png b/Resources/Textures/_CP14/Objects/keys.rsi/lock.png deleted file mode 100644 index f5da11ad68e90c7dc14b7ca69754d1fa3001f962..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^TFU3qUM>IaQ&S#kCD+Ni>LE# zD*d_&ff_`XG>USI8?K4i(Gl~uz@bb}KtyoqjUqNSE~f)`Z%=lN^6Pte>gj3`%Z5co z4({Qzl}<}aoY3eJzVzu|vUi97Je%|ggKVLb&nAX8sV;f?*Iius_@_VvF1Ldk2|&QW ZkdWl`ZS`D#7GUr&c)I$ztaD0e0ss;gf;j*H diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/lock_copper.png b/Resources/Textures/_CP14/Objects/keys.rsi/lock_copper.png new file mode 100644 index 0000000000000000000000000000000000000000..ff4696caf7427f151ade5bd1de09364843b55467 GIT binary patch literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^TVdnK5e4|7hEIpEUui2Z)V!#C>|zu}2>zv;P& zM_R#JuxRtYg*S@W*o2%JBvWSpO%0elE#b!B5GlPj8K)ymlQ#RVTz|Aa)bUJ70njAp z@6Uv{oNY5$uzumMc;Bcd$Hv#@%s_B>-R*oyy?Z-+r$vGTCeYvk1H;Glp$2CK&b9(W Ok-^i|&t;ucLK6TSIhlt5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/lock_gold.png b/Resources/Textures/_CP14/Objects/keys.rsi/lock_gold.png new file mode 100644 index 0000000000000000000000000000000000000000..7620f761eada2877e5395be37bba6a547f821c63 GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<+MX_sArY;~ z2@e@Bkyt5`R5iX3%+SJSpx_O`x}#kP2rn@%MTWlB?? zrY^rx#KtD%%pj?A>SDr$$s#E)B7Y0%waGXgVVbo0Y+J_M|6;#lBp#{j)g^O8RJEpj zKB47s=gE(MuRXbpZmjrVWB>#{)_*z@uP^pb5qARzOQ69528PJ<0h{G3{8WHp$l&Sf K=d#Wzp$Py;9GH{< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/lock_iron.png b/Resources/Textures/_CP14/Objects/keys.rsi/lock_iron.png new file mode 100644 index 0000000000000000000000000000000000000000..b6973da49a0cefc52b5e7ac49ad96d90d9c6acdd GIT binary patch literal 361 zcmV-v0ha!WP)Px$BS}O-R9J;$U>F6XU=)mkkq#Ki(bUm7>%X3XA)J5d!g+>@@-(u{B3V;M=dAyc zQNAc*SFb&x$PpxgZ97l@@93QMA6e|-TKdI?}B*oiyp8l_`C4*D`>a`~f zUhbwOnMqOzEML5gL0eZ7w*xL;C&f4h1_lNOCQ=mNy?+PJo-?bTVa}|6k}X6BWG6xv zHXe#CXJ8;P1du^OLMnrhkOae~O`G9j$RR{5AUWH_#uWa?mJY67zRs|CNk7TvkyU_b zXqx^P5|Ut0R#ahNU|?W4ef9{$jq9grUks0eQ7{Td0WAOkxNTI1$*ffR00000NkvXX Hu0mjflPZ@C literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/lock_mithril.png b/Resources/Textures/_CP14/Objects/keys.rsi/lock_mithril.png new file mode 100644 index 0000000000000000000000000000000000000000..976d5b8a6a3b2712af5430e36b3d33a9c7262245 GIT binary patch literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<@}4e^ArY;~ z2@>aPDYAKt&F zH%ZoM65Ep_$A3RjX6~uA-!S!|;$oKO_e%sOU1s!D{1DkT|DdZM_o0c-lPq>mX>4Si zB;m=bVwv!L&2OGPaq@+y^Q+xAG0*S_s`+m`r&hC^>+sS$nkvy9d?)-`_$5^(K;Vl; z34^C%15b^5tHGa8^VAy#Ulk7-ED=x=n=r4wc-DXRO3p-%^|!zEH70uL=5AKx*|5su z-~ZKlr#|>k6hCx-WBBPndMF+ON-YzKt1pn%Pw<(rqeOF|Yl=R%8ygqjS*$p{gXZ=56!jqA? z%BaK3(|AwaH<8u07P1$D!cRtAzVh$?Px#%Sl8*R9J=W&_4@7VHC&l?=8h@RK$AS?x?&2QC||fz_L+&%2LfP0EJve16Zwh zDw&9BxB6;dP!Q`W&uj&A^`q; z^YTvM4*;~!;yPEWb*(Rrj9>bJoJXC15mG3-tPXGR=cNua!3dvg!q;# X&wNH7^3`IU00000NkvXXu0mjf_TY6t literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/lockpick_mithril.png b/Resources/Textures/_CP14/Objects/keys.rsi/lockpick_mithril.png new file mode 100644 index 0000000000000000000000000000000000000000..251e8e114a2943827c373424da8be4718f63cd9c GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}$30yfLn2z= zURcX@C_&`d$Nvr&S6qC=D#631pI{*|!({eRgU_dYHs9b?x{+qadB|lC)8VGj4{Rp9 zsSiz0uoN2q3_Q1fj=0=8c6|=T7J*0Sw`@7UVZ(aim0#SZqg&V;;@@U4EdK0wvvro( z^(B>=k!o)l>Z=$Q$hGO;+-9q6RN8YOxVMP)cH}*A3vVF1Q2#*24VHx3JL>N||1vV@ zgntb$_Pfq~H0EER`V@u^pSf?cK7Z-+`Fqb=ZqNL`hSOHpZT0}#`(u){3YU{;-v#+? QKrb CrystallEdge migration zone end