diff --git a/Content.Server/_CP14/LockKey/CP14KeyholeGenerationSystem.cs b/Content.Server/_CP14/LockKey/CP14KeyholeGenerationSystem.cs index 35547d478b..a0d31fbc06 100644 --- a/Content.Server/_CP14/LockKey/CP14KeyholeGenerationSystem.cs +++ b/Content.Server/_CP14/LockKey/CP14KeyholeGenerationSystem.cs @@ -1,14 +1,10 @@ using System.Linq; -using Content.Server.GameTicking.Events; using Content.Shared._CP14.LockKey; -using Content.Shared.Containers.ItemSlots; +using Content.Shared._CP14.LockKey.Components; using Content.Shared.Examine; -using Content.Shared.Lock; -using Content.Shared.Popups; +using Content.Shared.GameTicking; using Robust.Shared.Prototypes; using Robust.Shared.Random; -using CP14KeyComponent = Content.Shared._CP14.LockKey.Components.CP14KeyComponent; -using CP14LockComponent = Content.Shared._CP14.LockKey.Components.CP14LockComponent; namespace Content.Server._CP14.LockKey; @@ -16,9 +12,6 @@ public sealed partial class CP14KeyholeGenerationSystem : EntitySystem { [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] private readonly LockSystem _lock = default!; private Dictionary, List> _roundKeyData = new(); @@ -28,7 +21,7 @@ public sealed partial class CP14KeyholeGenerationSystem : EntitySystem { base.Initialize(); - SubscribeLocalEvent(OnRoundStart); + SubscribeLocalEvent(OnRoundEnd); SubscribeLocalEvent(OnLockInit); SubscribeLocalEvent(OnKeyInit); @@ -37,7 +30,7 @@ public sealed partial class CP14KeyholeGenerationSystem : EntitySystem } #region Init - private void OnRoundStart(RoundStartingEvent ev) + private void OnRoundEnd(RoundRestartCleanupEvent ev) { _roundKeyData = new(); } @@ -68,7 +61,7 @@ public sealed partial class CP14KeyholeGenerationSystem : EntitySystem if (key.Comp.LockShape == null) return; - var markup = Loc.GetString("cp-lock-examine-key", ("item", MetaData(key).EntityName)); + var markup = Loc.GetString("cp14-lock-examine-key", ("item", MetaData(key).EntityName)); markup += " ("; foreach (var item in key.Comp.LockShape) { diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs index a2efffea98..d129cd2cb6 100644 --- a/Content.Shared/Lock/LockSystem.cs +++ b/Content.Shared/Lock/LockSystem.cs @@ -109,17 +109,14 @@ public sealed class LockSystem : EntitySystem //CrystallPunk Lock System Adapt Start if (lockComp.LockSlotId != null && _lockCp14.TryGetLockFromSlot(uid, out var lockEnt)) { - args.PushText(Loc.GetString("cp-lock-examine-lock-slot", ("lock", MetaData(lockEnt.Value).EntityName))); + args.PushText(Loc.GetString("cp14-lock-examine-lock-slot", ("lock", MetaData(lockEnt.Value).EntityName))); args.PushMarkup(Loc.GetString(lockComp.Locked ? "lock-comp-on-examined-is-locked" : "lock-comp-on-examined-is-unlocked", ("entityName", Identity.Name(uid, EntityManager)))); if (lockEnt.Value.Comp.LockpickeddFailMarkup) - args.PushMarkup(Loc.GetString("cp-lock-examine-lock-lockpicked", ("lock", MetaData(lockEnt.Value).EntityName))); - } else - { - args.PushText(Loc.GetString("cp-lock-examine-lock-null")); + args.PushMarkup(Loc.GetString("cp14-lock-examine-lock-lockpicked", ("lock", MetaData(lockEnt.Value).EntityName))); } //CrystallPunk Lock System Adapt End } @@ -158,7 +155,7 @@ public sealed class LockSystem : EntitySystem _sharedPopupSystem.PopupClient(Loc.GetString("lock-comp-do-lock-success", ("entityName", Identity.Name(uid, EntityManager))), uid, user); - _audio.PlayPredicted(lockComp.LockSound, uid, user); + _audio.PlayPvs(lockComp.LockSound, uid); lockComp.Locked = true; _appearanceSystem.SetData(uid, LockVisuals.Locked, true); @@ -189,7 +186,7 @@ public sealed class LockSystem : EntitySystem ("entityName", Identity.Name(uid, EntityManager))), uid, user.Value); } - _audio.PlayPredicted(lockComp.UnlockSound, uid, user); + _audio.PlayPvs(lockComp.UnlockSound, uid); lockComp.Locked = false; _appearanceSystem.SetData(uid, LockVisuals.Locked, false); @@ -309,7 +306,7 @@ public sealed class LockSystem : EntitySystem if (!component.Locked || !component.BreakOnEmag) return; - _audio.PlayPredicted(component.UnlockSound, uid, args.UserUid); + _audio.PlayPvs(component.UnlockSound, uid); component.Locked = false; _appearanceSystem.SetData(uid, LockVisuals.Locked, false); diff --git a/Content.Shared/_CP14/LockKey/SharedCP14LockKeySystem.cs b/Content.Shared/_CP14/LockKey/SharedCP14LockKeySystem.cs index a3092bdaf8..2d14a9a4b0 100644 --- a/Content.Shared/_CP14/LockKey/SharedCP14LockKeySystem.cs +++ b/Content.Shared/_CP14/LockKey/SharedCP14LockKeySystem.cs @@ -28,7 +28,6 @@ public sealed class SharedCP14LockKeySystem : EntitySystem private const int DepthComplexity = 2; //TODO - fix this constant duplication from KeyholeGenerationSystem.cs - public override void Initialize() { base.Initialize(); @@ -54,7 +53,6 @@ public sealed class SharedCP14LockKeySystem : EntitySystem if (!TryComp(keyring, out var storageComp)) return; - if (TryComp(args.Target, out var lockComp) && TryGetLockFromSlot(args.Target.Value, out var lockEnt)) { @@ -71,7 +69,7 @@ public sealed class SharedCP14LockKeySystem : EntitySystem args.Handled = true; return; } - _popup.PopupEntity(Loc.GetString("cp-lock-keyring-use-nofit"), args.Target.Value, args.User); + _popup.PopupEntity(Loc.GetString("cp14-lock-keyring-use-nofit"), args.Target.Value, args.User); } } @@ -117,10 +115,11 @@ public sealed class SharedCP14LockKeySystem : EntitySystem { TryHackDoorElement(user, target, lockpick, lockItemComp, lockComp, height); }, - Text = Loc.GetString("cp-lock-verb-lockpick-use-text") + $" {height}", - Message = Loc.GetString("cp-lock-verb-lockpick-use-message"), + Text = Loc.GetString("cp14-lock-verb-lockpick-use-text") + $" {height}", + Message = Loc.GetString("cp14-lock-verb-lockpick-use-message"), Category = VerbCategory.Lockpick, Priority = height, + CloseMenu = false, }; args.Verbs.Add(verb); @@ -141,19 +140,19 @@ public sealed class SharedCP14LockKeySystem : EntitySystem if (lockComp.Locked) { _lock.TryUnlock(target, user, lockComp); - _popup.PopupEntity(Loc.GetString("cp-lock-unlock-lock", ("lock", MetaData(lockEnt.Owner).EntityName)), target, user); + _popup.PopupEntity(Loc.GetString("cp14-lock-unlock-lock", ("lock", MetaData(lockEnt.Owner).EntityName)), target, user); lockEnt.LockpickStatus = 0; return true; } else { _lock.TryLock(target, user, lockComp); - _popup.PopupEntity(Loc.GetString("cp-lock-lock-lock", ("lock", MetaData(lockEnt.Owner).EntityName)), target, user); + _popup.PopupEntity(Loc.GetString("cp14-lock-lock-lock", ("lock", MetaData(lockEnt.Owner).EntityName)), target, user); lockEnt.LockpickStatus = 0; return true; } } - _popup.PopupEntity(Loc.GetString("cp-lock-lockpick-success"), target, user); + _popup.PopupEntity(Loc.GetString("cp14-lock-lockpick-success"), target, user); return true; } else //Fail @@ -164,16 +163,16 @@ public sealed class SharedCP14LockKeySystem : EntitySystem lockpick.Comp.Health--; if (lockpick.Comp.Health > 0) { - _popup.PopupEntity(Loc.GetString("cp-lock-lockpick-failed-damage", ("lock", MetaData(lockEnt.Owner).EntityName)), target, user); + _popup.PopupEntity(Loc.GetString("cp14-lock-lockpick-failed-damage", ("lock", MetaData(lockEnt.Owner).EntityName)), target, user); } else { - _popup.PopupEntity(Loc.GetString("cp-lock-lockpick-failed-break", ("lock", MetaData(lockEnt.Owner).EntityName)), target, user); + _popup.PopupEntity(Loc.GetString("cp14-lock-lockpick-failed-break", ("lock", MetaData(lockEnt.Owner).EntityName)), target, user); QueueDel(lockpick); } } else { - _popup.PopupEntity(Loc.GetString("cp-lock-lockpick-failed", ("lock", MetaData(lockEnt.Owner).EntityName)), target, user); + _popup.PopupEntity(Loc.GetString("cp14-lock-lockpick-failed", ("lock", MetaData(lockEnt.Owner).EntityName)), target, user); } lockEnt.LockpickeddFailMarkup = true; lockEnt.LockpickStatus = 0; @@ -205,8 +204,8 @@ public sealed class SharedCP14LockKeySystem : EntitySystem TryUseKeyOnLock(user, target, key, new Entity(target, lockItemComp)); }, IconEntity = GetNetEntity(key), - Text = Loc.GetString(lockComp.Locked ? "cp-lock-verb-use-key-text-open" : "cp-lock-verb-use-key-text-close", ("item", MetaData(args.Target).EntityName)), - Message = Loc.GetString("cp-lock-verb-use-key-message", ("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); @@ -220,14 +219,10 @@ public sealed class SharedCP14LockKeySystem : EntitySystem if (args.Container.ID != lockSlot.Comp.LockSlotId) return; - if (!TryComp(args.EntityUid, out var lockComp)) - { - args.Cancel(); + if (TryComp(args.EntityUid, out var lockComp)) return; - } - if (lockComp == null) - return; + args.Cancel(); //if (lockComp.Locked) //{ @@ -309,18 +304,18 @@ public sealed class SharedCP14LockKeySystem : EntitySystem if (lockComp.Locked) { if(_lock.TryUnlock(target, user)) - _popup.PopupEntity(Loc.GetString("cp-lock-unlock-lock", ("lock", MetaData(lockEnt).EntityName)), lockEnt, user); + _popup.PopupEntity(Loc.GetString("cp14-lock-unlock-lock", ("lock", MetaData(lockEnt).EntityName)), lockEnt, user); } else { if (_lock.TryLock(target, user)) - _popup.PopupEntity(Loc.GetString("cp-lock-lock-lock", ("lock", MetaData(lockEnt).EntityName)), lockEnt, user); + _popup.PopupEntity(Loc.GetString("cp14-lock-lock-lock", ("lock", MetaData(lockEnt).EntityName)), lockEnt, user); } return true; } else { - _popup.PopupEntity(Loc.GetString("cp-lock-key-use-nofit"), lockEnt, user); + _popup.PopupEntity(Loc.GetString("cp14-lock-key-use-nofit"), lockEnt, user); } return false; } diff --git a/Resources/Locale/en-US/_CP14/keyring/keyring.ftl b/Resources/Locale/en-US/_CP14/keyring/keyring.ftl new file mode 100644 index 0000000000..0e4c5749b2 --- /dev/null +++ b/Resources/Locale/en-US/_CP14/keyring/keyring.ftl @@ -0,0 +1,21 @@ +cp14-lock-verb-lockpick-use-text = Push: {$height} +cp14-lock-verb-lockpick-use-message = If you engage the lock prongs in the correct sequence, you can unlock the lock. + +cp14-lock-keyring-use-nofit = The key does not fit! + +cp14-lock-unlock-lock = You have opened {$lock} +cp14-lock-lock-lock = You closed {$lock} + +cp14-lock-lockpick-success = You have successfully picked the lock! +cp14-lock-lockpick-failed = {$lock} is reset to its original position. +cp14-lock-lockpick-failed-damage = {$lock} is reset to its original position, damaging your lockpick. +cp14-lock-lockpick-failed-break = {$lock} resets to its original position, breaking your lockpick. + +cp14-lock-verb-use-key-text-open = Open the lock with {$item}. +cp14-lock-verb-use-key-text-close = Close the lock with {$item} +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 diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 75292ad339..7c40a9644c 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -18,15 +18,9 @@ ent-CP14BaseKey = ключ ent-CP14BaseLockpick = отмычка .desc = Воровской инструмент, при должном умении и сноровке позволяющий взламывать любые замки. -ent-CP14KeyTavern = ключ от таверны - .desc = { ent-CP14BaseKey.desc } - ent-CP14BaseLock = стальной замок .desc = Он запирает вещи. И вам потребуется ключ, чтобы открыть их обратно. -ent-CP14LockTavern = замок от таверны - .desc = { ent-CP14BaseLock.desc } - ent-CP14BaseMagicRune = magic rune .desc = manifestation of magical energy in the physical plane diff --git a/Resources/Locale/ru-RU/_CP14/keyring/keyring.ftl b/Resources/Locale/ru-RU/_CP14/keyring/keyring.ftl new file mode 100644 index 0000000000..ea86c414a7 --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/keyring/keyring.ftl @@ -0,0 +1,21 @@ +cp14-lock-verb-lockpick-use-text = Надавить: {$height} +cp14-lock-verb-lockpick-use-message = Если вы в правильной последовательности заденете зубчики замка, вы сможете разблокировать его. + +cp14-lock-keyring-use-nofit = Ключ не подходит! + +cp14-lock-unlock-lock = Вы открыли {$lock} +cp14-lock-lock-lock = Вы закрыли {$lock} + +cp14-lock-lockpick-success = Вы успешно взломали замок! +cp14-lock-lockpick-failed = {$lock} сбрасывается в исходное положение. +cp14-lock-lockpick-failed-damage = {$lock} сбрасывается в исходное положение, повреждая вашу отмычку. +cp14-lock-lockpick-failed-break = {$lock} сбрасывается в исходное положение, ломая вашу отмычку. + +cp14-lock-verb-use-key-text-open = Открыть замок при помощи {$item} +cp14-lock-verb-use-key-text-close = Закрыть замок при помощи {$item} +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 diff --git a/Resources/Maps/_CP14/dev_map.yml b/Resources/Maps/_CP14/dev_map.yml index 2194f87711..a03fdfbe1d 100644 --- a/Resources/Maps/_CP14/dev_map.yml +++ b/Resources/Maps/_CP14/dev_map.yml @@ -126,11 +126,11 @@ entities: version: 6 -1,0: ind: -1,0 - tiles: HAAAAAAAHAAAAAAEHAAAAAACHAAAAAADHAAAAAACHAAAAAAFHAAAAAACHQAAAAAEHgAAAAAAHgAAAAAEHAAAAAAAHQAAAAACHAAAAAAEIAAAAAADHwAAAAACHwAAAAADHAAAAAACHAAAAAAEHAAAAAACHAAAAAADHAAAAAABHAAAAAACHAAAAAAEHQAAAAADHgAAAAAAHQAAAAAFHAAAAAADHAAAAAAAHQAAAAABIAAAAAABIAAAAAAAIAAAAAABHAAAAAACHAAAAAADHAAAAAADHAAAAAADHAAAAAADHAAAAAAFHAAAAAABHQAAAAACHgAAAAAAHQAAAAACHAAAAAABHAAAAAAFHAAAAAAFIAAAAAADIAAAAAAAIAAAAAACHQAAAAAAHAAAAAADHAAAAAABHAAAAAAAHAAAAAACHAAAAAADHQAAAAAAHgAAAAAFHgAAAAAAHQAAAAADHAAAAAABHAAAAAAAHAAAAAABHAAAAAAEHQAAAAABHQAAAAAFHQAAAAADHQAAAAADHQAAAAADHAAAAAAAHAAAAAAAHAAAAAABHQAAAAACHgAAAAADHgAAAAAFHAAAAAABHAAAAAABHAAAAAABHAAAAAACHAAAAAAFHAAAAAAFHAAAAAAAHQAAAAAAHQAAAAAFHQAAAAACHQAAAAAFHQAAAAABHQAAAAABHQAAAAAFHQAAAAAAHgAAAAADHQAAAAAAHAAAAAAEHAAAAAAEHAAAAAADHAAAAAAEHAAAAAAAHAAAAAAAHQAAAAADHQAAAAAEHQAAAAADHgAAAAAAHQAAAAABHQAAAAAEHQAAAAAAHQAAAAADHQAAAAAEHQAAAAACHQAAAAADHAAAAAAAHAAAAAAFHAAAAAABHAAAAAACHQAAAAACHQAAAAABHQAAAAAFHgAAAAADHgAAAAAFHQAAAAAEHQAAAAABHQAAAAAEHQAAAAADHQAAAAAFHQAAAAAAHQAAAAACHQAAAAAFHAAAAAAAHAAAAAAAHQAAAAAEHQAAAAAAHQAAAAAFHQAAAAADHQAAAAAAHQAAAAACHgAAAAAEHQAAAAABHAAAAAABHQAAAAAFHQAAAAAEHQAAAAAAHQAAAAAEHQAAAAAAHQAAAAAAHAAAAAADHQAAAAAEHQAAAAAEHQAAAAADHQAAAAAFHQAAAAAEHQAAAAABHQAAAAADHQAAAAABHAAAAAACHQAAAAAAHQAAAAAAHQAAAAAEHgAAAAAAHgAAAAABHQAAAAAEHQAAAAABHQAAAAADHQAAAAACHAAAAAADHAAAAAABHQAAAAAAHgAAAAAAHgAAAAAEHQAAAAACHQAAAAAAHAAAAAABHAAAAAAFHQAAAAAEHQAAAAAEHgAAAAACHgAAAAACHgAAAAACHQAAAAAAHAAAAAABHAAAAAABHQAAAAADHQAAAAAEHgAAAAAFHgAAAAABHQAAAAABHQAAAAACHAAAAAAAHAAAAAACHQAAAAADHQAAAAAEHgAAAAAEHgAAAAAEHQAAAAACHAAAAAAFHAAAAAADHAAAAAABHQAAAAAAHQAAAAAFHQAAAAAAHQAAAAAEHAAAAAAEHQAAAAADHQAAAAAEHQAAAAAFHQAAAAACHQAAAAAEHQAAAAAAHgAAAAACHQAAAAAFHAAAAAAEHAAAAAAFHAAAAAAEHQAAAAADHQAAAAABHQAAAAABHQAAAAADHAAAAAACHAAAAAADHAAAAAAEHQAAAAAEHQAAAAAAHQAAAAADHQAAAAAAHgAAAAAAHQAAAAACHQAAAAACHAAAAAAEHQAAAAAEHgAAAAABHQAAAAADHQAAAAAFHAAAAAACHAAAAAAAHAAAAAAAHAAAAAADHAAAAAAAHAAAAAACHQAAAAAAHgAAAAACHgAAAAAEHQAAAAADHQAAAAAAHAAAAAABHQAAAAAEHgAAAAAFHgAAAAABHgAAAAABHQAAAAAFHAAAAAAAHAAAAAAEHQAAAAACHAAAAAABHAAAAAABHAAAAAACHQAAAAADHgAAAAAFHgAAAAAEHQAAAAAAHAAAAAAB + tiles: HAAAAAAAHAAAAAAEHAAAAAACHAAAAAADHAAAAAACHAAAAAAFHAAAAAACHQAAAAAEHgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAADHAAAAAACHAAAAAAEHAAAAAACHAAAAAADHAAAAAABHAAAAAACHAAAAAAEHQAAAAADHgAAAAAAHQAAAAAFHAAAAAADHAAAAAAAHQAAAAABIAAAAAABIAAAAAAAIAAAAAABHAAAAAACHAAAAAADHAAAAAADHAAAAAADHAAAAAADHAAAAAAFHAAAAAABHQAAAAACHgAAAAAAHQAAAAACHAAAAAABHAAAAAAFHAAAAAAFIAAAAAADIAAAAAAAIAAAAAACHQAAAAAAHAAAAAADHAAAAAABHAAAAAAAHAAAAAACHAAAAAADHQAAAAAAHgAAAAAFHgAAAAAAHQAAAAADHAAAAAABHAAAAAAAHAAAAAABHAAAAAAEHQAAAAABHQAAAAAFHQAAAAADHQAAAAADHQAAAAADHAAAAAAAHAAAAAAAHAAAAAABHQAAAAACHgAAAAADHgAAAAAFHAAAAAABHAAAAAABHAAAAAABHAAAAAACHAAAAAAFHAAAAAAFHAAAAAAAHQAAAAAAHQAAAAAFHQAAAAACHQAAAAAFHQAAAAABHQAAAAABHQAAAAAFHQAAAAAAHgAAAAADHQAAAAAAHAAAAAAEHAAAAAAEHAAAAAADHAAAAAAEHAAAAAAAHAAAAAAAHQAAAAADHQAAAAAEHQAAAAADHgAAAAAAHQAAAAABHQAAAAAEHQAAAAAAHQAAAAADHQAAAAAEHQAAAAACHQAAAAADHAAAAAAAHAAAAAAFHAAAAAABHAAAAAACHQAAAAACHQAAAAABHQAAAAAFHgAAAAADHgAAAAAFHQAAAAAEHQAAAAABHQAAAAAEHQAAAAADHQAAAAAFHQAAAAAAHQAAAAACHQAAAAAFHAAAAAAAHAAAAAAAHQAAAAAEHQAAAAAAHQAAAAAFHQAAAAADHQAAAAAAHQAAAAACHgAAAAAEHQAAAAABHAAAAAABHQAAAAAFHQAAAAAEHQAAAAAAHQAAAAAEHQAAAAAAHQAAAAAAHAAAAAADHQAAAAAEHQAAAAAEHQAAAAADHQAAAAAFHQAAAAAEHQAAAAABHQAAAAADHQAAAAABHAAAAAACHQAAAAAAHQAAAAAAHQAAAAAEHgAAAAAAHgAAAAABHQAAAAAEHQAAAAABHQAAAAADHQAAAAACHAAAAAADHAAAAAABHQAAAAAAHgAAAAAAHgAAAAAEHQAAAAACHQAAAAAAHAAAAAABHAAAAAAFHQAAAAAEHQAAAAAEHgAAAAACHgAAAAACHgAAAAACHQAAAAAAHAAAAAABHAAAAAABHQAAAAADHQAAAAAEHgAAAAAFHgAAAAABHQAAAAABHQAAAAACHAAAAAAAHAAAAAACHQAAAAADHQAAAAAEHgAAAAAEHgAAAAAEHQAAAAACHAAAAAAFHAAAAAADHAAAAAABHQAAAAAAHQAAAAAFHQAAAAAAHQAAAAAEHAAAAAAEHQAAAAADHQAAAAAEHQAAAAAFHQAAAAACHQAAAAAEHQAAAAAAHgAAAAACHQAAAAAFHAAAAAAEHAAAAAAFHAAAAAAEHQAAAAADHQAAAAABHQAAAAABHQAAAAADHAAAAAACHAAAAAADHAAAAAAEHQAAAAAEHQAAAAAAHQAAAAADHQAAAAAAHgAAAAAAHQAAAAACHQAAAAACHAAAAAAEHQAAAAAEHgAAAAABHQAAAAADHQAAAAAFHAAAAAACHAAAAAAAHAAAAAAAHAAAAAADHAAAAAAAHAAAAAACHQAAAAAAHgAAAAACHgAAAAAEHQAAAAADHQAAAAAAHAAAAAABHQAAAAAEHgAAAAAFHgAAAAABHgAAAAABHQAAAAAFHAAAAAAAHAAAAAAEHQAAAAACHAAAAAABHAAAAAABHAAAAAACHQAAAAADHgAAAAAFHgAAAAAEHQAAAAAAHAAAAAAB version: 6 -1,-1: ind: -1,-1 - tiles: HAAAAAADHAAAAAADHAAAAAAFHAAAAAABHAAAAAAAHAAAAAAEHAAAAAAFHgAAAAADHgAAAAAEHQAAAAACHQAAAAADHQAAAAACLwAAAAAALwAAAAAALwAAAAAELwAAAAAAHAAAAAABHAAAAAAAHAAAAAADHAAAAAAAHAAAAAABHAAAAAAEHQAAAAAAHQAAAAAEHQAAAAAAHQAAAAADHQAAAAACHQAAAAAFLwAAAAAALwAAAAAELwAAAAABLwAAAAAAHAAAAAAFHAAAAAAAHQAAAAABHAAAAAABHQAAAAAAHQAAAAACHQAAAAABHQAAAAAAHAAAAAAFHAAAAAADHAAAAAAAHAAAAAAFLwAAAAAALwAAAAAALwAAAAACLwAAAAAAHAAAAAABHAAAAAACHAAAAAAAHQAAAAABHQAAAAAEHQAAAAABHQAAAAABHAAAAAAEHAAAAAAEHAAAAAAFHAAAAAAEHAAAAAAALwAAAAABLwAAAAAELwAAAAABLwAAAAAEHAAAAAACHAAAAAACHAAAAAACHQAAAAACHgAAAAAFHgAAAAAEHQAAAAAEHAAAAAABHAAAAAAAHAAAAAACHAAAAAABHAAAAAAELwAAAAACLwAAAAACLwAAAAACLwAAAAAAHAAAAAABHAAAAAAEHAAAAAACHQAAAAACHgAAAAABHgAAAAAEHQAAAAACHAAAAAAEHAAAAAAFHAAAAAAAHQAAAAAEHAAAAAADHAAAAAAFLwAAAAAALwAAAAAALwAAAAACHAAAAAABHAAAAAACHAAAAAAEHgAAAAAFHQAAAAAAHQAAAAAAHQAAAAAEHAAAAAAEHAAAAAADHAAAAAAFHAAAAAADHAAAAAAAHAAAAAADHAAAAAAFLwAAAAACLwAAAAAEHQAAAAAEHAAAAAAFHAAAAAABHQAAAAACHQAAAAAEHQAAAAADHQAAAAAFHAAAAAADHAAAAAAFHAAAAAACHAAAAAADHAAAAAADHAAAAAAFHAAAAAAELwAAAAABLwAAAAABHQAAAAABHQAAAAAFHQAAAAAFHQAAAAAFHQAAAAAFHQAAAAAAHQAAAAAEHAAAAAACHAAAAAADHAAAAAADHAAAAAAEHAAAAAAFHAAAAAABHAAAAAADHAAAAAAFHAAAAAACHQAAAAAFHQAAAAAEHQAAAAADHAAAAAABHQAAAAAFHQAAAAAAHAAAAAAEHAAAAAACHAAAAAAEHQAAAAADHAAAAAADHAAAAAACHQAAAAABHAAAAAAAHAAAAAADHAAAAAABHQAAAAAFHQAAAAAAHAAAAAAFHAAAAAABHQAAAAAFHAAAAAAFHAAAAAACHAAAAAAEHAAAAAAAHQAAAAAEHQAAAAACHQAAAAACHQAAAAABHgAAAAADHQAAAAAAHAAAAAACHQAAAAACHQAAAAABHAAAAAAAHAAAAAAEHQAAAAACHQAAAAAEHAAAAAACHAAAAAAEHAAAAAACHQAAAAAEHQAAAAABHQAAAAAEHQAAAAAFHQAAAAADHgAAAAACHQAAAAAAHgAAAAACHgAAAAADHQAAAAAFHQAAAAAFHQAAAAABHQAAAAAAHAAAAAACHAAAAAABHAAAAAACHAAAAAACHAAAAAAFHAAAAAAFHgAAAAACIAAAAAACIAAAAAAAIAAAAAABHAAAAAAEHAAAAAABHAAAAAADHQAAAAAFHQAAAAACHQAAAAAAHAAAAAACHAAAAAAEHAAAAAADHAAAAAADHAAAAAAFHAAAAAAFHQAAAAADIAAAAAABIAAAAAABIAAAAAAAHAAAAAABHAAAAAABHAAAAAABHAAAAAAFHAAAAAACHQAAAAABHQAAAAADHAAAAAAAHAAAAAACHAAAAAAEHAAAAAAEHAAAAAAFHAAAAAABIAAAAAAAHwAAAAABHwAAAAADHAAAAAADHAAAAAACHAAAAAAFHAAAAAACHAAAAAAFHAAAAAACHQAAAAACHQAAAAAEHAAAAAABHAAAAAACHAAAAAAEHAAAAAAFHAAAAAADIAAAAAAAHwAAAAABHwAAAAAA + tiles: HAAAAAADHAAAAAADHAAAAAAFHAAAAAABHAAAAAAAHAAAAAAEHAAAAAAFHgAAAAADHgAAAAAEHQAAAAACHQAAAAADHQAAAAACLwAAAAAALwAAAAAALwAAAAAELwAAAAAAHAAAAAABHAAAAAAAHAAAAAADHAAAAAAAHAAAAAABHAAAAAAEHQAAAAAAHQAAAAAEHQAAAAAAHQAAAAADHQAAAAACHQAAAAAFLwAAAAAALwAAAAAELwAAAAABLwAAAAAAHAAAAAAFHAAAAAAAHQAAAAABHAAAAAABHQAAAAAAHQAAAAACHQAAAAABHQAAAAAAHAAAAAAFHAAAAAADHAAAAAAAHAAAAAAFLwAAAAAALwAAAAAALwAAAAACLwAAAAAAHAAAAAABHAAAAAACHAAAAAAAHQAAAAABHQAAAAAEHQAAAAABHQAAAAABHAAAAAAEHAAAAAAEHAAAAAAFHAAAAAAEHAAAAAAALwAAAAABLwAAAAAELwAAAAABLwAAAAAEHAAAAAACHAAAAAACHAAAAAACHQAAAAACHgAAAAAFHgAAAAAEHQAAAAAEHAAAAAABHAAAAAAAHAAAAAACHAAAAAABHAAAAAAELwAAAAACLwAAAAACLwAAAAACLwAAAAAAHAAAAAABHAAAAAAEHAAAAAACHQAAAAACHgAAAAABHgAAAAAEHQAAAAACHAAAAAAEHAAAAAAFHAAAAAAAHQAAAAAEHAAAAAADHAAAAAAFLwAAAAAALwAAAAAALwAAAAACHAAAAAABHAAAAAACHAAAAAAEHgAAAAAFHQAAAAAAHQAAAAAAHQAAAAAEHAAAAAAEHAAAAAADHAAAAAAFHAAAAAADHAAAAAAAHAAAAAADHAAAAAAFLwAAAAACLwAAAAAEHQAAAAAEHAAAAAAFHAAAAAABHQAAAAACHQAAAAAEHQAAAAADHQAAAAAFHAAAAAADHAAAAAAFHAAAAAACHAAAAAADHAAAAAADHAAAAAAFHAAAAAAELwAAAAABLwAAAAABHQAAAAABHQAAAAAFHQAAAAAFHQAAAAAFHQAAAAAFHQAAAAAAHQAAAAAEHAAAAAACHAAAAAADHAAAAAADHAAAAAAEHAAAAAAFHAAAAAABHAAAAAADHAAAAAAFHAAAAAACHQAAAAAFHQAAAAAEHQAAAAADHAAAAAABHQAAAAAFHQAAAAAAHAAAAAAEHAAAAAACHAAAAAAEHQAAAAADHAAAAAADHAAAAAACHQAAAAABHAAAAAAAHAAAAAADHAAAAAABHQAAAAAFHQAAAAAAHAAAAAAFHAAAAAABHQAAAAAFHAAAAAAFHAAAAAACHAAAAAAEHAAAAAAAHQAAAAAEHQAAAAACHQAAAAACHQAAAAABHgAAAAADHQAAAAAAHAAAAAACHQAAAAACHQAAAAABHAAAAAAAHAAAAAAEHQAAAAACHQAAAAAEHAAAAAACHAAAAAAEHAAAAAACHQAAAAAEHQAAAAABHQAAAAAEHQAAAAAFHQAAAAADHgAAAAACHQAAAAAAHgAAAAACHgAAAAADHQAAAAAFHQAAAAAFHQAAAAABHQAAAAAAHAAAAAACHAAAAAABHAAAAAACHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAIAAAAAAAIAAAAAABHAAAAAAEHAAAAAABHAAAAAADHQAAAAAFHQAAAAACHQAAAAAAHAAAAAACHAAAAAAEHAAAAAADHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAIAAAAAABIAAAAAAAHAAAAAABHAAAAAABHAAAAAABHAAAAAAFHAAAAAACHQAAAAABHQAAAAADHAAAAAAAHAAAAAACHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHAAAAAADHAAAAAACHAAAAAAFHAAAAAACHAAAAAAFHAAAAAACHQAAAAACHQAAAAAEHAAAAAABHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAA version: 6 -1,-2: ind: -1,-2 @@ -186,7 +186,7 @@ entities: version: 6 2,0: ind: 2,0 - tiles: HQAAAAADHQAAAAACHQAAAAAEHgAAAAAAHQAAAAAEHQAAAAACHAAAAAAFHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAFHQAAAAABHQAAAAAAHQAAAAADHQAAAAAAHQAAAAABHQAAAAAEHAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHQAAAAAFHQAAAAACHQAAAAACHQAAAAADHQAAAAAFHAAAAAAEHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAFHQAAAAABHQAAAAADHQAAAAADHQAAAAAEHAAAAAAAHAAAAAAAHAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAACHQAAAAAAHgAAAAADHQAAAAACHAAAAAAAHAAAAAADHAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAAFHQAAAAAAHQAAAAACHQAAAAABHQAAAAACHQAAAAADHQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAAEHQAAAAACHQAAAAADHgAAAAAAHQAAAAAFHgAAAAADHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAACHAAAAAAFHQAAAAAAHQAAAAADHgAAAAADHQAAAAABHQAAAAABHgAAAAAFHQAAAAAFHAAAAAACHAAAAAAFHAAAAAABHQAAAAAAHAAAAAAEHAAAAAACHAAAAAADHAAAAAACHAAAAAABHQAAAAAEHQAAAAACHQAAAAAFHQAAAAACHQAAAAAFHQAAAAAAHAAAAAABHAAAAAADHAAAAAACHAAAAAAFHQAAAAAAHQAAAAAFHQAAAAACHAAAAAACHAAAAAABHAAAAAAFHQAAAAACHQAAAAACHQAAAAAFHQAAAAAAHgAAAAAFHQAAAAAAHAAAAAACHAAAAAAEHAAAAAADHAAAAAADHAAAAAAAHQAAAAAFHQAAAAAAHQAAAAADHAAAAAACHQAAAAAAHQAAAAABHAAAAAAFHQAAAAADHQAAAAAFHQAAAAADHQAAAAAEHQAAAAABHAAAAAAEHAAAAAACHAAAAAABHAAAAAADHAAAAAAAHQAAAAAEHgAAAAACHAAAAAABHAAAAAAAHAAAAAADHAAAAAADHAAAAAACHAAAAAAAHQAAAAADHQAAAAAAHQAAAAAFHQAAAAADHAAAAAACHAAAAAAAHQAAAAAAHQAAAAAFHQAAAAAAHgAAAAAFHAAAAAABHAAAAAAAHAAAAAAEHAAAAAADHAAAAAABHAAAAAAFHQAAAAAAHQAAAAACHQAAAAACHAAAAAAFHAAAAAAFHAAAAAADHAAAAAAFHQAAAAAAHQAAAAADHQAAAAAEHAAAAAABHAAAAAAFHAAAAAABHAAAAAAAHQAAAAACHQAAAAAFHAAAAAAFHQAAAAAEHQAAAAAFHAAAAAAEHAAAAAAFHAAAAAADHAAAAAABHQAAAAABHQAAAAABHQAAAAADHAAAAAAAHAAAAAAFHAAAAAABHAAAAAAFHQAAAAABHQAAAAAAHQAAAAAEHQAAAAAFHQAAAAACHQAAAAADHQAAAAAEHQAAAAABHQAAAAAEHQAAAAAFHQAAAAACHQAAAAAEHAAAAAAFHAAAAAAFHAAAAAAFHAAAAAAAHAAAAAAFHQAAAAACHQAAAAAEHgAAAAABHQAAAAAAHQAAAAABHAAAAAABHQAAAAAAHQAAAAAFHgAAAAAAHgAAAAAEHgAAAAAF + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAACHAAAAAAFHQAAAAAAHQAAAAADHgAAAAADHQAAAAABHQAAAAABHgAAAAAFHQAAAAAFHAAAAAACHAAAAAAFHAAAAAABHQAAAAAAHAAAAAAEHAAAAAACHAAAAAADHAAAAAACHAAAAAABHQAAAAAEHQAAAAACHQAAAAAFHQAAAAACHQAAAAAFHQAAAAAAHAAAAAABHAAAAAADHAAAAAACHAAAAAAFHQAAAAAAHQAAAAAFHQAAAAACHAAAAAACHAAAAAABHAAAAAAFHQAAAAACHQAAAAACHQAAAAAFHQAAAAAAHgAAAAAFHQAAAAAAHAAAAAACHAAAAAAEHAAAAAADHAAAAAADHAAAAAAAHQAAAAAFHQAAAAAAHQAAAAADHAAAAAACHQAAAAAAHQAAAAABHAAAAAAFHQAAAAADHQAAAAAFHQAAAAADHQAAAAAEHQAAAAABHAAAAAAEHAAAAAACHAAAAAABHAAAAAADHAAAAAAAHQAAAAAEHgAAAAACHAAAAAABHAAAAAAAHAAAAAADHAAAAAADHAAAAAACHAAAAAAAHQAAAAADHQAAAAAAHQAAAAAFHQAAAAADHAAAAAACHAAAAAAAHQAAAAAAHQAAAAAFHQAAAAAAHgAAAAAFHAAAAAABHAAAAAAAHAAAAAAEHAAAAAADHAAAAAABHAAAAAAFHQAAAAAAHQAAAAACHQAAAAACHAAAAAAFHAAAAAAFHAAAAAADHAAAAAAFHQAAAAAAHQAAAAADHQAAAAAEHAAAAAABHAAAAAAFHAAAAAABHAAAAAAAHQAAAAACHQAAAAAFHAAAAAAFHQAAAAAEHQAAAAAFHAAAAAAEHAAAAAAFHAAAAAADHAAAAAABHQAAAAABHQAAAAABHQAAAAADHAAAAAAAHAAAAAAFHAAAAAABHAAAAAAFHQAAAAABHQAAAAAAHQAAAAAEHQAAAAAFHQAAAAACHQAAAAADHQAAAAAEHQAAAAABHQAAAAAEHQAAAAAFHQAAAAACHQAAAAAEHAAAAAAFHAAAAAAFHAAAAAAFHAAAAAAAHAAAAAAFHQAAAAACHQAAAAAEHgAAAAABHQAAAAAAHQAAAAABHAAAAAABHQAAAAAAHQAAAAAFHgAAAAAAHgAAAAAEHgAAAAAF version: 6 2,1: ind: 2,1 @@ -330,74 +330,74 @@ entities: - 0,-32 - -16,16 - -8,0 - - 24,16 - - 32,24 + - 24,24 + - -40,24 - -16,0 - -8,-24 - 8,-8 - - 32,16 + - -40,16 - 0,16 - -8,-32 - -16,-32 - -24,16 - - -32,16 + - -32,24 - -16,-16 - - 32,8 + - -40,8 - -24,-16 - 8,-16 - - 32,0 + - -40,0 - -16,-24 - -24,-32 - 8,-24 - -8,16 - - -32,8 + - -32,16 - -24,-24 - - -32,0 + - -32,8 - 0,8 - -24,0 - - 32,-8 - - 24,8 + - -40,-8 + - 24,16 - -8,8 - - 24,24 - - 32,-16 + - 24,8 + - -40,-16 - 0,-8 - - -32,-8 + - -32,0 - 8,-32 - -8,-8 - - -32,-16 + - -32,-8 - 24,0 - 24,-8 - - 32,-24 - - 16,-40 + - -40,-24 + - -40,-32 - 24,-16 - - -32,-24 - - 8,-40 + - -32,-16 + - 24,-24 - 16,0 - 16,-8 - 16,-16 - 16,-24 - -16,-8 - - -32,-32 + - -32,-24 - -24,-8 - -16,8 - - 0,-40 + - -40,-40 - 16,-32 - - 24,-24 + - 24,-32 - 16,24 + - 8,24 + - 0,24 + - -8,24 + - -16,24 + - -24,24 + - -32,-32 + - 24,-40 + - 16,-40 + - 8,-40 + - 0,-40 - -8,-40 - -16,-40 - -24,-40 - -32,-40 - - 8,24 - - 0,24 - - -8,24 - - 24,-32 - - -16,24 - - 24,-40 - - -24,24 - - 32,-32 - - -32,24 - - 32,-40 entities: 16,16: {} -24,8: {} @@ -412,74 +412,74 @@ entities: 0,-32: {} -16,16: {} -8,0: {} - 24,16: {} - 32,24: {} + 24,24: {} + -40,24: {} -16,0: {} -8,-24: {} 8,-8: {} - 32,16: {} + -40,16: {} 0,16: {} -8,-32: {} -16,-32: {} -24,16: {} - -32,16: {} + -32,24: {} -16,-16: {} - 32,8: {} + -40,8: {} -24,-16: {} 8,-16: {} - 32,0: {} + -40,0: {} -16,-24: {} -24,-32: {} 8,-24: {} -8,16: {} - -32,8: {} + -32,16: {} -24,-24: {} - -32,0: {} + -32,8: {} 0,8: {} -24,0: {} - 32,-8: {} - 24,8: {} + -40,-8: {} + 24,16: {} -8,8: {} - 24,24: {} - 32,-16: {} + 24,8: {} + -40,-16: {} 0,-8: {} - -32,-8: {} + -32,0: {} 8,-32: {} -8,-8: {} - -32,-16: {} + -32,-8: {} 24,0: {} 24,-8: {} - 32,-24: {} - 16,-40: {} + -40,-24: {} + -40,-32: {} 24,-16: {} - -32,-24: {} - 8,-40: {} + -32,-16: {} + 24,-24: {} 16,0: {} 16,-8: {} 16,-16: {} 16,-24: {} -16,-8: {} - -32,-32: {} + -32,-24: {} -24,-8: {} -16,8: {} - 0,-40: {} + -40,-40: {} 16,-32: {} - 24,-24: {} + 24,-32: {} 16,24: {} + 8,24: {} + 0,24: {} + -8,24: {} + -16,24: {} + -24,24: {} + -32,-32: {} + 24,-40: {} + 16,-40: {} + 8,-40: {} + 0,-40: {} -8,-40: {} -16,-40: {} -24,-40: {} -32,-40: {} - 8,24: {} - 0,24: {} - -8,24: {} - 24,-32: {} - -16,24: {} - 24,-40: {} - -24,24: {} - 32,-32: {} - -32,24: {} - 32,-40: {} decals: 16,16: {} -24,8: {} @@ -494,74 +494,74 @@ entities: 0,-32: {} -16,16: {} -8,0: {} - 24,16: {} - 32,24: {} + 24,24: {} + -40,24: {} -16,0: {} -8,-24: {} 8,-8: {} - 32,16: {} + -40,16: {} 0,16: {} -8,-32: {} -16,-32: {} -24,16: {} - -32,16: {} + -32,24: {} -16,-16: {} - 32,8: {} + -40,8: {} -24,-16: {} 8,-16: {} - 32,0: {} + -40,0: {} -16,-24: {} -24,-32: {} 8,-24: {} -8,16: {} - -32,8: {} + -32,16: {} -24,-24: {} - -32,0: {} + -32,8: {} 0,8: {} -24,0: {} - 32,-8: {} - 24,8: {} + -40,-8: {} + 24,16: {} -8,8: {} - 24,24: {} - 32,-16: {} + 24,8: {} + -40,-16: {} 0,-8: {} - -32,-8: {} + -32,0: {} 8,-32: {} -8,-8: {} - -32,-16: {} + -32,-8: {} 24,0: {} 24,-8: {} - 32,-24: {} - 16,-40: {} + -40,-24: {} + -40,-32: {} 24,-16: {} - -32,-24: {} - 8,-40: {} + -32,-16: {} + 24,-24: {} 16,0: {} 16,-8: {} 16,-16: {} 16,-24: {} -16,-8: {} - -32,-32: {} + -32,-24: {} -24,-8: {} -16,8: {} - 0,-40: {} + -40,-40: {} 16,-32: {} - 24,-24: {} + 24,-32: {} 16,24: {} + 8,24: {} + 0,24: {} + -8,24: {} + -16,24: {} + -24,24: {} + -32,-32: {} + 24,-40: {} + 16,-40: {} + 8,-40: {} + 0,-40: {} -8,-40: {} -16,-40: {} -24,-40: {} -32,-40: {} - 8,24: {} - 0,24: {} - -8,24: {} - 24,-32: {} - -16,24: {} - 24,-40: {} - -24,24: {} - 32,-32: {} - -32,24: {} - 32,-40: {} modifiedTiles: 8,0: - 8,0 @@ -9365,13 +9365,6 @@ entities: - type: Transform pos: -0.6860852,-2.2317724 parent: 1 -- proto: CP14AuraNodeBase - entities: - - uid: 9767 - components: - - type: Transform - pos: -6.5,-0.5 - parent: 1 - proto: CP14AuraScanner entities: - uid: 9766 @@ -66785,10 +66778,10 @@ entities: rot: -1.5707963267948966 rad pos: -26.468407,-6.526269 parent: 1 - - uid: 9768 + - uid: 943 components: - type: Transform - pos: -6.5183344,-0.78019 + pos: -4.425286,-1.3735769 parent: 1 - proto: CP14CrystalSapphiresMedium entities: @@ -66806,21 +66799,6 @@ entities: rot: -1.5707963267948966 rad pos: -19.495275,-6.3942447 parent: 1 - - uid: 9769 - components: - - type: Transform - pos: -7.8568444,-2.0283158 - parent: 1 - - uid: 9770 - components: - - type: Transform - pos: -4.347471,-2.2981808 - parent: 1 - - uid: 9771 - components: - - type: Transform - pos: -7.204461,1.4911742 - parent: 1 - proto: CP14DirtBlock10 entities: - uid: 850 @@ -67062,16 +67040,6 @@ entities: parent: 1 - proto: CP14FrameWooden entities: - - uid: 943 - components: - - type: Transform - pos: -3.5,0.5 - parent: 1 - - uid: 944 - components: - - type: Transform - pos: -5.5,0.5 - parent: 1 - uid: 945 components: - type: Transform @@ -67196,6 +67164,14 @@ entities: - type: Transform pos: -16.5,-7.5 parent: 1 +- proto: CP14IronGrilleGateLockedTavern + entities: + - uid: 9768 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,0.5 + parent: 1 - proto: CP14IronGrilleStraight entities: - uid: 335 @@ -67215,6 +67191,20 @@ entities: - type: Transform pos: -16.5,-8.5 parent: 1 +- proto: CP14KeyRingInnkeeper + entities: + - uid: 9780 + components: + - type: Transform + pos: -4.626365,-4.538626 + parent: 1 +- proto: CP14KeyTavern + entities: + - uid: 9777 + components: + - type: Transform + pos: -5.2000813,-4.4137797 + parent: 1 - proto: CP14LumiMushroom entities: - uid: 979 @@ -68343,6 +68333,11 @@ entities: - type: Transform pos: -1.5,-3.5 parent: 1 + - uid: 944 + components: + - type: Transform + pos: -6.5,-1.5 + parent: 1 - uid: 1077 components: - type: Transform @@ -68379,6 +68374,46 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-10.5 parent: 1 + - uid: 9767 + components: + - type: Transform + pos: -6.5,0.5 + parent: 1 + - uid: 9769 + components: + - type: Transform + pos: -6.5,-0.5 + parent: 1 + - uid: 9770 + components: + - type: Transform + pos: -5.5,0.5 + parent: 1 + - uid: 9771 + components: + - type: Transform + pos: -3.5,0.5 + parent: 1 + - uid: 9773 + components: + - type: Transform + pos: -3.5,-3.5 + parent: 1 + - uid: 9774 + components: + - type: Transform + pos: -5.5,-3.5 + parent: 1 + - uid: 9775 + components: + - type: Transform + pos: -6.5,-3.5 + parent: 1 + - uid: 9776 + components: + - type: Transform + pos: -6.5,-2.5 + parent: 1 - proto: CP14Wheat entities: - uid: 926 @@ -68488,6 +68523,13 @@ entities: rot: 3.141592653589793 rad pos: -0.5,2.5 parent: 1 +- proto: CP14WoodDoorTavern + entities: + - uid: 9772 + components: + - type: Transform + pos: -4.5,-3.5 + parent: 1 - proto: CP14WoodenBed entities: - uid: 928 @@ -68557,6 +68599,20 @@ entities: - type: Transform pos: 10.5,-9.5 parent: 1 +- proto: PlushieLizard + entities: + - uid: 9778 + components: + - type: Transform + pos: -5.1000986,-1.4613454 + parent: 1 +- proto: PlushieLizardMirrored + entities: + - uid: 9779 + components: + - type: Transform + pos: -3.907811,-1.4613452 + parent: 1 - proto: SpawnPointLatejoin entities: - uid: 391 diff --git a/Resources/Prototypes/_CP14/Entities/keyrings.yml b/Resources/Prototypes/_CP14/Entities/keyrings.yml index 38ab145859..4b7ee6a5fe 100644 --- a/Resources/Prototypes/_CP14/Entities/keyrings.yml +++ b/Resources/Prototypes/_CP14/Entities/keyrings.yml @@ -30,6 +30,10 @@ - type: ContainerContainer containers: storagebase: !type:Container + - type: Clothing + quickEquip: false + slots: + - belt - type: entity parent: CP14BaseKeyRing diff --git a/Resources/Prototypes/_CP14/Entities/locks.yml b/Resources/Prototypes/_CP14/Entities/locks.yml index f528b26594..02c0052ea2 100644 --- a/Resources/Prototypes/_CP14/Entities/locks.yml +++ b/Resources/Prototypes/_CP14/Entities/locks.yml @@ -2,8 +2,8 @@ parent: BaseItem abstract: true id: CP14BaseLock - name: стальной замок - description: Он запирает вещи. И вам потребуется ключ, чтобы открыть их обратно. + name: steel lock + description: It locks things up. And you'll need a key to open them back up. components: - type: CP14Lock lockPickDamageChance: 0.2 @@ -16,7 +16,7 @@ - type: entity parent: CP14BaseLock id: CP14LockTavern - name: замок от таверны + name: captain's lock components: - type: CP14Lock autoGenerateShape: Tavern \ No newline at end of file