From 3dc303105429da582b7ca199cd3647debe8086d1 Mon Sep 17 00:00:00 2001
From: Acruid <shatter66@gmail.com>
Date: Thu, 25 Oct 2018 17:35:34 -0700
Subject: [PATCH] World Storage (#112)

* Added generic crate assets.
Added open flag to StorageComponent.

* StorageComponent door toggling works.

* Door now updates based on if someone is subscribed to the Storage.

* Added License to crate.rsi
Fixed Icon of crate.

* Added basic Locker.

* Added Fire Extinguisher.

* Added ability to close the storage UI by the server.
Notify the server that the UI is closed, so that the player is unsubscribed from the storage.
Unsubscribe the player from a storage if the player entity moves out of range.

* Add check to make sure entity is on the same map as the storage.

* Update Engine module.

* Update Engine.
---
 .../Storage/ClientStorageComponent.cs         |  50 ++++++++++++++-
 Content.Server/Content.Server.csproj          |   1 +
 .../Items/Storage/ServerStorageComponent.cs   |  50 +++++++++++++--
 .../EntitySystems/StorageSystem.cs            |  57 ++++++++++++++++++
 .../Storage/SharedStorageComponent.cs         |  23 +++++++
 Resources/Prototypes/Entities/Container.yml   |  24 ++++++++
 Resources/Prototypes/Entities/Items.yml       |  13 ++++
 Resources/Prototypes/Entities/closet.yml      |  24 ++++++++
 .../Textures/Buildings/closet.rsi/generic.png | Bin 0 -> 178 bytes
 .../Buildings/closet.rsi/generic_door.png     | Bin 0 -> 177 bytes
 .../Buildings/closet.rsi/generic_open.png     | Bin 0 -> 165 bytes
 .../Textures/Buildings/closet.rsi/meta.json   |  29 +++++++++
 .../Textures/Buildings/crate.rsi/crate.png    | Bin 0 -> 278 bytes
 .../Buildings/crate.rsi/crate_door.png        | Bin 0 -> 183 bytes
 .../Buildings/crate.rsi/crate_open.png        | Bin 0 -> 166 bytes
 .../Textures/Buildings/crate.rsi/meta.json    |  29 +++++++++
 .../Textures/Objects/fire_extinguisher.png    | Bin 0 -> 230 bytes
 engine                                        |   2 +-
 18 files changed, 296 insertions(+), 6 deletions(-)
 create mode 100644 Content.Server/GameObjects/EntitySystems/StorageSystem.cs
 create mode 100644 Resources/Prototypes/Entities/Container.yml
 create mode 100644 Resources/Prototypes/Entities/closet.yml
 create mode 100644 Resources/Textures/Buildings/closet.rsi/generic.png
 create mode 100644 Resources/Textures/Buildings/closet.rsi/generic_door.png
 create mode 100644 Resources/Textures/Buildings/closet.rsi/generic_open.png
 create mode 100644 Resources/Textures/Buildings/closet.rsi/meta.json
 create mode 100644 Resources/Textures/Buildings/crate.rsi/crate.png
 create mode 100644 Resources/Textures/Buildings/crate.rsi/crate_door.png
 create mode 100644 Resources/Textures/Buildings/crate.rsi/crate_open.png
 create mode 100644 Resources/Textures/Buildings/crate.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/fire_extinguisher.png

diff --git a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
index 72d3df22e4..9878fc0767 100644
--- a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
+++ b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
@@ -27,6 +27,16 @@ namespace Content.Client.GameObjects.Components.Storage
         private int StorageCapacityMax;
         private StorageWindow Window;
 
+        public bool Open
+        {
+            get => _open;
+            set
+            {
+                _open = value;
+                SetDoorSprite(_open);
+            }
+        }
+
         public override void OnAdd()
         {
             base.OnAdd();
@@ -41,6 +51,17 @@ namespace Content.Client.GameObjects.Components.Storage
             base.OnRemove();
         }
 
+        /// <inheritdoc />
+        public override void HandleComponentState(ComponentState state)
+        {
+            base.HandleComponentState(state);
+
+            if (!(state is StorageComponentState storageState))
+                return;
+
+            Open = storageState.Open;
+        }
+
         public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
         {
             switch (message)
@@ -54,7 +75,7 @@ namespace Content.Client.GameObjects.Components.Storage
                     OpenUI();
                     break;
                 case CloseStorageUIMessage msg:
-                    // todo: close window/grey it out
+                    CloseUI();
                     break;
             }
         }
