diff --git a/Content.Server/_CP14/DayCycle/CP14DayCycleSystem.cs b/Content.Server/_CP14/DayCycle/CP14DayCycleSystem.cs index 4798ae37bc..e9dcc7006c 100644 --- a/Content.Server/_CP14/DayCycle/CP14DayCycleSystem.cs +++ b/Content.Server/_CP14/DayCycle/CP14DayCycleSystem.cs @@ -1,9 +1,6 @@ using Content.Shared._CP14.DayCycle; using Content.Shared._CP14.DayCycle.Components; -using Content.Shared.Maps; -using Robust.Shared.Map; using Robust.Shared.Map.Components; -using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Timing; @@ -14,11 +11,7 @@ public sealed partial class CP14DayCycleSystem : CP14SharedDayCycleSystem public const int MinTimeEntryCount = 2; private const float MaxTimeDiff = 0.05f; - private static readonly ProtoId DayPeriod = "Day"; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedMapSystem _maps = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; [Dependency] private readonly IRobustRandom _random = default!; public override void Initialize() @@ -28,7 +21,6 @@ public sealed partial class CP14DayCycleSystem : CP14SharedDayCycleSystem SubscribeLocalEvent(OnMapInitDayCycle); } - private void OnMapInitDayCycle(Entity dayCycle, ref MapInitEvent args) { Init(dayCycle); @@ -93,29 +85,6 @@ public sealed partial class CP14DayCycleSystem : CP14SharedDayCycleSystem Dirty(dayCycle); } - /// - /// Checks to see if the specified entity is on the map where it's daytime. - /// - /// An entity being tested to see if it is in daylight - /// Checks if the tile covers the weather (the only "roof" factor at the moment) - public bool TryDaylightThere(EntityUid target, bool checkRoof) - { - var xform = Transform(target); - if (!TryComp(xform.MapUid, out var dayCycle)) - return false; - - if (!checkRoof || !TryComp(xform.GridUid, out var mapGrid)) - return dayCycle.CurrentPeriod == DayPeriod; - - var tileRef = _maps.GetTileRef(xform.GridUid.Value, mapGrid, xform.Coordinates); - var tileDef = (ContentTileDefinition) _tileDefManager[tileRef.Tile.TypeId]; - - if (!tileDef.Weather) - return false; - - return dayCycle.CurrentPeriod == DayPeriod; - } - private void SetAmbientColor(Entity light, Color color) { if (color == light.Comp.AmbientLightColor) diff --git a/Content.Shared/_CP14/DayCycle/CP14SharedDayCycleSystem.cs b/Content.Shared/_CP14/DayCycle/CP14SharedDayCycleSystem.cs index 1c67a48162..ec8a0e0c23 100644 --- a/Content.Shared/_CP14/DayCycle/CP14SharedDayCycleSystem.cs +++ b/Content.Shared/_CP14/DayCycle/CP14SharedDayCycleSystem.cs @@ -1,6 +1,38 @@ -namespace Content.Shared._CP14.DayCycle; +using Content.Shared._CP14.DayCycle.Components; +using Content.Shared.Maps; +using Robust.Shared.Map; +using Robust.Shared.Map.Components; +using Robust.Shared.Prototypes; + +namespace Content.Shared._CP14.DayCycle; public abstract class CP14SharedDayCycleSystem : EntitySystem { + private static readonly ProtoId DayPeriod = "Day"; + [Dependency] private readonly SharedMapSystem _maps = default!; + [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; + + /// + /// Checks to see if the specified entity is on the map where it's daytime. + /// + /// An entity being tested to see if it is in daylight + /// Checks if the tile covers the weather (the only "roof" factor at the moment) + public bool TryDaylightThere(EntityUid target, bool checkRoof) + { + var xform = Transform(target); + if (!TryComp(xform.MapUid, out var dayCycle)) + return false; + + if (!checkRoof || !TryComp(xform.GridUid, out var mapGrid)) + return dayCycle.CurrentPeriod == DayPeriod; + + var tileRef = _maps.GetTileRef(xform.GridUid.Value, mapGrid, xform.Coordinates); + var tileDef = (ContentTileDefinition) _tileDefManager[tileRef.Tile.TypeId]; + + if (!tileDef.Weather) + return false; + + return dayCycle.CurrentPeriod == DayPeriod; + } } diff --git a/Content.Shared/_CP14/Random/Rules/IsDaylight.cs b/Content.Shared/_CP14/Random/Rules/IsDaylight.cs index 2f21338c83..869ee7d2f5 100644 --- a/Content.Shared/_CP14/Random/Rules/IsDaylight.cs +++ b/Content.Shared/_CP14/Random/Rules/IsDaylight.cs @@ -1,3 +1,4 @@ +using Content.Shared._CP14.DayCycle; using Content.Shared.Random.Rules; namespace Content.Shared._CP14.Random.Rules; @@ -9,12 +10,11 @@ public sealed partial class IsDaylight : RulesRule { public override bool Check(EntityManager entManager, EntityUid uid) { - var transform = entManager.System(); + var dayCycle = entManager.System(); - // Not shared yet, use raw component data from map - // var dayCycle = entManager.System(); - - //черт, нужны комиты из ветки фермерства - return !Inverted; + if (Inverted) + return !dayCycle.TryDaylightThere(uid, true); + else + return dayCycle.TryDaylightThere(uid, true); } } diff --git a/Resources/Audio/_CP14/Ambience/Loops/attributions.yml b/Resources/Audio/_CP14/Ambience/Loops/attributions.yml index 85ec50a7e3..3aced15a86 100644 --- a/Resources/Audio/_CP14/Ambience/Loops/attributions.yml +++ b/Resources/Audio/_CP14/Ambience/Loops/attributions.yml @@ -1,4 +1,4 @@ -- files: ["grasslands.ogg"] +- files: ["winds.ogg"] license: "CC-BY-NC-4.0" copyright: 'by jgrzinich of Freesound.org.' source: "https://freesound.org/people/jgrzinich/sounds/329805/" diff --git a/Resources/Audio/_CP14/Ambience/Loops/grasslands.ogg b/Resources/Audio/_CP14/Ambience/Loops/winds.ogg similarity index 100% rename from Resources/Audio/_CP14/Ambience/Loops/grasslands.ogg rename to Resources/Audio/_CP14/Ambience/Loops/winds.ogg diff --git a/Resources/Maps/_CP14/dev_map.yml b/Resources/Maps/_CP14/dev_map.yml index 15f3a5d920..fdd0dc7b81 100644 --- a/Resources/Maps/_CP14/dev_map.yml +++ b/Resources/Maps/_CP14/dev_map.yml @@ -23,6 +23,7 @@ entities: - type: MapLight ambientLightColor: '#111111FF' - type: Map + mapPaused: True - type: PhysicsMap - type: GridTree - type: MovedGrids @@ -113,11 +114,11 @@ entities: version: 6 0,-1: ind: 0,-1 - tiles: LwAAAAACLwAAAAAELwAAAAAELwAAAAAELwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAAHAAAAAADHAAAAAAEHQAAAAAAHQAAAAACHgAAAAAAHgAAAAAAHgAAAAAALwAAAAAELwAAAAABLwAAAAABLwAAAAAELwAAAAAELwAAAAAALwAAAAAALwAAAAAALwAAAAAAHQAAAAABHAAAAAACHAAAAAAFHQAAAAAAHQAAAAAFHgAAAAADHgAAAAAFLwAAAAAALwAAAAADLwAAAAACLwAAAAAALwAAAAAELwAAAAACLwAAAAABLwAAAAAALwAAAAAAHAAAAAAFHAAAAAAAHAAAAAADHQAAAAAAHQAAAAACHQAAAAADHQAAAAADLwAAAAAELwAAAAAELwAAAAADLwAAAAADLwAAAAADLwAAAAAALwAAAAAELwAAAAAALwAAAAAAHAAAAAADHAAAAAACHAAAAAAAHQAAAAAAHQAAAAACHAAAAAADHAAAAAAALwAAAAAELwAAAAABLwAAAAADLwAAAAABLwAAAAACLwAAAAAALwAAAAAALwAAAAADLwAAAAAAHQAAAAAEHQAAAAAFHAAAAAACHQAAAAAAGgAAAAAFGgAAAAAEGgAAAAACLwAAAAAELwAAAAACLwAAAAAELwAAAAABLwAAAAACLwAAAAAELwAAAAAALwAAAAAAHQAAAAAAHQAAAAAEHQAAAAADHQAAAAAEHgAAAAABGgAAAAAKGgAAAAAEGgAAAAACLwAAAAADLwAAAAADLwAAAAAALwAAAAABLwAAAAACLwAAAAABLwAAAAAELwAAAAACHAAAAAAEHAAAAAAEHQAAAAADHQAAAAAEHgAAAAACGgAAAAABGgAAAAAJGgAAAAAILwAAAAAALwAAAAACLwAAAAABHAAAAAAALwAAAAAALwAAAAADLwAAAAABHQAAAAACHAAAAAACHAAAAAABHAAAAAACHQAAAAABHgAAAAABGgAAAAAJGgAAAAAHGgAAAAACLwAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHQAAAAAFHQAAAAACHQAAAAAFHQAAAAACHAAAAAAFHAAAAAABHQAAAAACHQAAAAAFGgAAAAACGgAAAAAJGgAAAAAKHAAAAAAEHAAAAAABHAAAAAAFHQAAAAAFHQAAAAACHQAAAAABHQAAAAAFHQAAAAACHQAAAAACHQAAAAADHAAAAAAEHQAAAAADHQAAAAAAHgAAAAAFHQAAAAACHAAAAAAEHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAFHQAAAAAEHQAAAAAFHQAAAAAFHQAAAAAFHQAAAAAFHQAAAAAAHQAAAAAAHQAAAAACHQAAAAAEHgAAAAADHQAAAAADHAAAAAABHAAAAAAAHAAAAAADHAAAAAABHAAAAAACIAAAAAADIAAAAAACIAAAAAAAHQAAAAACHQAAAAAEHQAAAAABHQAAAAAEHQAAAAACHQAAAAADHQAAAAAFHQAAAAAAHQAAAAABIAAAAAABIAAAAAABIAAAAAADIAAAAAADIAAAAAABIAAAAAAAIAAAAAADIAAAAAACIAAAAAABHQAAAAABHQAAAAAAHQAAAAAEHQAAAAADHQAAAAAFHQAAAAADHQAAAAAEIAAAAAADIAAAAAACIAAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAACIAAAAAADIAAAAAAAHQAAAAAAHQAAAAAAHQAAAAACHAAAAAAFHAAAAAACHAAAAAABHQAAAAABHwAAAAADHwAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAABHwAAAAAAIAAAAAABHQAAAAAAHAAAAAABHAAAAAADHAAAAAAAHAAAAAAAHAAAAAAFHAAAAAAEHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAHwAAAAADIAAAAAACHQAAAAABHAAAAAAFHAAAAAAAHAAAAAADHAAAAAAEHAAAAAABHQAAAAAC + tiles: LwAAAAACLwAAAAAELwAAAAAELwAAAAAELwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAAHAAAAAADHAAAAAAEHQAAAAAAHQAAAAACHgAAAAAAHgAAAAAAHgAAAAAALwAAAAAELwAAAAABLwAAAAABLwAAAAAELwAAAAAELwAAAAAALwAAAAAALwAAAAAALwAAAAAAHQAAAAABHAAAAAACHAAAAAAFHQAAAAAAHQAAAAAFHgAAAAADHgAAAAAFLwAAAAAALwAAAAADLwAAAAACLwAAAAAALwAAAAAELwAAAAACLwAAAAABLwAAAAAALwAAAAAAHAAAAAAFHAAAAAAAHAAAAAADHQAAAAAAHQAAAAACHQAAAAADHQAAAAADLwAAAAAELwAAAAAELwAAAAADLwAAAAADLwAAAAADLwAAAAAALwAAAAAELwAAAAAALwAAAAAAHAAAAAADHAAAAAACHAAAAAAAHQAAAAAAHQAAAAACHAAAAAADHAAAAAAALwAAAAAELwAAAAABLwAAAAADLwAAAAABLwAAAAACLwAAAAAALwAAAAAALwAAAAADLwAAAAAAHQAAAAAEHQAAAAAFHAAAAAACHQAAAAAAGgAAAAAFGgAAAAAEGgAAAAACLwAAAAAELwAAAAACLwAAAAAELwAAAAABLwAAAAACLwAAAAAELwAAAAAALwAAAAAAHQAAAAAAHQAAAAAEHQAAAAADHQAAAAAEHgAAAAABGgAAAAAKGgAAAAAEGgAAAAACLwAAAAADLwAAAAADLwAAAAAALwAAAAABLwAAAAACLwAAAAABLwAAAAAELwAAAAACHAAAAAAEHAAAAAAEHQAAAAADHQAAAAAEHgAAAAACGgAAAAABGgAAAAAJGgAAAAAILwAAAAAALwAAAAACLwAAAAABHAAAAAAALwAAAAAALwAAAAADLwAAAAABHQAAAAACHAAAAAACHAAAAAABHAAAAAACHQAAAAABHgAAAAABGgAAAAAJGgAAAAAHGgAAAAACLwAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHQAAAAAFHQAAAAACHQAAAAAFHQAAAAACHAAAAAAFHAAAAAABHQAAAAACHQAAAAAFHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAEHAAAAAABHAAAAAAFHQAAAAAFHQAAAAACHQAAAAABHQAAAAAFHQAAAAACHQAAAAACHQAAAAADHAAAAAAEHQAAAAADHQAAAAAAHgAAAAAFHQAAAAACHAAAAAAEHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAFHQAAAAAEHQAAAAAFHQAAAAAFHQAAAAAFHQAAAAAFHQAAAAAAHQAAAAAAHQAAAAACHQAAAAAEHgAAAAADHQAAAAADHAAAAAABHAAAAAAAHAAAAAADHAAAAAABHAAAAAACIAAAAAADIAAAAAACIAAAAAAAHQAAAAACHQAAAAAEHQAAAAABHQAAAAAEHQAAAAACHQAAAAADHQAAAAAFHQAAAAAAHQAAAAABIAAAAAABIAAAAAABIAAAAAADIAAAAAADIAAAAAABIAAAAAAAIAAAAAADIAAAAAACIAAAAAABHQAAAAABHQAAAAAAHQAAAAAEHQAAAAADHQAAAAAFHQAAAAADHQAAAAAEIAAAAAADIAAAAAACIAAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAACIAAAAAADIAAAAAAAHQAAAAAAHQAAAAAAHQAAAAACHAAAAAAFHAAAAAACHAAAAAABHQAAAAABHwAAAAADHwAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAABHwAAAAAAIAAAAAABHQAAAAAAHAAAAAABHAAAAAADHAAAAAAAHAAAAAAAHAAAAAAFHAAAAAAEHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAHwAAAAADIAAAAAACHQAAAAABHAAAAAAFHAAAAAAAHAAAAAADHAAAAAAEHAAAAAABHQAAAAAC version: 6 3,2: ind: 3,2 - tiles: HQAAAAACHQAAAAACHQAAAAAEHQAAAAADHAAAAAAFHQAAAAABHQAAAAAEHgAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHAAAAAAFHAAAAAAFHQAAAAAAHAAAAAACHAAAAAABHAAAAAACHQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAABHAAAAAAAHAAAAAAEHQAAAAABHAAAAAAFHAAAAAABHAAAAAADHAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAACHAAAAAAEHAAAAAAAHAAAAAACHQAAAAABHAAAAAAAHAAAAAACHAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAFHAAAAAAEHAAAAAACHAAAAAAFHQAAAAACHAAAAAADHAAAAAABHAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAFHAAAAAAEHAAAAAAAHAAAAAADHQAAAAAEHAAAAAAAHAAAAAAEHAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAACHAAAAAADHAAAAAAAHQAAAAADHQAAAAABHQAAAAABHQAAAAACHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAEHQAAAAADHQAAAAABHQAAAAAFHQAAAAAEHQAAAAABHQAAAAABHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAFHgAAAAADHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAEHgAAAAAFHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHgAAAAAAHQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAEHgAAAAACHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAADHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAADHQAAAAABHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAABHQAAAAADHAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: HQAAAAACHQAAAAACHQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHAAAAAAFHAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAABHAAAAAAAHAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAACHAAAAAAEHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAFHAAAAAAEHAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAFHAAAAAAEHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAACHAAAAAADHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAEHQAAAAADHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAFHgAAAAADHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAEHgAAAAAFHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHgAAAAAAHQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAEHgAAAAACHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAADHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAADHQAAAAABHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAABHQAAAAADHAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -3,-2: ind: -3,-2 @@ -145,7 +146,7 @@ entities: version: 6 1,-1: ind: 1,-1 - tiles: HQAAAAABHQAAAAAFHAAAAAAAHAAAAAAFHAAAAAABHAAAAAADHAAAAAAEHAAAAAAFHQAAAAAAHQAAAAABHQAAAAABHgAAAAAAHgAAAAABHQAAAAADHQAAAAACHQAAAAAAHQAAAAAFHQAAAAAAHAAAAAAAHAAAAAAEHAAAAAACHAAAAAAFHAAAAAADHQAAAAACHQAAAAABHQAAAAABHQAAAAAEHQAAAAACHQAAAAADHQAAAAAEHQAAAAABHQAAAAAFHAAAAAABHQAAAAAFHAAAAAABHAAAAAADHAAAAAACHAAAAAACHAAAAAAAHQAAAAADHQAAAAAFHgAAAAADHgAAAAAFHQAAAAAFHAAAAAAAHAAAAAACHAAAAAADHAAAAAACHAAAAAAEHQAAAAAEHAAAAAABHAAAAAABHAAAAAAAHAAAAAAAHAAAAAAEHQAAAAACHgAAAAADHQAAAAACHAAAAAADHAAAAAAAHAAAAAAAHAAAAAACHAAAAAABHQAAAAAEGgAAAAAFGgAAAAAEGgAAAAANGgAAAAAOGgAAAAAHHAAAAAACHAAAAAADHQAAAAAEHgAAAAADHgAAAAACHQAAAAAEHAAAAAADHAAAAAAAHAAAAAACHAAAAAAFHQAAAAAEGgAAAAAAGgAAAAAEGgAAAAAMGgAAAAAEGgAAAAAHHAAAAAACHAAAAAAFHgAAAAACHgAAAAABHQAAAAACHAAAAAABHAAAAAACHQAAAAABHQAAAAADHAAAAAABHAAAAAAEGgAAAAAOGgAAAAADGgAAAAABGgAAAAAOGgAAAAAGHAAAAAAEHQAAAAAEHgAAAAAAHQAAAAACHAAAAAADHAAAAAAAHAAAAAAEHAAAAAABHAAAAAADHAAAAAABHAAAAAABGgAAAAAPGgAAAAAIGgAAAAAEGgAAAAAHGgAAAAAGHAAAAAADHQAAAAAEHgAAAAAAHQAAAAACHQAAAAAFHAAAAAACHAAAAAADHAAAAAAAHAAAAAADHAAAAAABHQAAAAAAGgAAAAALGgAAAAAOGgAAAAALGgAAAAAIGgAAAAAAHAAAAAACHQAAAAACHgAAAAACHQAAAAACHQAAAAACHAAAAAABHAAAAAACHQAAAAAAHQAAAAAAHQAAAAAAHgAAAAACHAAAAAADHAAAAAADHAAAAAAAHAAAAAAEHAAAAAAAHAAAAAAEHQAAAAACHgAAAAAFHgAAAAADHgAAAAACHQAAAAAFHgAAAAAFHQAAAAABHQAAAAAFHQAAAAACHQAAAAAFGgAAAAAKGgAAAAABGgAAAAAEGgAAAAABHAAAAAAEHAAAAAAAHQAAAAADHQAAAAADHQAAAAAFHQAAAAAAHQAAAAAAHQAAAAAFHQAAAAAFHQAAAAADHgAAAAABHQAAAAAEGgAAAAACGgAAAAABGgAAAAAPGgAAAAAHHAAAAAABHAAAAAACHQAAAAACHQAAAAACHQAAAAAEHQAAAAACHAAAAAAAHAAAAAABHQAAAAACHQAAAAADHQAAAAAAHQAAAAAFGgAAAAAGGgAAAAAIGgAAAAAJGgAAAAAIHAAAAAAFHAAAAAABHQAAAAAEHQAAAAAEHQAAAAAAHQAAAAAAHQAAAAAFHQAAAAACHQAAAAAFHQAAAAADHQAAAAADHAAAAAACHgAAAAADGgAAAAAJGgAAAAALHQAAAAAFHQAAAAABHQAAAAADHQAAAAAEHQAAAAACHgAAAAAFHgAAAAAEHQAAAAABHQAAAAACHQAAAAACHQAAAAACHAAAAAAAHAAAAAACHQAAAAACHQAAAAAEHQAAAAABHQAAAAADHQAAAAABHQAAAAABHQAAAAAAHQAAAAAEHQAAAAAFHQAAAAAFHgAAAAADHgAAAAAEHQAAAAABHAAAAAADHAAAAAAEHQAAAAACHQAAAAACHQAAAAACHQAAAAAAHQAAAAAFHgAAAAAAHgAAAAAAHQAAAAAFHAAAAAACHAAAAAAFHAAAAAAEHQAAAAACHQAAAAAFHQAAAAAFHQAAAAADHQAAAAAFHAAAAAAE + tiles: HQAAAAABHQAAAAAFHAAAAAAAHAAAAAAFHAAAAAABHAAAAAADHAAAAAAEHAAAAAAFHQAAAAAAHQAAAAABHQAAAAABHgAAAAAAHgAAAAABHQAAAAADHQAAAAACHQAAAAAAHQAAAAAFHQAAAAAAHAAAAAAAHAAAAAAEHAAAAAACHAAAAAAFHAAAAAADHQAAAAACHQAAAAABHQAAAAABHQAAAAAEHQAAAAACHQAAAAADHQAAAAAEHQAAAAABHQAAAAAFHAAAAAABHQAAAAAFHAAAAAABHAAAAAADHAAAAAACHAAAAAACHAAAAAAAHQAAAAADHQAAAAAFHgAAAAADHgAAAAAFHQAAAAAFHAAAAAAAHAAAAAACHAAAAAADHAAAAAACHAAAAAAEHQAAAAAEHAAAAAABHAAAAAABHAAAAAAAHAAAAAAAHAAAAAAEHQAAAAACHgAAAAADHQAAAAACHAAAAAADHAAAAAAAHAAAAAAAHAAAAAACHAAAAAABHQAAAAAEGgAAAAAFGgAAAAAEGgAAAAANGgAAAAAOGgAAAAAHHAAAAAACHAAAAAADHQAAAAAEHgAAAAADHgAAAAACHQAAAAAEHAAAAAADHAAAAAAAHAAAAAACHAAAAAAFHQAAAAAEGgAAAAAAGgAAAAAEGgAAAAAMGgAAAAAEGgAAAAAHHAAAAAACHAAAAAAFHgAAAAACHgAAAAABHQAAAAACHAAAAAABHAAAAAACHQAAAAABHQAAAAADHAAAAAABHAAAAAAEGgAAAAAOGgAAAAADGgAAAAABGgAAAAAOGgAAAAAGHAAAAAAEHQAAAAAEHgAAAAAAHQAAAAACHAAAAAADHAAAAAAAHAAAAAAEHAAAAAABHAAAAAADHAAAAAABHAAAAAABGgAAAAAPGgAAAAAIGgAAAAAEGgAAAAAHGgAAAAAGHAAAAAADHQAAAAAEHgAAAAAAHQAAAAACHQAAAAAFHAAAAAACHAAAAAADHAAAAAAAHAAAAAADHAAAAAABHQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAACHQAAAAACHgAAAAACHQAAAAACHQAAAAACHAAAAAABHAAAAAACHQAAAAAAHQAAAAAAHQAAAAAAHgAAAAACHAAAAAADHAAAAAADHAAAAAAAHAAAAAAEHAAAAAAAHAAAAAAEHQAAAAACHgAAAAAFHgAAAAADHgAAAAACHQAAAAAFHgAAAAAFHQAAAAABHQAAAAAFHQAAAAACHQAAAAAFGgAAAAAKGgAAAAABGgAAAAAEGgAAAAABHAAAAAAEHAAAAAAAHQAAAAADHQAAAAADHQAAAAAFHQAAAAAAHQAAAAAAHQAAAAAFHQAAAAAFHQAAAAADHgAAAAABHQAAAAAEGgAAAAACGgAAAAABGgAAAAAPGgAAAAAHHAAAAAABHAAAAAACHQAAAAACHQAAAAACHQAAAAAEHQAAAAACHAAAAAAAHAAAAAABHQAAAAACHQAAAAADHQAAAAAAHQAAAAAFGgAAAAAGGgAAAAAIGgAAAAAJGgAAAAAIHAAAAAAFHAAAAAABHQAAAAAEHQAAAAAEHQAAAAAAHQAAAAAAHQAAAAAFHQAAAAACHQAAAAAFHQAAAAADHQAAAAADHAAAAAACHgAAAAADGgAAAAAJGgAAAAALHQAAAAAFHQAAAAABHQAAAAADHQAAAAAEHQAAAAACHgAAAAAFHgAAAAAEHQAAAAABHQAAAAACHQAAAAACHQAAAAACHAAAAAAAHAAAAAACHQAAAAACHQAAAAAEHQAAAAABHQAAAAADHQAAAAABHQAAAAABHQAAAAAAHQAAAAAEHQAAAAAFHQAAAAAFHgAAAAADHgAAAAAEHQAAAAABHAAAAAADHAAAAAAEHQAAAAACHQAAAAACHQAAAAACHQAAAAAAHQAAAAAFHgAAAAAAHgAAAAAAHQAAAAAFHAAAAAACHAAAAAAFHAAAAAAEHQAAAAACHQAAAAAFHQAAAAAFHQAAAAADHQAAAAAFHAAAAAAE version: 6 -2,0: ind: -2,0 @@ -181,7 +182,7 @@ entities: version: 6 3,1: ind: 3,1 - tiles: HgAAAAADHgAAAAADHgAAAAADHgAAAAADHQAAAAAFHQAAAAAFHAAAAAABHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHgAAAAAFHgAAAAAEHgAAAAACHgAAAAAFHQAAAAAAHAAAAAAAHAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAEHgAAAAACHgAAAAAFHgAAAAADHQAAAAABHQAAAAACHAAAAAAAHAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAAFHQAAAAADHQAAAAABHgAAAAAFHQAAAAADHAAAAAAAHAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAEHQAAAAAEHQAAAAACHQAAAAAAHQAAAAAAHQAAAAADHQAAAAAEHAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAEHQAAAAAAHQAAAAAFHQAAAAADHQAAAAAAHQAAAAAFHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHQAAAAAAHQAAAAAAHQAAAAABHQAAAAAEHgAAAAAEHQAAAAABHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAFHQAAAAABHQAAAAAFHQAAAAADHgAAAAACHQAAAAAFHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAABHAAAAAAEHAAAAAABHQAAAAAEHQAAAAAEHQAAAAAAHQAAAAADHQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAEHAAAAAAAHAAAAAAEHQAAAAADHQAAAAADHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAFHAAAAAADHAAAAAACHAAAAAADHAAAAAACHAAAAAACHAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAEHAAAAAABHAAAAAAFHAAAAAAFHAAAAAACHAAAAAAFHAAAAAACHAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHAAAAAAFHAAAAAACHAAAAAAFHQAAAAAFHAAAAAAFHAAAAAAAHAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAADHQAAAAACHAAAAAAEHQAAAAACHAAAAAADHAAAAAAEHQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHQAAAAACHQAAAAAAHQAAAAACHQAAAAADHQAAAAABHQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAEHQAAAAABHQAAAAACHQAAAAAEHQAAAAAAHQAAAAAAHgAAAAABHgAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: HgAAAAADHgAAAAADHgAAAAADHgAAAAADHQAAAAAFHQAAAAAFHAAAAAABHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHgAAAAAFHgAAAAAEHgAAAAACHgAAAAAFHQAAAAAAHAAAAAAAHAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAEHgAAAAACHgAAAAAFHgAAAAADHQAAAAABHQAAAAACHAAAAAAAHAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAAFHQAAAAADHQAAAAABHgAAAAAFHQAAAAADHAAAAAAAHAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAEHQAAAAAEHQAAAAACHQAAAAAAHQAAAAAAHQAAAAADHQAAAAAEHAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAEHQAAAAAAHQAAAAAFHQAAAAADHQAAAAAAHQAAAAAFHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHQAAAAAAHQAAAAAAHQAAAAABHQAAAAAEHgAAAAAEHQAAAAABHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAFHQAAAAABHQAAAAAFHQAAAAADHgAAAAACHQAAAAAFHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAABHAAAAAAEHAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAFHAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAEHAAAAAABHAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHAAAAAAFHAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAADHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHQAAAAACHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAEHQAAAAABHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 2,-2: ind: 2,-2 @@ -225,7 +226,7 @@ entities: version: 6 1,-3: ind: 1,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAFHAAAAAABHAAAAAABHAAAAAADHQAAAAABHAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAACHAAAAAACHAAAAAAFHAAAAAADHAAAAAAFHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAACHAAAAAAEHAAAAAABHAAAAAABHAAAAAABHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAFHAAAAAAAHAAAAAAFHAAAAAAEHAAAAAAEHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAFHQAAAAAEHQAAAAADHQAAAAAFHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAABHAAAAAAAHAAAAAAAHQAAAAAFHQAAAAAAHAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHAAAAAABHAAAAAAAHQAAAAABHQAAAAADHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHAAAAAAEHAAAAAAEHQAAAAACHQAAAAAFHQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHQAAAAADHQAAAAACHQAAAAAEHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAAFHQAAAAAFHQAAAAABHQAAAAAEHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAADHAAAAAAFHAAAAAABHAAAAAADHAAAAAAAHQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAFHAAAAAADHAAAAAAAHAAAAAAAHAAAAAAFHAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAADHAAAAAADHAAAAAAEHAAAAAAEHAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAADHAAAAAADHAAAAAAEHAAAAAABHAAAAAAAHAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAABHAAAAAAFHAAAAAABHAAAAAAAHAAAAAADHAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAACHAAAAAAAHAAAAAADHAAAAAABHAAAAAABHAAAAAAA + tiles: HQAAAAACHQAAAAABHAAAAAACHAAAAAAFHAAAAAADHAAAAAAEHAAAAAAFHQAAAAACHQAAAAAAHQAAAAADHAAAAAAFHAAAAAABHAAAAAABHAAAAAADHQAAAAABHAAAAAABHAAAAAAEHAAAAAAEHAAAAAADHAAAAAAEHAAAAAACHAAAAAAAHQAAAAABHQAAAAAAHQAAAAAFHQAAAAAAHAAAAAACHAAAAAACHAAAAAAFHAAAAAADHAAAAAAFHQAAAAADHAAAAAAEHAAAAAABHAAAAAADHAAAAAAAHQAAAAACHQAAAAAAHQAAAAAAHQAAAAAEHQAAAAACHQAAAAACHAAAAAACHAAAAAAEHAAAAAABHAAAAAABHAAAAAABHQAAAAABHAAAAAADHAAAAAACHAAAAAABHAAAAAABHQAAAAAAHQAAAAAAHQAAAAABHQAAAAAFHQAAAAAFHQAAAAABHAAAAAAFHAAAAAAAHAAAAAAFHAAAAAAEHAAAAAAEHQAAAAAAHAAAAAAEHAAAAAAFHAAAAAABHQAAAAAFHAAAAAAEHAAAAAABHQAAAAAEHgAAAAACHgAAAAABHQAAAAAAHAAAAAAFHQAAAAAEHQAAAAADHQAAAAAFHQAAAAAAHQAAAAAAHQAAAAACHQAAAAADHQAAAAABHQAAAAAAHQAAAAABHQAAAAABHQAAAAACHgAAAAACHgAAAAABHQAAAAAEHAAAAAABHAAAAAAAHAAAAAAAHQAAAAAFHQAAAAAAHAAAAAABHQAAAAABHQAAAAABHQAAAAAAHgAAAAAFHQAAAAADHQAAAAAEHQAAAAACHgAAAAAFHQAAAAAEHQAAAAACHQAAAAACHAAAAAABHAAAAAAAHQAAAAABHQAAAAADHQAAAAADHQAAAAADHQAAAAACHQAAAAAEHQAAAAACHQAAAAACHgAAAAAEHgAAAAADHgAAAAAFHgAAAAAEHgAAAAAEHQAAAAAAHAAAAAAEHAAAAAAEHQAAAAACHQAAAAAFHQAAAAAEHQAAAAADHQAAAAABHQAAAAACHQAAAAAEHQAAAAABHQAAAAABHQAAAAAFHgAAAAABHgAAAAAEHgAAAAAEHgAAAAAAHQAAAAADHQAAAAACHQAAAAAEHQAAAAAAHQAAAAAAHAAAAAAEHQAAAAADHQAAAAACHAAAAAABHAAAAAABHAAAAAACHAAAAAADHQAAAAABHgAAAAADHQAAAAAEHQAAAAACHQAAAAAFHQAAAAAFHQAAAAABHQAAAAAEHQAAAAACHQAAAAABHQAAAAAEHQAAAAABHAAAAAABHAAAAAAAHAAAAAAFHAAAAAACHQAAAAAFHgAAAAABHQAAAAAAHAAAAAADHAAAAAAFHAAAAAABHAAAAAADHAAAAAAAHQAAAAAEHQAAAAABHQAAAAAFHQAAAAABHAAAAAAAHAAAAAAFHAAAAAAAHAAAAAAEHQAAAAAFHgAAAAABHAAAAAAEHAAAAAAFHAAAAAADHAAAAAAAHAAAAAAAHAAAAAAFHAAAAAAEHQAAAAABHQAAAAAAHAAAAAADHAAAAAABHAAAAAADHAAAAAAFHAAAAAABHgAAAAAAHgAAAAABHQAAAAAEHAAAAAAAHAAAAAADHAAAAAADHAAAAAAEHAAAAAAEHAAAAAACHgAAAAAEHgAAAAADHAAAAAACHAAAAAAFHAAAAAABHAAAAAAEHQAAAAAFHQAAAAAAHQAAAAAEHQAAAAADHAAAAAADHAAAAAADHAAAAAAEHAAAAAABHAAAAAAAHAAAAAADHQAAAAAEHQAAAAAEHQAAAAADHAAAAAAEHAAAAAAAHQAAAAAEHQAAAAABHQAAAAAEHQAAAAACHQAAAAADHAAAAAABHAAAAAAFHAAAAAABHAAAAAAAHAAAAAADHAAAAAABHQAAAAAFHQAAAAAAHAAAAAAFHAAAAAADHAAAAAAFHAAAAAADHQAAAAAFHgAAAAAEHQAAAAACHQAAAAAFHAAAAAACHAAAAAAAHAAAAAADHAAAAAABHAAAAAABHAAAAAAA version: 6 2,-3: ind: 2,-3 @@ -233,7 +234,7 @@ entities: version: 6 3,-3: ind: 3,-3 - tiles: HgAAAAAAHgAAAAAEHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHgAAAAABHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHQAAAAACHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHgAAAAABHgAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAACHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAACHAAAAAADHAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAABHAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAEHAAAAAAEHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAABHQAAAAABHAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAABHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHAAAAAAFHQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHQAAAAADHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHQAAAAAEHQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHQAAAAADHAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHAAAAAAAHAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: HgAAAAAAHgAAAAAEHQAAAAAAHQAAAAAFHAAAAAABHAAAAAAFHAAAAAABHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHgAAAAABHgAAAAADHgAAAAAEHQAAAAAAHQAAAAADHQAAAAADHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHQAAAAACHgAAAAACHgAAAAACHgAAAAADHgAAAAACHQAAAAABHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHgAAAAABHgAAAAAEHQAAAAAAHQAAAAAFHQAAAAAFHQAAAAABHQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAACHQAAAAACHQAAAAABHAAAAAAAHAAAAAABHAAAAAAEHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAACHAAAAAADHAAAAAADHAAAAAACHAAAAAABHAAAAAACHAAAAAAFHQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAABHAAAAAABHAAAAAAAHAAAAAABHAAAAAADHAAAAAAEHAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAEHAAAAAAEHAAAAAAAHAAAAAAEHAAAAAAAHAAAAAAFHAAAAAAAHAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAABHQAAAAABHAAAAAAEHAAAAAACHAAAAAAEHAAAAAAEHAAAAAACHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAABHQAAAAAAHAAAAAABHAAAAAAAHAAAAAADHAAAAAAEHAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHAAAAAAFHQAAAAAFHgAAAAAEHQAAAAACHQAAAAABHQAAAAAAHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHAAAAAAAHQAAAAAAHgAAAAAFHgAAAAABHgAAAAAEHQAAAAAFHgAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHQAAAAADHQAAAAADHQAAAAAEHgAAAAAFHgAAAAACHgAAAAADHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHQAAAAAEHQAAAAAEHAAAAAABHAAAAAABHQAAAAACHQAAAAABHQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHQAAAAADHAAAAAACHAAAAAAFHAAAAAAFHAAAAAAEHQAAAAACHAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHAAAAAAAHAAAAAAEHAAAAAAFHAAAAAACHAAAAAAAHQAAAAADHAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,-4: ind: 3,-4 @@ -265,7 +266,7 @@ entities: version: 6 0,-3: ind: 0,-3 - tiles: HQAAAAAEHQAAAAABAAAAAAAAHAAAAAADHAAAAAADHAAAAAABHAAAAAABHAAAAAAEHAAAAAADHAAAAAACHAAAAAAFHAAAAAACHQAAAAACHgAAAAADHQAAAAADHQAAAAAEHAAAAAACHQAAAAADHQAAAAAAHAAAAAABHAAAAAADHAAAAAADAAAAAAAAHAAAAAACHAAAAAAAHAAAAAACHAAAAAAFHAAAAAAEHAAAAAAAHQAAAAABHQAAAAAEHQAAAAACHAAAAAACHAAAAAABHAAAAAAAHAAAAAAAHAAAAAABHAAAAAABHAAAAAACAAAAAAAAHAAAAAAAHAAAAAAEHAAAAAACHAAAAAADHAAAAAACHAAAAAAAHAAAAAAFHAAAAAAAAAAAAAAAHAAAAAAFHAAAAAAFAAAAAAAAHAAAAAABHAAAAAACHAAAAAACHQAAAAACHQAAAAAEAAAAAAAAAAAAAAAAHQAAAAADHQAAAAACAAAAAAAAHAAAAAAFHAAAAAAFHAAAAAAEHAAAAAAAAAAAAAAAAAAAAAAAHAAAAAABHAAAAAADHAAAAAAFHAAAAAADHAAAAAAEHQAAAAAAHQAAAAACHgAAAAAFHgAAAAAAHgAAAAAFHQAAAAAFHAAAAAADHQAAAAAAHAAAAAABHAAAAAAEHAAAAAAFHAAAAAABAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAACAAAAAAAAHQAAAAACHQAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHQAAAAAEHQAAAAACHAAAAAAEHQAAAAAEAAAAAAAAHAAAAAAAHAAAAAADHAAAAAAFHQAAAAACHQAAAAAEHQAAAAAEHQAAAAAAHQAAAAAAHQAAAAAFHQAAAAABHQAAAAAEHQAAAAAFHAAAAAABHAAAAAAEHQAAAAAEHAAAAAAFAAAAAAAAHQAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAHQAAAAAEHQAAAAABHQAAAAADAAAAAAAAAAAAAAAAHQAAAAAEHQAAAAADHAAAAAAEHAAAAAACHAAAAAAEHAAAAAACHQAAAAACHQAAAAAEHgAAAAAEHgAAAAACHQAAAAAEHQAAAAAEHQAAAAAAHQAAAAAFHQAAAAABHgAAAAACHgAAAAAFHQAAAAAAAAAAAAAAHAAAAAACHAAAAAABHAAAAAACHAAAAAACHQAAAAADHQAAAAABAAAAAAAAAAAAAAAAHQAAAAAEHQAAAAAEHAAAAAAEHQAAAAADHQAAAAABHQAAAAADHQAAAAADHAAAAAACHAAAAAAFHAAAAAAAHAAAAAAFHAAAAAAFHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAFHAAAAAADHAAAAAAEHQAAAAADAAAAAAAAHQAAAAADHQAAAAAFHQAAAAACHQAAAAADHQAAAAAEHQAAAAAFHQAAAAAFHQAAAAACHQAAAAABHgAAAAAFHgAAAAAAHQAAAAAFHAAAAAABHAAAAAAFHQAAAAAFHgAAAAACHQAAAAADHQAAAAAFHAAAAAADHAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAAAAAAAAHgAAAAABHQAAAAAFHQAAAAADHAAAAAAFHAAAAAABHAAAAAACHgAAAAAEHQAAAAABAAAAAAAAHAAAAAACHAAAAAAFHAAAAAAEAAAAAAAAHQAAAAAEHQAAAAACHQAAAAAFHQAAAAAEHQAAAAAFHQAAAAADHAAAAAAAHAAAAAACHAAAAAADHQAAAAADHQAAAAAEHQAAAAAAHAAAAAAAHAAAAAAAHAAAAAADHAAAAAAEHAAAAAAFHAAAAAABHQAAAAAAAAAAAAAAHgAAAAAFHgAAAAABHQAAAAAFHAAAAAABHAAAAAAEAAAAAAAAHQAAAAABHgAAAAAFHQAAAAAFHAAAAAAEHAAAAAACHQAAAAAEHQAAAAABHAAAAAAFHQAAAAAFHQAAAAAEHQAAAAACHQAAAAAFHAAAAAAEHAAAAAADHAAAAAACHAAAAAAAHQAAAAAF + tiles: HQAAAAAEHQAAAAABHQAAAAAEHAAAAAADHAAAAAADHAAAAAABHAAAAAABHAAAAAAEHAAAAAADHAAAAAACHAAAAAAFHAAAAAACHQAAAAACHgAAAAADHQAAAAADHQAAAAAEHAAAAAACHQAAAAADHQAAAAAAHAAAAAABHAAAAAADHAAAAAADHAAAAAAFHAAAAAACHAAAAAAAHAAAAAACHAAAAAAFHAAAAAAEHAAAAAAAHQAAAAABHQAAAAAEHQAAAAACHAAAAAACHAAAAAABHAAAAAAAHAAAAAAAHAAAAAABHAAAAAABHAAAAAACHAAAAAADHAAAAAAAHAAAAAAEHAAAAAACHAAAAAADHAAAAAACHAAAAAAAHAAAAAAFHAAAAAAAHAAAAAAAHAAAAAAFHAAAAAAFHAAAAAACHAAAAAABHAAAAAACHAAAAAACHQAAAAACHQAAAAAEHQAAAAAFHQAAAAACHQAAAAADHQAAAAACHQAAAAAAHAAAAAAFHAAAAAAFHAAAAAAEHAAAAAAAHAAAAAAFHAAAAAAEHAAAAAABHAAAAAADHAAAAAAFHAAAAAADHAAAAAAEHQAAAAAAHQAAAAACHgAAAAAFHgAAAAAAHgAAAAAFHQAAAAAFHAAAAAADHQAAAAAAHAAAAAABHAAAAAAEHAAAAAAFHAAAAAABHAAAAAADHAAAAAAAHAAAAAAAHAAAAAACHAAAAAACHQAAAAACHQAAAAAAHQAAAAAFHgAAAAAAHgAAAAAAHQAAAAAEHQAAAAACHAAAAAAEHQAAAAAEHAAAAAAEHAAAAAAAHAAAAAADHAAAAAAFHQAAAAACHQAAAAAEHQAAAAAEHQAAAAAAHQAAAAAAHQAAAAAFHQAAAAABHQAAAAAEHQAAAAAFHAAAAAABHAAAAAAEHQAAAAAEHAAAAAAFHAAAAAABHQAAAAAAHQAAAAADHQAAAAAAHQAAAAAAHQAAAAAEHQAAAAAEHQAAAAABHQAAAAADHQAAAAAFHQAAAAADHQAAAAAEHQAAAAADHAAAAAAEHAAAAAACHAAAAAAEHAAAAAACHQAAAAACHQAAAAAEHgAAAAAEHgAAAAACHQAAAAAEHQAAAAAEHQAAAAAAHQAAAAAFHQAAAAABHgAAAAACHgAAAAAFHQAAAAAAHAAAAAAFHAAAAAACHAAAAAABHAAAAAACHAAAAAACHQAAAAADHQAAAAABHgAAAAADHQAAAAABHQAAAAAEHQAAAAAEHAAAAAAEHQAAAAADHQAAAAABHQAAAAADHQAAAAADHAAAAAACHAAAAAAFHAAAAAAAHAAAAAAFHAAAAAAFHQAAAAACHgAAAAAAHgAAAAABHQAAAAADHQAAAAAFHAAAAAADHAAAAAAEHQAAAAADHQAAAAAEHQAAAAADHQAAAAAFHQAAAAACHQAAAAADHQAAAAAEHQAAAAAFHQAAAAAFHQAAAAACHQAAAAABHgAAAAAFHgAAAAAAHQAAAAAFHAAAAAABHAAAAAAFHQAAAAAFHgAAAAACHQAAAAADHQAAAAAFHAAAAAADHAAAAAACHQAAAAAAHQAAAAABHAAAAAABHAAAAAAAHQAAAAAAHgAAAAABHQAAAAAFHQAAAAADHAAAAAAFHAAAAAABHAAAAAACHgAAAAAEHQAAAAABHQAAAAABHAAAAAACHAAAAAAFHAAAAAAEHAAAAAAFHQAAAAAEHQAAAAACHQAAAAAFHQAAAAAEHQAAAAAFHQAAAAADHAAAAAAAHAAAAAACHAAAAAADHQAAAAADHQAAAAAEHQAAAAAAHAAAAAAAHAAAAAAAHAAAAAADHAAAAAAEHAAAAAAFHAAAAAABHQAAAAAAHQAAAAACHgAAAAAFHgAAAAABHQAAAAAFHAAAAAABHAAAAAAEHQAAAAAEHQAAAAABHgAAAAAFHQAAAAAFHAAAAAAEHAAAAAACHQAAAAAEHQAAAAABHAAAAAAFHQAAAAAFHQAAAAAEHQAAAAACHQAAAAAFHAAAAAAEHAAAAAADHAAAAAACHAAAAAAAHQAAAAAF version: 6 -3,1: ind: -3,1 @@ -320,251 +321,251 @@ entities: loadedMarkers: {} pendingMarkers: {} loadedChunks: - - 24,-8 - 0,-16 - 0,-24 - - -16,32 - - -16,24 - -16,16 - 0,-32 - - 24,-16 - - 24,-24 - - 24,-32 - - 48,24 - - 48,8 - - -8,32 - - 40,24 - 48,16 - 40,16 + - 40,8 - 40,0 - - 32,16 - 40,-8 + - 40,-16 + - 48,8 + - 40,-24 - 8,-8 - 16,-8 - 8,-16 - - 32,-8 + - 32,16 - 16,-16 - 8,-24 - 0,-8 - - 48,0 - - 32,24 + - 40,-32 - 16,-24 - - 40,8 - - 24,16 - - 48,-8 + - 32,-40 + - 32,8 - 16,-32 - 8,-32 - - 48,-16 - - 48,-24 - - -8,24 - -8,16 - - 32,8 - - 48,-32 - - 24,8 + - 32,0 + - 40,-40 - -16,8 - 16,16 - - 48,32 - - 40,32 + - 48,0 + - 24,16 - -16,0 - - 40,-16 + - 24,8 - -8,8 - 16,8 - - 32,0 + - 32,-8 - 8,8 - 24,0 - - 40,-24 + - 40,-48 - 32,-16 - 16,0 - - 40,-32 - 0,8 - -16,-8 - 8,0 - 0,0 - - 24,24 - -8,0 - 8,16 - - 32,32 + - 24,-8 - -16,-16 - -16,-24 - - 24,32 + - 48,-8 - 32,-24 - 32,-32 - -8,-8 - - 16,32 + - 48,-16 - -16,-32 - -8,-16 - - 8,32 + - 48,-24 - -8,-24 - -8,-32 - - 16,24 - 0,16 - - 8,24 - - 0,24 - - 0,32 + - 24,-16 + - 24,-40 + - 48,-32 + - 32,-48 + - 24,-48 + - 16,-48 + - 8,-48 + - 0,-48 + - -8,-48 + - -16,-48 + - 16,-40 + - 48,-40 + - 48,-48 + - 8,-40 + - 0,-40 + - -8,-40 + - -16,-40 + - 24,-24 + - 24,-32 entities: - 24,-8: {} 0,-16: {} 0,-24: {} - -16,32: {} - -16,24: {} -16,16: {} 0,-32: {} - 24,-16: {} - 24,-24: {} - 24,-32: {} - 48,24: {} - 48,8: {} - -8,32: {} - 40,24: {} 48,16: {} 40,16: {} + 40,8: {} 40,0: {} - 32,16: {} 40,-8: {} + 40,-16: {} + 48,8: {} + 40,-24: {} 8,-8: {} 16,-8: {} 8,-16: {} - 32,-8: {} + 32,16: {} 16,-16: {} 8,-24: {} 0,-8: {} - 48,0: {} - 32,24: {} + 40,-32: {} 16,-24: {} - 40,8: {} - 24,16: {} - 48,-8: {} + 32,-40: {} + 32,8: {} 16,-32: {} 8,-32: {} - 48,-16: {} - 48,-24: {} - -8,24: {} -8,16: {} - 32,8: {} - 48,-32: {} - 24,8: {} + 32,0: {} + 40,-40: {} -16,8: {} 16,16: {} - 48,32: {} - 40,32: {} + 48,0: {} + 24,16: {} -16,0: {} - 40,-16: {} + 24,8: {} -8,8: {} 16,8: {} - 32,0: {} + 32,-8: {} 8,8: {} 24,0: {} - 40,-24: {} + 40,-48: {} 32,-16: {} 16,0: {} - 40,-32: {} 0,8: {} -16,-8: {} 8,0: {} 0,0: {} - 24,24: {} -8,0: {} 8,16: {} - 32,32: {} + 24,-8: {} -16,-16: {} -16,-24: {} - 24,32: {} + 48,-8: {} 32,-24: {} 32,-32: {} -8,-8: {} - 16,32: {} + 48,-16: {} -16,-32: {} -8,-16: {} - 8,32: {} + 48,-24: {} -8,-24: {} -8,-32: {} - 16,24: {} 0,16: {} - 8,24: {} - 0,24: {} - 0,32: {} + 24,-16: {} + 24,-40: {} + 48,-32: {} + 32,-48: {} + 24,-48: {} + 16,-48: {} + 8,-48: {} + 0,-48: {} + -8,-48: {} + -16,-48: {} + 16,-40: {} + 48,-40: {} + 48,-48: {} + 8,-40: {} + 0,-40: {} + -8,-40: {} + -16,-40: {} + 24,-24: {} + 24,-32: {} decals: - 24,-8: {} 0,-16: {} 0,-24: {} - -16,32: {} - -16,24: {} -16,16: {} 0,-32: {} - 24,-16: {} - 24,-24: {} - 24,-32: {} - 48,24: {} - 48,8: {} - -8,32: {} - 40,24: {} 48,16: {} 40,16: {} + 40,8: {} 40,0: {} - 32,16: {} 40,-8: {} + 40,-16: {} + 48,8: {} + 40,-24: {} 8,-8: {} 16,-8: {} 8,-16: {} - 32,-8: {} + 32,16: {} 16,-16: {} 8,-24: {} 0,-8: {} - 48,0: {} - 32,24: {} + 40,-32: {} 16,-24: {} - 40,8: {} - 24,16: {} - 48,-8: {} + 32,-40: {} + 32,8: {} 16,-32: {} 8,-32: {} - 48,-16: {} - 48,-24: {} - -8,24: {} -8,16: {} - 32,8: {} - 48,-32: {} - 24,8: {} + 32,0: {} + 40,-40: {} -16,8: {} 16,16: {} - 48,32: {} - 40,32: {} + 48,0: {} + 24,16: {} -16,0: {} - 40,-16: {} + 24,8: {} -8,8: {} 16,8: {} - 32,0: {} + 32,-8: {} 8,8: {} 24,0: {} - 40,-24: {} + 40,-48: {} 32,-16: {} 16,0: {} - 40,-32: {} 0,8: {} -16,-8: {} 8,0: {} 0,0: {} - 24,24: {} -8,0: {} 8,16: {} - 32,32: {} + 24,-8: {} -16,-16: {} -16,-24: {} - 24,32: {} + 48,-8: {} 32,-24: {} 32,-32: {} -8,-8: {} - 16,32: {} + 48,-16: {} -16,-32: {} -8,-16: {} - 8,32: {} + 48,-24: {} -8,-24: {} -8,-32: {} - 16,24: {} 0,16: {} - 8,24: {} - 0,24: {} - 0,32: {} + 24,-16: {} + 24,-40: {} + 48,-32: {} + 32,-48: {} + 24,-48: {} + 16,-48: {} + 8,-48: {} + 0,-48: {} + -8,-48: {} + -16,-48: {} + 16,-40: {} + 48,-40: {} + 48,-48: {} + 8,-40: {} + 0,-40: {} + -8,-40: {} + -16,-40: {} + 24,-24: {} + 24,-32: {} modifiedTiles: 8,0: - 8,0 @@ -67922,10 +67923,10 @@ entities: - type: Transform pos: 7.372381,1.0823065 parent: 1 - - uid: 9839 + - uid: 9783 components: - type: Transform - pos: 19.487864,-7.393545 + pos: 18.543306,-8.375412 parent: 1 - proto: CP14DungeonEntranceAutoLink entities: @@ -68182,6 +68183,38 @@ entities: - type: Transform pos: -0.6293511,-4.187657 parent: 1 +- proto: CP14FoodCucumber + entities: + - uid: 9871 + components: + - type: Transform + pos: -1.6717572,-4.420642 + parent: 1 + - uid: 9872 + components: + - type: Transform + pos: -1.8404775,-4.2744656 + parent: 1 + - uid: 9873 + components: + - type: Transform + pos: -1.8854694,-4.420642 + parent: 1 + - uid: 9874 + components: + - type: Transform + pos: -1.7279973,-4.4543753 + parent: 1 + - uid: 9875 + components: + - type: Transform + pos: -1.7055016,-4.420642 + parent: 1 + - uid: 9876 + components: + - type: Transform + pos: -1.6717572,-4.2182436 + parent: 1 - proto: CP14FoodEgg entities: - uid: 9846 @@ -68201,6 +68234,38 @@ entities: - type: Transform pos: -0.12319158,-4.4013004 parent: 1 +- proto: CP14FoodPotato + entities: + - uid: 9865 + components: + - type: Transform + pos: -1.294512,-4.353176 + parent: 1 + - uid: 9866 + components: + - type: Transform + pos: -1.2270243,-4.353176 + parent: 1 + - uid: 9867 + components: + - type: Transform + pos: -1.2270243,-4.1395326 + parent: 1 + - uid: 9868 + components: + - type: Transform + pos: -1.3619998,-4.46562 + parent: 1 + - uid: 9869 + components: + - type: Transform + pos: -1.6319516,-4.3756647 + parent: 1 + - uid: 9870 + components: + - type: Transform + pos: -1.429488,-4.589308 + parent: 1 - proto: CP14FoodPumpkin entities: - uid: 9843 @@ -68481,6 +68546,40 @@ entities: - type: Transform pos: 14.5,-10.5 parent: 1 +- proto: CP14PlantCucumber + entities: + - uid: 9839 + components: + - type: Transform + pos: 13.5,-8.5 + parent: 1 + - uid: 9860 + components: + - type: Transform + pos: 13.5,-9.5 + parent: 1 + - uid: 9861 + components: + - type: Transform + pos: 14.5,-8.5 + parent: 1 +- proto: CP14PlantPotato + entities: + - uid: 1086 + components: + - type: Transform + pos: 17.5,-9.5 + parent: 1 + - uid: 9862 + components: + - type: Transform + pos: 16.5,-8.5 + parent: 1 + - uid: 9863 + components: + - type: Transform + pos: 17.5,-8.5 + parent: 1 - proto: CP14PlantPumpkin entities: - uid: 9798 @@ -68493,10 +68592,10 @@ entities: - type: Transform pos: 16.5,-10.5 parent: 1 - - uid: 9800 + - uid: 9864 components: - type: Transform - pos: 17.5,-9.5 + pos: 17.5,-10.5 parent: 1 - proto: CP14PlantWheat entities: @@ -68527,11 +68626,6 @@ entities: parent: 1 - proto: CP14RandomBushOffsetSpawner entities: - - uid: 1086 - components: - - type: Transform - pos: 20.5,-5.5 - parent: 1 - uid: 1087 components: - type: Transform @@ -68790,6 +68884,28 @@ entities: - type: Transform pos: 19.693756,-6.399627 parent: 1 +- proto: CP14SeedCucumber + entities: + - uid: 9784 + components: + - type: Transform + pos: 20.1315,-6.0960546 + parent: 1 + - uid: 9785 + components: + - type: Transform + pos: 19.951532,-6.377164 + parent: 1 + - uid: 9786 + components: + - type: Transform + pos: 19.951532,-6.1185436 + parent: 1 + - uid: 9800 + components: + - type: Transform + pos: 20.232733,-6.4108973 + parent: 1 - proto: CP14SeedPumpkin entities: - uid: 9791 @@ -68812,28 +68928,6 @@ entities: - type: Transform pos: 18.896654,-6.365894 parent: 1 -- proto: CP14SeedTomato - entities: - - uid: 9783 - components: - - type: Transform - pos: 19.952461,-6.2084727 - parent: 1 - - uid: 9784 - components: - - type: Transform - pos: 20.053692,-6.399627 - parent: 1 - - uid: 9785 - components: - - type: Transform - pos: 20.154924,-6.163495 - parent: 1 - - uid: 9786 - components: - - type: Transform - pos: 20.23366,-6.410871 - parent: 1 - proto: CP14SeedWheat entities: - uid: 9787 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml index d2faed360c..b6065edf03 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml @@ -127,4 +127,74 @@ - ReagentId: Nutriment Quantity: 4 - ReagentId: Vitamin - Quantity: 1 \ No newline at end of file + Quantity: 1 + +- type: entity + id: CP14FoodPotato + parent: FoodInjectableBase + name: potato + description: Cute potato + components: + - type: Item + size: Tiny + - type: FlavorProfile + flavors: + - potatoes + - type: Sprite + sprite: _CP14/Objects/Flora/Farm/potato.rsi + layers: + - state: base1 + map: [ "random" ] + - type: RandomSprite + available: + - random: + base1: "" + base2: "" + base3: "" + base4: "" + - type: SolutionContainerManager + solutions: + food: + maxVol: 11 + reagents: + - ReagentId: Nutriment + Quantity: 7 + - ReagentId: Vitamin + Quantity: 2 + - type: CP14Seed + plantProto: CP14PlantPotato #TODO sliceable potato + +- type: entity + id: CP14FoodCucumber + parent: FoodInjectableBase + name: cucumber + description: An oblong green vegetable. Refreshing! + components: + - type: Item + size: Tiny + - type: FlavorProfile + flavors: + - CP14Water #TODO + - type: Sprite + sprite: _CP14/Objects/Flora/Farm/cucumber.rsi + layers: + - state: base1 + map: [ "random" ] + - type: RandomSprite + available: + - random: + base1: "" + base2: "" + base3: "" + base4: "" + - type: SolutionContainerManager + solutions: + food: + maxVol: 11 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 2 + - ReagentId: CP14Water + Quantity: 3 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml index b02f08a035..5ba048c7f4 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml @@ -47,6 +47,19 @@ - type: CP14Seed plantProto: CP14PlantCabbage +- type: entity + id: CP14SeedCucumber + name: cucumber seeds + description: Are cucumber seeds. You know what to do with them. + parent: CP14BaseSeed + components: + - type: Sprite + layers: + - state: bag + - state: cucumber + - type: CP14Seed + plantProto: CP14PlantCucumber + - type: entity id: CP14SeedTomato name: tomato seeds diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/cucumber.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/cucumber.yml new file mode 100644 index 0000000000..cec33ccf30 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/cucumber.yml @@ -0,0 +1,69 @@ +- type: entity + id: CP14PlantCucumber + parent: CP14GatherablePlantBase + name: cucumber + description: OOO # TODO + components: + - type: Sprite + sprite: _CP14/Structures/Flora/Farm/cucumber.rsi + layers: + - state: grow-1 + map: ["enum.PlantVisualLayers.Base"] + - type: CP14PlantMetabolizer + metabolizerId: Base + - type: CP14PlantEnergyFromLight + energy: 1 + daytime: true + - type: CP14PlantVisuals + growthSteps: 6 + - type: CP14PlantGrowing + energyCost: 1 + resourceCost: 1 + growthPerUpdate: 0.1 # 10 minute to full grow + - type: CP14PlantFading + resourcePerMinute: 0.25 #20 minute from water + - type: CP14PlantGatherable + deleteAfterHarvest: true + loot: + All: CP14GatherCucumber + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 25 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTypeTrigger + damageType: Cellular + damage: 1 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + CP14PlantCucumberDeath: + min: 1 + max: 1 + +- type: entity + id: CP14PlantCucumberDeath + name: dead cucumber + description: The sad spectacle of wasted food. + parent: CP14GatherableBase + components: + - type: Sprite + sprite: _CP14/Structures/Flora/Farm/cucumber.rsi + state: death + - type: Gatherable + toolWhitelist: + tags: + - CP14HerbalGathering + +- type: entityLootTable + id: CP14GatherCucumber + entries: + - id: CP14FoodCucumber + amount: 2 + maxAmount: 3 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/potato.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/potato.yml new file mode 100644 index 0000000000..e2fa235ac4 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/potato.yml @@ -0,0 +1,69 @@ +- type: entity + id: CP14PlantPotato + parent: CP14GatherablePlantBase + name: potato + description: OOO # TODO + components: + - type: Sprite + sprite: _CP14/Structures/Flora/Farm/potato.rsi + layers: + - state: grow-1 + map: ["enum.PlantVisualLayers.Base"] + - type: CP14PlantMetabolizer + metabolizerId: Base + - type: CP14PlantEnergyFromLight + energy: 1 + daytime: true + - type: CP14PlantVisuals + growthSteps: 5 + - type: CP14PlantGrowing + energyCost: 1 + resourceCost: 1 + growthPerUpdate: 0.1 # 10 minute to full grow + - type: CP14PlantFading + resourcePerMinute: 0.25 #20 minute from water + - type: CP14PlantGatherable + deleteAfterHarvest: true + loot: + All: CP14GatherPotato + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 25 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTypeTrigger + damageType: Cellular + damage: 1 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + CP14PlantPotatoDeath: + min: 1 + max: 1 + +- type: entity + id: CP14PlantPotatoDeath + name: dead potato + description: The sad spectacle of wasted food. + parent: CP14GatherableBase + components: + - type: Sprite + sprite: _CP14/Structures/Flora/Farm/potato.rsi + state: death + - type: Gatherable + toolWhitelist: + tags: + - CP14HerbalGathering + +- type: entityLootTable + id: CP14GatherPotato + entries: + - id: CP14FoodPotato + amount: 2 + maxAmount: 4 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/wheat.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/wheat.yml index 877c22621d..0708165f95 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/wheat.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/wheat.yml @@ -61,6 +61,9 @@ toolWhitelist: tags: - CP14HerbalGathering + - type: CP14WaveShader + speed: 2.8 + dis: 4 - type: entityLootTable id: CP14GatherWheat diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml index 10eca3bcae..bcb8f1e9a2 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml @@ -123,6 +123,7 @@ - CP14FoodMeatLamb - CP14SeedPumpkin - CP14SeedWheat + - CP14SeedCucumber - type: entity id: CP14WorkbenchSewing diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml index d686816628..6df5c0ae5e 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml @@ -38,6 +38,13 @@ CP14FoodPumpkinSlice: 1 result: CP14SeedPumpkin +- type: CP14Recipe + id: CP14SeedCucumber + craftTime: 1 + entities: + CP14FoodCucumber: 1 + result: CP14SeedCucumber + - type: CP14Recipe id: CP14SeedWheat craftTime: 1 diff --git a/Resources/Prototypes/_CP14/audio_loops.yml b/Resources/Prototypes/_CP14/audio_loops.yml index 715113d63a..8185d240bd 100644 --- a/Resources/Prototypes/_CP14/audio_loops.yml +++ b/Resources/Prototypes/_CP14/audio_loops.yml @@ -1,11 +1,11 @@ - type: ambientLoop - id: Grasslands + id: OpenWinds sound: params: volume: -3 - collection: CP14LoopGrassland - rules: NearGrass + collection: CP14LoopWinds + rules: OpenWinds - type: ambientLoop id: Water @@ -17,9 +17,9 @@ # Sound collections - type: soundCollection - id: CP14LoopGrassland + id: CP14LoopWinds files: - - /Audio/_CP14/Ambience/Loops/grasslands.ogg + - /Audio/_CP14/Ambience/Loops/winds.ogg - type: soundCollection id: CP14LoopWater @@ -28,7 +28,7 @@ # Rules - type: rules - id: NearGrass + id: OpenWinds rules: - !type:NearbyTilesPercentRule ignoreAnchored: true @@ -37,6 +37,8 @@ - CP14FloorGrass - CP14FloorGrassLight - CP14FloorGrassTall + - CP14FloorDirt + - CP14FloorSand range: 5 - type: rules diff --git a/Resources/Textures/_CP14/Effects/weather.rsi/rain.png b/Resources/Textures/_CP14/Effects/weather.rsi/rain.png index 09d74bad9a..aa751d6dae 100644 Binary files a/Resources/Textures/_CP14/Effects/weather.rsi/rain.png and b/Resources/Textures/_CP14/Effects/weather.rsi/rain.png differ diff --git a/Resources/Textures/_CP14/Effects/weather.rsi/storm.png b/Resources/Textures/_CP14/Effects/weather.rsi/storm.png index e42f8a7061..ca7fec68c2 100644 Binary files a/Resources/Textures/_CP14/Effects/weather.rsi/storm.png and b/Resources/Textures/_CP14/Effects/weather.rsi/storm.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/base1.png b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/base1.png new file mode 100644 index 0000000000..ea9684daa3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/base1.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/base2.png b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/base2.png new file mode 100644 index 0000000000..919fc8aad9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/base2.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/base3.png b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/base3.png new file mode 100644 index 0000000000..127e893bf9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/base3.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/base4.png b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/base4.png new file mode 100644 index 0000000000..c5f6dc42d5 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/base4.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/meta.json new file mode 100644 index 0000000000..8fd863464d --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base1" + }, + { + "name": "base2" + }, + { + "name": "base3" + }, + { + "name": "base4" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/potato.rsi/base1.png b/Resources/Textures/_CP14/Objects/Flora/Farm/potato.rsi/base1.png new file mode 100644 index 0000000000..ea31660873 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/potato.rsi/base1.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/potato.rsi/base2.png b/Resources/Textures/_CP14/Objects/Flora/Farm/potato.rsi/base2.png new file mode 100644 index 0000000000..fbdafb8e6a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/potato.rsi/base2.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/potato.rsi/base3.png b/Resources/Textures/_CP14/Objects/Flora/Farm/potato.rsi/base3.png new file mode 100644 index 0000000000..d6cd0180a4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/potato.rsi/base3.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/potato.rsi/base4.png b/Resources/Textures/_CP14/Objects/Flora/Farm/potato.rsi/base4.png new file mode 100644 index 0000000000..0937bd3a8e Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/potato.rsi/base4.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/potato.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Farm/potato.rsi/meta.json new file mode 100644 index 0000000000..8fd863464d --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Flora/Farm/potato.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base1" + }, + { + "name": "base2" + }, + { + "name": "base3" + }, + { + "name": "base4" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/cucumber.png b/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/cucumber.png new file mode 100644 index 0000000000..e65a3ef1de Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/cucumber.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/meta.json index 32c5e3d610..809792e3c4 100644 --- a/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/meta.json @@ -13,6 +13,12 @@ { "name": "cabbage" }, + { + "name": "cucumber" + }, + { + "name": "potatoes" + }, { "name": "pumpkin" }, diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/potatoes.png b/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/potatoes.png new file mode 100644 index 0000000000..211b5ea6ff Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/potatoes.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/death.png b/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/death.png new file mode 100644 index 0000000000..02e339d08f Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/death.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-1.png b/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-1.png new file mode 100644 index 0000000000..861500a382 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-1.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-2.png b/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-2.png new file mode 100644 index 0000000000..25fba4ce60 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-2.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-3.png b/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-3.png new file mode 100644 index 0000000000..edca17791a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-3.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-4.png b/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-4.png new file mode 100644 index 0000000000..7c04c058d8 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-4.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-5.png b/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-5.png new file mode 100644 index 0000000000..d0527210e7 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-5.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-6.png b/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-6.png new file mode 100644 index 0000000000..6ef8e81ced Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/grow-6.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/meta.json new file mode 100644 index 0000000000..30e14d2088 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Flora/Farm/cucumber.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "grow-1" + }, + { + "name": "grow-2" + }, + { + "name": "grow-3" + }, + { + "name": "grow-4" + }, + { + "name": "grow-5" + }, + { + "name": "grow-6" + }, + { + "name": "death" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/death.png b/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/death.png new file mode 100644 index 0000000000..89e3134e4b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/death.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/grow-1.png b/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/grow-1.png new file mode 100644 index 0000000000..377ec88b8c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/grow-1.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/grow-2.png b/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/grow-2.png new file mode 100644 index 0000000000..87c74aad2f Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/grow-2.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/grow-3.png b/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/grow-3.png new file mode 100644 index 0000000000..c0c598313f Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/grow-3.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/grow-4.png b/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/grow-4.png new file mode 100644 index 0000000000..1ead3b76fc Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/grow-4.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/grow-5.png b/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/grow-5.png new file mode 100644 index 0000000000..151de38e3a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/grow-5.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/meta.json new file mode 100644 index 0000000000..5bf55d154c --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Flora/Farm/potato.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "grow-1" + }, + { + "name": "grow-2" + }, + { + "name": "grow-3" + }, + { + "name": "grow-4" + }, + { + "name": "grow-5" + }, + { + "name": "death" + } + ] +} \ No newline at end of file