From 8e1d310a8eca42b7ecf82f771c6099865912f64a Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sat, 1 Feb 2025 17:52:01 +0300 Subject: [PATCH] Guildmaster YML implementation + Clothing pack (#832) * banker clothing resprite * dinazewwr * commandant cape resprite * guildmaster cloak * Guildmaster loadout * guildmaster job icon * key locks work * map update * guildmaster keys * guildmaster stamp * update guildmaster house * track demiplanes * player death track * localization * guildmaster objective * Update empire_orders.yml * fix * fix map --- .../CP14DemiplanSystem.Generation.cs | 4 +- .../CP14DemiplanSystem.Stabilization.cs | 10 + .../_CP14/Demiplane/CP14DemiplaneSystem.cs | 2 + .../CP14DemiplaneGeneratorDataComponent.cs | 4 + .../CP14StatisticRangeConditionComponent.cs | 26 + .../CP14TownSendConditionComponent.cs | 2 +- .../CP14StatisticRangeConditionStstem.cs | 54 + .../Systems/CP14TownSendConditionSystem.cs | 9 +- .../CP14RoundStatTrackerSystem.cs | 71 + .../CP14DeathDemiplaneStatisticComponent.cs | 14 + ...14RoundStatTrackerSystem.DemiplaneDeath.cs | 35 + .../CP14RoundStatTrackerPrototype.cs | 12 + .../Locale/en-US/_CP14/loadouts/loadout.ftl | 8 + .../en-US/_CP14/lockKey/locks-types.ftl | 7 +- .../objectives/condition/empire-order.ftl | 5 +- Resources/Locale/en-US/_CP14/stamp/stamp.ftl | 3 +- .../en-US/_CP14/statisticTracker/trackers.ftl | 4 + .../Locale/ru-RU/_CP14/loadouts/loadout.ftl | 8 + .../ru-RU/_CP14/lockKey/locks-types.ftl | 7 +- .../objectives/condition/empire-order.ftl | 5 +- Resources/Locale/ru-RU/_CP14/stamp/stamp.ftl | 3 +- .../ru-RU/_CP14/statisticTracker/trackers.ftl | 4 + Resources/Maps/_CP14/comoss.yml | 1322 +++++++++++----- Resources/Maps/_CP14/comoss_d.yml | 1391 +++++++++-------- .../_CP14/Catalog/Fills/closets.yml | 16 +- .../_CP14/Catalog/Fills/dresser.yml | 16 +- .../Entities/Clothing/Cloak/Roles/bank.yml | 11 +- .../Clothing/Cloak/Roles/guildmaster.yml | 11 + .../Clothing/OuterClothing/Roles/banker.yml | 22 + .../Entities/Clothing/Shirt/Roles/general.yml | 19 - .../Clothing/Shirt/Roles/guildmaster.yml | 18 + .../_CP14/Entities/Markers/Spawners/jobs.yml | 3 +- .../_CP14/Entities/Mobs/Species/base.yml | 15 +- .../_CP14/Entities/Mobs/Species/silva.yml | 7 +- .../Entities/Objects/Bureaucracy/stamps.yml | 15 +- .../Entities/Objects/Keys/guildmaster.yml | 15 + .../_CP14/Entities/Objects/Keys/keyrings.yml | 10 + .../Entities/Objects/Keys/personalHouse.yml | 50 +- .../Structures/Doors/Locked/alchemist.yml | 19 +- .../Structures/Doors/Locked/blacksmith.yml | 19 +- .../Structures/Doors/Locked/guildmaster.yml | 10 + .../Structures/Doors/Locked/personalHouse.yml | 10 + .../Prototypes/_CP14/GameRules/roundstart.yml | 15 +- .../Prototypes/_CP14/Loadouts/Jobs/bank.yml | 30 +- .../_CP14/Loadouts/Jobs/commandant.yml | 26 + .../_CP14/Loadouts/Jobs/general.yml | 12 - .../_CP14/Loadouts/Jobs/guildmaster.yml | 50 + .../_CP14/Loadouts/role_loadouts.yml | 14 + .../_CP14/LockCategories/lockTypes.yml | 35 +- Resources/Prototypes/_CP14/Maps/arenas.yml | 7 +- .../_CP14/Objectives/empire_orders.yml | 25 +- .../_CP14/Objectives/personal_objectives.yml | 2 +- .../Roles/Jobs/Mercenary/guildmaster.yml | 2 +- Resources/Prototypes/_CP14/stat_trackers.yml | 7 + .../commandant_cape.rsi/equipped-CLOAK.png | Bin 0 -> 1347 bytes .../Roles/Bank/commandant_cape.rsi/icon.png | Bin 0 -> 634 bytes .../meta.json | 0 .../commandant_jacket.rsi/equipped-CLOAK.png | Bin 916 -> 0 bytes .../Roles/Bank/commandant_jacket.rsi/icon.png | Bin 453 -> 0 bytes .../guildmaster_cape.rsi/equipped-CLOAK.png | Bin 0 -> 1179 bytes .../Mercenary/guildmaster_cape.rsi/icon.png | Bin 0 -> 644 bytes .../Mercenary/guildmaster_cape.rsi/meta.json | 18 + .../equipped-OUTERCLOTHING.png | Bin 0 -> 823 bytes .../Roles/Bank/vest_banker.rsi/icon.png | Bin 0 -> 369 bytes .../Bank/vest_banker.rsi/inhand-left.png | Bin 0 -> 482 bytes .../Bank/vest_banker.rsi/inhand-right.png | Bin 0 -> 470 bytes .../Roles/Bank/vest_banker.rsi/meta.json | 26 + .../equipped-OUTERCLOTHING.png | Bin 0 -> 708 bytes .../Roles/Bank/vest_banker_open.rsi/icon.png | Bin 0 -> 338 bytes .../Bank/vest_banker_open.rsi/inhand-left.png | Bin 0 -> 482 bytes .../vest_banker_open.rsi/inhand-right.png | Bin 0 -> 470 bytes .../Roles/Bank/vest_banker_open.rsi/meta.json | 26 + .../Roles/Bank/banker.rsi/equipped-SHIRT.png | Bin 547 -> 1098 bytes .../Shirt/Roles/Bank/banker.rsi/icon.png | Bin 341 -> 502 bytes .../Roles/Bank/banker.rsi/inhand-left.png | Bin 0 -> 482 bytes .../Roles/Bank/banker.rsi/inhand-right.png | Bin 0 -> 488 bytes .../Shirt/Roles/Bank/banker.rsi/meta.json | 10 +- .../guildmaster_vest.rsi}/equipped-SHIRT.png | Bin .../guildmaster_vest.rsi}/icon.png | Bin .../guildmaster_vest.rsi}/meta.json | 0 .../guildmaster_vest2.rsi}/equipped-SHIRT.png | Bin .../guildmaster_vest2.rsi}/icon.png | Bin .../guildmaster_vest2.rsi}/meta.json | 0 .../_CP14/Markers/jobs.rsi/guildmaster.png | Bin 0 -> 1448 bytes .../Textures/_CP14/Markers/jobs.rsi/meta.json | 3 + .../paper.rsi/guildmaster_on_paper.png | Bin 0 -> 153 bytes .../Objects/Bureaucracy/paper.rsi/meta.json | 3 + .../Bureaucracy/stamp.rsi/approved.png | Bin 303 -> 297 bytes .../Objects/Bureaucracy/stamp.rsi/denied.png | Bin 305 -> 294 bytes .../Bureaucracy/stamp.rsi/guildmaster.png | Bin 0 -> 331 bytes .../Objects/Bureaucracy/stamp.rsi/meta.json | 3 + 91 files changed, 2463 insertions(+), 1147 deletions(-) create mode 100644 Content.Server/_CP14/Objectives/Components/CP14StatisticRangeConditionComponent.cs create mode 100644 Content.Server/_CP14/Objectives/Systems/CP14StatisticRangeConditionStstem.cs create mode 100644 Content.Server/_CP14/RoundStatistic/CP14RoundStatTrackerSystem.cs create mode 100644 Content.Server/_CP14/RoundStatistic/DemiplaneDeath/CP14DeathDemiplaneStatisticComponent.cs create mode 100644 Content.Server/_CP14/RoundStatistic/DemiplaneDeath/CP14RoundStatTrackerSystem.DemiplaneDeath.cs create mode 100644 Content.Shared/_CP14/RoundStatistic/CP14RoundStatTrackerPrototype.cs create mode 100644 Resources/Locale/en-US/_CP14/statisticTracker/trackers.ftl create mode 100644 Resources/Locale/ru-RU/_CP14/statisticTracker/trackers.ftl create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/guildmaster.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/banker.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guildmaster.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Keys/guildmaster.yml create mode 100644 Resources/Prototypes/_CP14/Loadouts/Jobs/commandant.yml create mode 100644 Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml create mode 100644 Resources/Prototypes/_CP14/stat_trackers.yml create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_cape.rsi/equipped-CLOAK.png create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_cape.rsi/icon.png rename Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/{commandant_jacket.rsi => commandant_cape.rsi}/meta.json (100%) delete mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi/equipped-CLOAK.png delete mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/Mercenary/guildmaster_cape.rsi/equipped-CLOAK.png create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/Mercenary/guildmaster_cape.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/Mercenary/guildmaster_cape.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Roles/Bank/banker.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Roles/Bank/banker.rsi/inhand-right.png rename Resources/Textures/_CP14/Clothing/Shirt/Roles/{General/white_green_vest.rsi => Mercenary/guildmaster_vest.rsi}/equipped-SHIRT.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/Roles/{General/white_green_vest.rsi => Mercenary/guildmaster_vest.rsi}/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/Roles/{General/white_green_vest.rsi => Mercenary/guildmaster_vest.rsi}/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Shirt/Roles/{General/white_green_vest2.rsi => Mercenary/guildmaster_vest2.rsi}/equipped-SHIRT.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/Roles/{General/white_green_vest2.rsi => Mercenary/guildmaster_vest2.rsi}/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/Roles/{General/white_green_vest2.rsi => Mercenary/guildmaster_vest2.rsi}/meta.json (100%) create mode 100644 Resources/Textures/_CP14/Markers/jobs.rsi/guildmaster.png create mode 100644 Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/guildmaster_on_paper.png create mode 100644 Resources/Textures/_CP14/Objects/Bureaucracy/stamp.rsi/guildmaster.png diff --git a/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Generation.cs b/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Generation.cs index e091946fec..0ad31f8a04 100644 --- a/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Generation.cs +++ b/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Generation.cs @@ -2,11 +2,9 @@ using System.Linq; using System.Threading; using Content.Server._CP14.Demiplane.Components; using Content.Server._CP14.Demiplane.Jobs; -using Content.Server._CP14.RoundEnd; using Content.Server.GameTicking; using Content.Shared._CP14.Demiplane.Components; using Content.Shared._CP14.Demiplane.Prototypes; -using Content.Shared._CP14.MagicManacostModify; using Content.Shared.Examine; using Content.Shared.Interaction.Events; using Content.Shared.Verbs; @@ -158,6 +156,8 @@ public sealed partial class CP14DemiplaneSystem SpawnRandomDemiplane(generator.Comp.Location.Value, generator.Comp.SelectedModifiers, out var demiplane, out var mapId); + _statistic.TrackAdd(generator.Comp.Statistic, 1); + //Admin log needed EnsureComp(demiplane); diff --git a/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Stabilization.cs b/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Stabilization.cs index e1bbf33cbb..d1c3242265 100644 --- a/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Stabilization.cs +++ b/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Stabilization.cs @@ -81,10 +81,20 @@ public sealed partial class CP14DemiplaneSystem if (TryTeleportOutDemiplane(demiplane, uid)) { if (!safe) + { + var ev = new CP14DemiplaneUnsafeExit(); + RaiseLocalEvent(uid, ev); + _body.GibBody(uid); + } } } QueueDel(demiplane); } } + +public sealed class CP14DemiplaneUnsafeExit : EntityEventArgs +{ + +} diff --git a/Content.Server/_CP14/Demiplane/CP14DemiplaneSystem.cs b/Content.Server/_CP14/Demiplane/CP14DemiplaneSystem.cs index 5e1a82e58c..7acf2b40ef 100644 --- a/Content.Server/_CP14/Demiplane/CP14DemiplaneSystem.cs +++ b/Content.Server/_CP14/Demiplane/CP14DemiplaneSystem.cs @@ -1,3 +1,4 @@ +using Content.Server._CP14.RoundStatistic; using Content.Server.Flash; using Content.Server.Procedural; using Content.Shared._CP14.Demiplane; @@ -25,6 +26,7 @@ public sealed partial class CP14DemiplaneSystem : CP14SharedDemiplaneSystem [Dependency] private readonly FlashSystem _flash = default!; [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly CP14RoundStatTrackerSystem _statistic = default!; public override void Initialize() { diff --git a/Content.Server/_CP14/Demiplane/Components/CP14DemiplaneGeneratorDataComponent.cs b/Content.Server/_CP14/Demiplane/Components/CP14DemiplaneGeneratorDataComponent.cs index 06ee11f714..ba768ea9df 100644 --- a/Content.Server/_CP14/Demiplane/Components/CP14DemiplaneGeneratorDataComponent.cs +++ b/Content.Server/_CP14/Demiplane/Components/CP14DemiplaneGeneratorDataComponent.cs @@ -1,4 +1,5 @@ using Content.Shared._CP14.Demiplane.Prototypes; +using Content.Shared._CP14.RoundStatistic; using Robust.Shared.Prototypes; namespace Content.Server._CP14.Demiplane.Components; @@ -23,4 +24,7 @@ public sealed partial class CP14DemiplaneGeneratorDataComponent : Component [DataField(required: true)] public Dictionary, float> Limits; + + [DataField] + public ProtoId Statistic = "DemiplaneOpen"; } diff --git a/Content.Server/_CP14/Objectives/Components/CP14StatisticRangeConditionComponent.cs b/Content.Server/_CP14/Objectives/Components/CP14StatisticRangeConditionComponent.cs new file mode 100644 index 0000000000..d5d372b683 --- /dev/null +++ b/Content.Server/_CP14/Objectives/Components/CP14StatisticRangeConditionComponent.cs @@ -0,0 +1,26 @@ +using Content.Server._CP14.Objectives.Systems; +using Content.Shared._CP14.RoundStatistic; +using Content.Shared.Destructible.Thresholds; +using Robust.Shared.Prototypes; +using Robust.Shared.Utility; + +namespace Content.Server._CP14.Objectives.Components; + +[RegisterComponent, Access(typeof(CP14StatisticRangeConditionSystem))] +public sealed partial class CP14StatisticRangeConditionComponent : Component +{ + [DataField(required: true)] + public ProtoId Statistic; + + [DataField(required: true)] + public MinMax Range; + + [DataField(required: true)] + public LocId ObjectiveText; + + [DataField(required: true)] + public LocId ObjectiveDescription; + + [DataField(required: true)] + public SpriteSpecifier? ObjectiveSprite; +} diff --git a/Content.Server/_CP14/Objectives/Components/CP14TownSendConditionComponent.cs b/Content.Server/_CP14/Objectives/Components/CP14TownSendConditionComponent.cs index 42eaba434b..6b99e4e429 100644 --- a/Content.Server/_CP14/Objectives/Components/CP14TownSendConditionComponent.cs +++ b/Content.Server/_CP14/Objectives/Components/CP14TownSendConditionComponent.cs @@ -38,5 +38,5 @@ public sealed partial class CP14TownSendConditionComponent : Component public LocId ObjectiveText; [DataField(required: true)] - public LocId DescriptionText; + public LocId ObjectiveDescription; } diff --git a/Content.Server/_CP14/Objectives/Systems/CP14StatisticRangeConditionStstem.cs b/Content.Server/_CP14/Objectives/Systems/CP14StatisticRangeConditionStstem.cs new file mode 100644 index 0000000000..ceac079e2f --- /dev/null +++ b/Content.Server/_CP14/Objectives/Systems/CP14StatisticRangeConditionStstem.cs @@ -0,0 +1,54 @@ +using Content.Server._CP14.Objectives.Components; +using Content.Server._CP14.RoundStatistic; +using Content.Shared.Objectives.Components; +using Content.Shared.Objectives.Systems; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; + +namespace Content.Server._CP14.Objectives.Systems; + +public sealed class CP14StatisticRangeConditionSystem : EntitySystem +{ + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private readonly SharedObjectivesSystem _objectives = default!; + [Dependency] private readonly CP14RoundStatTrackerSystem _statistic = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnAfterAssign); + SubscribeLocalEvent(OnGetProgress); + } + + private void OnAfterAssign(Entity condition, ref ObjectiveAfterAssignEvent args) + { + var title = Loc.GetString(condition.Comp.ObjectiveText, + ("min", condition.Comp.Range.Min), + ("max", condition.Comp.Range.Max)); + + var description = Loc.GetString(condition.Comp.ObjectiveDescription, + ("min", condition.Comp.Range.Min), + ("max", condition.Comp.Range.Max)); + + _metaData.SetEntityName(condition.Owner, title, args.Meta); + _metaData.SetEntityDescription(condition.Owner, description, args.Meta); + if (condition.Comp.ObjectiveSprite is not null) + _objectives.SetIcon(condition.Owner, condition.Comp.ObjectiveSprite, args.Objective); + } + + private void OnGetProgress(Entity ent, ref ObjectiveGetProgressEvent args) + { + var statValue = _statistic.GetTrack(ent.Comp.Statistic); + + if (statValue is null || statValue > ent.Comp.Range.Max || statValue < ent.Comp.Range.Min) + { + args.Progress = 0; + return; + } + + args.Progress = 1; + } +} diff --git a/Content.Server/_CP14/Objectives/Systems/CP14TownSendConditionSystem.cs b/Content.Server/_CP14/Objectives/Systems/CP14TownSendConditionSystem.cs index b1f39de9fc..e838ce016c 100644 --- a/Content.Server/_CP14/Objectives/Systems/CP14TownSendConditionSystem.cs +++ b/Content.Server/_CP14/Objectives/Systems/CP14TownSendConditionSystem.cs @@ -26,7 +26,6 @@ public sealed class CP14TownSendConditionSystem : EntitySystem _stealQuery = GetEntityQuery(); _stackQuery = GetEntityQuery(); - SubscribeLocalEvent(OnAssigned); SubscribeLocalEvent(OnAfterAssign); SubscribeLocalEvent(OnGetProgress); @@ -72,12 +71,6 @@ public sealed class CP14TownSendConditionSystem : EntitySystem } } - private void OnAssigned(Entity condition, ref ObjectiveAssignedEvent args) - { - //TODO: Add ability to create mindfree objectives to Wizden - //condition.Comp.CollectionSize = _random.Next(condition.Comp.MinCollectionSize, condition.Comp.MaxCollectionSize); - } - //Set the visual, name, icon for the objective. private void OnAfterAssign(Entity condition, ref ObjectiveAfterAssignEvent args) { @@ -86,7 +79,7 @@ public sealed class CP14TownSendConditionSystem : EntitySystem var group = _proto.Index(condition.Comp.CollectGroup); var title = Loc.GetString(condition.Comp.ObjectiveText, ("itemName", Loc.GetString(group.Name)), ("count", condition.Comp.CollectionSize)); - var description = Loc.GetString(condition.Comp.DescriptionText, ("itemName", Loc.GetString(group.Name)), ("count", condition.Comp.CollectionSize)); + var description = Loc.GetString(condition.Comp.ObjectiveDescription, ("itemName", Loc.GetString(group.Name)), ("count", condition.Comp.CollectionSize)); _metaData.SetEntityName(condition.Owner, title, args.Meta); _metaData.SetEntityDescription(condition.Owner, description, args.Meta); diff --git a/Content.Server/_CP14/RoundStatistic/CP14RoundStatTrackerSystem.cs b/Content.Server/_CP14/RoundStatistic/CP14RoundStatTrackerSystem.cs new file mode 100644 index 0000000000..ced62e5461 --- /dev/null +++ b/Content.Server/_CP14/RoundStatistic/CP14RoundStatTrackerSystem.cs @@ -0,0 +1,71 @@ +using System.Text; +using Content.Server.GameTicking; +using Content.Shared._CP14.RoundStatistic; +using Content.Shared.GameTicking; +using Robust.Shared.Prototypes; + +namespace Content.Server._CP14.RoundStatistic; + +public sealed partial class CP14RoundStatTrackerSystem : EntitySystem +{ + [Dependency] private readonly IPrototypeManager _proto = default!; + + private readonly Dictionary, int> _tracking = new(); + + public override void Initialize() + { + base.Initialize(); + InitializeDemiplaneDeath(); + + SubscribeLocalEvent(OnRoundReset); + SubscribeLocalEvent(OnRoundEndTextAppend); + ClearStatistic(); + } + + private void OnRoundReset(RoundRestartCleanupEvent ev) + { + ClearStatistic(); + } + + private void OnRoundEndTextAppend(RoundEndTextAppendEvent ev) + { + //TODO: Move to separate UI Text block + var sb = new StringBuilder(); + + sb.Append($"[head=3]{Loc.GetString("cp14-tracker-header")}[/head] \n"); + foreach (var pair in _tracking) + { + if (!_proto.TryIndex(pair.Key, out var indexedTracker)) + continue; + + sb.Append($"- {Loc.GetString(indexedTracker.Text)}: {pair.Value}\n"); + } + ev.AddLine(sb.ToString()); + } + + private void ClearStatistic() + { + _tracking.Clear(); + + foreach (var statTracker in _proto.EnumeratePrototypes()) + { + _tracking.Add(statTracker.ID, 0); + } + } + + public void TrackAdd(ProtoId proto, int dif) + { + _tracking[proto] += Math.Max(dif, 0); + } + + public int? GetTrack(ProtoId proto) + { + if (!_tracking.TryGetValue(proto, out var stat)) + { + Log.Error($"Failed to get round statistic: {proto}"); + return null; + } + + return stat; + } +} diff --git a/Content.Server/_CP14/RoundStatistic/DemiplaneDeath/CP14DeathDemiplaneStatisticComponent.cs b/Content.Server/_CP14/RoundStatistic/DemiplaneDeath/CP14DeathDemiplaneStatisticComponent.cs new file mode 100644 index 0000000000..df155ac9b1 --- /dev/null +++ b/Content.Server/_CP14/RoundStatistic/DemiplaneDeath/CP14DeathDemiplaneStatisticComponent.cs @@ -0,0 +1,14 @@ +using Content.Shared._CP14.RoundStatistic; +using Robust.Shared.Prototypes; + +namespace Content.Server._CP14.RoundStatistic.DemiplaneDeath; + +/// +/// Tracks the destruction or full-blown death of this entity. +/// +[RegisterComponent] +public sealed partial class CP14DeathDemiplaneStatisticComponent : Component +{ + [DataField] + public ProtoId Statistic = "DemiplaneDeaths"; +} diff --git a/Content.Server/_CP14/RoundStatistic/DemiplaneDeath/CP14RoundStatTrackerSystem.DemiplaneDeath.cs b/Content.Server/_CP14/RoundStatistic/DemiplaneDeath/CP14RoundStatTrackerSystem.DemiplaneDeath.cs new file mode 100644 index 0000000000..744b0e1276 --- /dev/null +++ b/Content.Server/_CP14/RoundStatistic/DemiplaneDeath/CP14RoundStatTrackerSystem.DemiplaneDeath.cs @@ -0,0 +1,35 @@ +using Content.Server._CP14.Demiplane; +using Content.Server._CP14.RoundStatistic.DemiplaneDeath; +using Content.Shared._CP14.Demiplane.Components; +using Content.Shared.GameTicking; + +namespace Content.Server._CP14.RoundStatistic; + +public sealed partial class CP14RoundStatTrackerSystem +{ + private void InitializeDemiplaneDeath() + { + SubscribeLocalEvent(OnSpawnComplete); + SubscribeLocalEvent(OnEntityTerminated); + SubscribeLocalEvent(OnDemiplaneUnsafeExit); + } + + private void OnSpawnComplete(PlayerSpawnCompleteEvent ev) + { + EnsureComp(ev.Mob); + } + + private void OnDemiplaneUnsafeExit(Entity ent, ref CP14DemiplaneUnsafeExit args) + { + TrackAdd(ent.Comp.Statistic, 1); + } + + //For round remove variants, like gibs or chasm falls + private void OnEntityTerminated(Entity ent, ref EntityTerminatingEvent args) + { + if (!HasComp(Transform(ent).MapUid)) + return; + + TrackAdd(ent.Comp.Statistic, 1); + } +} diff --git a/Content.Shared/_CP14/RoundStatistic/CP14RoundStatTrackerPrototype.cs b/Content.Shared/_CP14/RoundStatistic/CP14RoundStatTrackerPrototype.cs new file mode 100644 index 0000000000..9da3be1582 --- /dev/null +++ b/Content.Shared/_CP14/RoundStatistic/CP14RoundStatTrackerPrototype.cs @@ -0,0 +1,12 @@ +using Robust.Shared.Prototypes; + +namespace Content.Shared._CP14.RoundStatistic; + +[Prototype("statisticTracker")] +public sealed partial class CP14RoundStatTrackerPrototype : IPrototype +{ + [IdDataField] public string ID { get; } = default!; + + [DataField(required: true)] + public LocId Text; +} diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl index 458d4230cc..3bd93f6065 100644 --- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl @@ -42,6 +42,14 @@ cp14-loadout-guard-spells = Guard's spells cp14-loadout-bank-head = Bank employee hat cp14-loadout-commandant-head = Commandant's hat cp14-loadout-commandant-cloak = Commandant's cloak +cp14-loadout-banker-outer = Banker's waistcoat cp14-loadout-bank-shirt = Bank Employee shirt cp14-loadout-bank-pants = Bank Employee pants cp14-loadout-bank-shoes = Bank Employee shoes + +# Guildmaster + +cp14-loadout-guildmaster-cloak = Guildmaster cloak +cp14-loadout-guildmaster-shirt = Guildmaster shirt +cp14-loadout-guildmaster-pants = Guildmaster pants +cp14-loadout-guildmaster-shoes = Guildmaster shoes \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/lockKey/locks-types.ftl b/Resources/Locale/en-US/_CP14/lockKey/locks-types.ftl index b824cefb87..bf30536c06 100644 --- a/Resources/Locale/en-US/_CP14/lockKey/locks-types.ftl +++ b/Resources/Locale/en-US/_CP14/lockKey/locks-types.ftl @@ -14,9 +14,11 @@ cp14-lock-shape-tavern-dorm5 = tavern room №5 cp14-lock-shape-alchemist1 = alchemist's lab №1 cp14-lock-shape-alchemist2 = alchemist's lab №2 +cp14-lock-shape-alchemist3 = alchemist's lab №3 cp14-lock-shape-blacksmith1 = forge №1 cp14-lock-shape-blacksmith2 = forge №2 +cp14-lock-shape-blacksmith3 = forge №3 cp14-lock-shape-personalhouse1 = house №1 cp14-lock-shape-personalhouse2 = house №2 @@ -33,9 +35,12 @@ cp14-lock-shape-personalhouse12 = house №12 cp14-lock-shape-personalhouse13 = house №13 cp14-lock-shape-personalhouse14 = house №14 cp14-lock-shape-personalhouse15 = house №15 +cp14-lock-shape-personalhouse16 = house №16 cp14-lock-shaper-guard-entrance = barracks, entrance cp14-lock-shaper-guard-staff = barracks cp14-lock-shaper-guard-commander = guardhouse cp14-lock-shaper-guard-weapon-storage = weapons storage -cp14-lock-shape-guildmaster = guildmaster \ No newline at end of file + +cp14-lock-shape-guildmaster = guildmaster +cp14-lock-shape-demiplane-crystal = demiplane crystal \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/objectives/condition/empire-order.ftl b/Resources/Locale/en-US/_CP14/objectives/condition/empire-order.ftl index 3c34fbddf8..b7b9a14086 100644 --- a/Resources/Locale/en-US/_CP14/objectives/condition/empire-order.ftl +++ b/Resources/Locale/en-US/_CP14/objectives/condition/empire-order.ftl @@ -4,4 +4,7 @@ cp14-objective-town-send-title = Extract { $count } { $itemName } cp14-objective-town-send-desc = Your task is to mine and ship { $count } { $itemName } to the city on a merchant ship. cp14-objective-bank-earning-title = Accumulate in the vault{ $coins } -cp14-objective-bank-earning-desc = There must be at least{ $coins } in the bank vault. You can use any methods of earning money that do not violate the law. \ No newline at end of file +cp14-objective-bank-earning-desc = There must be at least{ $coins } in the bank vault. You can use any methods of earning money that do not violate the law. + +cp14-objective-no-demiplane-death-title = Prevent deaths in the demiplanes +cp14-objective-no-demiplane-death-desc = I need to control the work of the adventurers so they don't die in the demiplanes. No more {$max} deaths! \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/stamp/stamp.ftl b/Resources/Locale/en-US/_CP14/stamp/stamp.ftl index dadbd410f5..ada48b177f 100644 --- a/Resources/Locale/en-US/_CP14/stamp/stamp.ftl +++ b/Resources/Locale/en-US/_CP14/stamp/stamp.ftl @@ -3,4 +3,5 @@ cp14-stamp-salary = Intendant of the Guard cp14-stamp-denied = Denied cp14-stamp-approved = Approved cp14-stamp-bank = Commandant -cp14-stamp-guard-commander = Guard commander \ No newline at end of file +cp14-stamp-guard-commander = Guard commander +cp14-stamp-guildmaster = Guildmaster \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/statisticTracker/trackers.ftl b/Resources/Locale/en-US/_CP14/statisticTracker/trackers.ftl new file mode 100644 index 0000000000..4e29ccb2a0 --- /dev/null +++ b/Resources/Locale/en-US/_CP14/statisticTracker/trackers.ftl @@ -0,0 +1,4 @@ +cp14-tracker-header = Round statistic: + +cp14-tracker-demiplane-open = Demiplanes opened +cp14-tracker-demiplane-deaths = Players died in demiplanes \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl index 2e4f90b396..60677bec31 100644 --- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl @@ -44,6 +44,14 @@ cp14-loadout-guard-spells = Заклинания стражи cp14-loadout-bank-head = Шляпа работника банка cp14-loadout-commandant-head = Шляпа коменданта cp14-loadout-commandant-cloak = Накидка коменданта +cp14-loadout-banker-outer = Жилет банкира cp14-loadout-bank-shirt = Рубашка работника банка cp14-loadout-bank-pants = Штаны работника банка cp14-loadout-bank-shoes = Ботинки работника банка + +# Guildmaster + +cp14-loadout-guildmaster-cloak = Накидка гильдмастера +cp14-loadout-guildmaster-shirt = Рубашка гильдмастера +cp14-loadout-guildmaster-pants = Штаны гильдмастера +cp14-loadout-guildmaster-shoes = Ботинки гильдмастера \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/lockKey/locks-types.ftl b/Resources/Locale/ru-RU/_CP14/lockKey/locks-types.ftl index 61a6fb67c3..b9f8c01846 100644 --- a/Resources/Locale/ru-RU/_CP14/lockKey/locks-types.ftl +++ b/Resources/Locale/ru-RU/_CP14/lockKey/locks-types.ftl @@ -14,9 +14,11 @@ cp14-lock-shape-tavern-dorm5 = комната таверны №5 cp14-lock-shape-alchemist1 = лаборатория алхимика №1 cp14-lock-shape-alchemist2 = лаборатория алхимика №2 +cp14-lock-shape-alchemist3 = лаборатория алхимика №3 cp14-lock-shape-blacksmith1 = кузня №1 cp14-lock-shape-blacksmith2 = кузня №2 +cp14-lock-shape-blacksmith3 = кузня №3 cp14-lock-shape-personalhouse1 = дом №1 cp14-lock-shape-personalhouse2 = дом №2 @@ -33,9 +35,12 @@ cp14-lock-shape-personalhouse12 = дом №12 cp14-lock-shape-personalhouse13 = дом №13 cp14-lock-shape-personalhouse14 = дом №14 cp14-lock-shape-personalhouse15 = дом №15 +cp14-lock-shape-personalhouse16 = дом №16 cp14-lock-shaper-guard-entrance = казармы, вход cp14-lock-shaper-guard-staff = казармы cp14-lock-shaper-guard-commander = дом главы стражи cp14-lock-shaper-guard-weapon-storage = хранилище оружия -cp14-lock-shape-guildmaster = гильдмастер \ No newline at end of file + +cp14-lock-shape-guildmaster = гильдмастер +cp14-lock-shape-demiplane-crystal = кристалл демиплана \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/objectives/condition/empire-order.ftl b/Resources/Locale/ru-RU/_CP14/objectives/condition/empire-order.ftl index a94ad1a577..cd8595b870 100644 --- a/Resources/Locale/ru-RU/_CP14/objectives/condition/empire-order.ftl +++ b/Resources/Locale/ru-RU/_CP14/objectives/condition/empire-order.ftl @@ -4,4 +4,7 @@ cp14-objective-town-send-title = Добыть { $count } { $itemName } cp14-objective-town-send-desc = Ваша задача - добыть и отправить { $count } { $itemName } в город на торговом корабле. cp14-objective-bank-earning-title = Накопить в хранилище{ $coins } -cp14-objective-bank-earning-desc = В банковском хранилище должно находиться не меньше{ $coins }. Вы можете использовать любые методы заработка, не нарушающие закон. \ No newline at end of file +cp14-objective-bank-earning-desc = В банковском хранилище должно находиться не меньше{ $coins }. Вы можете использовать любые методы заработка, не нарушающие закон. + +cp14-objective-no-demiplane-death-title = Не допустить смертей в демипланах +cp14-objective-no-demiplane-death-desc = Мне нужно контролировать работу авантюристов, чтобы они не погибали в демипланах. Не больше {$max} смертей! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/stamp/stamp.ftl b/Resources/Locale/ru-RU/_CP14/stamp/stamp.ftl index 6f003ae829..d47c8dc709 100644 --- a/Resources/Locale/ru-RU/_CP14/stamp/stamp.ftl +++ b/Resources/Locale/ru-RU/_CP14/stamp/stamp.ftl @@ -3,4 +3,5 @@ cp14-stamp-salary = Интендант гвардии cp14-stamp-denied = Отказано cp14-stamp-approved = Утверждено cp14-stamp-bank = Комендант -cp14-stamp-guard-commander = Командир стражи \ No newline at end of file +cp14-stamp-guard-commander = Командир стражи +cp14-stamp-guildmaster = Гильдмастер \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/statisticTracker/trackers.ftl b/Resources/Locale/ru-RU/_CP14/statisticTracker/trackers.ftl new file mode 100644 index 0000000000..b225a1072b --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/statisticTracker/trackers.ftl @@ -0,0 +1,4 @@ +cp14-tracker-header = Статистика раунда: + +cp14-tracker-demiplane-open = Открыто демипланов +cp14-tracker-demiplane-deaths = Умерло игроков в демипланах \ No newline at end of file diff --git a/Resources/Maps/_CP14/comoss.yml b/Resources/Maps/_CP14/comoss.yml index edcf83d3b8..9ab268fa62 100644 --- a/Resources/Maps/_CP14/comoss.yml +++ b/Resources/Maps/_CP14/comoss.yml @@ -14,6 +14,9 @@ tilemap: 28: CP14FloorGrass 29: CP14FloorGrassLight 30: CP14FloorGrassTall + 31: CP14FloorIce + 26: CP14FloorLucensWoodPlanksCruciform + 27: CP14FloorLucensWoodPlanksStairways 14: CP14FloorMarble 5: CP14FloorOakWoodPlanks 19: CP14FloorOakWoodPlanksBig @@ -98,7 +101,7 @@ entities: version: 6 -1,-1: ind: -1,-1 - tiles: BQAAAAABBQAAAAAABAAAAAAIFgAAAAABGAAAAAAFFwAAAAADBAAAAAABBQAAAAABBQAAAAACBQAAAAACBQAAAAABBQAAAAACBQAAAAAABQAAAAACBQAAAAAABAAAAAAMBQAAAAADBQAAAAABBAAAAAAEFgAAAAADGAAAAAADFwAAAAADBAAAAAAEBQAAAAAABQAAAAAABQAAAAABBQAAAAAABQAAAAABBQAAAAABBQAAAAABBQAAAAABBAAAAAABBAAAAAAMBAAAAAAKBAAAAAACFgAAAAAAFgAAAAAAFwAAAAABBAAAAAACBAAAAAALBAAAAAANBAAAAAAHBAAAAAAGBQAAAAACBAAAAAANBAAAAAAJBAAAAAACBAAAAAACBAAAAAAIGAAAAAAFGAAAAAADFgAAAAABFgAAAAAAFgAAAAAEFgAAAAADFgAAAAACBQAAAAABBQAAAAAABQAAAAAABQAAAAADBQAAAAABBAAAAAANFwAAAAAAFwAAAAABFwAAAAAAGAAAAAAAFgAAAAAAFgAAAAACFgAAAAACGAAAAAAAGAAAAAAAGAAAAAABBAAAAAABBQAAAAABBQAAAAACBQAAAAABBQAAAAADBAAAAAAJFwAAAAADGQAAAAAFFwAAAAAAGAAAAAAFFgAAAAAAGAAAAAAFGAAAAAACFwAAAAABFwAAAAADFwAAAAABBAAAAAAJBAAAAAAMBAAAAAABBAAAAAABBAAAAAALBAAAAAADFwAAAAAEGQAAAAABFwAAAAABFwAAAAABGAAAAAABFwAAAAAFFwAAAAAFFwAAAAAFFwAAAAAAFwAAAAABFwAAAAAFFwAAAAABFwAAAAAEFwAAAAADFwAAAAABFwAAAAADFwAAAAAAGQAAAAACFwAAAAACFwAAAAACGAAAAAAEFwAAAAABFwAAAAAEFwAAAAAABAAAAAADBAAAAAABBAAAAAANBAAAAAAHBAAAAAABBAAAAAAHBAAAAAAFBAAAAAAMFwAAAAAEGQAAAAAIBAAAAAAIBAAAAAACBAAAAAADBAAAAAAEBAAAAAAGFwAAAAABBAAAAAAIBgAAAAACBwAAAAACBgAAAAAABwAAAAADBQAAAAABBQAAAAADBAAAAAAJFwAAAAAFGQAAAAAGBQAAAAABBQAAAAABBQAAAAABBQAAAAABBAAAAAAGFwAAAAAEBAAAAAAEBQAAAAACBgAAAAADBwAAAAADBgAAAAAABgAAAAABBwAAAAADBAAAAAAIFwAAAAACGQAAAAAFBQAAAAABBQAAAAADBQAAAAACBQAAAAABBAAAAAAMFwAAAAABBAAAAAAIBQAAAAADBwAAAAACBgAAAAADBwAAAAABBwAAAAADBgAAAAADBAAAAAALFwAAAAAEGQAAAAABBAAAAAAJBAAAAAAKBQAAAAADBAAAAAAMBAAAAAAEFwAAAAACBAAAAAABBgAAAAADBwAAAAAABQAAAAABBAAAAAAJBAAAAAAGBAAAAAAHBAAAAAAGFwAAAAAEGQAAAAADBAAAAAANBQAAAAACBQAAAAAABQAAAAAAFwAAAAAFFwAAAAAEBAAAAAAIBwAAAAABBgAAAAACBQAAAAACBQAAAAAAFwAAAAAFFwAAAAABFwAAAAAAFwAAAAAFGQAAAAAHBAAAAAABBQAAAAADBQAAAAAABQAAAAADFwAAAAAAFwAAAAAEBAAAAAANBAAAAAAFBAAAAAAGBAAAAAAJBAAAAAADFwAAAAAAFwAAAAADGQAAAAAAGQAAAAADGQAAAAAHFwAAAAACFwAAAAABFwAAAAABFwAAAAADFwAAAAACFwAAAAACFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAADFwAAAAAEFwAAAAABGQAAAAAHGQAAAAACGQAAAAAGGQAAAAADFwAAAAADFwAAAAAEFwAAAAAAFwAAAAABFwAAAAAFFwAAAAADBAAAAAAABAAAAAAFBAAAAAAFBAAAAAAAGAAAAAACGAAAAAAFGQAAAAAFGQAAAAAGGQAAAAAIGQAAAAAD + tiles: BQAAAAABBQAAAAAABAAAAAAIFgAAAAABGAAAAAAFBAAAAAAABAAAAAABBQAAAAABBQAAAAACGgAAAAAAGwAAAAAAGwAAAAAAGgAAAAAAGwAAAAAAGwAAAAAABAAAAAAMBQAAAAADBQAAAAABBAAAAAAEFgAAAAADGAAAAAADFwAAAAADFgAAAAAAFgAAAAAABAAAAAAAGgAAAAAAGgAAAAAAGgAAAAAAGgAAAAAAGgAAAAAAGgAAAAAABAAAAAABBAAAAAAMBAAAAAAKBAAAAAACFgAAAAAAFgAAAAAAFwAAAAABFgAAAAAAFgAAAAAABAAAAAANBAAAAAAHBAAAAAAGGgAAAAAABAAAAAANBAAAAAAJBAAAAAACBAAAAAACBAAAAAAIGAAAAAAFGAAAAAADFgAAAAABFgAAAAAAFgAAAAAEFgAAAAADFgAAAAACGgAAAAAAGgAAAAAAGgAAAAAAGgAAAAAAGgAAAAAABAAAAAANFwAAAAAAFwAAAAABFwAAAAAAGAAAAAAAFgAAAAAAFgAAAAACFgAAAAACGAAAAAAAGAAAAAAAGAAAAAABBAAAAAABGgAAAAAAGgAAAAAAGgAAAAAAGgAAAAAABAAAAAAJFwAAAAADGQAAAAAFFwAAAAAAGAAAAAAFFgAAAAAAGAAAAAAFGAAAAAACFwAAAAABFwAAAAADFwAAAAABBAAAAAAJBAAAAAAMBAAAAAABBAAAAAABBAAAAAALBAAAAAADFwAAAAAEGQAAAAABFwAAAAABFwAAAAABGAAAAAABFwAAAAAFFwAAAAAFFwAAAAAFFwAAAAAAFwAAAAABFwAAAAAFFwAAAAABFwAAAAAEFwAAAAADFwAAAAABFwAAAAADFwAAAAAAGQAAAAACFwAAAAACFwAAAAACGAAAAAAEFwAAAAABFwAAAAAEFwAAAAAABAAAAAADBAAAAAABBAAAAAANBAAAAAAHBAAAAAABBAAAAAAHBAAAAAAFBAAAAAAMFwAAAAAEGQAAAAAIBAAAAAAIBAAAAAACBAAAAAADBAAAAAAEBAAAAAAGFwAAAAABBAAAAAAIBgAAAAACBwAAAAACBgAAAAAABwAAAAADBQAAAAABBQAAAAADBAAAAAAJFwAAAAAFGQAAAAAGBQAAAAABBQAAAAABBQAAAAABBQAAAAABBAAAAAAGFwAAAAAEBAAAAAAEBQAAAAACBgAAAAADBwAAAAADBgAAAAAABgAAAAABBwAAAAADBAAAAAAIFwAAAAACGQAAAAAFBQAAAAABBQAAAAADBQAAAAACBQAAAAABBAAAAAAMFwAAAAABBAAAAAAIBQAAAAADBwAAAAACBgAAAAADBwAAAAABBwAAAAADBgAAAAADBAAAAAALFwAAAAAEGQAAAAABBAAAAAAJBAAAAAAKBQAAAAADBAAAAAAMBAAAAAAEFwAAAAACBAAAAAABBgAAAAADBwAAAAAABQAAAAABBAAAAAAJBAAAAAAGBAAAAAAHBAAAAAAGFwAAAAAEGQAAAAADBAAAAAANBQAAAAACBQAAAAAABQAAAAAAFwAAAAAFFwAAAAAEBAAAAAAIBwAAAAABBgAAAAACBQAAAAACBQAAAAAAFwAAAAAFFwAAAAABFwAAAAAAFwAAAAAFGQAAAAAHBAAAAAABBQAAAAADBQAAAAAABQAAAAADFwAAAAAAFwAAAAAEBAAAAAANBAAAAAAFBAAAAAAGBAAAAAAJBAAAAAADFwAAAAAAFwAAAAADGQAAAAAAGQAAAAADGQAAAAAHFwAAAAACFwAAAAABFwAAAAABFwAAAAADFwAAAAACFwAAAAACFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAADFwAAAAAEFwAAAAABGQAAAAAHGQAAAAACGQAAAAAGGQAAAAADFwAAAAADFwAAAAAEFwAAAAAAFwAAAAABFwAAAAAFFwAAAAADBAAAAAAABAAAAAAFBAAAAAAFBAAAAAAAGAAAAAACGAAAAAAFGQAAAAAFGQAAAAAGGQAAAAAIGQAAAAAD version: 6 -1,0: ind: -1,0 @@ -106,7 +109,7 @@ entities: version: 6 -1,-2: ind: -1,-2 - tiles: BwAAAAADBAAAAAAAAgAAAAAKCQAAAAAMAgAAAAAPAgAAAAALBAAAAAACBQAAAAADBgAAAAACBQAAAAADBgAAAAACBwAAAAACBgAAAAABBAAAAAAMFwAAAAAEGQAAAAAHBQAAAAAABAAAAAACBAAAAAAABAAAAAAMBAAAAAAKCQAAAAAABAAAAAAJBgAAAAACBQAAAAACBQAAAAABBAAAAAABBgAAAAABBwAAAAADBAAAAAAHFwAAAAAFGQAAAAAHBwAAAAAABwAAAAAABQAAAAAABQAAAAAABAAAAAAJFwAAAAAABAAAAAACBAAAAAABBAAAAAAEBAAAAAACBAAAAAAFBQAAAAAABAAAAAAJBAAAAAAGFwAAAAADGQAAAAAABQAAAAADBgAAAAADBgAAAAADBQAAAAAABAAAAAALFwAAAAADFwAAAAADFwAAAAABFwAAAAAEFwAAAAAFFwAAAAACGAAAAAAEFwAAAAAAFwAAAAACFwAAAAACGQAAAAABBwAAAAAABgAAAAABBgAAAAACBQAAAAAABQAAAAADGAAAAAADGQAAAAABGQAAAAADGQAAAAAIGQAAAAAAGQAAAAAEGQAAAAAAGQAAAAABGQAAAAADGQAAAAABGQAAAAAGBAAAAAAGBAAAAAAGBAAAAAAMBAAAAAAEBAAAAAAEFwAAAAAAGQAAAAAHGQAAAAAFGQAAAAAEGQAAAAABGQAAAAAGGQAAAAAEGQAAAAACGQAAAAAFGQAAAAAHGQAAAAABFwAAAAADFwAAAAADFwAAAAAEFwAAAAAAFwAAAAAFFwAAAAABFwAAAAADGAAAAAAEFgAAAAAEFwAAAAACFwAAAAAAFwAAAAACFwAAAAAFFwAAAAAEFwAAAAABFwAAAAABBAAAAAAGBAAAAAAEBAAAAAANBAAAAAAIBAAAAAAEBAAAAAAHBAAAAAALBAAAAAAJBAAAAAALBAAAAAAHBAAAAAAFBAAAAAAIBAAAAAALBAAAAAACBAAAAAADBAAAAAADBQAAAAADBQAAAAADBQAAAAACBQAAAAAABAAAAAAKBQAAAAADBQAAAAADBgAAAAADBgAAAAADBgAAAAAABQAAAAADBgAAAAAABgAAAAABBgAAAAADBQAAAAADBAAAAAAEBQAAAAABBQAAAAACBQAAAAAABgAAAAADBgAAAAADBgAAAAACBQAAAAADBgAAAAABBgAAAAADBgAAAAADBQAAAAABBgAAAAAABgAAAAADBgAAAAADBgAAAAADBgAAAAAABQAAAAAABQAAAAAABQAAAAAABgAAAAACBgAAAAAABgAAAAACBQAAAAAABQAAAAAABQAAAAAABQAAAAABBQAAAAABBQAAAAACBQAAAAAABQAAAAADBgAAAAABBgAAAAADBQAAAAACBQAAAAADBQAAAAACBQAAAAACBwAAAAABBQAAAAACBwAAAAACBwAAAAABBQAAAAABBwAAAAABBwAAAAABBwAAAAADBwAAAAACBQAAAAABBQAAAAABBAAAAAAABQAAAAADBQAAAAADBQAAAAABBQAAAAABBQAAAAABBQAAAAAABwAAAAABBwAAAAAABQAAAAABBwAAAAABBwAAAAAABwAAAAAABwAAAAABBQAAAAAABQAAAAABBAAAAAAHBQAAAAADBAAAAAAMBAAAAAAABAAAAAAKBAAAAAAEBAAAAAADDQAAAAAADQAAAAAABAAAAAABBAAAAAAMDQAAAAAADQAAAAAABAAAAAAGDQAAAAAABAAAAAAKBAAAAAAJBQAAAAABBQAAAAACBAAAAAADFgAAAAACGAAAAAAEBAAAAAAJBAAAAAACBAAAAAAGBAAAAAAHBQAAAAACBQAAAAAABQAAAAAABQAAAAADBQAAAAAABQAAAAABBAAAAAAHBQAAAAACBQAAAAADBAAAAAALFgAAAAADGAAAAAABFwAAAAABBAAAAAAIBQAAAAABBQAAAAABBQAAAAADBQAAAAADBQAAAAACBQAAAAADBQAAAAABBQAAAAADBAAAAAAC + tiles: BwAAAAADBAAAAAAAAgAAAAAKCQAAAAAMBAAAAAAABQAAAAAABAAAAAACBQAAAAADBgAAAAACBQAAAAADBgAAAAACBwAAAAACBgAAAAABBAAAAAAMFwAAAAAEGQAAAAAHBQAAAAAABAAAAAACBAAAAAAABAAAAAAMBAAAAAAKBAAAAAAABAAAAAAJBgAAAAACBQAAAAACBQAAAAABBAAAAAABBgAAAAABBwAAAAADBAAAAAAHFwAAAAAFGQAAAAAHBwAAAAAABwAAAAAABQAAAAAABQAAAAAABAAAAAAJFwAAAAAABAAAAAACBAAAAAABBAAAAAAEBAAAAAACBAAAAAAFBQAAAAAABAAAAAAJBAAAAAAGFwAAAAADGQAAAAAABQAAAAADBgAAAAADBgAAAAADBQAAAAAABAAAAAALFwAAAAADFwAAAAADFwAAAAABFwAAAAAEFwAAAAAFFwAAAAACGAAAAAAEFwAAAAAAFwAAAAACFwAAAAACGQAAAAABBwAAAAAABgAAAAABBgAAAAACBQAAAAAABQAAAAADGAAAAAADGQAAAAABGQAAAAADGQAAAAAIGQAAAAAAGQAAAAAEGQAAAAAAGQAAAAABGQAAAAADGQAAAAABGQAAAAAGBAAAAAAGBAAAAAAGBAAAAAAMBAAAAAAEBAAAAAAEFwAAAAAAGQAAAAAHGQAAAAAFGQAAAAAEGQAAAAABGQAAAAAGGQAAAAAEGQAAAAACGQAAAAAFGQAAAAAHGQAAAAABFwAAAAADFwAAAAADFwAAAAAEFwAAAAAAFwAAAAAFFwAAAAABFwAAAAADGAAAAAAEFgAAAAAEFwAAAAACFwAAAAAAFwAAAAACFwAAAAAFFwAAAAAEFwAAAAABFwAAAAABBAAAAAAGBAAAAAAEBAAAAAANBAAAAAAIBAAAAAAEBAAAAAAHBAAAAAALBAAAAAAJBAAAAAALBAAAAAAHBAAAAAAFBAAAAAAIBAAAAAALBAAAAAACBAAAAAADBAAAAAADBQAAAAADBQAAAAADBQAAAAACBQAAAAAABAAAAAAKBQAAAAADBQAAAAADBgAAAAADBgAAAAADBgAAAAAABQAAAAADBgAAAAAABgAAAAABBgAAAAADBQAAAAADBAAAAAAEBQAAAAABBQAAAAACBQAAAAAABgAAAAADBgAAAAADBgAAAAACBQAAAAADBgAAAAABBgAAAAADBgAAAAADBQAAAAABBgAAAAAABgAAAAADBgAAAAADBgAAAAADBgAAAAAABQAAAAAABQAAAAAABQAAAAAABgAAAAACBgAAAAAABgAAAAACBQAAAAAABQAAAAAABQAAAAAABQAAAAABBQAAAAABBQAAAAACBQAAAAAABQAAAAADBgAAAAABBgAAAAADBQAAAAACBQAAAAADBQAAAAACBQAAAAACBwAAAAABBQAAAAACBwAAAAACBwAAAAABBQAAAAABBwAAAAABBwAAAAABBwAAAAADBwAAAAACBQAAAAABBQAAAAABBAAAAAAABQAAAAADBQAAAAADBQAAAAABBQAAAAABBQAAAAABBQAAAAAABwAAAAABBwAAAAAABQAAAAABBwAAAAABBwAAAAAABwAAAAAABwAAAAABBQAAAAAABQAAAAABBAAAAAAHBQAAAAADBAAAAAAMBAAAAAAABAAAAAAKBAAAAAAEBAAAAAADAwAAAAAAAwAAAAAABQAAAAAABAAAAAAMDQAAAAAADQAAAAAABAAAAAAGDQAAAAAABAAAAAAKBAAAAAAJBQAAAAABBQAAAAACBAAAAAADFgAAAAACGAAAAAAEBAAAAAAJAwAAAAAAAwAAAAAABQAAAAAAGgAAAAAAGgAAAAAAGgAAAAAAGgAAAAAAGgAAAAAAGgAAAAAABAAAAAAHBQAAAAACBQAAAAADBAAAAAALFgAAAAADGAAAAAABBAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAGgAAAAAAGwAAAAAAGwAAAAAAGgAAAAAAGwAAAAAAGwAAAAAABAAAAAAC version: 6 0,-2: ind: 0,-2 @@ -138,7 +141,7 @@ entities: version: 6 1,1: ind: 1,1 - tiles: GAAAAAAFBAAAAAAGBAAAAAAKBAAAAAAKBwAAAAACBQAAAAADBQAAAAABBAAAAAAIHAAAAAACBAAAAAANAwAAAAAEAwAAAAAGAwAAAAAHDQAAAAAADQAAAAAADQAAAAAAFwAAAAAAFwAAAAAAFwAAAAACBwAAAAABBwAAAAACBQAAAAADBgAAAAAABAAAAAAHHAAAAAABBAAAAAAKAwAAAAACAwAAAAAEAwAAAAACBAAAAAANBAAAAAAEBAAAAAANFwAAAAAAFwAAAAADFwAAAAAEBAAAAAAHBAAAAAAHBAAAAAACBAAAAAAIBAAAAAAEHAAAAAAEBAAAAAANBAAAAAABBAAAAAAEBAAAAAALBAAAAAAGFwAAAAAFFwAAAAACFwAAAAACFwAAAAAAFwAAAAAFFwAAAAABFwAAAAABFwAAAAAEFwAAAAAAFwAAAAAFFwAAAAADCQAAAAADCQAAAAAJCQAAAAAJCQAAAAAGCQAAAAAICQAAAAAKCQAAAAABFwAAAAAEFwAAAAAAFwAAAAABFwAAAAABFwAAAAAEFwAAAAAEFwAAAAABFwAAAAACCQAAAAAKCQAAAAAMCQAAAAAKCQAAAAAGCQAAAAAICQAAAAAHCQAAAAAGCQAAAAACHAAAAAADFwAAAAADFwAAAAAEFwAAAAABFwAAAAAAFwAAAAABFwAAAAAFFwAAAAAACQAAAAABCQAAAAADCQAAAAAICQAAAAAKCQAAAAAKCQAAAAAICQAAAAADCQAAAAALHAAAAAAAHgAAAAAAFwAAAAABAgAAAAAGAgAAAAAKFwAAAAADFwAAAAAECQAAAAAICQAAAAACCQAAAAALCQAAAAALCQAAAAACCQAAAAALCQAAAAAJCQAAAAANCQAAAAAKHAAAAAABFwAAAAAEAgAAAAAFAgAAAAABAgAAAAAFAgAAAAAPFwAAAAADCQAAAAAICQAAAAADCQAAAAADCQAAAAAICQAAAAAJCQAAAAAKCQAAAAAACQAAAAAMCQAAAAABGAAAAAABGAAAAAADAgAAAAABAgAAAAAGAgAAAAAOAgAAAAAHFwAAAAAECQAAAAAICQAAAAACCQAAAAADCQAAAAABCQAAAAAHCQAAAAAGCQAAAAABCQAAAAAECQAAAAANFwAAAAAFCQAAAAADFwAAAAAFAgAAAAABAgAAAAABFwAAAAABFwAAAAAACQAAAAAKCQAAAAAHCQAAAAABCQAAAAAJCQAAAAACCQAAAAABCQAAAAAICQAAAAABCQAAAAABCQAAAAAIHAAAAAAFHAAAAAACFwAAAAAAFwAAAAAFFwAAAAAAHAAAAAAECQAAAAAKCQAAAAAECQAAAAANCQAAAAAFCQAAAAAJCQAAAAAMCQAAAAAECQAAAAAKCQAAAAAECQAAAAAKCQAAAAANCQAAAAAECQAAAAAFFwAAAAAAHAAAAAACHAAAAAAFCQAAAAAJCQAAAAADCQAAAAAFCQAAAAABCQAAAAAMCQAAAAAACQAAAAABCQAAAAAGCQAAAAAKCQAAAAAICQAAAAAFCQAAAAAGCQAAAAADCQAAAAANFwAAAAAFHAAAAAACCQAAAAAJCQAAAAAJCQAAAAAMCQAAAAAECQAAAAANCQAAAAAECQAAAAAMCQAAAAADCQAAAAAKCQAAAAAFCQAAAAAMCQAAAAAACQAAAAANCQAAAAAGCQAAAAACFwAAAAAACQAAAAAJCQAAAAALCQAAAAALCQAAAAACCQAAAAANCQAAAAAHCQAAAAANCQAAAAAJCQAAAAALCQAAAAAHCQAAAAABCQAAAAANCQAAAAAGCQAAAAAGCQAAAAAHCQAAAAAECQAAAAAKCQAAAAAGCQAAAAAJCQAAAAANCQAAAAACCQAAAAANCQAAAAAMCQAAAAAFCQAAAAAFCQAAAAAACQAAAAABCQAAAAAMCQAAAAALCQAAAAAMCQAAAAAKCQAAAAAKCQAAAAADCQAAAAADCQAAAAADCQAAAAAGCQAAAAAHCQAAAAACCQAAAAAFCQAAAAAMCQAAAAAN + tiles: GAAAAAAFBAAAAAAGBAAAAAAKBAAAAAAKBwAAAAACBQAAAAADBQAAAAABBAAAAAAIHAAAAAACBAAAAAANAwAAAAAEAwAAAAAGAwAAAAAHDQAAAAAADQAAAAAADQAAAAAAFwAAAAAAFwAAAAAAFwAAAAACBwAAAAABBwAAAAACBQAAAAADBgAAAAAABAAAAAAHHAAAAAABBAAAAAAKAwAAAAACAwAAAAAEAwAAAAACBAAAAAANBAAAAAAEBAAAAAANFwAAAAAAFwAAAAADFwAAAAAEBAAAAAAHBAAAAAAHBAAAAAACBAAAAAAIBAAAAAAEHAAAAAAEBAAAAAANBAAAAAABBAAAAAAEBAAAAAALBAAAAAAGFwAAAAAFFwAAAAACFwAAAAACFwAAAAAAFwAAAAAFFwAAAAABFwAAAAABFwAAAAAEFwAAAAAAFwAAAAAFFwAAAAADCQAAAAADCQAAAAAJCQAAAAAJCQAAAAAGCQAAAAAICQAAAAAKCQAAAAABFwAAAAAEFwAAAAAAFwAAAAABFwAAAAABFwAAAAAEFwAAAAAEFwAAAAABFwAAAAACCQAAAAAKCQAAAAAMCQAAAAAKCQAAAAAGCQAAAAAICQAAAAAHCQAAAAAGCQAAAAACGAAAAAAAFwAAAAADFwAAAAAEHwAAAAAAHwAAAAAAFwAAAAABFwAAAAAFFwAAAAAACQAAAAABCQAAAAADCQAAAAAICQAAAAAKCQAAAAAKCQAAAAAICQAAAAADCQAAAAALGAAAAAAAGAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAFwAAAAAECQAAAAAICQAAAAACCQAAAAALCQAAAAALCQAAAAACCQAAAAALCQAAAAAJCQAAAAANCQAAAAAKGAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAFwAAAAADCQAAAAAICQAAAAADCQAAAAADCQAAAAAICQAAAAAJCQAAAAAKCQAAAAAACQAAAAAMCQAAAAABGAAAAAABGAAAAAADHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAACQAAAAAICQAAAAACCQAAAAADCQAAAAABCQAAAAAHCQAAAAAGCQAAAAABCQAAAAAECQAAAAANFwAAAAAFGAAAAAAAGAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAFwAAAAAACQAAAAAKCQAAAAAHCQAAAAABCQAAAAAJCQAAAAACCQAAAAABCQAAAAAICQAAAAABCQAAAAABCQAAAAAIGAAAAAAAGAAAAAAAFwAAAAAAFwAAAAAFFwAAAAAAGAAAAAAACQAAAAAKCQAAAAAECQAAAAANCQAAAAAFCQAAAAAJCQAAAAAMCQAAAAAECQAAAAAKCQAAAAAECQAAAAAKCQAAAAANCQAAAAAECQAAAAAFFwAAAAAAGAAAAAAAGAAAAAAACQAAAAAJCQAAAAADCQAAAAAFCQAAAAABCQAAAAAMCQAAAAAACQAAAAABCQAAAAAGCQAAAAAKCQAAAAAICQAAAAAFCQAAAAAGCQAAAAADCQAAAAANFwAAAAAFHAAAAAACCQAAAAAJCQAAAAAJCQAAAAAMCQAAAAAECQAAAAANCQAAAAAECQAAAAAMCQAAAAADCQAAAAAKCQAAAAAFCQAAAAAMCQAAAAAACQAAAAANCQAAAAAGCQAAAAACFwAAAAAACQAAAAAJCQAAAAALCQAAAAALCQAAAAACCQAAAAANCQAAAAAHCQAAAAANCQAAAAAJCQAAAAALCQAAAAAHCQAAAAABCQAAAAANCQAAAAAGCQAAAAAGCQAAAAAHCQAAAAAECQAAAAAKCQAAAAAGCQAAAAAJCQAAAAANCQAAAAACCQAAAAANCQAAAAAMCQAAAAAFCQAAAAAFCQAAAAAACQAAAAABCQAAAAAMCQAAAAALCQAAAAAMCQAAAAAKCQAAAAAKCQAAAAADCQAAAAADCQAAAAADCQAAAAAGCQAAAAAHCQAAAAACCQAAAAAFCQAAAAAMCQAAAAAN version: 6 0,1: ind: 0,1 @@ -190,7 +193,7 @@ entities: version: 6 -1,-3: ind: -1,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAEAQAAAAAEAQAAAAACFwAAAAADFwAAAAADFwAAAAABFwAAAAACFwAAAAABFwAAAAADFwAAAAAFFwAAAAABGQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAQAAAAAAAQAAAAAEFwAAAAADFwAAAAAAFwAAAAAFFwAAAAABFwAAAAADFwAAAAAAFwAAAAAEFwAAAAAAGQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAACQAAAAAEFwAAAAABFwAAAAADFgAAAAABGAAAAAADGAAAAAADGAAAAAAFFwAAAAAEFwAAAAADFwAAAAAFGQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAABCQAAAAADBAAAAAAHBAAAAAAJBAAAAAAGBAAAAAAFBAAAAAAMBAAAAAAABAAAAAALBAAAAAACFwAAAAAAGQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAECQAAAAAICQAAAAACBAAAAAAHBQAAAAACBwAAAAABBwAAAAAABQAAAAABBgAAAAACBQAAAAAABAAAAAAHFwAAAAAFGQAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABCQAAAAAECQAAAAAGBAAAAAABBQAAAAADBwAAAAACBgAAAAABBgAAAAACBgAAAAABBgAAAAABBAAAAAAAFwAAAAABGQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABCQAAAAAMCQAAAAAFBAAAAAAFBQAAAAADBwAAAAAABQAAAAACBQAAAAADBwAAAAACBwAAAAACBAAAAAALFwAAAAACGQAAAAACAAAAAAAAAAAAAAAAAQAAAAACAQAAAAABCQAAAAAGCQAAAAAIBAAAAAAIBAAAAAANBAAAAAALBgAAAAAABQAAAAACBwAAAAABBQAAAAACBAAAAAAJFwAAAAABGQAAAAAIAAAAAAAAAAAAAAAAAQAAAAACFwAAAAABFwAAAAACCQAAAAALFgAAAAAEFgAAAAADBwAAAAABBwAAAAABBQAAAAAABgAAAAABBQAAAAACBQAAAAACGAAAAAADGQAAAAABAAAAAAAAAQAAAAACAQAAAAADFwAAAAAEFwAAAAACCQAAAAAKFgAAAAAAFgAAAAADBAAAAAAFBwAAAAAABwAAAAADBQAAAAAABQAAAAAABAAAAAALFwAAAAACGQAAAAAIAQAAAAAEAQAAAAAEFwAAAAAAFwAAAAAFFwAAAAADFwAAAAAAFwAAAAADFgAAAAAEBAAAAAAIBAAAAAAIBAAAAAAIBAAAAAAGBAAAAAABBAAAAAAHFwAAAAAFGQAAAAAHAQAAAAAAFwAAAAAAFwAAAAADFwAAAAAEFwAAAAACFwAAAAAEFwAAAAAEFwAAAAAAAgAAAAALFwAAAAABFwAAAAACFwAAAAACFwAAAAAEFwAAAAAEFwAAAAADGQAAAAAHFwAAAAACFwAAAAAAFwAAAAACAgAAAAAOBAAAAAANBAAAAAAABAAAAAAJBAAAAAAJBAAAAAAEBAAAAAAGBAAAAAAMBAAAAAANBAAAAAAMBAAAAAAIFwAAAAAEGQAAAAAHFwAAAAAFFwAAAAABCQAAAAAKAgAAAAAHBQAAAAACBQAAAAABBQAAAAAABQAAAAADBQAAAAABBQAAAAAABQAAAAADBgAAAAAABQAAAAAABAAAAAAHFwAAAAADGQAAAAAFBAAAAAAKBAAAAAAFAgAAAAAAAgAAAAAJBAAAAAALBQAAAAAABQAAAAAABQAAAAADBQAAAAACBQAAAAADBgAAAAADBQAAAAAABQAAAAABBAAAAAAJFwAAAAABGQAAAAAGBgAAAAACBQAAAAAAAgAAAAAGAgAAAAAGBAAAAAAABAAAAAAJBAAAAAAFBQAAAAAABQAAAAABBQAAAAAABAAAAAAKBgAAAAAABwAAAAADBAAAAAAHFwAAAAAAGQAAAAAG + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAEAQAAAAAEAQAAAAACFwAAAAADFwAAAAADFwAAAAABFwAAAAACFwAAAAABFwAAAAADFwAAAAAFFwAAAAABGQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAQAAAAAAAQAAAAAEFwAAAAADFwAAAAAAFwAAAAAFFwAAAAABFwAAAAADFwAAAAAAFwAAAAAEFwAAAAAAGQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAACQAAAAAEFwAAAAABFwAAAAADFgAAAAABGAAAAAADGAAAAAADGAAAAAAFFwAAAAAEFwAAAAADFwAAAAAFGQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAABCQAAAAADBAAAAAAHBAAAAAAJBAAAAAAGBAAAAAAFBAAAAAAMBAAAAAAABAAAAAALBAAAAAACFwAAAAAAGQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAECQAAAAAICQAAAAACBAAAAAAHBQAAAAACBwAAAAABBwAAAAAABQAAAAABBgAAAAACBQAAAAAABAAAAAAHFwAAAAAFGQAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABCQAAAAAECQAAAAAGBAAAAAABBQAAAAADBwAAAAACBgAAAAABBgAAAAACBgAAAAABBgAAAAABBAAAAAAAFwAAAAABGQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABCQAAAAAMCQAAAAAFBAAAAAAFBQAAAAADBwAAAAAABQAAAAACBQAAAAADBwAAAAACBwAAAAACBAAAAAALFwAAAAACGQAAAAACAAAAAAAAAAAAAAAAAQAAAAACAQAAAAABCQAAAAAGCQAAAAAIBAAAAAAIBAAAAAANBAAAAAALBgAAAAAABQAAAAACBwAAAAABBQAAAAACBAAAAAAJFwAAAAABGQAAAAAIAAAAAAAAAAAAAAAAAQAAAAACFwAAAAABFwAAAAACCQAAAAALFgAAAAAEFgAAAAADBwAAAAABBwAAAAABBQAAAAAABgAAAAABBQAAAAACBQAAAAACGAAAAAADGQAAAAABAAAAAAAAAQAAAAACAQAAAAADFwAAAAAEFwAAAAACCQAAAAAKFgAAAAAAFgAAAAADBAAAAAAFBwAAAAAABwAAAAADBQAAAAAABQAAAAAABAAAAAALFwAAAAACGQAAAAAIAQAAAAAEAQAAAAAEFwAAAAAAFwAAAAAFFwAAAAADFwAAAAAAFwAAAAADFgAAAAAEBAAAAAAIBAAAAAAIBAAAAAAIBAAAAAAGBAAAAAABBAAAAAAHFwAAAAAFGQAAAAAHAQAAAAAAFwAAAAAAFwAAAAADFwAAAAAEFwAAAAACFwAAAAAEFwAAAAAEFwAAAAAAAgAAAAALFwAAAAABFwAAAAACFwAAAAACFwAAAAAEFwAAAAAEFwAAAAADGQAAAAAHFwAAAAACFwAAAAAAFwAAAAACAgAAAAAOBAAAAAANBAAAAAAABAAAAAAJBAAAAAAJBAAAAAAEBAAAAAAGBAAAAAAMBAAAAAANBAAAAAAMBAAAAAAIFwAAAAAEGQAAAAAHFwAAAAAFFwAAAAABCQAAAAAKAgAAAAAHBQAAAAACBQAAAAABBQAAAAAABQAAAAADBQAAAAABBQAAAAAABQAAAAADBgAAAAAABQAAAAAABAAAAAAHFwAAAAADGQAAAAAFBAAAAAAKBAAAAAAFAgAAAAAAAgAAAAAJBAAAAAALBQAAAAAABQAAAAAABQAAAAADBQAAAAACBQAAAAADBgAAAAADBQAAAAAABQAAAAABBAAAAAAJFwAAAAABGQAAAAAGBgAAAAACBQAAAAAAAgAAAAAGAgAAAAAGBAAAAAAABQAAAAAABAAAAAAFBQAAAAAABQAAAAABBQAAAAAABAAAAAAKBgAAAAAABwAAAAADBAAAAAAHFwAAAAAAGQAAAAAG version: 6 0,-3: ind: 0,-3 @@ -712,14 +715,14 @@ entities: 125: 19,-45 193: -11,-20 194: -8,-20 - 195: -9,-20 - 196: -10,-20 197: -7,-20 198: -6,-20 199: -5,-20 200: -4,-20 202: -2,-20 203: -3,-20 + 204: -10,-20 + 205: -9,-20 - node: color: '#FFFFFFFF' id: CP14BrickTileStoneLineS @@ -2878,6 +2881,64 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance +- proto: ActionToggleBlock + entities: + - uid: 13977 + components: + - type: Transform + parent: 13336 + - type: InstantAction + originalIconColor: '#FFFFFFFF' + container: 13336 + - uid: 13978 + components: + - type: Transform + parent: 13876 + - type: InstantAction + originalIconColor: '#FFFFFFFF' + container: 13876 + - uid: 13979 + components: + - type: Transform + parent: 13335 + - type: InstantAction + originalIconColor: '#FFFFFFFF' + container: 13335 + - uid: 13980 + components: + - type: Transform + parent: 619 + - type: InstantAction + originalIconColor: '#FFFFFFFF' + container: 619 + - uid: 13982 + components: + - type: Transform + parent: 13981 + - type: InstantAction + originalIconColor: '#FFFFFFFF' + container: 13981 + - uid: 13984 + components: + - type: Transform + parent: 13983 + - type: InstantAction + originalIconColor: '#FFFFFFFF' + container: 13983 + - uid: 13986 + components: + - type: Transform + parent: 13985 + - type: InstantAction + originalIconColor: '#FFFFFFFF' + container: 13985 + - uid: 13988 + components: + - type: Transform + parent: 13987 + - type: InstantAction + originalIconColor: '#FFFFFFFF' + container: 13987 - proto: CP14AlchemyFurnace entities: - uid: 936 @@ -2910,6 +2971,90 @@ entities: - type: ItemPlacer placedEntities: - 15363 +- proto: CP14Arrow + entities: + - uid: 13955 + components: + - type: Transform + pos: -0.8673811,-17.455278 + parent: 2 + - uid: 13957 + components: + - type: Transform + pos: -1.9140058,-15.633688 + parent: 2 + - uid: 13964 + components: + - type: Transform + parent: 13960 + - type: Physics + canCollide: False + - uid: 13965 + components: + - type: Transform + parent: 13960 + - type: Physics + canCollide: False + - uid: 13966 + components: + - type: Transform + parent: 13960 + - type: Physics + canCollide: False + - uid: 13967 + components: + - type: Transform + parent: 13960 + - type: Physics + canCollide: False + - uid: 13968 + components: + - type: Transform + parent: 13960 + - type: Physics + canCollide: False + - uid: 13969 + components: + - type: Transform + parent: 13960 + - type: Physics + canCollide: False + - uid: 13970 + components: + - type: Transform + parent: 13960 + - type: Physics + canCollide: False + - uid: 13971 + components: + - type: Transform + parent: 13960 + - type: Physics + canCollide: False + - uid: 13972 + components: + - type: Transform + parent: 13960 + - type: Physics + canCollide: False + - uid: 13973 + components: + - type: Transform + parent: 13960 + - type: Physics + canCollide: False + - uid: 13974 + components: + - type: Transform + parent: 13960 + - type: Physics + canCollide: False + - uid: 13975 + components: + - type: Transform + parent: 13960 + - type: Physics + canCollide: False - proto: CP14BankStorageMarker entities: - uid: 1269 @@ -3126,6 +3271,11 @@ entities: - type: Transform pos: 14.454906,-37.17427 parent: 2 + - uid: 13959 + components: + - type: Transform + pos: -1.346062,-16.465773 + parent: 2 - proto: CP14BaseLockpick entities: - uid: 12912 @@ -3272,9 +3422,17 @@ entities: - uid: 619 components: - type: Transform - rot: 3.141592653589793 rad - pos: 2.3470995,-24.278017 - parent: 2 + parent: 13976 + - type: Blocking + blockingToggleActionEntity: 13980 + - type: Physics + canCollide: False + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 13980 - uid: 7861 components: - type: Transform @@ -3314,21 +3472,101 @@ entities: - uid: 13335 components: - type: Transform - rot: 3.141592653589793 rad - pos: 2.7409906,-24.244284 - parent: 2 + parent: 13976 + - type: Blocking + blockingToggleActionEntity: 13979 + - type: Physics + canCollide: False + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 13979 - uid: 13336 components: - type: Transform - rot: 3.141592653589793 rad - pos: 2.538418,-24.457928 - parent: 2 + parent: 13976 + - type: Blocking + blockingToggleActionEntity: 13977 + - type: Physics + canCollide: False + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 13977 - uid: 13876 components: - type: Transform - rot: 3.141592653589793 rad - pos: 2.9885783,-24.457928 - parent: 2 + parent: 13976 + - type: Blocking + blockingToggleActionEntity: 13978 + - type: Physics + canCollide: False + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 13978 + - uid: 13981 + components: + - type: Transform + parent: 13976 + - type: Blocking + blockingToggleActionEntity: 13982 + - type: Physics + canCollide: False + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 13982 + - uid: 13983 + components: + - type: Transform + parent: 13976 + - type: Blocking + blockingToggleActionEntity: 13984 + - type: Physics + canCollide: False + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 13984 + - uid: 13985 + components: + - type: Transform + parent: 13976 + - type: Blocking + blockingToggleActionEntity: 13986 + - type: Physics + canCollide: False + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 13986 + - uid: 13987 + components: + - type: Transform + parent: 13976 + - type: Blocking + blockingToggleActionEntity: 13988 + - type: Physics + canCollide: False + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 13988 - proto: CP14BaseTombstone entities: - uid: 461 @@ -42546,6 +42784,24 @@ entities: rot: 3.141592653589793 rad pos: 12.802945,-33.41739 parent: 2 + - uid: 13961 + components: + - type: Transform + parent: 13960 + - type: Physics + canCollide: False + - uid: 13962 + components: + - type: Transform + parent: 13960 + - type: Physics + canCollide: False + - uid: 13963 + components: + - type: Transform + parent: 13960 + - type: Physics + canCollide: False - proto: CP14BrassChest entities: - uid: 687 @@ -42583,6 +42839,13 @@ entities: - type: Transform pos: 20.5,-45.5 parent: 2 +- proto: CP14BrassChestFilledDemiplanes + entities: + - uid: 8558 + components: + - type: Transform + pos: -3.5,-14.5 + parent: 2 - proto: CP14BrassChestFilledFarmSeeds entities: - uid: 7083 @@ -42696,6 +42959,11 @@ entities: parent: 2 - proto: CP14CashConverter entities: + - uid: 979 + components: + - type: Transform + pos: -6.5,-14.5 + parent: 2 - uid: 1498 components: - type: Transform @@ -42719,11 +42987,6 @@ entities: rot: 1.5707963267948966 rad pos: -9.5,17.5 parent: 2 - - uid: 8652 - components: - - type: Transform - pos: -7.5,-14.5 - parent: 2 - proto: CP14Cauldron entities: - uid: 15363 @@ -43167,6 +43430,16 @@ entities: parent: 2 - proto: CP14ClothingBeltQuiver entities: + - uid: 5537 + components: + - type: Transform + pos: -1.7395523,-16.53324 + parent: 2 + - uid: 5539 + components: + - type: Transform + pos: -1.5383277,-16.33084 + parent: 2 - uid: 17925 components: - type: Transform @@ -43403,13 +43676,6 @@ entities: - type: Transform pos: 22.188015,-45.08068 parent: 2 -- proto: CP14CrayonGreen - entities: - - uid: 4657 - components: - - type: Transform - pos: -9.245207,-33.204025 - parent: 2 - proto: CP14CrayonRed entities: - uid: 3626 @@ -43426,6 +43692,18 @@ entities: parent: 2 - proto: CP14Crossbolt entities: + - uid: 2062 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.7061898,-15.397556 + parent: 2 + - uid: 5540 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.728699,-15.599956 + parent: 2 - uid: 7785 components: - type: Transform @@ -43651,52 +43929,78 @@ entities: rot: -1.5707963267948966 rad pos: 12.32648,-37.455616 parent: 2 -- proto: CP14CrystalAmethystsMedium - entities: - - uid: 1786 - components: - - type: Transform - pos: 22.636328,24.536194 - parent: 2 - - uid: 1800 + - uid: 13954 components: - type: Transform rot: -1.5707963267948966 rad - pos: 20.254408,24.226461 + pos: -1.751207,-15.22889 parent: 2 -- proto: CP14CrystalAmethystsSmall + - uid: 13956 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.7061898,-15.465022 + parent: 2 + - uid: 13958 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.773715,-15.127691 + parent: 2 + - uid: 13990 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.7399523,-15.296357 + parent: 2 + - uid: 13991 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.751207,-15.734887 + parent: 2 + - uid: 13992 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.751207,-15.858576 + parent: 2 +- proto: CP14CrystalElementalElectricBig entities: - - uid: 1780 + - uid: 12936 components: - type: Transform - pos: 22.658825,23.186869 + rot: -1.5707963267948966 rad + pos: 0.38306594,20.636196 parent: 2 - - uid: 4151 + - uid: 12937 components: - type: Transform - pos: 16.530275,20.53926 + rot: -1.5707963267948966 rad + pos: 5.5089397,23.222403 parent: 2 -- proto: CP14CrystalDiamondsBig +- proto: CP14CrystalElementalElectricSmall entities: - - uid: 9112 + - uid: 8018 components: - type: Transform - pos: 13.551556,43.51112 + rot: -1.5707963267948966 rad + pos: -1.439316,22.62645 parent: 2 -- proto: CP14CrystalEmeraldsBig + - uid: 8019 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.4403806,21.389568 + parent: 2 +- proto: CP14CrystalElementalHealingBig entities: - uid: 1772 components: - type: Transform pos: 19.470413,26.68387 parent: 2 - - uid: 1799 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 19.759497,23.765442 - parent: 2 -- proto: CP14CrystalEmeraldsMedium +- proto: CP14CrystalElementalHealingMedium entities: - uid: 569 components: @@ -43708,14 +44012,21 @@ entities: - type: Transform pos: 21.506302,28.437994 parent: 2 -- proto: CP14CrystalEmeraldsSmall +- proto: CP14CrystalElementalHealingSmall entities: - uid: 1787 components: - type: Transform pos: 16.422209,24.940992 parent: 2 -- proto: CP14CrystalSapphiresBig +- proto: CP14CrystalElementalLightBig + entities: + - uid: 9112 + components: + - type: Transform + pos: 13.551556,43.51112 + parent: 2 +- proto: CP14CrystalElementalWaterBig entities: - uid: 4615 components: @@ -43734,7 +44045,7 @@ entities: rot: -1.5707963267948966 rad pos: 9.563785,-43.047474 parent: 2 -- proto: CP14CrystalSapphiresMedium +- proto: CP14CrystalElementalWaterMedium entities: - uid: 12930 components: @@ -43742,7 +44053,7 @@ entities: rot: -1.5707963267948966 rad pos: 16.559088,-40.410233 parent: 2 -- proto: CP14CrystalSapphiresSmall +- proto: CP14CrystalElementalWaterSmall entities: - uid: 1584 components: @@ -43782,48 +44093,6 @@ entities: - type: Transform pos: 10.65302,5.011636 parent: 2 -- proto: CP14CrystalTopazesBig - entities: - - uid: 12936 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.38306594,20.636196 - parent: 2 - - uid: 12937 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5089397,23.222403 - parent: 2 -- proto: CP14CrystalTopazesSmall - entities: - - uid: 8018 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.439316,22.62645 - parent: 2 - - uid: 8019 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.4403806,21.389568 - parent: 2 -- proto: CP14CurtainsBlue - entities: - - uid: 600 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-15.5 - parent: 2 - - uid: 12988 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-14.5 - parent: 2 - proto: CP14CurtainsBlueOpened entities: - uid: 599 @@ -44414,50 +44683,55 @@ entities: parent: 2 - proto: CP14DemiplaneKeyT1 entities: - - uid: 5537 + - uid: 981 components: - type: Transform - pos: -17.757793,26.57975 + pos: -5.841518,-14.157722 parent: 2 - - uid: 5539 + - uid: 8583 components: - type: Transform - pos: -17.525335,26.377352 + pos: -5.5601673,-14.180212 parent: 2 - - uid: 5540 + - uid: 8652 components: - type: Transform - pos: -17.757793,26.2799 + pos: -5.2563095,-14.180212 parent: 2 - - uid: 5541 + - uid: 9157 components: - type: Transform - pos: -17.562828,26.09999 + pos: -5.6839614,-14.337633 parent: 2 - - uid: 5542 + - uid: 10691 components: - type: Transform - pos: -17.27788,26.144968 + pos: -5.3688498,-14.348878 parent: 2 - - uid: 5543 + - uid: 12075 components: - type: Transform - pos: -17.247885,26.399841 + pos: -5.8527718,-14.472566 parent: 2 - - uid: 5544 + - uid: 12988 components: - type: Transform - pos: -17.810284,25.98005 + pos: -5.4701347,-14.495055 parent: 2 - - uid: 5545 + - uid: 13341 components: - type: Transform - pos: -17.525335,25.815132 + pos: -5.1662765,-14.517543 parent: 2 - - uid: 5546 + - uid: 13342 components: - type: Transform - pos: -17.307873,25.845118 + pos: -5.1100073,-14.360122 + parent: 2 + - uid: 13352 + components: + - type: Transform + pos: -5.9540577,-14.337633 parent: 2 - proto: CP14DemiplaneKeyT2 entities: @@ -44514,6 +44788,13 @@ entities: rot: 3.141592653589793 rad pos: -18.5,24.5 parent: 2 +- proto: CP14FenceIronGrilleGateDemiplaneCrystal + entities: + - uid: 975 + components: + - type: Transform + pos: -8.5,-18.5 + parent: 2 - proto: CP14FenceIronGrilleGateGuard entities: - uid: 1701 @@ -44608,6 +44889,11 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,23.5 parent: 2 + - uid: 4657 + components: + - type: Transform + pos: -9.5,-18.5 + parent: 2 - uid: 7744 components: - type: Transform @@ -45572,11 +45858,6 @@ entities: - type: Transform pos: -10.5,5.5 parent: 2 - - uid: 1353 - components: - - type: Transform - pos: -10.5,-30.5 - parent: 2 - uid: 1632 components: - type: Transform @@ -45882,66 +46163,6 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,-11.5 parent: 2 - - uid: 970 - components: - - type: Transform - pos: 19.5,23.5 - parent: 2 - - uid: 971 - components: - - type: Transform - pos: 19.5,24.5 - parent: 2 - - uid: 972 - components: - - type: Transform - pos: 20.5,23.5 - parent: 2 - - uid: 973 - components: - - type: Transform - pos: 20.5,24.5 - parent: 2 - - uid: 974 - components: - - type: Transform - pos: 20.5,25.5 - parent: 2 - - uid: 975 - components: - - type: Transform - pos: 21.5,24.5 - parent: 2 - - uid: 976 - components: - - type: Transform - pos: 19.5,25.5 - parent: 2 - - uid: 977 - components: - - type: Transform - pos: 18.5,24.5 - parent: 2 - - uid: 978 - components: - - type: Transform - pos: 18.5,23.5 - parent: 2 - - uid: 979 - components: - - type: Transform - pos: 19.5,22.5 - parent: 2 - - uid: 980 - components: - - type: Transform - pos: 20.5,22.5 - parent: 2 - - uid: 981 - components: - - type: Transform - pos: 21.5,23.5 - parent: 2 - uid: 1300 components: - type: Transform @@ -46147,6 +46368,11 @@ entities: - type: Transform pos: -14.461581,-16.665932 parent: 2 + - uid: 970 + components: + - type: Transform + pos: -1.3481102,-15.798591 + parent: 2 - uid: 13350 components: - type: Transform @@ -46171,6 +46397,11 @@ entities: parent: 2 - proto: CP14FoodBreadBun entities: + - uid: 971 + components: + - type: Transform + pos: -8.455805,-4.242589 + parent: 2 - uid: 13847 components: - type: Transform @@ -46183,6 +46414,16 @@ entities: parent: 2 - proto: CP14FoodBreadSlice entities: + - uid: 13359 + components: + - type: Transform + pos: -14.618983,5.757293 + parent: 2 + - uid: 13360 + components: + - type: Transform + pos: -14.427665,5.521161 + parent: 2 - uid: 13939 components: - type: Transform @@ -46207,11 +46448,6 @@ entities: - type: Transform pos: 5.6847034,-30.44728 parent: 2 - - uid: 5565 - components: - - type: Transform - pos: -9.696621,-33.186497 - parent: 2 - uid: 5754 components: - type: Transform @@ -46645,6 +46881,11 @@ entities: - type: Transform pos: -0.36587298,17.584122 parent: 2 + - uid: 13403 + components: + - type: Transform + pos: -1.7351644,-16.072481 + parent: 2 - proto: CP14GreenBottle entities: - uid: 1803 @@ -46796,6 +47037,12 @@ entities: parent: 2 - proto: CP14IronDoorGuardGuildmaster entities: + - uid: 974 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,-16.5 + parent: 2 - uid: 13381 components: - type: Transform @@ -46950,25 +47197,31 @@ entities: rot: 1.5707963267948966 rad pos: 81.5,41.5 parent: 2 + - uid: 5519 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-17.5 + parent: 2 + - uid: 5542 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-16.5 + parent: 2 - uid: 8091 components: - type: Transform pos: 16.5,40.5 parent: 2 - - uid: 13359 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-18.5 - parent: 2 - - uid: 13360 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-18.5 - parent: 2 - proto: CP14LaddersDownWoodAutoLink entities: + - uid: 601 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-31.5 + parent: 2 - uid: 7925 components: - type: Transform @@ -47241,6 +47494,51 @@ entities: - type: Transform pos: -45.5,-74.5 parent: 2 + - uid: 13976 + components: + - type: Transform + pos: -1.5,-14.5 + parent: 2 + - type: Storage + storedItems: + 13336: + position: 0,0 + _rotation: South + 13876: + position: 2,0 + _rotation: South + 13335: + position: 4,0 + _rotation: South + 619: + position: 6,0 + _rotation: South + 13981: + position: 0,2 + _rotation: South + 13983: + position: 2,2 + _rotation: South + 13985: + position: 4,2 + _rotation: South + 13987: + position: 6,2 + _rotation: South + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 13336 + - 13876 + - 13335 + - 619 + - 13981 + - 13983 + - 13985 + - 13987 - proto: CP14LargeWoodenCrateFilled entities: - uid: 479 @@ -47249,6 +47547,11 @@ entities: rot: 1.5707963267948966 rad pos: 13.5,27.5 parent: 2 + - uid: 600 + components: + - type: Transform + pos: -8.5,-14.5 + parent: 2 - uid: 629 components: - type: Transform @@ -47346,22 +47649,12 @@ entities: - type: Transform pos: 7.5,-37.5 parent: 2 - - uid: 5566 - components: - - type: Transform - pos: -10.5,-31.5 - parent: 2 - uid: 8374 components: - type: Transform rot: 3.141592653589793 rad pos: 22.5,19.5 parent: 2 - - uid: 8806 - components: - - type: Transform - pos: -1.5,-14.5 - parent: 2 - uid: 12914 components: - type: Transform @@ -47682,15 +47975,15 @@ entities: - uid: 2075 components: - type: Transform - rot: 3.141592653589793 rad - pos: 4.2602825,-24.31175 - parent: 2 + parent: 8982 + - type: Physics + canCollide: False - uid: 2124 components: - type: Transform - rot: 3.141592653589793 rad - pos: 4.091472,-24.390461 - parent: 2 + parent: 8982 + - type: Physics + canCollide: False - uid: 12504 components: - type: Transform @@ -47706,8 +47999,9 @@ entities: - uid: 1083 components: - type: Transform - pos: 5.7233057,-24.266773 - parent: 2 + parent: 8982 + - type: Physics + canCollide: False - uid: 12065 components: - type: Transform @@ -47718,8 +48012,9 @@ entities: - uid: 1135 components: - type: Transform - pos: 5.45321,-24.31175 - parent: 2 + parent: 8982 + - type: Physics + canCollide: False - uid: 8874 components: - type: Transform @@ -47738,6 +48033,18 @@ entities: - type: Transform pos: 14.230516,45.45195 parent: 2 + - uid: 10700 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.3688526,-17.002651 + parent: 2 + - uid: 13993 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.2338047,-17.339983 + parent: 2 - proto: CP14ModularIronShovel entities: - uid: 583 @@ -47763,23 +48070,23 @@ entities: - uid: 617 components: - type: Transform - rot: 3.141592653589793 rad - pos: 3.6975818,-24.345484 - parent: 2 + parent: 8982 + - type: Physics + canCollide: False - proto: CP14ModularIronSpear entities: - uid: 2065 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.9917946,-24.165573 - parent: 2 + parent: 8982 + - type: Physics + canCollide: False - uid: 2151 components: - type: Transform - rot: 3.141592653589793 rad - pos: 5.0143023,-24.547882 - parent: 2 + parent: 8982 + - type: Physics + canCollide: False - uid: 7860 components: - type: Transform @@ -47848,7 +48155,7 @@ entities: rot: 1.5707963267948966 rad pos: 11.675974,-34.404755 parent: 2 -- proto: CP14Nail10 +- proto: CP14Nail20 entities: - uid: 12047 components: @@ -47865,15 +48172,45 @@ entities: - type: Transform pos: 7.6940155,1.5639436 parent: 2 -- proto: CP14OreGold +- proto: CP14OreGold1 entities: - uid: 1522 components: - type: Transform pos: -19.350714,26.635136 parent: 2 + - uid: 5541 + components: + - type: Transform + pos: -17.570698,26.43613 + parent: 2 + - uid: 8394 + components: + - type: Transform + pos: -13.326466,22.911493 + parent: 2 + - uid: 8802 + components: + - type: Transform + pos: -14.368698,16.498537 + parent: 2 + - uid: 8806 + components: + - type: Transform + pos: -28.378479,18.575125 + parent: 2 - proto: CP14Paper entities: + - uid: 654 + components: + - type: Transform + pos: -4.593895,-18.351065 + parent: 2 + - uid: 656 + components: + - type: Transform + pos: -4.41383,-18.418531 + parent: 2 - uid: 891 components: - type: Transform @@ -48094,6 +48431,12 @@ entities: parent: 2 - proto: CP14PaperFolderRed entities: + - uid: 1353 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.4090066,-15.326327 + parent: 2 - uid: 1431 components: - type: Transform @@ -48114,6 +48457,12 @@ entities: - type: Transform pos: -13.647471,24.511906 parent: 2 + - uid: 1785 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.4990387,-15.450015 + parent: 2 - uid: 1854 components: - type: Transform @@ -48138,6 +48487,16 @@ entities: rot: 3.141592653589793 rad pos: -16.625248,-6.326728 parent: 2 + - uid: 972 + components: + - type: Transform + pos: -1.5506823,-15.674903 + parent: 2 + - uid: 1333 + components: + - type: Transform + pos: -1.3414826,-15.674903 + parent: 2 - uid: 1670 components: - type: Transform @@ -48233,11 +48592,6 @@ entities: - type: Transform pos: -20.5,-21.5 parent: 2 - - uid: 5519 - components: - - type: Transform - pos: 21.5,22.5 - parent: 2 - proto: CP14PlantTomatoes entities: - uid: 2024 @@ -48286,13 +48640,6 @@ entities: parent: 2 - proto: CP14RoofStone entities: - - uid: 601 - components: - - type: Transform - pos: -9.5,-13.5 - parent: 2 - - type: Fixtures - fixtures: {} - uid: 614 components: - type: Transform @@ -50183,20 +50530,6 @@ entities: parent: 2 - type: Fixtures fixtures: {} - - uid: 13352 - components: - - type: Transform - pos: -8.5,-14.5 - parent: 2 - - type: Fixtures - fixtures: {} - - uid: 13406 - components: - - type: Transform - pos: -9.5,-14.5 - parent: 2 - - type: Fixtures - fixtures: {} - uid: 13407 components: - type: Transform @@ -52001,13 +52334,6 @@ entities: parent: 2 - type: Fixtures fixtures: {} - - uid: 13885 - components: - - type: Transform - pos: -8.5,-13.5 - parent: 2 - - type: Fixtures - fixtures: {} - uid: 13886 components: - type: Transform @@ -82794,6 +83120,13 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,28.5 parent: 2 +- proto: CP14ScrapCopper + entities: + - uid: 13374 + components: + - type: Transform + pos: 7.7062325,2.3277578 + parent: 2 - proto: CP14SeedbedWooden entities: - uid: 1411 @@ -82956,11 +83289,6 @@ entities: - type: Transform pos: -20.5,-22.5 parent: 2 - - uid: 5518 - components: - - type: Transform - pos: 21.5,22.5 - parent: 2 - uid: 6088 components: - type: Transform @@ -83043,6 +83371,47 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,-5.5 parent: 2 + - uid: 8982 + components: + - type: Transform + pos: -1.5,-17.5 + parent: 2 + - type: Storage + storedItems: + 2124: + position: 0,2 + _rotation: South + 2075: + position: 3,3 + _rotation: South + 617: + position: 2,3 + _rotation: South + 2151: + position: 1,2 + _rotation: South + 2065: + position: 4,2 + _rotation: South + 1135: + position: 5,3 + _rotation: South + 1083: + position: 0,4 + _rotation: South + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 2124 + - 2075 + - 617 + - 2151 + - 2065 + - 1135 + - 1083 - uid: 9785 components: - type: Transform @@ -83055,6 +83424,79 @@ entities: rot: -1.5707963267948966 rad pos: 104.5,61.5 parent: 2 + - uid: 13960 + components: + - type: Transform + pos: -2.5,-14.5 + parent: 2 + - type: Storage + storedItems: + 13961: + position: 0,0 + _rotation: South + 13962: + position: 2,0 + _rotation: South + 13963: + position: 4,0 + _rotation: South + 13972: + position: 2,2 + _rotation: South + 13971: + position: 1,2 + _rotation: South + 13964: + position: 0,2 + _rotation: South + 13965: + position: 0,4 + _rotation: South + 13966: + position: 1,4 + _rotation: South + 13967: + position: 2,4 + _rotation: South + 13968: + position: 3,4 + _rotation: South + 13969: + position: 4,4 + _rotation: South + 13970: + position: 5,4 + _rotation: South + 13973: + position: 3,2 + _rotation: South + 13974: + position: 4,2 + _rotation: South + 13975: + position: 5,2 + _rotation: South + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 13961 + - 13962 + - 13963 + - 13965 + - 13966 + - 13967 + - 13968 + - 13969 + - 13970 + - 13964 + - 13971 + - 13972 + - 13973 + - 13974 + - 13975 - proto: CP14SmallWoodenCrateFilled entities: - uid: 451 @@ -83119,6 +83561,16 @@ entities: - type: Transform pos: 19.5,27.5 parent: 2 + - uid: 977 + components: + - type: Transform + pos: -9.5,-14.5 + parent: 2 + - uid: 980 + components: + - type: Transform + pos: -8.5,-13.5 + parent: 2 - uid: 986 components: - type: Transform @@ -83247,11 +83699,6 @@ entities: - type: Transform pos: -12.5,-15.5 parent: 2 - - uid: 5507 - components: - - type: Transform - pos: -10.5,-14.5 - parent: 2 - uid: 8049 components: - type: Transform @@ -83275,16 +83722,6 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,-8.5 parent: 2 - - uid: 8802 - components: - - type: Transform - pos: -2.5,-14.5 - parent: 2 - - uid: 8982 - components: - - type: Transform - pos: -1.5,-17.5 - parent: 2 - uid: 12915 components: - type: Transform @@ -85054,16 +85491,6 @@ entities: - type: Transform pos: -39.5,-9.5 parent: 2 - - uid: 9157 - components: - - type: Transform - pos: -1.5,-16.5 - parent: 2 - - uid: 10691 - components: - - type: Transform - pos: -1.5,-15.5 - parent: 2 - proto: CP14SpawnMobMonsterMole entities: - uid: 3608 @@ -85331,14 +85758,6 @@ entities: - type: Transform pos: -23.505562,23.334337 parent: 2 -- proto: CP14StatueGobRuinedVines - entities: - - uid: 1785 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,26.5 - parent: 2 - proto: CP14SteelBeerMug entities: - uid: 1585 @@ -85920,6 +86339,11 @@ entities: parent: 2 - proto: CP14TableWoodenCounter entities: + - uid: 978 + components: + - type: Transform + pos: -5.5,-14.5 + parent: 2 - uid: 1220 components: - type: Transform @@ -86077,11 +86501,6 @@ entities: - type: Transform pos: 3.5,-24.5 parent: 2 - - uid: 2062 - components: - - type: Transform - pos: 2.5,-24.5 - parent: 2 - uid: 2149 components: - type: Transform @@ -86150,21 +86569,6 @@ entities: - type: Transform pos: -6.5,-14.5 parent: 2 - - uid: 8403 - components: - - type: Transform - pos: -7.5,-14.5 - parent: 2 - - uid: 8558 - components: - - type: Transform - pos: -8.5,-14.5 - parent: 2 - - uid: 8583 - components: - - type: Transform - pos: -8.5,-15.5 - parent: 2 - uid: 8584 components: - type: Transform @@ -86347,6 +86751,12 @@ entities: - type: Transform pos: -14.5,-20.5 parent: 2 + - uid: 13989 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,-17.5 + parent: 2 - proto: CP14TableWoodenFrame entities: - uid: 1599 @@ -86369,11 +86779,11 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,20.5 parent: 2 - - uid: 2331 + - uid: 5545 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-33.5 + rot: -1.5707963267948966 rad + pos: -3.5,-11.5 parent: 2 - uid: 5753 components: @@ -88067,6 +88477,53 @@ entities: parent: 2 - type: Fixtures fixtures: {} +- proto: CP14WallmountFlagTavern + entities: + - uid: 639 + components: + - type: Transform + pos: -6.5,-25.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 1800 + components: + - type: Transform + pos: -7.5,-19.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 5518 + components: + - type: Transform + pos: -1.5,-25.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 5565 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-13.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 5566 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-10.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8403 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-24.5 + parent: 2 + - type: Fixtures + fixtures: {} - proto: CP14WallmountGarlandBlue entities: - uid: 5419 @@ -89662,6 +90119,21 @@ entities: parent: 2 - type: Fixtures fixtures: {} + - uid: 5546 + components: + - type: Transform + pos: -8.5,-16.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8380 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-12.5 + parent: 2 + - type: Fixtures + fixtures: {} - uid: 8795 components: - type: Transform @@ -89678,13 +90150,6 @@ entities: parent: 2 - type: Fixtures fixtures: {} - - uid: 10700 - components: - - type: Transform - pos: -5.5,-11.5 - parent: 2 - - type: Fixtures - fixtures: {} - uid: 12122 components: - type: Transform @@ -89724,13 +90189,6 @@ entities: parent: 2 - type: Fixtures fixtures: {} - - uid: 13914 - components: - - type: Transform - pos: -7.5,-19.5 - parent: 2 - - type: Fixtures - fixtures: {} - proto: CP14WallpaperGreen entities: - uid: 2039 @@ -100586,11 +101044,6 @@ entities: - type: Transform pos: -5.5,-13.5 parent: 2 - - uid: 639 - components: - - type: Transform - pos: -8.5,-13.5 - parent: 2 - uid: 640 components: - type: Transform @@ -100634,17 +101087,7 @@ entities: - uid: 652 components: - type: Transform - pos: -9.5,-17.5 - parent: 2 - - uid: 654 - components: - - type: Transform - pos: -8.5,-17.5 - parent: 2 - - uid: 656 - components: - - type: Transform - pos: -9.5,-16.5 + pos: -9.5,-15.5 parent: 2 - uid: 879 components: @@ -101051,6 +101494,21 @@ entities: - type: Transform pos: 13.5,-17.5 parent: 2 + - uid: 1780 + components: + - type: Transform + pos: -7.5,-14.5 + parent: 2 + - uid: 1786 + components: + - type: Transform + pos: -7.5,-18.5 + parent: 2 + - uid: 1799 + components: + - type: Transform + pos: -7.5,-15.5 + parent: 2 - uid: 1808 components: - type: Transform @@ -101101,6 +101559,11 @@ entities: - type: Transform pos: 17.5,-13.5 parent: 2 + - uid: 2240 + components: + - type: Transform + pos: -7.5,-17.5 + parent: 2 - uid: 2300 components: - type: Transform @@ -101111,6 +101574,11 @@ entities: - type: Transform pos: -9.5,0.5 parent: 2 + - uid: 2331 + components: + - type: Transform + pos: -10.5,-16.5 + parent: 2 - uid: 2344 components: - type: Transform @@ -101131,6 +101599,11 @@ entities: - type: Transform pos: 18.5,-13.5 parent: 2 + - uid: 4151 + components: + - type: Transform + pos: -10.5,-15.5 + parent: 2 - uid: 4157 components: - type: Transform @@ -101151,6 +101624,11 @@ entities: - type: Transform pos: 23.5,-20.5 parent: 2 + - uid: 5507 + components: + - type: Transform + pos: -8.5,-15.5 + parent: 2 - uid: 5707 components: - type: Transform @@ -101456,16 +101934,6 @@ entities: - type: Transform pos: -0.5,-13.5 parent: 2 - - uid: 13341 - components: - - type: Transform - pos: -7.5,-17.5 - parent: 2 - - uid: 13342 - components: - - type: Transform - pos: -7.5,-18.5 - parent: 2 - uid: 13344 components: - type: Transform @@ -101486,11 +101954,6 @@ entities: - type: Transform pos: -2.5,-13.5 parent: 2 - - uid: 13374 - components: - - type: Transform - pos: -9.5,-13.5 - parent: 2 - uid: 13422 components: - type: Transform @@ -102705,6 +103168,16 @@ entities: layers: - sprite: _CP14/Structures/Wallpaper/wallpaper_green.rsi state: bottom + - uid: 973 + components: + - type: Transform + pos: -11.5,-31.5 + parent: 2 + - uid: 976 + components: + - type: Transform + pos: -10.5,-30.5 + parent: 2 - uid: 1015 components: - type: Transform @@ -102960,15 +103433,6 @@ entities: state: bottom - sprite: _CP14/Structures/Wallpaper/wallpaper_green.rsi state: right - - uid: 1333 - components: - - type: Transform - pos: -10.5,-32.5 - parent: 2 - - type: CP14WallpaperHolder - layers: - - sprite: _CP14/Structures/Wallpaper/wallpaper_green.rsi - state: bottom - uid: 1335 components: - type: Transform @@ -104764,16 +105228,6 @@ entities: rot: 1.5707963267948966 rad pos: 33.5,13.5 parent: 2 - - uid: 13403 - components: - - type: Transform - pos: -9.5,-14.5 - parent: 2 - - uid: 13404 - components: - - type: Transform - pos: -9.5,-15.5 - parent: 2 - proto: CP14WindowWooden entities: - uid: 455 @@ -105309,6 +105763,11 @@ entities: - type: Transform pos: -3.5,-7.5 parent: 2 + - uid: 5543 + components: + - type: Transform + pos: -4.5,-11.5 + parent: 2 - uid: 6081 components: - type: Transform @@ -105329,11 +105788,6 @@ entities: - type: Transform pos: 14.5,-16.5 parent: 2 - - uid: 8380 - components: - - type: Transform - pos: -3.5,-11.5 - parent: 2 - uid: 8617 components: - type: Transform @@ -105364,11 +105818,6 @@ entities: - type: Transform pos: 102.5,61.5 parent: 2 - - uid: 12075 - components: - - type: Transform - pos: -8.5,-32.5 - parent: 2 - proto: CP14WoodenBeerMug entities: - uid: 1545 @@ -105516,11 +105965,6 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,13.5 parent: 2 - - uid: 8378 - components: - - type: Transform - pos: -4.5,-11.5 - parent: 2 - uid: 8631 components: - type: Transform @@ -105547,11 +105991,6 @@ entities: rot: 1.5707963267948966 rad pos: 12.5,4.5 parent: 2 - - uid: 2240 - components: - - type: Transform - pos: -10.5,-33.5 - parent: 2 - proto: CP14WoodenCabinetBanker entities: - uid: 1365 @@ -105643,6 +106082,13 @@ entities: - type: Transform pos: 20.5,-40.5 parent: 2 +- proto: CP14WoodenCabinetGuildmaster + entities: + - uid: 8378 + components: + - type: Transform + pos: -5.5,-11.5 + parent: 2 - proto: CP14WoodenChest entities: - uid: 9784 @@ -105734,11 +106180,6 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,14.5 parent: 2 - - uid: 8394 - components: - - type: Transform - pos: -6.5,-11.5 - parent: 2 - uid: 8914 components: - type: Transform @@ -105851,6 +106292,13 @@ entities: - type: Transform pos: 17.5,-14.5 parent: 2 +- proto: CP14WoodenClosetGuildmasterFilled + entities: + - uid: 5544 + components: + - type: Transform + pos: -6.5,-11.5 + parent: 2 - proto: CP14WoodenDoor entities: - uid: 2374 @@ -106338,6 +106786,48 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-7.5 parent: 2 +- proto: DeskBell + entities: + - uid: 13404 + components: + - type: Transform + pos: -5.0221357,-18.365133 + parent: 2 + - uid: 13406 + components: + - type: Transform + pos: -4.1443224,-32.36918 + parent: 2 + - uid: 13885 + components: + - type: Transform + pos: 11.297916,-28.345606 + parent: 2 + - uid: 13914 + components: + - type: Transform + pos: 15.760235,5.7842155 + parent: 2 + - uid: 13950 + components: + - type: Transform + pos: 28.263111,13.671432 + parent: 2 + - uid: 13951 + components: + - type: Transform + pos: -17.249964,16.594639 + parent: 2 + - uid: 13952 + components: + - type: Transform + pos: -6.193482,1.8160825 + parent: 2 + - uid: 13953 + components: + - type: Transform + pos: -11.280857,-22.228916 + parent: 2 - proto: DrinkBeerGrowler entities: - uid: 12946 @@ -106504,4 +106994,4 @@ entities: parent: 2 - type: WarpPoint location: Dungeon -... \ No newline at end of file +... diff --git a/Resources/Maps/_CP14/comoss_d.yml b/Resources/Maps/_CP14/comoss_d.yml index 3a49c2aad6..19afb99992 100644 --- a/Resources/Maps/_CP14/comoss_d.yml +++ b/Resources/Maps/_CP14/comoss_d.yml @@ -66,7 +66,7 @@ entities: version: 6 -1,-1: ind: -1,-1 - tiles: CQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAMQAAAAAAMQAAAAAAMgAAAAAAMQAAAAAAMQAAAAAACQAAAAAECQAAAAAJMQAAAAAAMQAAAAAACQAAAAAGCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAMQAAAAAAMQAAAAAACQAAAAAACQAAAAAACQAAAAALCQAAAAAHCQAAAAANCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAMCQAAAAALCQAAAAANCQAAAAAACQAAAAADCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAANCQAAAAADCQAAAAAMMQAAAAAAMQAAAAAAMQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAHCQAAAAAJCQAAAAAFMQAAAAAAMQAAAAAADQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAADCQAAAAABCQAAAAAFMQAAAAAADQAAAAAADQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAIMQAAAAAAMQAAAAAADQAAAAAACQAAAAADCQAAAAAMCQAAAAALCQAAAAAKAQAAAAAAAQAAAAAAAQAAAAAACQAAAAABAQAAAAAAAQAAAAAAAQAAAAAACQAAAAAACQAAAAAEMQAAAAAAMQAAAAAAMQAAAAAACQAAAAAICQAAAAAMCQAAAAAECQAAAAAEAQAAAAAAAQAAAAAAAQAAAAAACQAAAAALMwAAAAAAAQAAAAAAAQAAAAAACQAAAAAACQAAAAAHCQAAAAAACQAAAAAACQAAAAAGCQAAAAACCQAAAAAGCQAAAAADMwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAACQAAAAALAQAAAAAAAQAAAAAAAQAAAAAACQAAAAAACQAAAAADCQAAAAAACQAAAAAACQAAAAAICQAAAAABCQAAAAAGCQAAAAAKCQAAAAANCQAAAAADCQAAAAANCQAAAAAMCQAAAAAACQAAAAADCQAAAAAMCQAAAAALCQAAAAANCQAAAAAICQAAAAAACQAAAAAACQAAAAABCQAAAAAJCQAAAAANCQAAAAAFCQAAAAABCQAAAAAMCQAAAAAGCQAAAAAECQAAAAAICQAAAAALCQAAAAAACQAAAAANCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAFCQAAAAANCQAAAAAJCQAAAAAACQAAAAAJCQAAAAAACQAAAAAJCQAAAAABCQAAAAAACQAAAAAGCQAAAAAECQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAICQAAAAANCQAAAAAICQAAAAALCQAAAAACCQAAAAAACQAAAAAKCQAAAAAACQAAAAAKCQAAAAANCQAAAAALCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAJCQAAAAANCQAAAAAGCQAAAAAICQAAAAAFCQAAAAABCQAAAAAACQAAAAAACQAAAAAACQAAAAAKCQAAAAAICQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAABCQAAAAANCQAAAAAICQAAAAAICQAAAAANAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAACQAAAAACCQAAAAAECQAAAAALCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAECQAAAAAH + tiles: CQAAAAAACQAAAAAACQAAAAAACQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMgAAAAAAMQAAAAAAMQAAAAAACQAAAAAECQAAAAAJMQAAAAAAMQAAAAAACQAAAAAGCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAACQAAAAAACQAAAAAACQAAAAALCQAAAAAHCQAAAAANCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAMCQAAAAALCQAAAAANCQAAAAAACQAAAAADMQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAANCQAAAAADCQAAAAAMMQAAAAAAMQAAAAAAMQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAHCQAAAAAJCQAAAAAFMQAAAAAAMQAAAAAADQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAADCQAAAAABCQAAAAAFMQAAAAAADQAAAAAADQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAIMQAAAAAAMQAAAAAADQAAAAAACQAAAAADCQAAAAAMCQAAAAALCQAAAAAKAQAAAAAAAQAAAAAAAQAAAAAACQAAAAABAQAAAAAAAQAAAAAAAQAAAAAACQAAAAAACQAAAAAEMQAAAAAAMQAAAAAAMQAAAAAACQAAAAAICQAAAAAMCQAAAAAECQAAAAAEAQAAAAAAAQAAAAAAAQAAAAAACQAAAAALMwAAAAAAAQAAAAAAAQAAAAAACQAAAAAACQAAAAAHCQAAAAAACQAAAAAACQAAAAAGCQAAAAACCQAAAAAGCQAAAAADMwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAACQAAAAALAQAAAAAAAQAAAAAAAQAAAAAACQAAAAAACQAAAAADCQAAAAAACQAAAAAACQAAAAAICQAAAAABCQAAAAAGCQAAAAAKCQAAAAANCQAAAAADCQAAAAANCQAAAAAMCQAAAAAACQAAAAADCQAAAAAMCQAAAAALCQAAAAANCQAAAAAICQAAAAAACQAAAAAACQAAAAABCQAAAAAJCQAAAAANCQAAAAAFCQAAAAABCQAAAAAMCQAAAAAGCQAAAAAECQAAAAAICQAAAAALCQAAAAAACQAAAAANCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAFCQAAAAANCQAAAAAJCQAAAAAACQAAAAAJCQAAAAAACQAAAAAJCQAAAAABCQAAAAAACQAAAAAGCQAAAAAECQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAICQAAAAANCQAAAAAICQAAAAALCQAAAAACCQAAAAAACQAAAAAKCQAAAAAACQAAAAAKCQAAAAANCQAAAAALCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAJCQAAAAANCQAAAAAGCQAAAAAICQAAAAAFCQAAAAABCQAAAAAACQAAAAAACQAAAAAACQAAAAAKCQAAAAAICQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAABCQAAAAANCQAAAAAICQAAAAAICQAAAAANAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAACQAAAAACCQAAAAAECQAAAAALCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAECQAAAAAH version: 6 -1,0: ind: -1,0 @@ -98,7 +98,7 @@ entities: version: 6 -1,-2: ind: -1,-2 - tiles: CQAAAAAACQAAAAAAAwAAAAAAAwAAAAAACQAAAAAACQAAAAACCQAAAAAJCQAAAAAACQAAAAADCQAAAAADCQAAAAAMCQAAAAAJCQAAAAABCQAAAAALCQAAAAAGCQAAAAAICQAAAAAHCQAAAAAMAwAAAAAAAwAAAAAACQAAAAALCQAAAAAGCQAAAAAACQAAAAAJCQAAAAANCQAAAAADCQAAAAAJCQAAAAACCQAAAAAECQAAAAAHCQAAAAALCQAAAAAKCQAAAAAKCQAAAAAHMwAAAAAAAwAAAAAACQAAAAALCQAAAAAHCQAAAAAECQAAAAALCQAAAAAKCQAAAAAICQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAFCQAAAAAJCQAAAAABCQAAAAAFCQAAAAAJCQAAAAAECQAAAAAFCQAAAAAMCQAAAAACCQAAAAAJCQAAAAAACQAAAAAACQAAAAALCQAAAAAACQAAAAAACQAAAAAICQAAAAABCQAAAAAJCQAAAAALCQAAAAAFCQAAAAANCQAAAAAMCQAAAAADCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAFCQAAAAAFCQAAAAACCQAAAAABCQAAAAAFCQAAAAAACQAAAAAECQAAAAAMCQAAAAAHCQAAAAANCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAABCQAAAAAGCQAAAAABCQAAAAABCQAAAAAFCQAAAAALCQAAAAADCQAAAAACCQAAAAALCQAAAAAECQAAAAAACQAAAAAFCQAAAAACCQAAAAAJCQAAAAAGCQAAAAADCQAAAAAACQAAAAAACQAAAAACCQAAAAADCQAAAAANCQAAAAAFCQAAAAACCQAAAAADCQAAAAAKCQAAAAAECQAAAAAACQAAAAALCQAAAAADCQAAAAANCQAAAAADCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAACCQAAAAAACQAAAAAHCQAAAAAMCQAAAAAJCQAAAAAFCQAAAAAFCQAAAAAMCQAAAAAJCQAAAAAICQAAAAAMCQAAAAAFCQAAAAACCQAAAAALCQAAAAAJCQAAAAAACQAAAAAACQAAAAAFCQAAAAAMCQAAAAAHCQAAAAAFCQAAAAAHCQAAAAAJCQAAAAADCQAAAAACCQAAAAAECQAAAAABCQAAAAABCQAAAAANCQAAAAAGCQAAAAAMCQAAAAAACQAAAAADCQAAAAABCQAAAAAECQAAAAANCQAAAAAKCQAAAAAHCQAAAAAFCQAAAAAACQAAAAAICQAAAAAKCQAAAAANCQAAAAAMCQAAAAAICQAAAAAHCQAAAAAKCQAAAAAACQAAAAAFCQAAAAADCQAAAAACCQAAAAADCQAAAAAKCQAAAAAMCQAAAAAFCQAAAAAICQAAAAADCQAAAAAACQAAAAACCQAAAAABHAAAAAAACQAAAAALCQAAAAAMCQAAAAAAHAAAAAAAHAAAAAAACQAAAAALCQAAAAAKCQAAAAABCQAAAAAMCQAAAAANCQAAAAALCQAAAAAMCQAAAAALCQAAAAAMCQAAAAANCQAAAAAKCQAAAAAGCQAAAAAEHQAAAAAAHAAAAAAACQAAAAAFCQAAAAAECQAAAAABCQAAAAAKCQAAAAAGCQAAAAAECQAAAAACMwAAAAAAMwAAAAAACQAAAAACHQAAAAAACQAAAAAJHAAAAAAAHQAAAAAAHAAAAAAACQAAAAAACQAAAAAJCQAAAAAACQAAAAADCQAAAAAMCQAAAAAHCQAAAAANCQAAAAAJMQAAAAAAMQAAAAAAMgAAAAAACQAAAAAMCQAAAAAMHAAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAALCQAAAAAFCQAAAAAECQAAAAANCQAAAAADCQAAAAAHCQAAAAAKMQAAAAAAMQAAAAAAMgAAAAAAMQAAAAAACQAAAAAMCQAAAAABMQAAAAAAMQAAAAAACQAAAAAMCQAAAAAD + tiles: CQAAAAAACQAAAAAAAwAAAAAAAwAAAAAACQAAAAAAMwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACQAAAAADCQAAAAAMCQAAAAAJCQAAAAABCQAAAAALCQAAAAAGCQAAAAAICQAAAAAHCQAAAAAMAwAAAAAAAwAAAAAACQAAAAALAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACQAAAAADCQAAAAAJCQAAAAACCQAAAAAECQAAAAAHCQAAAAALCQAAAAAKCQAAAAAKCQAAAAAHMwAAAAAAAwAAAAAACQAAAAALAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACQAAAAAICQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAFCQAAAAAJCQAAAAABCQAAAAAFCQAAAAAJCQAAAAAECQAAAAAFCQAAAAAMCQAAAAACCQAAAAAJCQAAAAAACQAAAAAACQAAAAALCQAAAAAACQAAAAAACQAAAAAICQAAAAABCQAAAAAJCQAAAAALCQAAAAAFCQAAAAANCQAAAAAMCQAAAAADCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAFCQAAAAAFCQAAAAACCQAAAAABCQAAAAAFCQAAAAAACQAAAAAECQAAAAAMCQAAAAAHCQAAAAANCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAABCQAAAAAGCQAAAAABCQAAAAABCQAAAAAFCQAAAAALCQAAAAADCQAAAAACCQAAAAALCQAAAAAECQAAAAAACQAAAAAFCQAAAAACCQAAAAAJCQAAAAAGCQAAAAADCQAAAAAACQAAAAAACQAAAAACCQAAAAADCQAAAAANCQAAAAAFCQAAAAACCQAAAAADCQAAAAAKCQAAAAAECQAAAAAACQAAAAALCQAAAAADCQAAAAANCQAAAAADCQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAACCQAAAAAACQAAAAAHCQAAAAAMCQAAAAAJCQAAAAAFCQAAAAAFCQAAAAAMCQAAAAAJCQAAAAAICQAAAAAMCQAAAAAFCQAAAAACCQAAAAALCQAAAAAJCQAAAAAACQAAAAAACQAAAAAFCQAAAAAMCQAAAAAHCQAAAAAFCQAAAAAHCQAAAAAJCQAAAAADCQAAAAACCQAAAAAECQAAAAABCQAAAAABCQAAAAANCQAAAAAGCQAAAAAMCQAAAAAACQAAAAADCQAAAAABCQAAAAAECQAAAAANCQAAAAAKCQAAAAAHCQAAAAAFCQAAAAAACQAAAAAICQAAAAAKCQAAAAANCQAAAAAMCQAAAAAICQAAAAAHCQAAAAAKCQAAAAAACQAAAAAFCQAAAAADCQAAAAACCQAAAAADCQAAAAAKCQAAAAAMCQAAAAAFCQAAAAAICQAAAAADCQAAAAAACQAAAAACCQAAAAABHAAAAAAACQAAAAALCQAAAAAMCQAAAAAAHAAAAAAAHAAAAAAACQAAAAALCQAAAAAKCQAAAAABCQAAAAAMMQAAAAAAMQAAAAAAMQAAAAAAHQAAAAAACQAAAAAACQAAAAANCQAAAAAKCQAAAAAGCQAAAAAEHQAAAAAAHAAAAAAACQAAAAAFCQAAAAAECQAAAAABCQAAAAAKCQAAAAAGMQAAAAAAMQAAAAAACQAAAAAAMQAAAAAACQAAAAAAHQAAAAAACQAAAAAJHAAAAAAAHQAAAAAAHAAAAAAACQAAAAAACQAAAAAJCQAAAAAACQAAAAADCQAAAAAMCQAAAAAHMQAAAAAAMQAAAAAAMwAAAAAAMQAAAAAAMgAAAAAACQAAAAAMCQAAAAAMHAAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAALCQAAAAAFCQAAAAAECQAAAAANCQAAAAADMQAAAAAAMQAAAAAAMwAAAAAAMQAAAAAAMgAAAAAAMQAAAAAACQAAAAAMCQAAAAABMQAAAAAAMQAAAAAACQAAAAAMCQAAAAAD version: 6 0,-2: ind: 0,-2 @@ -5612,11 +5612,6 @@ entities: - type: Transform pos: 4.5,-20.5 parent: 2 - - uid: 654 - components: - - type: Transform - pos: 4.5,-19.5 - parent: 2 - uid: 655 components: - type: Transform @@ -5637,11 +5632,6 @@ entities: - type: Transform pos: 2.5,-0.5 parent: 2 - - uid: 662 - components: - - type: Transform - pos: 4.5,-18.5 - parent: 2 - uid: 663 components: - type: Transform @@ -5829,21 +5819,6 @@ entities: - type: Transform pos: 3.5,-22.5 parent: 2 - - uid: 716 - components: - - type: Transform - pos: 3.5,-21.5 - parent: 2 - - uid: 717 - components: - - type: Transform - pos: 3.5,-20.5 - parent: 2 - - uid: 718 - components: - - type: Transform - pos: 3.5,-19.5 - parent: 2 - uid: 719 components: - type: Transform @@ -5854,11 +5829,6 @@ entities: - type: Transform pos: 2.5,-40.5 parent: 2 - - uid: 722 - components: - - type: Transform - pos: 0.5,-22.5 - parent: 2 - uid: 724 components: - type: Transform @@ -5954,11 +5924,6 @@ entities: - type: Transform pos: 2.5,-34.5 parent: 2 - - uid: 746 - components: - - type: Transform - pos: 2.5,-21.5 - parent: 2 - uid: 748 components: - type: Transform @@ -6044,11 +6009,6 @@ entities: - type: Transform pos: 1.5,-34.5 parent: 2 - - uid: 766 - components: - - type: Transform - pos: 2.5,-22.5 - parent: 2 - uid: 767 components: - type: Transform @@ -6069,11 +6029,6 @@ entities: - type: Transform pos: 0.5,-29.5 parent: 2 - - uid: 774 - components: - - type: Transform - pos: 1.5,-22.5 - parent: 2 - uid: 776 components: - type: Transform @@ -6254,11 +6209,6 @@ entities: - type: Transform pos: -0.5,-25.5 parent: 2 - - uid: 813 - components: - - type: Transform - pos: -0.5,-22.5 - parent: 2 - uid: 815 components: - type: Transform @@ -6584,11 +6534,6 @@ entities: - type: Transform pos: -2.5,-23.5 parent: 2 - - uid: 889 - components: - - type: Transform - pos: -2.5,-22.5 - parent: 2 - uid: 890 components: - type: Transform @@ -6634,11 +6579,6 @@ entities: - type: Transform pos: -18.5,36.5 parent: 2 - - uid: 902 - components: - - type: Transform - pos: -1.5,-22.5 - parent: 2 - uid: 904 components: - type: Transform @@ -12963,11 +12903,6 @@ entities: - type: Transform pos: -12.5,-22.5 parent: 2 - - uid: 2481 - components: - - type: Transform - pos: -12.5,-21.5 - parent: 2 - uid: 2482 components: - type: Transform @@ -12998,16 +12933,6 @@ entities: - type: Transform pos: -3.5,-33.5 parent: 2 - - uid: 2495 - components: - - type: Transform - pos: -12.5,-20.5 - parent: 2 - - uid: 2496 - components: - - type: Transform - pos: -12.5,-19.5 - parent: 2 - uid: 2497 components: - type: Transform @@ -13038,16 +12963,6 @@ entities: - type: Transform pos: 14.5,17.5 parent: 2 - - uid: 2505 - components: - - type: Transform - pos: -11.5,-21.5 - parent: 2 - - uid: 2506 - components: - - type: Transform - pos: -11.5,-20.5 - parent: 2 - uid: 2507 components: - type: Transform @@ -13068,21 +12983,6 @@ entities: - type: Transform pos: -3.5,-32.5 parent: 2 - - uid: 2511 - components: - - type: Transform - pos: -12.5,-18.5 - parent: 2 - - uid: 2512 - components: - - type: Transform - pos: -12.5,-16.5 - parent: 2 - - uid: 2513 - components: - - type: Transform - pos: -12.5,-15.5 - parent: 2 - uid: 2514 components: - type: Transform @@ -13143,11 +13043,6 @@ entities: - type: Transform pos: -3.5,-27.5 parent: 2 - - uid: 2528 - components: - - type: Transform - pos: -12.5,-17.5 - parent: 2 - uid: 2529 components: - type: Transform @@ -13158,11 +13053,6 @@ entities: - type: Transform pos: -13.5,-25.5 parent: 2 - - uid: 2531 - components: - - type: Transform - pos: -3.5,-22.5 - parent: 2 - uid: 2533 components: - type: Transform @@ -13214,41 +13104,6 @@ entities: - type: Transform pos: -13.5,-22.5 parent: 2 - - uid: 2543 - components: - - type: Transform - pos: -13.5,-21.5 - parent: 2 - - uid: 2544 - components: - - type: Transform - pos: -13.5,-20.5 - parent: 2 - - uid: 2545 - components: - - type: Transform - pos: -13.5,-19.5 - parent: 2 - - uid: 2546 - components: - - type: Transform - pos: -13.5,-18.5 - parent: 2 - - uid: 2547 - components: - - type: Transform - pos: -13.5,-17.5 - parent: 2 - - uid: 2556 - components: - - type: Transform - pos: -13.5,-16.5 - parent: 2 - - uid: 2557 - components: - - type: Transform - pos: -13.5,-15.5 - parent: 2 - uid: 2559 components: - type: Transform @@ -13279,12 +13134,6 @@ entities: - type: Transform pos: -5.5,-26.5 parent: 2 - - uid: 2575 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-13.5 - parent: 2 - uid: 2579 components: - type: Transform @@ -13325,22 +13174,6 @@ entities: - type: Transform pos: -6.5,-24.5 parent: 2 - - uid: 2588 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-16.5 - parent: 2 - - uid: 2589 - components: - - type: Transform - pos: -6.5,-28.5 - parent: 2 - - uid: 2594 - components: - - type: Transform - pos: -4.5,-22.5 - parent: 2 - uid: 2597 components: - type: Transform @@ -13411,11 +13244,6 @@ entities: - type: Transform pos: -6.5,-23.5 parent: 2 - - uid: 2611 - components: - - type: Transform - pos: -6.5,-22.5 - parent: 2 - uid: 2612 components: - type: Transform @@ -13441,18 +13269,6 @@ entities: - type: Transform pos: -9.5,-25.5 parent: 2 - - uid: 2618 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-14.5 - parent: 2 - - uid: 2619 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-15.5 - parent: 2 - uid: 2620 components: - type: Transform @@ -13463,11 +13279,6 @@ entities: - type: Transform pos: -5.5,-23.5 parent: 2 - - uid: 2622 - components: - - type: Transform - pos: -5.5,-22.5 - parent: 2 - uid: 2625 components: - type: Transform @@ -13538,11 +13349,6 @@ entities: - type: Transform pos: -20.5,6.5 parent: 2 - - uid: 2655 - components: - - type: Transform - pos: -7.5,-28.5 - parent: 2 - uid: 2658 components: - type: Transform @@ -13558,21 +13364,11 @@ entities: - type: Transform pos: -10.5,-22.5 parent: 2 - - uid: 2663 - components: - - type: Transform - pos: -10.5,-21.5 - parent: 2 - uid: 2664 components: - type: Transform pos: -9.5,-22.5 parent: 2 - - uid: 2665 - components: - - type: Transform - pos: -9.5,-20.5 - parent: 2 - uid: 2667 components: - type: Transform @@ -13623,21 +13419,11 @@ entities: - type: Transform pos: -7.5,-23.5 parent: 2 - - uid: 2678 - components: - - type: Transform - pos: -7.5,-22.5 - parent: 2 - uid: 2679 components: - type: Transform pos: -8.5,-22.5 parent: 2 - - uid: 2680 - components: - - type: Transform - pos: -8.5,-21.5 - parent: 2 - uid: 2681 components: - type: Transform @@ -13648,16 +13434,6 @@ entities: - type: Transform pos: -10.5,-25.5 parent: 2 - - uid: 2683 - components: - - type: Transform - pos: -10.5,-20.5 - parent: 2 - - uid: 2685 - components: - - type: Transform - pos: -9.5,-21.5 - parent: 2 - uid: 2692 components: - type: Transform @@ -13683,16 +13459,6 @@ entities: - type: Transform pos: -7.5,-24.5 parent: 2 - - uid: 2697 - components: - - type: Transform - pos: -7.5,-21.5 - parent: 2 - - uid: 2699 - components: - - type: Transform - pos: -8.5,-20.5 - parent: 2 - uid: 2701 components: - type: Transform @@ -15881,11 +15647,6 @@ entities: - type: Transform pos: 7.5,-11.5 parent: 2 - - uid: 3372 - components: - - type: Transform - pos: 4.5,-12.5 - parent: 2 - uid: 3373 components: - type: Transform @@ -15916,16 +15677,6 @@ entities: - type: Transform pos: 5.5,-5.5 parent: 2 - - uid: 3399 - components: - - type: Transform - pos: 4.5,-13.5 - parent: 2 - - uid: 3400 - components: - - type: Transform - pos: 4.5,-14.5 - parent: 2 - uid: 3408 components: - type: Transform @@ -16324,16 +16075,6 @@ entities: - type: Transform pos: -13.5,-10.5 parent: 2 - - uid: 3564 - components: - - type: Transform - pos: -13.5,-13.5 - parent: 2 - - uid: 3565 - components: - - type: Transform - pos: -13.5,-14.5 - parent: 2 - uid: 3568 components: - type: Transform @@ -17549,11 +17290,6 @@ entities: - type: Transform pos: 38.5,-35.5 parent: 2 - - uid: 4026 - components: - - type: Transform - pos: -12.5,-14.5 - parent: 2 - uid: 4027 components: - type: Transform @@ -17615,11 +17351,6 @@ entities: - type: Transform pos: -11.5,18.5 parent: 2 - - uid: 4050 - components: - - type: Transform - pos: -12.5,-13.5 - parent: 2 - uid: 4051 components: - type: Transform @@ -18119,29 +17850,11 @@ entities: - type: Transform pos: 7.5,6.5 parent: 2 - - uid: 4183 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-18.5 - parent: 2 - uid: 4184 components: - type: Transform pos: 7.5,-1.5 parent: 2 - - uid: 4186 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-19.5 - parent: 2 - - uid: 4187 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-17.5 - parent: 2 - uid: 4192 components: - type: Transform @@ -21487,11 +21200,6 @@ entities: - type: Transform pos: 24.5,-15.5 parent: 2 - - uid: 5094 - components: - - type: Transform - pos: 4.5,-17.5 - parent: 2 - uid: 5095 components: - type: Transform @@ -21522,11 +21230,6 @@ entities: - type: Transform pos: 5.5,-20.5 parent: 2 - - uid: 5101 - components: - - type: Transform - pos: 4.5,-16.5 - parent: 2 - uid: 5102 components: - type: Transform @@ -21547,11 +21250,6 @@ entities: - type: Transform pos: 6.5,-16.5 parent: 2 - - uid: 5107 - components: - - type: Transform - pos: 4.5,-15.5 - parent: 2 - uid: 5108 components: - type: Transform @@ -31781,12 +31479,6 @@ entities: - type: Transform pos: 36.5,20.5 parent: 2 - - uid: 8146 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-28.5 - parent: 2 - uid: 8147 components: - type: Transform @@ -31811,126 +31503,12 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,-27.5 parent: 2 - - uid: 8159 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-30.5 - parent: 2 - - uid: 8160 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-31.5 - parent: 2 - - uid: 8161 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-29.5 - parent: 2 - - uid: 8162 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-28.5 - parent: 2 - - uid: 8163 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-29.5 - parent: 2 - - uid: 8164 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-30.5 - parent: 2 - - uid: 8165 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-31.5 - parent: 2 - - uid: 8166 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-28.5 - parent: 2 - - uid: 8167 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-31.5 - parent: 2 - - uid: 8168 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-30.5 - parent: 2 - - uid: 8169 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-29.5 - parent: 2 - - uid: 8170 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-29.5 - parent: 2 - - uid: 8171 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-30.5 - parent: 2 - - uid: 8172 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-32.5 - parent: 2 - uid: 8173 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-33.5 parent: 2 - - uid: 8174 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-29.5 - parent: 2 - - uid: 8175 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-30.5 - parent: 2 - - uid: 8176 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-31.5 - parent: 2 - - uid: 8177 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-32.5 - parent: 2 - - uid: 8178 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-31.5 - parent: 2 - uid: 8179 components: - type: Transform @@ -31985,24 +31563,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-30.5 parent: 2 - - uid: 8188 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-32.5 - parent: 2 - - uid: 8189 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-32.5 - parent: 2 - - uid: 8190 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-32.5 - parent: 2 - uid: 8191 components: - type: Transform @@ -95943,7 +95503,45 @@ entities: - type: Transform pos: -18.5,-7.5 parent: 2 -- proto: CP14CrystalAmethystsBig +- proto: CP14CrateCoffin + entities: + - uid: 2697 + components: + - type: Transform + pos: -7.5,-30.5 + parent: 2 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 2699 + - 3340 + - 3372 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - uid: 4050 + components: + - type: Transform + pos: -7.5,-29.5 + parent: 2 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 4127 + - 4154 + - 4175 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null +- proto: CP14CrystalElementalDarknessBig entities: - uid: 526 components: @@ -95962,7 +95560,7 @@ entities: - type: Transform pos: -4.4530544,-12.664821 parent: 2 -- proto: CP14CrystalAmethystsMedium +- proto: CP14CrystalElementalDarknessMedium entities: - uid: 4189 components: @@ -95976,7 +95574,7 @@ entities: rot: 3.141592653589793 rad pos: -70.47718,27.537062 parent: 2 -- proto: CP14CrystalAmethystsSmall +- proto: CP14CrystalElementalDarknessSmall entities: - uid: 676 components: @@ -96005,63 +95603,7 @@ entities: - type: Transform pos: -6.4675236,-14.508899 parent: 2 -- proto: CP14CrystalDiamondsSmall - entities: - - uid: 15225 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -55.453403,-5.6048665 - parent: 2 -- proto: CP14CrystalEmeraldsBig - entities: - - uid: 18698 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 38.46467,38.340416 - parent: 2 -- proto: CP14CrystalEmeraldsMedium - entities: - - uid: 440 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -59.91631,-3.0338006 - parent: 2 -- proto: CP14CrystalLampBlueEmpty - entities: - - uid: 8973 - components: - - type: Transform - parent: 8971 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: CP14CrystalLampOrangeEmpty - entities: - - uid: 8972 - components: - - type: Transform - parent: 8971 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: CP14CrystalRubiesMedium - entities: - - uid: 437 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -54.41131,-14.440628 - parent: 2 - - uid: 18692 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 30.503544,54.41658 - parent: 2 -- proto: CP14CrystalTopazesBig +- proto: CP14CrystalElementalElectricBig entities: - uid: 9902 components: @@ -96111,7 +95653,7 @@ entities: - type: Transform pos: -35.17431,19.706465 parent: 2 -- proto: CP14CrystalTopazesMedium +- proto: CP14CrystalElementalElectricMedium entities: - uid: 11355 components: @@ -96154,7 +95696,7 @@ entities: rot: -1.5707963267948966 rad pos: -56.54992,-10.055402 parent: 2 -- proto: CP14CrystalTopazesSmall +- proto: CP14CrystalElementalElectricSmall entities: - uid: 11401 components: @@ -96177,6 +95719,62 @@ entities: rot: 3.141592653589793 rad pos: 12.46924,50.596863 parent: 2 +- proto: CP14CrystalElementalFireMedium + entities: + - uid: 437 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -54.41131,-14.440628 + parent: 2 + - uid: 18692 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.503544,54.41658 + parent: 2 +- proto: CP14CrystalElementalHealingBig + entities: + - uid: 18698 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 38.46467,38.340416 + parent: 2 +- proto: CP14CrystalElementalHealingMedium + entities: + - uid: 440 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -59.91631,-3.0338006 + parent: 2 +- proto: CP14CrystalElementalLightSmall + entities: + - uid: 15225 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -55.453403,-5.6048665 + parent: 2 +- proto: CP14CrystalLampBlueEmpty + entities: + - uid: 8973 + components: + - type: Transform + parent: 8971 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: CP14CrystalLampOrangeEmpty + entities: + - uid: 8972 + components: + - type: Transform + parent: 8971 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: CP14CurtainsBlue entities: - uid: 1951 @@ -96206,10 +95804,9 @@ entities: parent: 2 - proto: CP14DemiplaneLinkCrystal entities: - - uid: 4154 + - uid: 8159 components: - type: Transform - rot: -1.5707963267948966 rad pos: -0.5,-10.5 parent: 2 - proto: CP14DirtBlock1 @@ -96299,9 +95896,9 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: CP14FenceIronGrilleGateGuildmaster +- proto: CP14FenceIronGrilleGateDemiplaneCrystal entities: - - uid: 659 + - uid: 8160 components: - type: Transform pos: -0.5,-12.5 @@ -96400,6 +95997,12 @@ entities: - type: Transform pos: -1.5,-12.5 parent: 2 + - uid: 8167 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-15.5 + parent: 2 - uid: 23474 components: - type: Transform @@ -96420,6 +96023,12 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,-29.5 parent: 2 + - uid: 4026 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-31.5 + parent: 2 - uid: 4490 components: - type: Transform @@ -96443,6 +96052,17 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,-38.5 parent: 2 + - uid: 8163 + components: + - type: Transform + pos: -9.5,-15.5 + parent: 2 + - uid: 8343 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-18.5 + parent: 2 - proto: CP14FloorWater entities: - uid: 728 @@ -96740,12 +96360,6 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-18.5 parent: 2 - - uid: 4636 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-18.5 - parent: 2 - uid: 4656 components: - type: Transform @@ -100120,11 +99734,27 @@ entities: parent: 2 - proto: CP14HeadSkeleton entities: + - uid: 4127 + components: + - type: Transform + parent: 4050 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 18696 components: - type: Transform pos: 36.87656,39.29631 parent: 2 +- proto: CP14HeadZombie + entities: + - uid: 3372 + components: + - type: Transform + parent: 2697 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: CP14Inkwell entities: - uid: 4020 @@ -100790,7 +100420,7 @@ entities: - type: Transform pos: 10.158333,-34.388634 parent: 2 -- proto: CP14OreCopper +- proto: CP14OreCopper1 entities: - uid: 9023 components: @@ -100820,7 +100450,7 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: CP14OreIron +- proto: CP14OreIron1 entities: - uid: 9024 components: @@ -101063,6 +100693,24 @@ entities: - type: Transform pos: 36.9571,38.752686 parent: 2 +- proto: CP14RightLegSkeleton + entities: + - uid: 4154 + components: + - type: Transform + parent: 4050 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: CP14RightLegZombie + entities: + - uid: 2699 + components: + - type: Transform + parent: 2697 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: CP14RockBig entities: - uid: 475 @@ -106903,6 +106551,34 @@ entities: fixtures: {} - proto: CP14RoofWooden entities: + - uid: 2547 + components: + - type: Transform + pos: -7.5,-31.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 2619 + components: + - type: Transform + pos: -9.5,-28.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 3399 + components: + - type: Transform + pos: -10.5,-30.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 3400 + components: + - type: Transform + pos: -10.5,-29.5 + parent: 2 + - type: Fixtures + fixtures: {} - uid: 3763 components: - type: Transform @@ -106951,6 +106627,20 @@ entities: parent: 2 - type: Fixtures fixtures: {} + - uid: 3943 + components: + - type: Transform + pos: -10.5,-32.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 3970 + components: + - type: Transform + pos: -10.5,-31.5 + parent: 2 + - type: Fixtures + fixtures: {} - uid: 4972 components: - type: Transform @@ -106967,6 +106657,90 @@ entities: parent: 2 - type: Fixtures fixtures: {} + - uid: 8161 + components: + - type: Transform + pos: -9.5,-31.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8162 + components: + - type: Transform + pos: -9.5,-29.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8164 + components: + - type: Transform + pos: -9.5,-30.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8165 + components: + - type: Transform + pos: -8.5,-32.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8166 + components: + - type: Transform + pos: -8.5,-31.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8175 + components: + - type: Transform + pos: -7.5,-28.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8176 + components: + - type: Transform + pos: -8.5,-28.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8177 + components: + - type: Transform + pos: -7.5,-29.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8178 + components: + - type: Transform + pos: -7.5,-30.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8188 + components: + - type: Transform + pos: -7.5,-32.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8189 + components: + - type: Transform + pos: -8.5,-30.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8190 + components: + - type: Transform + pos: -8.5,-29.5 + parent: 2 + - type: Fixtures + fixtures: {} - uid: 8316 components: - type: Transform @@ -107167,6 +106941,55 @@ entities: parent: 2 - type: Fixtures fixtures: {} + - uid: 8345 + components: + - type: Transform + pos: -6.5,-32.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8347 + components: + - type: Transform + pos: -9.5,-32.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8348 + components: + - type: Transform + pos: -10.5,-28.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8351 + components: + - type: Transform + pos: -6.5,-31.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8352 + components: + - type: Transform + pos: -6.5,-30.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8353 + components: + - type: Transform + pos: -6.5,-29.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8354 + components: + - type: Transform + pos: -6.5,-28.5 + parent: 2 + - type: Fixtures + fixtures: {} - uid: 8389 components: - type: Transform @@ -110511,10 +110334,15 @@ entities: - type: Transform pos: 17.5,26.5 parent: 2 - - uid: 2646 + - uid: 2663 components: - type: Transform - pos: -6.5,-18.5 + pos: -7.5,-17.5 + parent: 2 + - uid: 2665 + components: + - type: Transform + pos: -7.5,-14.5 parent: 2 - uid: 2706 components: @@ -110987,11 +110815,6 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,18.5 parent: 2 - - uid: 1329 - components: - - type: Transform - pos: -8.5,-14.5 - parent: 2 - uid: 1406 components: - type: Transform @@ -111035,6 +110858,11 @@ entities: rot: 1.5707963267948966 rad pos: -20.5,-13.5 parent: 2 + - uid: 3833 + components: + - type: Transform + pos: -7.5,-31.5 + parent: 2 - uid: 4120 components: - type: Transform @@ -111047,6 +110875,16 @@ entities: rot: -1.5707963267948966 rad pos: -11.5,-10.5 parent: 2 + - uid: 4183 + components: + - type: Transform + pos: -9.5,-31.5 + parent: 2 + - uid: 4186 + components: + - type: Transform + pos: -8.5,-31.5 + parent: 2 - uid: 4204 components: - type: Transform @@ -111141,6 +110979,12 @@ entities: rot: -1.5707963267948966 rad pos: -16.5,-8.5 parent: 2 + - uid: 8344 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-14.5 + parent: 2 - uid: 8967 components: - type: Transform @@ -111290,11 +111134,27 @@ entities: parent: 2 - proto: CP14TorsoSkeleton entities: + - uid: 4175 + components: + - type: Transform + parent: 4050 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 18685 components: - type: Transform pos: 36.87656,39.215775 parent: 2 +- proto: CP14TorsoZombie + entities: + - uid: 3340 + components: + - type: Transform + parent: 2697 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: CP14VialSmall entities: - uid: 9524 @@ -111853,12 +111713,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-20.5 parent: 2 - - uid: 5694 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-19.5 - parent: 2 - uid: 5699 components: - type: Transform @@ -111939,37 +111793,6 @@ entities: parent: 2 - proto: CP14WallmountGarlandPurple entities: - - uid: 2563 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-17.5 - parent: 2 - - type: Fixtures - fixtures: {} - - uid: 2564 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-15.5 - parent: 2 - - type: Fixtures - fixtures: {} - - uid: 2565 - components: - - type: Transform - pos: -7.5,-15.5 - parent: 2 - - type: Fixtures - fixtures: {} - - uid: 2568 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,-17.5 - parent: 2 - - type: Fixtures - fixtures: {} - uid: 2623 components: - type: Transform @@ -111992,6 +111815,20 @@ entities: parent: 2 - type: Fixtures fixtures: {} + - uid: 2678 + components: + - type: Transform + pos: -8.5,-18.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8174 + components: + - type: Transform + pos: -8.5,-15.5 + parent: 2 + - type: Fixtures + fixtures: {} - proto: CP14WallmountLamp entities: - uid: 5037 @@ -112308,10 +112145,10 @@ entities: fixtures: {} - proto: CP14WallmountPaintingSkull entities: - - uid: 3833 + - uid: 8346 components: - type: Transform - pos: -8.5,-14.5 + pos: -10.5,-14.5 parent: 2 - type: Fixtures fixtures: {} @@ -112363,6 +112200,13 @@ entities: parent: 2 - type: Fixtures fixtures: {} + - uid: 8168 + components: + - type: Transform + pos: -11.5,-15.5 + parent: 2 + - type: Fixtures + fixtures: {} - proto: CP14WallSkulls entities: - uid: 3938 @@ -112377,11 +112221,26 @@ entities: - type: Transform pos: -3.5,-7.5 parent: 2 + - uid: 654 + components: + - type: Transform + pos: 4.5,-19.5 + parent: 2 - uid: 658 components: - type: Transform pos: 1.5,-7.5 parent: 2 + - uid: 659 + components: + - type: Transform + pos: 4.5,-18.5 + parent: 2 + - uid: 662 + components: + - type: Transform + pos: 3.5,-21.5 + parent: 2 - uid: 668 components: - type: Transform @@ -112402,16 +112261,41 @@ entities: - type: Transform pos: 11.5,-39.5 parent: 2 + - uid: 716 + components: + - type: Transform + pos: 3.5,-20.5 + parent: 2 + - uid: 717 + components: + - type: Transform + pos: 3.5,-19.5 + parent: 2 + - uid: 718 + components: + - type: Transform + pos: 0.5,-22.5 + parent: 2 - uid: 720 components: - type: Transform pos: 3.5,-14.5 parent: 2 + - uid: 722 + components: + - type: Transform + pos: 2.5,-21.5 + parent: 2 - uid: 723 components: - type: Transform pos: -5.5,-21.5 parent: 2 + - uid: 746 + components: + - type: Transform + pos: 2.5,-22.5 + parent: 2 - uid: 747 components: - type: Transform @@ -112422,11 +112306,21 @@ entities: - type: Transform pos: 3.5,-16.5 parent: 2 + - uid: 766 + components: + - type: Transform + pos: 1.5,-22.5 + parent: 2 - uid: 769 components: - type: Transform pos: 2.5,-18.5 parent: 2 + - uid: 774 + components: + - type: Transform + pos: -0.5,-22.5 + parent: 2 - uid: 775 components: - type: Transform @@ -112437,6 +112331,11 @@ entities: - type: Transform pos: 3.5,-18.5 parent: 2 + - uid: 813 + components: + - type: Transform + pos: -2.5,-22.5 + parent: 2 - uid: 814 components: - type: Transform @@ -112457,6 +112356,11 @@ entities: - type: Transform pos: 13.5,-39.5 parent: 2 + - uid: 889 + components: + - type: Transform + pos: -1.5,-22.5 + parent: 2 - uid: 892 components: - type: Transform @@ -112467,6 +112371,11 @@ entities: - type: Transform pos: -3.5,-21.5 parent: 2 + - uid: 902 + components: + - type: Transform + pos: -13.5,-21.5 + parent: 2 - uid: 903 components: - type: Transform @@ -112717,6 +112626,71 @@ entities: - type: Transform pos: 12.5,-50.5 parent: 2 + - uid: 2495 + components: + - type: Transform + pos: -12.5,-21.5 + parent: 2 + - uid: 2505 + components: + - type: Transform + pos: -11.5,-21.5 + parent: 2 + - uid: 2513 + components: + - type: Transform + pos: -3.5,-22.5 + parent: 2 + - uid: 2516 + components: + - type: Transform + pos: -13.5,-20.5 + parent: 2 + - uid: 2528 + components: + - type: Transform + pos: -13.5,-19.5 + parent: 2 + - uid: 2531 + components: + - type: Transform + pos: -13.5,-18.5 + parent: 2 + - uid: 2543 + components: + - type: Transform + pos: -13.5,-17.5 + parent: 2 + - uid: 2544 + components: + - type: Transform + pos: -13.5,-16.5 + parent: 2 + - uid: 2545 + components: + - type: Transform + pos: -13.5,-15.5 + parent: 2 + - uid: 2546 + components: + - type: Transform + pos: -13.5,-14.5 + parent: 2 + - uid: 2552 + components: + - type: Transform + pos: -7.5,-22.5 + parent: 2 + - uid: 2556 + components: + - type: Transform + pos: -4.5,-22.5 + parent: 2 + - uid: 2557 + components: + - type: Transform + pos: -6.5,-22.5 + parent: 2 - uid: 2558 components: - type: Transform @@ -112727,11 +112701,26 @@ entities: - type: Transform pos: 66.5,32.5 parent: 2 + - uid: 2563 + components: + - type: Transform + pos: -11.5,-13.5 + parent: 2 + - uid: 2565 + components: + - type: Transform + pos: -5.5,-22.5 + parent: 2 - uid: 2566 components: - type: Transform pos: -1.5,-21.5 parent: 2 + - uid: 2575 + components: + - type: Transform + pos: -8.5,-21.5 + parent: 2 - uid: 2576 components: - type: Transform @@ -112747,6 +112736,11 @@ entities: - type: Transform pos: 66.5,33.5 parent: 2 + - uid: 2589 + components: + - type: Transform + pos: -6.5,-21.5 + parent: 2 - uid: 2590 components: - type: Transform @@ -112757,26 +112751,61 @@ entities: - type: Transform pos: 0.5,-21.5 parent: 2 + - uid: 2594 + components: + - type: Transform + pos: -9.5,-21.5 + parent: 2 - uid: 2595 components: - type: Transform pos: -0.5,-21.5 parent: 2 + - uid: 2611 + components: + - type: Transform + pos: -10.5,-21.5 + parent: 2 + - uid: 2618 + components: + - type: Transform + pos: -7.5,-21.5 + parent: 2 + - uid: 2622 + components: + - type: Transform + pos: 4.5,-12.5 + parent: 2 + - uid: 2635 + components: + - type: Transform + pos: 4.5,-13.5 + parent: 2 - uid: 2640 components: - type: Transform pos: 2.5,-20.5 parent: 2 + - uid: 2643 + components: + - type: Transform + pos: 4.5,-14.5 + parent: 2 + - uid: 2644 + components: + - type: Transform + pos: -12.5,-13.5 + parent: 2 + - uid: 2646 + components: + - type: Transform + pos: -13.5,-13.5 + parent: 2 - uid: 2649 components: - type: Transform pos: 66.5,34.5 parent: 2 - - uid: 2654 - components: - - type: Transform - pos: -6.5,-21.5 - parent: 2 - uid: 2656 components: - type: Transform @@ -112797,6 +112826,21 @@ entities: - type: Transform pos: -7.5,-11.5 parent: 2 + - uid: 2680 + components: + - type: Transform + pos: 4.5,-17.5 + parent: 2 + - uid: 2683 + components: + - type: Transform + pos: 4.5,-16.5 + parent: 2 + - uid: 2685 + components: + - type: Transform + pos: 4.5,-15.5 + parent: 2 - uid: 2689 components: - type: Transform @@ -113177,11 +113221,6 @@ entities: - type: Transform pos: 8.5,-38.5 parent: 2 - - uid: 3340 - components: - - type: Transform - pos: -6.5,-20.5 - parent: 2 - uid: 3430 components: - type: Transform @@ -113297,11 +113336,6 @@ entities: - type: Transform pos: 3.5,-15.5 parent: 2 - - uid: 4841 - components: - - type: Transform - pos: -7.5,-20.5 - parent: 2 - uid: 4852 components: - type: Transform @@ -113869,6 +113903,11 @@ entities: - type: Transform pos: 44.5,-19.5 parent: 2 + - uid: 1329 + components: + - type: Transform + pos: -12.5,-20.5 + parent: 2 - uid: 1396 components: - type: Transform @@ -113929,35 +113968,55 @@ entities: - type: Transform pos: 52.5,-19.5 parent: 2 - - uid: 2516 + - uid: 2481 components: - type: Transform - pos: -7.5,-14.5 + pos: -11.5,-20.5 parent: 2 - - uid: 2552 + - uid: 2496 components: - type: Transform - pos: -7.5,-19.5 + pos: -12.5,-19.5 + parent: 2 + - uid: 2506 + components: + - type: Transform + pos: -12.5,-17.5 + parent: 2 + - uid: 2511 + components: + - type: Transform + pos: -12.5,-16.5 + parent: 2 + - uid: 2512 + components: + - type: Transform + pos: -12.5,-18.5 + parent: 2 + - uid: 2564 + components: + - type: Transform + pos: -11.5,-14.5 + parent: 2 + - uid: 2588 + components: + - type: Transform + pos: -10.5,-20.5 parent: 2 - uid: 2614 components: - type: Transform - pos: -10.5,-17.5 + pos: -8.5,-20.5 parent: 2 - - uid: 2635 + - uid: 2654 components: - type: Transform - pos: -8.5,-19.5 + pos: -12.5,-15.5 parent: 2 - - uid: 2643 + - uid: 2655 components: - type: Transform - pos: -10.5,-19.5 - parent: 2 - - uid: 2644 - components: - - type: Transform - pos: -9.5,-19.5 + pos: -12.5,-14.5 parent: 2 - uid: 2705 components: @@ -113984,21 +114043,11 @@ entities: - type: Transform pos: 19.5,-16.5 parent: 2 - - uid: 3943 - components: - - type: Transform - pos: -10.5,-15.5 - parent: 2 - uid: 3958 components: - type: Transform pos: 20.5,-16.5 parent: 2 - - uid: 3970 - components: - - type: Transform - pos: -10.5,-16.5 - parent: 2 - uid: 3984 components: - type: Transform @@ -114019,11 +114068,6 @@ entities: - type: Transform pos: -7.5,-13.5 parent: 2 - - uid: 4127 - components: - - type: Transform - pos: -6.5,-19.5 - parent: 2 - uid: 4155 components: - type: Transform @@ -114044,11 +114088,6 @@ entities: - type: Transform pos: -2.5,-12.5 parent: 2 - - uid: 4175 - components: - - type: Transform - pos: -10.5,-14.5 - parent: 2 - uid: 4266 components: - type: Transform @@ -114119,11 +114158,6 @@ entities: - type: Transform pos: -2.5,7.5 parent: 2 - - uid: 4672 - components: - - type: Transform - pos: -7.5,-18.5 - parent: 2 - uid: 4680 components: - type: Transform @@ -114134,11 +114168,6 @@ entities: - type: Transform pos: 1.5,4.5 parent: 2 - - uid: 4714 - components: - - type: Transform - pos: -10.5,-18.5 - parent: 2 - uid: 4722 components: - type: Transform @@ -114259,6 +114288,36 @@ entities: - type: Transform pos: 16.5,-15.5 parent: 2 + - uid: 8169 + components: + - type: Transform + pos: -8.5,-14.5 + parent: 2 + - uid: 8170 + components: + - type: Transform + pos: -7.5,-20.5 + parent: 2 + - uid: 8171 + components: + - type: Transform + pos: -6.5,-20.5 + parent: 2 + - uid: 8172 + components: + - type: Transform + pos: -9.5,-20.5 + parent: 2 + - uid: 8349 + components: + - type: Transform + pos: -8.5,-17.5 + parent: 2 + - uid: 8350 + components: + - type: Transform + pos: -8.5,-16.5 + parent: 2 - uid: 8865 components: - type: Transform @@ -124614,11 +124673,21 @@ entities: - type: Transform pos: -15.5,-7.5 parent: 2 + - uid: 2553 + components: + - type: Transform + pos: -10.5,-32.5 + parent: 2 - uid: 2554 components: - type: Transform pos: -15.5,-6.5 parent: 2 + - uid: 2568 + components: + - type: Transform + pos: -10.5,-28.5 + parent: 2 - uid: 2577 components: - type: Transform @@ -124994,6 +125063,11 @@ entities: - type: Transform pos: 7.5,-6.5 parent: 2 + - uid: 4187 + components: + - type: Transform + pos: -9.5,-28.5 + parent: 2 - uid: 4190 components: - type: Transform @@ -125124,6 +125198,11 @@ entities: - type: Transform pos: -8.5,2.5 parent: 2 + - uid: 4636 + components: + - type: Transform + pos: -8.5,-28.5 + parent: 2 - uid: 4637 components: - type: Transform @@ -125159,6 +125238,11 @@ entities: - type: Transform pos: -12.5,-10.5 parent: 2 + - uid: 4660 + components: + - type: Transform + pos: -6.5,-28.5 + parent: 2 - uid: 4670 components: - type: Transform @@ -125169,11 +125253,21 @@ entities: - type: Transform pos: -5.5,-5.5 parent: 2 + - uid: 4672 + components: + - type: Transform + pos: -9.5,-32.5 + parent: 2 - uid: 4678 components: - type: Transform pos: -4.5,-6.5 parent: 2 + - uid: 4714 + components: + - type: Transform + pos: -8.5,-32.5 + parent: 2 - uid: 4716 components: - type: Transform @@ -125184,6 +125278,11 @@ entities: - type: Transform pos: -6.5,-9.5 parent: 2 + - uid: 4841 + components: + - type: Transform + pos: -7.5,-32.5 + parent: 2 - uid: 4881 components: - type: Transform @@ -125209,6 +125308,21 @@ entities: - type: Transform pos: 23.5,15.5 parent: 2 + - uid: 5094 + components: + - type: Transform + pos: -6.5,-32.5 + parent: 2 + - uid: 5101 + components: + - type: Transform + pos: -7.5,-28.5 + parent: 2 + - uid: 5107 + components: + - type: Transform + pos: -6.5,-29.5 + parent: 2 - uid: 5138 components: - type: Transform @@ -125283,6 +125397,11 @@ entities: layers: - sprite: _CP14/Structures/Wallpaper/wallpaper_yellow.rsi state: left + - uid: 5694 + components: + - type: Transform + pos: -6.5,-31.5 + parent: 2 - uid: 5712 components: - type: Transform @@ -125503,6 +125622,11 @@ entities: layers: - sprite: _CP14/Structures/Wallpaper/wallpaper_yellow.rsi state: right + - uid: 8146 + components: + - type: Transform + pos: -6.5,-30.5 + parent: 2 - uid: 8148 components: - type: Transform @@ -125573,12 +125697,6 @@ entities: rot: -1.5707963267948966 rad pos: -3.3085613,-17.70248 parent: 2 - - uid: 2553 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.0641885,-18.72572 - parent: 2 - uid: 2555 components: - type: Transform @@ -125800,6 +125918,13 @@ entities: - type: Transform pos: 81.5,30.5 parent: 2 +- proto: CP14WoodenCabinetAlchemist + entities: + - uid: 3564 + components: + - type: Transform + pos: -10.5,-29.5 + parent: 2 - proto: CP14WoodenCabinetBanker entities: - uid: 5135 @@ -125892,6 +126017,11 @@ entities: parent: 2 - proto: CP14WoodenClosetAlchemyFilled entities: + - uid: 3565 + components: + - type: Transform + pos: -9.5,-29.5 + parent: 2 - uid: 13267 components: - type: Transform @@ -126068,11 +126198,6 @@ entities: - type: Transform pos: -2.5,-16.5 parent: 2 - - uid: 4660 - components: - - type: Transform - pos: -0.5,-13.5 - parent: 2 - uid: 4781 components: - type: Transform @@ -126093,4 +126218,4 @@ entities: - type: Transform pos: 0.5,-11.5 parent: 2 -... \ No newline at end of file +... diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml index 7bc3ed4ac5..93cb0c8c00 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml @@ -80,6 +80,7 @@ - id: CP14StampDenied - id: CP14StampApproved - id: CP14StampCommandant + - id: CP14PaperFolderBlue - type: entity parent: CP14SafeVault @@ -167,4 +168,17 @@ - id: CP14EnergyCrystalSmall - id: CP14CrystalLampBlueEmpty - id: CP14StampGuardCommander - - id: CP14BookImperialLawsHandBook \ No newline at end of file + - id: CP14BookImperialLawsHandBook + +- type: entity + parent: CP14WoodenCloset + id: CP14WoodenClosetGuildmasterFilled + suffix: Guildmaster, Filled + components: + - type: StorageFill + contents: + - id: CP14StampGuildmaster + - id: HandLabeler #TODO custom cp14 labeler + - id: CP14StampDenied + - id: CP14StampApproved + - id: CP14PaperFolderBlue \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml b/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml index 06dd451e46..1db7a171fa 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml @@ -94,4 +94,18 @@ - id: CP14ClothingShirtGuardsChainmailShirtB prob: 0.7 - id: CP14ClothingCloakGuardCommander - prob: 1 \ No newline at end of file + prob: 1 + +- type: entity + parent: CP14WoodenCabinet + id: CP14WoodenCabinetGuildmaster + suffix: Guildmaster, Filled + components: + - type: StorageFill + contents: + - id: CP14ClothingCloakGuildmasterCape + prob: 1 + - id: CP14ClothingShirtGuildmasterVest + prob: 0.6 + - id: CP14ClothingShirtGuildmasterVest2 + prob: 0.6 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/bank.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/bank.yml index 3f65902585..20f965aeb4 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/bank.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/bank.yml @@ -1,12 +1,11 @@ - type: entity parent: - CP14ClothingCloakBase - - ClothingSlotBase - id: CP14ClothingCloakCommandantJacket - name: commandant's jacket - description: the colors white and gold tell you that you're looking at a higher power. + id: CP14ClothingCloakCommandantJacket #TODO: Rename from Jacket to Cape + name: commandant's cape + description: The colors white and gold tell you that you're looking at a higher power. components: - type: Sprite - sprite: _CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi + sprite: _CP14/Clothing/Cloak/Roles/Bank/commandant_cape.rsi - type: Clothing - sprite: _CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi \ No newline at end of file + sprite: _CP14/Clothing/Cloak/Roles/Bank/commandant_cape.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/guildmaster.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/guildmaster.yml new file mode 100644 index 0000000000..4bead421c5 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/guildmaster.yml @@ -0,0 +1,11 @@ +- type: entity + parent: + - CP14ClothingCloakBase + id: CP14ClothingCloakGuildmasterCape + name: guildmaster cape + description: The colors green and gold tell you that you're looking at a higher power. + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/Roles/Mercenary/guildmaster_cape.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/Roles/Mercenary/guildmaster_cape.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/banker.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/banker.yml new file mode 100644 index 0000000000..107467bf77 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/banker.yml @@ -0,0 +1,22 @@ +- type: entity + parent: + - ClothingSlotBase + - CP14ClothingOuterClothingBase + id: CP14ClothingOuterClothingBankerWaistCoat + name: "banker's waistcoat" + description: Stylish waistcoat made of expensive leather. A special uniform for bank employees that makes customers feel like beggars. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi + +- type: entity + parent: CP14ClothingOuterClothingBankerWaistCoat + id: CP14ClothingOuterClothingBankerWaistCoatOpen + name: "open banker's waistcoat" + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml index 2c482787f1..880b45ad9d 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml @@ -147,25 +147,6 @@ - type: Clothing sprite: _CP14/Clothing/Shirt/Roles/General/white_collar.rsi -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtCottonWhiteGreenVest - name: cotton white green vest shirt - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/white_green_vest.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/white_green_vest.rsi - -- type: entity - parent: CP14ClothingShirtCottonWhiteGreenVest - id: CP14ClothingShirtCottonWhiteGreenVest2 - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/white_green_vest2.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/white_green_vest2.rsi - - type: entity parent: CP14ClothingShirtBase id: CP14ClothingShirtCottonYellow diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guildmaster.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guildmaster.yml new file mode 100644 index 0000000000..81c2e9893c --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guildmaster.yml @@ -0,0 +1,18 @@ +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtGuildmasterVest + name: cotton white green vest shirt + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi + +- type: entity + parent: CP14ClothingShirtGuildmasterVest + id: CP14ClothingShirtGuildmasterVest2 + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml index 13bcf2713b..64ea6930eb 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml @@ -96,8 +96,7 @@ - type: Sprite layers: - state: green - - state: adventurer #TODO - color: red + - state: guildmaster # Artisans diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml index 9cbbd0374d..313ebc756f 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml @@ -337,15 +337,24 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] - - map: [ "shirt" ] - - map: [ "pants" ] + - shader: StencilClear + sprite: _CP14/Mobs/Species/Human/parts.rsi + state: l_leg + - shader: StencilMask + map: [ "enum.HumanoidVisualLayers.StencilMask" ] + sprite: Mobs/Customization/masking_helpers.rsi + state: unisex_full + visible: false - map: [ "enum.HumanoidVisualLayers.LFoot" ] - map: [ "enum.HumanoidVisualLayers.RFoot" ] + - map: [ "shoes" ] + - map: [ "shirt" ] + - map: [ "pants" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] - map: [ "gloves" ] - - map: [ "shoes" ] - map: [ "ears" ] + - map: [ "outerClothing" ] - map: [ "cloak" ] - map: [ "eyes" ] - map: [ "belt1" ] diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml index 58951ba2ed..9cd4986618 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml @@ -132,17 +132,18 @@ sprite: Mobs/Customization/masking_helpers.rsi state: unisex_full visible: false - - map: [ "shirt" ] - - map: [ "pants" ] - map: [ "enum.HumanoidVisualLayers.LFoot" ] - map: [ "enum.HumanoidVisualLayers.RFoot" ] + - map: [ "shoes" ] + - map: [ "shirt" ] + - map: [ "pants" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] - map: [ "enum.HumanoidVisualLayers.HeadSide" ] # Bark Before clothing - map: [ "enum.HumanoidVisualLayers.HeadTop" ] # Bark Before clothing - map: [ "gloves" ] - - map: [ "shoes" ] - map: [ "ears" ] + - map: [ "outerClothing" ] - map: [ "cloak" ] - map: [ "eyes" ] - map: [ "belt1" ] diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/stamps.yml b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/stamps.yml index f3ac073999..fa3062c94b 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/stamps.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/stamps.yml @@ -69,4 +69,17 @@ stampedColor: "#436a92" stampState: "guard_on_paper" - type: Sprite - state: guard \ No newline at end of file + state: guard + +- type: entity + id: CP14StampGuildmaster + parent: CP14StampBase + name: guildmaster stamp + suffix: DO NOT MAP + components: + - type: Stamp + stampedName: cp14-stamp-guildmaster + stampedColor: "#115c41" + stampState: "guildmaster_on_paper" + - type: Sprite + state: guildmaster \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/guildmaster.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/guildmaster.yml new file mode 100644 index 0000000000..2d040c6671 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/guildmaster.yml @@ -0,0 +1,15 @@ +- type: entity + parent: CP14BaseKey + id: CP14KeyGuildmaster + suffix: Guildmaster + components: + - type: CP14Key + autoGenerateShape: Guildmaster + +- type: entity + parent: CP14BaseKey + id: CP14KeyDemiplaneCrystal + suffix: Demiplane Crystal + components: + - type: CP14Key + autoGenerateShape: DemiplaneCrystal \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml index 9d7c0ccd22..9536cd6ea2 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml @@ -124,3 +124,13 @@ - id: CP14KeyGuard - id: CP14KeyGuardCommander #- id: CP14KeyGuardWeaponStorage + +- type: entity + parent: CP14BaseKeyRing + id: CP14KeyRingGuildmaster + suffix: Guildmaster + components: + - type: StorageFill + contents: + - id: CP14KeyGuildmaster + - id: CP14KeyDemiplaneCrystal diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/personalHouse.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/personalHouse.yml index 7338fbff78..1331ab2fd1 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/personalHouse.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/personalHouse.yml @@ -89,4 +89,52 @@ suffix: PersonalHouse10 components: - type: CP14Key - autoGenerateShape: PersonalHouse10 \ No newline at end of file + autoGenerateShape: PersonalHouse10 + +- type: entity + parent: CP14BaseKey + id: CP14KeyPersonalHouse11 + suffix: PersonalHouse11 + components: + - type: CP14Key + autoGenerateShape: PersonalHouse11 + +- type: entity + parent: CP14BaseKey + id: CP14KeyPersonalHouse12 + suffix: PersonalHouse12 + components: + - type: CP14Key + autoGenerateShape: PersonalHouse12 + +- type: entity + parent: CP14BaseKey + id: CP14KeyPersonalHouse13 + suffix: PersonalHouse13 + components: + - type: CP14Key + autoGenerateShape: PersonalHouse13 + +- type: entity + parent: CP14BaseKey + id: CP14KeyPersonalHouse14 + suffix: PersonalHouse14 + components: + - type: CP14Key + autoGenerateShape: PersonalHouse14 + +- type: entity + parent: CP14BaseKey + id: CP14KeyPersonalHouse15 + suffix: PersonalHouse15 + components: + - type: CP14Key + autoGenerateShape: PersonalHouse15 + +- type: entity + parent: CP14BaseKey + id: CP14KeyPersonalHouse16 + suffix: PersonalHouse16 + components: + - type: CP14Key + autoGenerateShape: PersonalHouse16 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/alchemist.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/alchemist.yml index b8de4b1485..3ee04785f3 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/alchemist.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/alchemist.yml @@ -32,4 +32,21 @@ - CP14WoodenDoorTavernAlchemy2 - CP14WoodenDoorMirrored id: CP14WoodenDoorTavernAlchemyMirrored2 - suffix: Alchemy 2, Mirrored \ No newline at end of file + suffix: Alchemy 2, Mirrored + +- type: entity + parent: CP14WoodenDoor + id: CP14WoodenDoorTavernAlchemy3 + suffix: Alchemy 3 + components: + - type: CP14Lock + autoGenerateShape: Alchemy3 + - type: Lock + locked: true + +- type: entity + parent: + - CP14WoodenDoorTavernAlchemy3 + - CP14WoodenDoorMirrored + id: CP14WoodenDoorTavernAlchemyMirrored3 + suffix: Alchemy 3, Mirrored \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/blacksmith.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/blacksmith.yml index 76afe1a49c..01ab67b6a2 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/blacksmith.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/blacksmith.yml @@ -30,4 +30,21 @@ - CP14IronDoorBlacksmith2 - CP14IronDoorMirrored id: CP14IronDoorMirroredBlacksmith2 - suffix: Blacksmith 2, Mirrored \ No newline at end of file + suffix: Blacksmith 2, Mirrored + +- type: entity + parent: CP14IronDoor + id: CP14IronDoorBlacksmith3 + suffix: Blacksmith 3 + components: + - type: CP14Lock + autoGenerateShape: Blacksmith3 + - type: Lock + locked: true + +- type: entity + parent: + - CP14IronDoorBlacksmith3 + - CP14IronDoorMirrored + id: CP14IronDoorMirroredBlacksmith3 + suffix: Blacksmith 3, Mirrored \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/guildmaster.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/guildmaster.yml index 5331928a7a..5008e3e49d 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/guildmaster.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/guildmaster.yml @@ -17,5 +17,15 @@ components: - type: CP14Lock autoGenerateShape: Guildmaster + - type: Lock + locked: true + +- type: entity + parent: CP14FenceIronGrilleGate + id: CP14FenceIronGrilleGateDemiplaneCrystal + suffix: DemiplaneCrystal + components: + - type: CP14Lock + autoGenerateShape: DemiplaneCrystal - type: Lock locked: true \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/personalHouse.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/personalHouse.yml index f2f386cf19..0b78322bef 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/personalHouse.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/personalHouse.yml @@ -147,5 +147,15 @@ components: - type: CP14Lock autoGenerateShape: PersonalHouse15 + - type: Lock + locked: true + +- type: entity + parent: CP14WoodenDoor + id: CP14WoodenDoorPersonalHouse16 + suffix: PersonalHouse16 + components: + - type: CP14Lock + autoGenerateShape: PersonalHouse16 - type: Lock locked: true \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/GameRules/roundstart.yml b/Resources/Prototypes/_CP14/GameRules/roundstart.yml index fe1b2518e0..d94fba9056 100644 --- a/Resources/Prototypes/_CP14/GameRules/roundstart.yml +++ b/Resources/Prototypes/_CP14/GameRules/roundstart.yml @@ -17,9 +17,20 @@ CP14Bank: - CP14BankEarningObjectiveGroup - type: CP14PersonalObjectivesRule - departmentObjectives: - CP14Mercenary: + roleObjectives: + CP14Guildmaster: + - CP14GuildmasterNoDemiplaneObjectiveGroup + CP14Adventurer: - CP14PersonalCurrencyCollectObjectiveGroup + CP14Alchemist: + - CP14PersonalCurrencyCollectObjectiveGroup + CP14Apprentice: + - CP14PersonalCurrencyCollectObjectiveGroup + CP14Blacksmith: + - CP14PersonalCurrencyCollectObjectiveGroup + CP14Innkeeper: + - CP14PersonalCurrencyCollectObjectiveGroup + - type: entity id: CP14SociopathsRule diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/bank.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/bank.yml index 7332c0b369..e9d733c18f 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/bank.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/bank.yml @@ -13,29 +13,25 @@ equipment: head: CP14ClothingHeadBowler -- type: loadoutGroup - id: CP14CommandantHead - name: cp14-loadout-commandant-head - loadouts: - - CP14ClothingHeadBowlerGolden - -- type: loadout - id: CP14ClothingHeadBowlerGolden - equipment: - head: CP14ClothingHeadBowlerGolden - -# Cloak +# OuterClothing - type: loadoutGroup - id: CP14CommandantCloak - name: cp14-loadout-commandant-cloak + id: CP14BankOuterClothing + name: cp14-loadout-banker-outer + minLimit: 0 loadouts: - - CP14ClothingCloakCommandantJacket + - CP14ClothingOuterClothingBankerWaistCoat + - CP14ClothingOuterClothingBankerWaistCoatOpen - type: loadout - id: CP14ClothingCloakCommandantJacket + id: CP14ClothingOuterClothingBankerWaistCoat equipment: - cloak: CP14ClothingCloakCommandantJacket + outerClothing: CP14ClothingOuterClothingBankerWaistCoat + +- type: loadout + id: CP14ClothingOuterClothingBankerWaistCoatOpen + equipment: + outerClothing: CP14ClothingOuterClothingBankerWaistCoatOpen # Shirt diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/commandant.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/commandant.yml new file mode 100644 index 0000000000..7250e6312a --- /dev/null +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/commandant.yml @@ -0,0 +1,26 @@ + +# Head + +- type: loadoutGroup + id: CP14CommandantHead + name: cp14-loadout-commandant-head + loadouts: + - CP14ClothingHeadBowlerGolden + +- type: loadout + id: CP14ClothingHeadBowlerGolden + equipment: + head: CP14ClothingHeadBowlerGolden + +# Cloak + +- type: loadoutGroup + id: CP14CommandantCloak + name: cp14-loadout-commandant-cloak + loadouts: + - CP14ClothingCloakCommandantJacket + +- type: loadout + id: CP14ClothingCloakCommandantJacket + equipment: + cloak: CP14ClothingCloakCommandantJacket \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 057f24b197..a225fad3a4 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -275,8 +275,6 @@ - CP14ClothingShirtCottonWhiteBrownVest2 - CP14ClothingShirtCottonWhiteBrownVest3 - CP14ClothingShirtCottonWhiteCollar - - CP14ClothingShirtCottonWhiteGreenVest - - CP14ClothingShirtCottonWhiteGreenVest2 - CP14ClothingShirtCottonYellow - CP14ClothingShirtCottonYellowCollar @@ -350,16 +348,6 @@ equipment: shirt: CP14ClothingShirtCottonWhiteCollar -- type: loadout - id: CP14ClothingShirtCottonWhiteGreenVest - equipment: - shirt: CP14ClothingShirtCottonWhiteGreenVest - -- type: loadout - id: CP14ClothingShirtCottonWhiteGreenVest2 - equipment: - shirt: CP14ClothingShirtCottonWhiteGreenVest2 - - type: loadout id: CP14ClothingShirtCottonYellow equipment: diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml new file mode 100644 index 0000000000..3df029e356 --- /dev/null +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml @@ -0,0 +1,50 @@ + +# Head + +# Cloak + +- type: loadoutGroup + id: CP14GuildmasterCloak + name: cp14-loadout-guildmaster-cloak + loadouts: + - CP14ClothingCloakGuildmasterCape + +- type: loadout + id: CP14ClothingCloakGuildmasterCape + equipment: + cloak: CP14ClothingCloakGuildmasterCape + +# Shirt + +- type: loadoutGroup + id: CP14GuildmasterShirt + name: cp14-loadout-guildmaster-shirt + loadouts: + - CP14ClothingShirtGuildmasterVest + - CP14ClothingShirtGuildmasterVest2 + +- type: loadout + id: CP14ClothingShirtGuildmasterVest + equipment: + shirt: CP14ClothingShirtGuildmasterVest + +- type: loadout + id: CP14ClothingShirtGuildmasterVest2 + equipment: + shirt: CP14ClothingShirtGuildmasterVest2 + +# Pants + +- type: loadoutGroup + id: CP14GuildmasterPants + name: cp14-loadout-guildmaster-pants + loadouts: + - CP14ClothingPantsAristocratic + +# Shoes + +- type: loadoutGroup + id: CP14GuildmasterShoes + name: cp14-loadout-guildmaster-shoes + loadouts: + - CP14ShoesAristocraticBlack \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index 6bb66891cf..ea09f61a3c 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -108,17 +108,31 @@ - CP14CommandantHead - CP14GeneralEyes - CP14CommandantCloak + - CP14BankOuterClothing - CP14BankShirt - CP14BankPants - CP14BankShoes - CP14GeneralBack - CP14GeneralTrinkets +- type: roleLoadout + id: JobCP14Guildmaster + groups: + - CP14GeneralSpells + - CP14GeneralEyes + - CP14GuildmasterCloak + - CP14GuildmasterShirt + - CP14GuildmasterPants + - CP14GuildmasterShoes + - CP14GeneralBack + - CP14GeneralTrinkets + - type: roleLoadout id: JobCP14Banker groups: - CP14GeneralSpells - CP14BankHead + - CP14BankOuterClothing - CP14GeneralEyes - CP14BankShirt - CP14BankPants diff --git a/Resources/Prototypes/_CP14/LockCategories/lockTypes.yml b/Resources/Prototypes/_CP14/LockCategories/lockTypes.yml index 12dca97475..0d2afed63e 100644 --- a/Resources/Prototypes/_CP14/LockCategories/lockTypes.yml +++ b/Resources/Prototypes/_CP14/LockCategories/lockTypes.yml @@ -67,37 +67,56 @@ complexity: 3 name: cp14-lock-shape-tavern-dorm5 -# Mercenary +# Artisans - type: CP14LockType id: Alchemy1 group: Alchemist - complexity: 3 + complexity: 4 name: cp14-lock-shape-alchemist1 - type: CP14LockType id: Alchemy2 group: Alchemist - complexity: 3 + complexity: 4 name: cp14-lock-shape-alchemist2 + +- type: CP14LockType + id: Alchemy3 + group: Alchemist + complexity: 4 + name: cp14-lock-shape-alchemist3 - type: CP14LockType id: Blacksmith1 group: Blacksmith - complexity: 3 + complexity: 4 name: cp14-lock-shape-blacksmith1 - type: CP14LockType id: Blacksmith2 group: Blacksmith - complexity: 3 + complexity: 4 name: cp14-lock-shape-blacksmith2 +- type: CP14LockType + id: Blacksmith3 + group: Blacksmith + complexity: 4 + name: cp14-lock-shape-blacksmith3 + +# Mercenary + - type: CP14LockType id: Guildmaster complexity: 5 name: cp14-lock-shape-guildmaster +- type: CP14LockType + id: DemiplaneCrystal + complexity: 5 + name: cp14-lock-shape-demiplane-crystal + # Personal house - type: CP14LockType @@ -190,6 +209,12 @@ complexity: 3 name: cp14-lock-shape-personalhouse15 +- type: CP14LockType + id: PersonalHouse16 + group: PersonalHouse + complexity: 3 + name: cp14-lock-shape-personalhouse16 + # Guard - type: CP14LockType diff --git a/Resources/Prototypes/_CP14/Maps/arenas.yml b/Resources/Prototypes/_CP14/Maps/arenas.yml index 74cdcae745..3d644a037e 100644 --- a/Resources/Prototypes/_CP14/Maps/arenas.yml +++ b/Resources/Prototypes/_CP14/Maps/arenas.yml @@ -28,13 +28,18 @@ mapNameTemplate: "Comoss island" - type: StationJobs availableJobs: - CP14Apprentice: [ 5, 5 ] + #Mercenary + CP14Guildmaster: [1, 1] CP14Adventurer: [ -1, -1 ] + #Artisans + CP14Apprentice: [ 5, 5 ] CP14Alchemist: [ 2, 2 ] CP14Blacksmith: [ 2, 2 ] CP14Innkeeper: [ 3, 4 ] + #Bank CP14Commandant: [1, 1] CP14Banker: [3, 4] + #Guard CP14Guard: [8, 8] CP14GuardCommander: [1, 1] - type: CP14StationZLevels diff --git a/Resources/Prototypes/_CP14/Objectives/empire_orders.yml b/Resources/Prototypes/_CP14/Objectives/empire_orders.yml index 7e86c393ce..cf059cf82f 100644 --- a/Resources/Prototypes/_CP14/Objectives/empire_orders.yml +++ b/Resources/Prototypes/_CP14/Objectives/empire_orders.yml @@ -18,7 +18,7 @@ minCollectionSize: 5 maxCollectionSize: 10 objectiveText: cp14-objective-town-send-title - descriptionText: cp14-objective-town-send-desc + objectiveDescription: cp14-objective-town-send-desc - type: Objective - type: entity @@ -87,4 +87,25 @@ id: CP14BankEarningObjectiveGroup weights: CP14TownBankEarningObjectiveMedium: 0.6 - CP14TownBankEarningObjectiveBig: 0.3 \ No newline at end of file + CP14TownBankEarningObjectiveBig: 0.3 + +# No Demiplane death objective +- type: entity + parent: CP14BaseTownObjective + id: CP14GuildmasterNoDemiplaneDeathObjective + components: + - type: CP14StatisticRangeCondition + statistic: DemiplaneDeaths + range: + min: 0 + max: 3 #TODO Adaptive to player count + objectiveText: cp14-objective-no-demiplane-death-title + objectiveDescription: cp14-objective-no-demiplane-death-desc + objectiveSprite: + sprite: /Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi + state: tool + +- type: weightedRandom + id: CP14GuildmasterNoDemiplaneObjectiveGroup + weights: + CP14GuildmasterNoDemiplaneDeathObjective: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Objectives/personal_objectives.yml b/Resources/Prototypes/_CP14/Objectives/personal_objectives.yml index 95d9f7c1c5..f8ae92d123 100644 --- a/Resources/Prototypes/_CP14/Objectives/personal_objectives.yml +++ b/Resources/Prototypes/_CP14/Objectives/personal_objectives.yml @@ -36,4 +36,4 @@ - type: weightedRandom id: CP14PersonalCurrencyCollectObjectiveGroup weights: - CP14PersonalCurrencyCollectObjective: 1 + CP14PersonalCurrencyCollectObjective: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml index 03d1af10f6..8a73dfbaf7 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml @@ -28,4 +28,4 @@ - CP14EnergyCrystalSmall equipment: belt1: CP14WalletFilledTest - keys: CP14KeyRingInnkeeper \ No newline at end of file + keys: CP14KeyRingGuildmaster \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/stat_trackers.yml b/Resources/Prototypes/_CP14/stat_trackers.yml new file mode 100644 index 0000000000..10204af15c --- /dev/null +++ b/Resources/Prototypes/_CP14/stat_trackers.yml @@ -0,0 +1,7 @@ +- type: statisticTracker + id: DemiplaneOpen + text: cp14-tracker-demiplane-open + +- type: statisticTracker + id: DemiplaneDeaths + text: cp14-tracker-demiplane-deaths \ No newline at end of file diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_cape.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_cape.rsi/equipped-CLOAK.png new file mode 100644 index 0000000000000000000000000000000000000000..dfc1d871ee41daba986e24142eed3aa6ac002016 GIT binary patch literal 1347 zcmV-J1-$x+P)Px({YgYYRCt{2nomd^R~W#5N-+}lpp24i8VeqZyU{Evs{~dEEVXMw8hYrZk{~&> zgtQM8lIdad#@Ro! z^WJ86-O%~L!p_Y5_kHi1@4YwQ2QDryE-o%EF8@>NWDELzAp>ANzGz!Vrc9}bw(Z(? zdTxhfLDBGFB*NpB#{euW-pi{u5c<>{fUYOYssz6;WN2Eed9CZoyfWf>Z?Kn#u^1qy zh@u7jzK}6;X@o>#n}@L&n%2s>^JfWk_pmj0nJ+(n!JT<8Q%mm`98@`!U={w{`LkKi z0^L3Q_2(bv^)L5-Mc0!IMj{+Lc9iI3)Nu^&$qXW;rvSKq^9G$Kjx#g;faq)k;AMQa z0Z1}Aaog@}2l!;D8mD;VhdtjaYm6aue!Tx>W-)Q!$vE{n;_+s69 ze6jA-=>f#AoLEg?kVtF;@cHm3=Dk374*uPoJ6pJ5L-Z(A`7lNxxFtQVJ+E3wAhZ{B5ub3>l#zV-eQLQ5mn4 z0)&Ihoq=l6tThAs0t=s%i|`4B9I_qKuK?uFKp`rz2PlSk_jCWtqNIR>MohrU%2L*K zA?&Oq7bOJ<6Rak}oQ3BXSZ7-ZTgv#9Ex^gltUJO=V->g*^9Kn9r1X@nSG5zi+$({Y z;oOan9Ti&zWSn57S$ndccW-lZGwZr6tAK|Mnz!$w?aiC_a^JC6`a)j4p!aX-&Q-B9 zbL#{Jx_j`jfwni#wZJVrY!q$N_AGEn8(<;X4vhdyG;iPKgVkHi&3o~%X_kR|S@l+4 ze29m9#gs}$m|gt!hdJ~54qL5W;%u@tcbPMu9?sHqpf~n&Wv-btF<{5GeOm>* z(ihOo*=%Cy>V5tJhPq&U_A_9|)&gRBN6}7IIHV1rH@35ogtq!&7LwDXX<+E;&spPX z8yaU8Xd430>>0GZU3d;2UKVZN@i;90N4j?Lw;g7E>t7aEU$PwEv8~(ZYcYyFSE0|> zVuZSmWX5CZKh$-^_ByuOWY%}um??h|0+^h*T~~=CZy|D58W{&y?cJ!0i;Ihki;Ihk zi;K%Uhw`bZ)Hr;tq9lOd7cvGT5dhmo;#0*3VHty;Qd<6(&ae4AEEW=oi3#$ZqZFGiIiy0Ss9sNGm|#lq=xvRc%p?@vOXr z{9J(VzWR84^2!Q0=v;wvQ*wB`7Q$rZ zKuH0zG52?gk}aT6EWVQYK`N+>Px%G)Y83R9J=WmOW?_VHn4Mjcsxyp(-zDJuVTPY(5$kVwYqRaS$sRMA5>>)f zs)MtxB1#e4RqPNI7a;{nZ%b=ZMGj1kD>O&I7P(Auh!+#I&80DRFn>6B-{+otpWpr8 zk2@G@sG{{~Iong4ec!eK;rm`j=rKO=(;{w z0JpnfH*3MwN$Bi?_C;8?awOvuMC31&G@Vp@f{1J&?C-49ruqk{TRH9|G#;-jlxSKU zi-uYdK9OdnCSgemKB2bSX3Zpiuz+D4=nudr(p-IU6o4(ftS>*}Na8-P-zo&rsatCu z4mj=NPX~g$>)!#Pd?ph1Q$pwP$p?Im&k*)h*vj5O2pP=;%>Px&PDw;TRCt{2n!j(_P!Pwzt~zC@6a^+ihcJ*LMO9Q!S&>NRc#Fu|p$pE0`Ug~W z30)Z~RY7T&WGx_h%@l$VN-=|%0!y5Tk)^}ykUYx)8~foODAj!=BxFDC-hF+~&-e}? z2!bF8f>;1+q}bn^kBl`^ER1o_&A(+_&TcF;EN3^OasKGP*&eWxl5@0QQgW=>9tiuF z{0yqpH3k50w^L|V4)FE-_uTJFN{;Q9FVNM;0Dy8a@5{D`f2FVsV`!pTIl%Vjnsr_u zO|f6TKqj5Ud8;Gj-*b>X_)IzpV`$>fSrH$qSJrQ9s?1&=)~)kliZJWn3sL_sy#|zv zdFem>Z2)I32mtfECavd#?TDB z>_WK*Y;Uf`k^y#sX9Mr*WAr;cVVj=YpdIeu^5*u*ah?IVk0%4{a8df59`wd%;ol2o zz-jeZa#K03^tb!52fsf0hO5E7@b)Xb1f2GGo)OEWpa|T4S06tKeh)t#AJ6?Dv;;U# zO7}ax(4PL>cu4V2c(c1>1-=J7c`RQUUjG!s^ixuDuKx-Nf*=TjAP9mW2!bF8B1G&R z7=}4vHC0~uYpI$lGsB#)NV`LT`QZ77ixB5KI_`@H&p(li&}mA_Px$e@R3^R9J=WmAh&JK^R8Q1Pe(ixEqxuyhVeiU&zZTHa zG0|zXQ2olvxNI(;64kHJX|(p206?jj6RP480P%6`%UV@&iBd6V`WrAMuuRoc+d3W} z$LRJ(R+qCT(Cv+OCa_CvuL4bdK-E)2?@u@8zT29;2<&R4_oq}nwfPY|sK9d6%1Ho# zuwqWY&Js8`5(Ka?VHfHz$Gvte{7X8Rx00000NkvXXu0mjf0WrjH diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Mercenary/guildmaster_cape.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Mercenary/guildmaster_cape.rsi/equipped-CLOAK.png new file mode 100644 index 0000000000000000000000000000000000000000..0dacbaca1b7ef45a4c0ee20780538fae6263165f GIT binary patch literal 1179 zcmV;M1Z4Y(P)Px(RY^oaRCt{2nn7zDM-<2Z3dIiVINoBASd&I3h&q-+Cr-v5T0hqTg@qiMU7Uww zIcTnJ0RSG|&!Y0(2>J1uflAqg|MQz)_t0G1!c;MjiOd85kba!dOaI)%dtSR^IaCh- zVEy~wr1ghJfUD>bz`60~##T3u0KEUKluZCxR5y;`Sce@GiwnQ;0J?O{J-mm;%Bs|u zOb7VAf4Xa7Y&wHVdCxO`v$m7^vgXQGkt5Uz%XSv0yB3_xBxV=qfrwEMy!&I*835gP zokD*fo6fk=Qp^kK7m5G?INh~y>)Xo!j=KI^o3))(6**GfxD3D&9a4(xw{LVA@4ueN zOu(@mT)%w-ja~6M2sz-Sd5m5QpC7+dvNP$fMXDd@0!N{SQ{#h<3Ci=hBqDTW>Z?*O_3^=@Mu%pr>m4cw z0G)R|xFbX%)B%ol$Xr!ftNlsySU3blkXhAb<%en)pjh?S-0N6&0nM~=_sup+Et}an zoqES?E4AGIn#u0ZLo;nWzF9-5WkWMCE(G9^b5a-~H`vLq~nw z?cX-o^9MLjg6Y&d@9sb6$m}uNXy2C{86KKxqpt^3*|0+*fctpc&jCjqha>*?{=1W-nEgmY<82$y56|d}4gjFBvf9;73DY0@ z$xTxDouQdF?%c|F2EY8%>Iiiirw@$-{Pa2zO5zw!p-?Ck3WY+UQ2cj^{F)04&I?FC zbCMD+Eab>kF%JMJp?KAW|!Ek@Q=aAbn^bch)CPqRegRlB01W z<$yR7o=G7)$5ZjsS>x7YNJ5#sN=9V!J>vSI?76 znlSyMbpaG12LyBVEY`OV5`RGA>5!=lpa?w)26Od;ie}ovbpaG12dr-&q}qn=Za;<& tY#&6QWrDN~-K!1Qyntv_C=`mJ=UPx%K1oDDR9J=WmcMHnVHn3hno{9B&4ENYQIwEh)S**LaH$z;p_`DckR>36{s*1X z#Xll6Q^y1h6daTy87g*3p^(xf9kfs{XKOi)T6OR`_ycVky&GBx^#jMf_r71A=gSw4 z=Y<(FX8iA1%!or9OZqg;N%pg;nuf)JRkscxdY#luwJYbN`^D3;;kvhsHeQLXQ&lU& z{ZSL5*NHvo!5;K5?{PsguNyToH?8@-r;iZ*3!EkMh<+E_Qir`Q4Z-T;)w7=nRv&v? z8v0j(_pLd;WInJGTW2v6qEWcmsa6^(BH!YJ$6@kF;9gixImPwc? z$b zOO3aEBWkI}e9UFYz_keoipKt0md&<;+tQ^eOEhJPoJ0C!0zEUm$8G7d*;d$J%U((6 zcdkvKDN96;?tl%-dJ%WOP}pT7srP(mDsAfhb!;SovTo(TCUbBk)098Lr|;$s2#QAf z!7;mOnU|I><&mbtF?(7b>N8%aJ}@&#ARbk?f7qIsz{GhyxB=BmHB*<2z^Ypx%nP$O eq!}~*Illn9RPlwuLKyV`0000Px%@kvBMRCt{2nz3#gK@f)jODG~hasxt<4qZwRZlSS={0c-oLGl9d2JT%XbtJz* zB+FH#v=$AtL`Qo%niG_O+)WCyrv>)p+uJ)1%zTn1dw0Dv^E10Q_6@)=48t%CbD>yq z7q%M}0)WYE8TmV6&DdQWtg)=vra(joV_!ahBBxfyXc{PeXg4Z!b6tZMtnm2k#Woh- zD*(N&L-WNt(gC|#+A%H%q9Z^Q!p3~DKA02ZV|QWc*wXfD&~MSc%Dt{bPOXd|zy9v* zm$m@1t!BL#j=BCO{N#y9%T__xxNKM;9O`u)Ql(#7!HXjXY=c(KYkmCC6kxts!}T|4 z){9{#h~Qm+bC8;rWhu{dQtWC8POYq*6XRodp(Xgcq|P+!#W47<-#T04-#;YXE;qCV z7)^sP{YKLO08sFsaDR7;&hRB&@Agn#eme6iv<0xMB>>wqXje;c{SAf>S19;T;Tj?e zztTeNr8mtQKOHls)e?35| z`Ex-_06Ab$45`M>iA)^cPg|2ZV1KVpvl@A^h!Q;0N-z$pbDLCzBo}FBm7oc)1(H^^ zs7vBP=&f+H49F6b?BNW^+W|qERih3Up8=T&kk^f#1kQlG9mpFNAa4iq=Hdl7S{-oA zKZbNT`3%VVk$Un109z5xskUGkhI#w68x@k@)?TC^y{<#Ou9KSxY1lV@xQf^00JK_D zOb|hPx$D@jB_R9J=Wls!(vKoCY>kPBp6N`vFZky|WLhBOF?GA&nt6Zi)76r3PuKsf_S zL)u7AYpom0DPxPy6lTJY1M*5(Q0!~GtDT+stZ!z)U@#c|m_gUT>&vjtiV}d;X4|@V zetJ>^1fIj=Q`$MN)ip3HN-oZP(tHO{e?1R8htPLfuJf)b0XWi%24<5Hf#G&UrvA{yI3V@K$_L}QyoRY;HMplyK=jqQE$ zo7*V>&kx7_3s|mm5>@Tj0G3*Ce|N<+e(7I;G+?4C0?#2)74dwCr54)7wFStiLDO(q zQOZ~n&xft)_;mpv3rfSuR|NGcKoAk%?RC(aS$KbP525=87z_r3;a~6yOaW|_IemWr P00000NkvXXu0mjfEDM~j literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..23f509e5b6de80ffddde89d9a65d1a14e2b6dfc6 GIT binary patch literal 482 zcmV<80UiE{P)Px$oJmAMRCt{2+P_Z1P!tC6a}5(Uaj~$Jbd}T*TugTcmnMA>cp77(51@;2;sK14 zs|jwVX%|vQ%6gnI6#wKF&LORSzl4E=9_V+tw>P<$2mk;800000>M9C-9>)Po*FBIf zs3pq_>i62>b;Sc1#{oy7FW#x=*LNdblSmegUPzZ!qcQ|Ex)p^!&(fuI+2+gv zqd`Zdu6O{mbV(X>!1eS^x+D=P{R1?*<+)BXo&rRA-O{M5@)Yn~N4hNCKPE-cGQ+ZWp!M88XJ~<)+t(2QWN27T*=pBp$%| zX}9!#-yN+=WeDuLH@MHx!~=MGnM;@a)i@5gX~WLS<`dy3SCiqF4>mRsW-h(9^{)bm zLccTwqR?lade#B7w)ma3;&%^;h{$st&hmopE-&aTzO}x-@c|_B1&szBTAd$ir4N;^ zuhmL$7pv20lbfST=M!ojfXzIR<;7?BJ=dXRzNmCeuU5-6n;ZUak+eDMYaOZt0Qhr0 Y06aX3pcq%_g8%>k07*qoM6N<$f>7+v_5c6? literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..aac7f5c90bdfd208f67af8b237c5a1f6d1bd455f GIT binary patch literal 470 zcmV;{0V)28P)Px$kV!;ARCt{2+A&MRKoke?7wMD;E{#P<$l6dxGf8*XO2H4{BrfeIaaQyjxD*7z zT^H9v-5kn(&^K2om7X>iS78HkWp|!apix_6I^IlM9l++@KR)bi{TfyV zP&VvUHat~S4j}2ajUSqLo_?6TTv6HlyB;Un0w`M%YGq<;jF}4`6U0*>@V&x3tYZr3 zAPyiuc$9S8{5`#7BBHDFFHPMtr=?OHb#_-@N+Px%en~_@RCt{2n!S$GKoo^f*c2#XMp_dudkKIwQfH&4cLU+o!e35cU5W@ zNx#>Ia5~CkvVGx)T87`tBP4#I@7_GcXwbsq)%`r(Sw-7`(V&HXuYIenxxU1+=Mzk3 zzY7zl;;szKlYzN1AkOUK7|r$Ntu`W3E@yd>eZ_~LB(41}wB`WdX7W*u!`a0#fZ{Vi zWn$ioRiSObD!59d+I$%#hDBY_8Uk_y6yFG?wby~t1eMGDzJ~33^5)8wguRR4X`c1Hf(@x0k)}h8QjOcz`?2 zZ4Tam%KpG8a{?^ty#vEA43m}duuIXmwFjxga|L;>ux5ho_yBGSCTxiCTtR22C&qD& zp9WP06IBqe63L6vR#@Ko`7$sTqRYz{PXGY)v2Tjcv3cFIIJ9lZVAf^d?>QaTuAKow8tc8|OA)qjkzaP!pg8#~FDL-&gTiPx$oJmAMRCt{2+P_Z1P!tC6a}5(Uaj~$Jbd}T*TugTcmnMA>cp77(51@;2;sK14 zs|jwVX%|vQ%6gnI6#wKF&LORSzl4E=9_V+tw>P<$2mk;800000>M9C-9>)Po*FBIf zs3pq_>i62>b;Sc1#{oy7FW#x=*LNdblSmegUPzZ!qcQ|Ex)p^!&(fuI+2+gv zqd`Zdu6O{mbV(X>!1eS^x+D=P{R1?*<+)BXo&rRA-O{M5@)Yn~N4hNCKPE-cGQ+ZWp!M88XJ~<)+t(2QWN27T*=pBp$%| zX}9!#-yN+=WeDuLH@MHx!~=MGnM;@a)i@5gX~WLS<`dy3SCiqF4>mRsW-h(9^{)bm zLccTwqR?lade#B7w)ma3;&%^;h{$st&hmopE-&aTzO}x-@c|_B1&szBTAd$ir4N;^ zuhmL$7pv20lbfST=M!ojfXzIR<;7?BJ=dXRzNmCeuU5-6n;ZUak+eDMYaOZt0Qhr0 Y06aX3pcq%_g8%>k07*qoM6N<$f>7+v_5c6? literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..aac7f5c90bdfd208f67af8b237c5a1f6d1bd455f GIT binary patch literal 470 zcmV;{0V)28P)Px$kV!;ARCt{2+A&MRKoke?7wMD;E{#P<$l6dxGf8*XO2H4{BrfeIaaQyjxD*7z zT^H9v-5kn(&^K2om7X>iS78HkWp|!apix_6I^IlM9l++@KR)bi{TfyV zP&VvUHat~S4j}2ajUSqLo_?6TTv6HlyB;Un0w`M%YGq<;jF}4`6U0*>@V&x3tYZr3 zAPyiuc$9S8{5`#7BBHDFFHPMtr=?OHb#_-@N+!Bf{Kae1_~!;lyo6Cok$T&P_k5Fh}6(B zmgPvLM2Q?nEL;>zjnuAJvAr9T&u0fG_OqKB!TU{4p5Oa_?|=V3KfmNXKp+qZ1OkEJ z2Su7y$QXkpjc(cAX|QU!g7TXeQ|qYN980Si+`g5Ps6GI*4X;o=Yu$XI#Nvr00HED! zLhI<}JxWZ5wd~3I15@8k+tmO7sPFDGWjTs!r3S5|JDQ+ob4-cJNN4Uq>l#?O`Kx(P z5Cg3GRyPhy z3c^X3AbqWCpxtW18p|ZrN)7Qu5;R!rkMB!v+GpH?(KuROucpqga051KrvkI@si+}9eFF&K*lI_pjc%;`>SMYwX zV-IAU9p}I7;)=Y;KI(^j!|$RWPb6*WPs9_+kwFvsaLIDl43ICJLu9y#^IvwM#AI7p z@nzlinS>+5O~@C{xpvSCv-BtNqdzkPKI(_k*hMsYM^ZiorgaU+44_ddZfR0#X@OCF zPf>8_yMNW0)OVW$W*RWAY__0vbXy8uy{_8QkTZd)v0Apixw0AV8x2s?nV5e9@EK-dTa!VVy8 zgaKg(@ZI9&r)wB(2?PRxzykN5Y578l0Wi0ztCgC0AmOyh7fQ?;2Y~s;k}s6l_D+NK z2Y&}l&F0MOe4)hDZ0^+FRcbcJ@`V!X4-VM&PJ^l0oOw+HG&kY?;J_wKCXf+x6CXnz zpB4k}KzLpW()pjsz4>;lX@2+muRnOSeL)&@V#JEpHIP;_;4#6o0lodQDQFd^BPqbw z=LO~gX(-E4+rcOrgm$aRwME9YF%lVWVt?>%bUhp#LrFaXFfv40j$&i1rFA_UHx{ie<};2yEiVfAY0-Bfj}S-2m}IwK=2GEh+#2 z01b3fPE-H?|NsC0|NsC0|Nj6z=pu#y000SaNLh0L01m?d0Dlg{0mpBsWB>pGY)M2x zR9HvtmPw9;FbqWOq+kaf-{1DXnDOgvG zh6k`Fsh=um1A|ClpApK9fjm5TSGBv!t8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00FQ`L_t(oh3%BFPr^_T z#=jaToCpw?vh%1A7=S@`qlte2#E!;Q7mSIciOQm@VXT40xR_wTQ5VGoLh~rA2?Gg^ zny{S%w6j54f9{(L_UV*xEKyEhe`hQ|>e^UiS1W6hlsn!}) z(aKO_%=J9i4dm23wl-4IPrVyUq6~=$)mnp;s0<~>z;y#$Hzope-GCBfP@*!bwFVKn z7RrIJ0_VjN~1X z(*gh>o=BqIYJVc07}=DljN_vsa%$ev&BD|K(kw*lYpZCtnDfTto9^#z;^9$uXv{td z4C_d<5J6C7VGppd5B`1$fnj~30WYua9eXpdzh43i`$Vn*2rBSm45aZb(CEHPXDJZx z^nR@X@AO7V-Eb)t36iN_s0YSk%LCU9#1ly?SSG7lYhcrECTr7AMfe2Mcz)6rkuRP= zCab#IhzPUH0^x6Hr~9g*V%vYb-J+s7?RI8)g1KjRDiS0)v;qL=4L)ICn{N-yHikVs dJUl%91YZ-PuCe2tr1Ss)002ovPDHLkV1gPv-U$Ez delta 325 zcmeyye3fZ}WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$h2fKQ04 zsfNhwpFa;=yrCw;_y7O@KwJ3_|Nj?+XsaoR%q%qB*yi&4O7{QlGC<`wj~&ngQhX&r ze!)PM2*BWa;LZu43}=ByWHAFnJ>OxVs>6)O^H-z*MQ3@sIEGmGznyTJ?}!42>-rPU zxqtuPm(9t{y6ux@czYfzlbn#qU-tDIiiHh2YSPyUFovKi{Tmi{>F?6Bn>V+) zFpp>9hPB0?)n=^v#TUq*$JB8m`AT#51;u}XMY3I=wbyU>y#B&(cB{ksB4>TP_5q#A N;OXk;vd$@?2>>c2i$(wd diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Bank/banker.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Bank/banker.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..dc9a85a3cbaec25a71f04e564ea67b12109c7df9 GIT binary patch literal 482 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z=Xkm}hE&XX zd&|&+DNu&(!+E#aOt)>axW0On2#DW~Wj;QKSv^{6R`7Chx4MPcws=# z=ARY^4_y6g+7YPm@Zx`0_51nz`^)cFALo6~FCYj3f1RhjU6HnXc}YsX2fNvA+tizV zFOu$FH=nU`N6HerdG>)%7Yl#9`{_^TG+_n5>rSOlyXu*&LcEt1xhL!1e8jqAvEeG! z;F9f=+(hbDD@p$J+{3Ux)bUbBS6bOJR*9ptGM+V6FuHAQJGVt)mgQ$D3BF&8W^zAb zpBb$>#S7y1 zPwx9OG1WTinV{3co9|Yp7Bf3?aUQKXV03lTN)5)E)nI za|CZOt&_iV;$x`(CJR=eU-#af!Su{IbTwBlWBlCsc}jCnD#dFk&ppXjRi+D!5@S*K z?ZNB~4xc#}>M!_R(|D92bYB3Uji=DXjVty~^FFix?~iY43=du&jqd)gq;%;W^J=?} VJ;y9lmI5PP)Px$qDe$SRCt{2+A(XwP!t8=Yw6@xa5UJd7(+z|af!RD;ArN8lP>)QE!C-=9PB8x zOK~cqyNhHi%|)eMS@2?R5LhIS*J5n)4+|xwN-bA(C=wGUv-+9&XvI$ln0ojLbLSuVNlRt1h|b z!U-~qFU*BQt-9p@cYr7)$sRYor3#TfZjvY@na?v1V7it`sP;UC3X@Rn(R3{{pFdam9=5X#H2xMMxDeulPx3Gi4$a z85HD61i_F#1>Qj4gouzPKp{^=i8%G|2BZmy42AzSw*DoH+TVT{LfjLj)$EssBhpqu zngGgkB1n-Z;#>B1(x_^Wj}5AIAq&z3C^@f0ebcJkTl(E{gDh2N!~j(cktDtoG!>B=&IcA!59L3T7~oIrl$fAOcwQbZ&yfXI}*Pzisx z9|by}7@Ipggtd!1Ri96f=Ay3A0H@82)^aN>ITmRm#w1|2%f+llJ$%718r|+&eyP8^ zkH4piK9MKV3h246u~79R0kSYA0T1PyvG2DA&AOFK*+*}!VbiBMu%c#*=AY3YXzfOQ zdm0=zy&(U|A71R-yd7_RxSoGPE;_vZVg<<0pOXoiCu0@HB!I|MyRfPZ$7?TQ*ZyO; z*4D+|UA8>#;K;*!XcXNpZ^$v@L@OcJwDtfC86QC+fj`vrh5F zxs!16;&npgKPPv#v(S!nn6lMFg#e`|C!kQ?An0~EC{Nd{p`9Jr%hqw*4^VScTBgC0*Dqnw=4G%~?8d7HPvOC$EMD+Bu>#6gO5_iGyovEm z0pk&p@Im(b96KK4EnV5pa3Lsk;+n^Y3`06*u4NdA{Qz^`1F%@L(ALuqn`7jBI%Aan zmG-5qFh2{2zdL!`Ge@cb!T}!n?%KBw9A~)X~vEd?XWwhBg>Tyuct+|QJu^yagCfnX~#v3 zjx=r41m*0x6A}_IrPGH+ZOv#34B|)rOlhKEAf`v2iJ#Ch3z{R@xZ0e8NO%y#*6Uc5 znU1F`Gw}KMJ)C^+#Gl0fg&vlIoj#rtCjRQ{#`*danujYEFu%{E+6nYb;>b?dhgy>r zwZ5D7qzSNVVyFtlZ=kdSsVS+u(& zmkUisG~e)II2PltVL^~u%6(5Lj9F7{xDp6LCZq_64h;#?4Uu@{74ixc5e=UBy@+Z- z7UT%{bLfugFj|x>O#a1`Y)lGBHYNom8gTe~DWM4fUF9!4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/meta.json b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/meta.json index eb98bb94a3..7436e63dd1 100644 --- a/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/meta.json @@ -36,6 +36,9 @@ { "name": "guard_on_paper" }, + { + "name": "guildmaster_on_paper" + }, { "name": "denied_on_paper" }, diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/stamp.rsi/approved.png b/Resources/Textures/_CP14/Objects/Bureaucracy/stamp.rsi/approved.png index 7492afe77e2200c8685d3db45eba4a961b2c47dc..93d686a7da93e9617b18f1410698656fe1cbef43 100644 GIT binary patch delta 256 zcmV+b0ssE50;vL!F@NJpL_t(oh3%6u3IZ_@MW3RLxF8l=1zbB9D=San0X%`=HLSgc z;5jTjf|Y3J7TcIY7k9C-h=oKHu}Flqnb!=NNoM|J5)cGI5dKWX_h77)iNb(H=j_td zJ5SBG_;l1KY&FqY!D5B+6;bs$6oml*IxF7Rr3pxM&iV2vetEtWBswooK&+Gj*c?v0 zTI+Yk=?%n6nenj0=5Tu6LZWk`FksMa1MY9ZYXlbC{V#a^fT7&IPcak6oGzQKh;K31;({Ou0>B-s=}R-AZbh?fdxS<_No;{EOv$1%-0M%vorJ0?1CT&g79W)zKO9?CJFan>bY)1|kFx=&IR1^}FOd3UZ%Kz~+fHc1M=CP~Q(U7dhf zDFd+j*>h{H-<1#7=EFgU?cedbg{;s-VL-pz1~9IF!RrYucKTOv+JL3sZQF^jwlV?h z^gyfm`QR^47cT)$?^Ro1dK2|DzMJKkv13h_%T~m*m}_%E5Cj3>9|M|6I@h6k{Qv*} M07*qoM6N<$g1Vl3F8}}l diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/stamp.rsi/denied.png b/Resources/Textures/_CP14/Objects/Bureaucracy/stamp.rsi/denied.png index 34d04efd2e8c6430c89804f1202ee91380996e58..2aa837f8eb6e15d2eb0e654f0bbabbde67440022 100644 GIT binary patch delta 253 zcmVlR{N5cnR`@er_|1*aBNRMr22(<_*chgHQd+n9j;@xq|j{qpCx zyORK`ennu`O4aUfl7zYCnbx021hvy{n_LhCK>&CFxeQ4&m8%yW00000NkvXXu0mjf D2RU<9 delta 265 zcmV+k0rvi;0+9MJyb_17YzGm22X6HA5SP%q35dN87YG9$Y z&ohOwj$>6NzmpVLXzgE~m)xl_jjMTDy(Ww3rv&Ah0-$mA)qlA&0meFZn-YNCro>p+ zoq$4X5Ab$4@zVx>EQ8qOi-&vmAD?X(jCJIhVm6%s_}E=Y8bKgb{}-Y<5SUFTq2ktd zCg8n1Gae0p`RlJsl7OgrZNWckee-@@Rm>ybjQ%{faC6&ZlM8|%2ms#@y+=BE!A{u# P0000YL87ucPjtQRxCbgx9M!6;`O5U8tiP5bD#6P3RjU_ zW^C|B{kovflZ>E=DX9rSP*LM5)aq}}4$|}R*}ug+AYlGoK6S_EKjwdB7HBGeuD{e6 zUEuxR=KooPmj`s&d?jc8e`3+F!~`T~e<5bx!#{t^H6C##?cr(basp}pzuvymDJV)o zn=64qjCTsdrlQ7$iv$ioes3=+cmFr%^UG%$f3M${BJkjl&sX_<6Q>J!79GeoS7d98 zeJ^2G^RqF!?w;@@8Hb{Wij$UnpC3F)-uch(&;304&tjE!yU0MiJdvA0t-*i6p8YIa QfuY0T>FVdQ&MBb@014-Z-T(jq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/stamp.rsi/meta.json b/Resources/Textures/_CP14/Objects/Bureaucracy/stamp.rsi/meta.json index 6ca962b778..c9d2392ffd 100644 --- a/Resources/Textures/_CP14/Objects/Bureaucracy/stamp.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Bureaucracy/stamp.rsi/meta.json @@ -18,6 +18,9 @@ }, { "name": "guard" + }, + { + "name": "guildmaster" } ] }