@@ -80,6 +101,11 @@ namespace Content.Client.GameObjects.Components.Storage
             Window.Open();
         }
 
+        private void CloseUI()
+        {
+            Window.Close();
+        }
+
         /// <summary>
         /// Function for clicking one of the stored entity buttons in the UI, tells server to remove that entity
         /// </summary>
@@ -89,6 +115,22 @@ namespace Content.Client.GameObjects.Components.Storage
             SendNetworkMessage(new RemoveEntityMessage(entityuid));
         }
 
+        private void SetDoorSprite(bool open)
+        {
+            if(!Owner.TryGetComponent<ISpriteComponent>(out var spriteComp))
+                return;
+
+            if(!spriteComp.Running)
+                return;
+
+            var baseName = spriteComp.LayerGetState(0).Name;
+
+            var stateId = open ? $"{baseName}_open" : $"{baseName}_door";
+
+            if (spriteComp.BaseRSI.TryGetState(stateId, out _))
+                spriteComp.LayerSetState(1, stateId);
+        }
+
         /// <summary>
         /// GUI class for client storage component
         /// </summary>
@@ -113,6 +155,12 @@ namespace Content.Client.GameObjects.Components.Storage
                 Information = VSplitContainer.GetChild<Label>("Information");
             }
 
+            public override void Close()
+            {
+                StorageEntity.SendNetworkMessage(new CloseStorageUIMessage());
+                base.Close();
+            }
+
             /// <summary>
             /// Loops through stored entities creating buttons for each, updates information labels
             /// </summary>
diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
index 5635a0e5ee..acd3bbd290 100644
--- a/Content.Server/Content.Server.csproj
+++ b/Content.Server/Content.Server.csproj
@@ -102,6 +102,7 @@
     <Compile Include="GameObjects\EntitySystems\PowerApcSystem.cs" />
     <Compile Include="GameObjects\EntitySystems\PowerSmesSystem.cs" />
     <Compile Include="GameObjects\EntitySystems\PowerSystem.cs" />
+    <Compile Include="GameObjects\EntitySystems\StorageSystem.cs" />
     <Compile Include="GameObjects\EntitySystems\WelderSystem.cs" />
     <Compile Include="GameObjects\EntitySystems\TemperatureSystem.cs" />
     <Compile Include="Interfaces\GameObjects\Components\Items\IHandsComponent.cs" />
diff --git a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
index 36d7ac8bd3..bbb0047927 100644
--- a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
+++ b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
@@ -14,6 +14,7 @@ using SS14.Shared.IoC;
 using SS14.Shared.Log;
 using SS14.Shared.Serialization;
 using System.Collections.Generic;
+using SS14.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects
 {
@@ -28,12 +29,32 @@ namespace Content.Server.GameObjects
         private int StorageCapacityMax = 10000;
         public HashSet<IPlayerSession> SubscribedSessions = new HashSet<IPlayerSession>();
 
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool Open
+        {
+            get => _open;
+            set
+            {
+                if (_open == value)
+                    return;
+
+                _open = value;
+                Dirty();
+            }
+        }
+
         public override void OnAdd()
         {
             base.OnAdd();
 
             storage = ContainerManagerComponent.Create<Container>("storagebase", Owner);
         }
+        
+        /// <inheritdoc />
+        public override ComponentState GetComponentState()
+        {
+            return new StorageComponentState(_open);
+        }
 
         public override void ExposeData(ObjectSerializer serializer)
         {
@@ -155,6 +176,7 @@ namespace Content.Server.GameObjects
                 Logger.DebugS("Storage", "Storage (UID {0}) subscribed player session (UID {1}).", Owner.Uid, session.AttachedEntityUid);
                 session.PlayerStatusChanged += HandlePlayerSessionChangeEvent;
                 SubscribedSessions.Add(session);
+                UpdateDoorState();
             }
         }
 
@@ -164,9 +186,18 @@ namespace Content.Server.GameObjects
         /// <param name="channel"></param>
         public void UnsubscribeSession(IPlayerSession session)
         {
-            Logger.DebugS("Storage", "Storage (UID {0}) unsubscribed player session (UID {1}).", Owner.Uid, session.AttachedEntityUid);
-            SubscribedSessions.Remove(session);
-            SendNetworkMessage(new CloseStorageUIMessage(), session.ConnectedClient);
+            if(SubscribedSessions.Contains(session))
+            {
+                Logger.DebugS("Storage", "Storage (UID {0}) unsubscribed player session (UID {1}).", Owner.Uid, session.AttachedEntityUid);
+                SubscribedSessions.Remove(session);
+                SendNetworkMessage(new CloseStorageUIMessage(), session.ConnectedClient);
+                UpdateDoorState();
+            }
+        }
+
+        private void UpdateDoorState()
+        {
+            Open = SubscribedSessions.Count != 0;
         }
 
         public void HandlePlayerSessionChangeEvent(object obj, SessionStatusEventArgs SSEA)
@@ -210,7 +241,8 @@ namespace Content.Server.GameObjects
 
             switch (message)
             {
-                case RemoveEntityMessage msg:
+                case RemoveEntityMessage _:
+                {
                     var playerMan = IoCManager.Resolve<IPlayerManager>();
                     var session = playerMan.GetSessionByChannel(netChannel);
                     var playerentity = session.AttachedEntity;
@@ -237,6 +269,16 @@ namespace Content.Server.GameObjects
                             entity.GetComponent<ITransformComponent>().WorldPosition = ourtransform.WorldPosition;
                         }
                     }
+                }
+                    break;
+
+                case CloseStorageUIMessage _:
+                {
+                    var playerMan = IoCManager.Resolve<IPlayerManager>();
+                    var session = playerMan.GetSessionByChannel(netChannel);
+
+                    UnsubscribeSession(session);
+                }
                     break;
             }
         }
diff --git a/Content.Server/GameObjects/EntitySystems/StorageSystem.cs b/Content.Server/GameObjects/EntitySystems/StorageSystem.cs
new file mode 100644
index 0000000000..8f0fa4bffc
--- /dev/null
+++ b/Content.Server/GameObjects/EntitySystems/StorageSystem.cs
@@ -0,0 +1,57 @@
+using System.Collections.Generic;
+using SS14.Server.Interfaces.Player;
+using SS14.Shared.GameObjects;
+using SS14.Shared.GameObjects.Systems;
+
+namespace Content.Server.GameObjects.EntitySystems
+{
+    class StorageSystem : EntitySystem
+    {
+        private readonly List<IPlayerSession> _sessionCache = new List<IPlayerSession>();
+
+        /// <inheritdoc />
+        public override void Initialize()
+        {
+            EntityQuery = new TypeEntityQuery(typeof(ServerStorageComponent));
+        }
+
+        /// <inheritdoc />
+        public override void Update(float frameTime)
+        {
+            foreach (var entity in RelevantEntities)
+            {
+                var storageComp = entity.GetComponent<ServerStorageComponent>();
+
+                // We have to cache the set of sessions because Unsubscribe modifies the original.
+                _sessionCache.Clear();
+                _sessionCache.AddRange(storageComp.SubscribedSessions);
+
+                if (_sessionCache.Count == 0)
+                    continue;
+
+                var storagePos = entity.Transform.WorldPosition;
+                var storageMap = entity.Transform.MapID;
+
+                foreach (var session in _sessionCache)
+                {
+                    var attachedEntity = session.AttachedEntity;
+
+                    // The component manages the set of sessions, so this invalid session should be removed soon.
+                    if (attachedEntity == null || !attachedEntity.IsValid())
+                        continue;
+
+                    if(storageMap != attachedEntity.Transform.MapID)
+                        continue;
+
+                    var distanceSquared = (storagePos - attachedEntity.Transform.WorldPosition).LengthSquared;
+                    if (distanceSquared > InteractionSystem.INTERACTION_RANGE_SQUARED)
+                    {
+                        storageComp.UnsubscribeSession(session);
+                    }
+                }
+
+
+            }
+        }
+    }
+}
diff --git a/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs b/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs
index c0f1749cd2..d3db244861 100644
--- a/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs
+++ b/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs
@@ -9,6 +9,29 @@ namespace Content.Shared.GameObjects.Components.Storage
     {
         public sealed override string Name => "Storage";
         public override uint? NetID => ContentNetIDs.INVENTORY;
+        public override Type StateType => typeof(StorageComponentState);
+
+        protected bool _open;
+
+        /// <inheritdoc />
+        public override void ExposeData(ObjectSerializer serializer)
+        {
+            base.ExposeData(serializer);
+
+            serializer.DataField(ref _open, "open", false);
+        }
+    }
+
+    [Serializable, NetSerializable]
+    public class StorageComponentState : ComponentState
+    {
+        public bool Open { get; }
+
+        public StorageComponentState(bool open)
+            : base(ContentNetIDs.INVENTORY)
+        {
+            Open = open;
+        }
     }
 
     /// <summary>
diff --git a/Resources/Prototypes/Entities/Container.yml b/Resources/Prototypes/Entities/Container.yml
new file mode 100644
index 0000000000..b477d569fd
--- /dev/null
+++ b/Resources/Prototypes/Entities/Container.yml
@@ -0,0 +1,24 @@
+- type: entity
+  id: crate_generic
+  name: Crate
+  description: A large container for items.
+  components:
+  - type: Sprite
+    sprite: Buildings/crate.rsi
+    layers:
+    - state: crate
+    - state: crate_door
+
+  - type: Icon
+    sprite: Buildings/crate.rsi
+    state: crate
+
+  - type: Clickable
+  - type: BoundingBox
+  - type: Collidable
+  - type: Storage
+    Capacity: 60
+
+  placement:
+    snap:
+    - Wall
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Items.yml b/Resources/Prototypes/Entities/Items.yml
index d5cc9894f0..0698d7db7d 100644
--- a/Resources/Prototypes/Entities/Items.yml
+++ b/Resources/Prototypes/Entities/Items.yml
@@ -69,6 +69,19 @@
   - type: Item
     Size: 10
 
+- type: entity
+  name: "Fire Extinguisher"
+  parent: BaseItem
+  id: fire_extinguisher
+  description: Extinguishes fires.
+  components:
+  - type: Sprite
+    texture: Objects/fire_extinguisher.png
+  - type: Icon
+    texture: Objects/fire_extinguisher.png
+  - type: Item
+    Size: 10
+    
 #handheld lights
 - type: entity
   name: "Lantern"
diff --git a/Resources/Prototypes/Entities/closet.yml b/Resources/Prototypes/Entities/closet.yml
new file mode 100644
index 0000000000..01fb939d29
--- /dev/null
+++ b/Resources/Prototypes/Entities/closet.yml
@@ -0,0 +1,24 @@
+- type: entity
+  id: locker_generic
+  name: Locker
+  description: A standard-issue Nanotrasen storage unit.
+  components:
+  - type: Sprite
+    sprite: Buildings/closet.rsi
+    layers:
+    - state: generic
+    - state: generic_door
+
+  - type: Icon
+    sprite: Buildings/closet.rsi
+    state: generic
+
+  - type: Clickable
+  - type: BoundingBox
+  - type: Collidable
+  - type: Storage
+    Capacity: 80
+
+  placement:
+    snap:
+    - Wall
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/closet.rsi/generic.png b/Resources/Textures/Buildings/closet.rsi/generic.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9d0380ee00a4082bba2e5e63b024fe756d72014
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(i*8>L*$jhs{1r)E}eXP7`
zhKYskljpDQ-<hcjRKQpg<QL4~@a#q!kmK#?;uxYaF*$*O$x+onAf<sZQQW|wg}X(v
z*-?v=>0o9;0+%>PE7Oh!E|+fM7>7Uso|X%&E}B9OH>@~VUpxxxaS&@+;oxEx$G~8i
XZTflE&M&b*V;MYM{an^LB{Ts56xB4*

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Buildings/closet.rsi/generic_door.png b/Resources/Textures/Buildings/closet.rsi/generic_door.png
new file mode 100644
index 0000000000000000000000000000000000000000..10c0367ea41a85acdbaa6ab00b38d74800619e65
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(i*8>L*$jhs{1r)E}eeB8e
zSLIDJOe}1_u2^&hsDQB~$S;_|;n|HeAjiwo#W6%<Vse6ng+j_BCYEzu9E_I(6gZA)
z3%q%h)TJaaMPr%QBCbQ*7I1cGF65RF6mhuj)V9@yqos*)QiE29e2dBiHZ~5%OAHJ*
Xe(A{j=IO5on#$nm>gTe~DWM4fM8-G&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Buildings/closet.rsi/generic_open.png b/Resources/Textures/Buildings/closet.rsi/generic_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3dcabd1e28005c6a72f3cac4c171895754ddccd
GIT binary patch
literal 165
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{*8>L*m{{1BH_dPhD3+I3
zmz9_1oHNZ1D9cz9<QL4~@a#q!kmKm-;uxYaF*!k^#UVhz*TFL~fW`H|4Udxop$Be6
z2)Z6Hk?=im!(>K?s6?BPa>65zO$?ITCg><=bf__i6eTKfFx-mc56xkcy9YFk!PC{x
JWt~$(6995`E$09L

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Buildings/closet.rsi/meta.json b/Resources/Textures/Buildings/closet.rsi/meta.json
new file mode 100644
index 0000000000..49576de12f
--- /dev/null
+++ b/Resources/Textures/Buildings/closet.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+    "version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Taken from https://github.com/discordia-space/CEV-Eris.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "generic",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "generic_door",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "generic_open",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/crate.rsi/crate.png b/Resources/Textures/Buildings/crate.rsi/crate.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6a11f9f6ad36e83ca1a818d9f749ac7c7a3cee8
GIT binary patch
literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy_5nU2u1Aj^O;1l>yl9b|o7=Wc
zn^vt_6%rDXl$4a8pYQ1CXl7<+V5EEX>Q#M1?F$z!w6?ZJM@Oe+B)EGzr=+Cl>+ARV
z>AeCP#aI&L7tG-B>_!@p)9UHs7-G@;_R>YZLkc{tiEh?vC8Y<x{X4(PSZbH7@b)7W
zPs^{i$nRKLTyKAMZ|XT)LxuZYeZLs0j2ih5r>1j!WBn)L@<(YCZxG8#7L{bC#R1$A
z>m6>g2x~t$$rkz9%UkoS<uhLgEBlPK>pQm{<k=^eQed>A#Ydr{UNv{=lf1~3<FZA}
YZ<~cfV>ksr0UgBP>FVdQ&MBb@0R66Mh5!Hn

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Buildings/crate.rsi/crate_door.png b/Resources/Textures/Buildings/crate.rsi/crate_door.png
new file mode 100644
index 0000000000000000000000000000000000000000..a191869066f929bcd2c8ea1312ab2dfd45c7188d
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)*P};|rl+U7xw&oIv}x7K
zm5UcGGBDD;aN&Z!q4w@Z{<A=3j3q&S!3+-1ZlnP@UY;(FAsQ2t6C^G*1PXAmEMPiy
zEFgj9q4CTe4vm|cA{?%;@-ZD`I#j{JqsYWztiY6W)FAqdu)?)1)14hzugJ>C23&Bs
e&9K0ffx+^btjEh!#hO4<89ZJ6T-G@yGywpm96Buk

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Buildings/crate.rsi/crate_open.png b/Resources/Textures/Buildings/crate.rsi/crate_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..abafc0975125c37afce1b1887014d6f255562e0b
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{*P};|y1BWnTDh{dwKY0A
zIz2r-EoJ^vpe$oakY6x^!?PP{K#r5Ai(`n!#N-4Z5NTmzWaAJBYGQKbm>+mkf~!Zt
ztEDGFYl>*5`hgcbo3F9FG7?npU=np-;T`F`P@y4F<N^}|!%}AvervDewLsGtJYD@<
J);T3K0RWjkFe3l}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Buildings/crate.rsi/meta.json b/Resources/Textures/Buildings/crate.rsi/meta.json
new file mode 100644
index 0000000000..e8fa1c03c2
--- /dev/null
+++ b/Resources/Textures/Buildings/crate.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+    "version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Taken from https://github.com/discordia-space/CEV-Eris.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "crate",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "crate_door",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "crate_open",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/fire_extinguisher.png b/Resources/Textures/Objects/fire_extinguisher.png
new file mode 100644
index 0000000000000000000000000000000000000000..87a128c8fee9b94dce21fd84bb4462133e3661f2
GIT binary patch
literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvtpJ}8*H>Tu0-1|iwC(NfeHa;=
zG9-!_7<RF;zG7znVq;@uXt+{J?q_~}H#4)$sUR(&QpS=XzhDN3XE)M-oGecl#}JK)
z$q5V86GR+@1zesl)(i-95l$?04L$JaQJdC-M`80C79CLByO}pKLGkvtb9^eQF-<v7
zWsN7WNU+|}vhq{l)Nv6Pa1nkWl;R+o;3Cezl*44~A)etbx+6BOTj{`rY1585xH2%*
XzES#et9rR6&{hUdS3j3^P6<r_|9nRn

literal 0
HcmV?d00001

diff --git a/engine b/engine
index d8ca95db0c..307030ec8f 160000
--- a/engine
+++ b/engine
@@ -1 +1 @@
-Subproject commit d8ca95db0c1a8e1db48465352e29c7650b3afc81
+Subproject commit 307030ec8f46965315488cb1f7ec5b1c6db3cd73