Reworked zones to allow for isolated zones (IE Opening Zone) and private area instances.

FFXIVClassic Map Server/actors/Actor.cs

@@ -2,6 +2,7 @@
 using FFXIVClassic_Lobby_Server.common;
 using FFXIVClassic_Lobby_Server.packets;
 using FFXIVClassic_Map_Server.actors;
+using FFXIVClassic_Map_Server.actors.area;
 using FFXIVClassic_Map_Server.dataobjects.chara;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;

FFXIVClassic Map Server/actors/area/Area.cs

@@ -0,0 +1,322 @@
+using FFXIVClassic_Lobby_Server.common;
+using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.dataobjects;
+using FFXIVClassic_Map_Server.dataobjects.chara;
+using FFXIVClassic_Map_Server.lua;
+using FFXIVClassic_Map_Server.packets.send.actor;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FFXIVClassic_Map_Server.Actors
+{
+    class Area : Actor
+    {
+        public string zoneName;        
+        public ushort regionId;
+        public bool isIsolated, canStealth, isInn, canRideChocobo, isInstanceRaid;
+        public ushort weatherNormal, weatherCommon, weatherRare;
+        public ushort bgmDay, bgmNight, bgmBattle;
+
+
+        private string classPath;
+
+        public int boundingGridSize = 50;
+        public int minX = -1000, minY = -1000, maxX = 1000, maxY = 1000;
+        private int numXBlocks, numYBlocks;
+        private int halfWidth, halfHeight;
+
+        private Dictionary<uint, Actor> mActorList = new Dictionary<uint,Actor>();
+        private List<Actor>[,] mActorBlock;
+
+        public Area(uint id, string zoneName, ushort regionId, string className, ushort bgmDay, ushort bgmNight, ushort bgmBattle, bool isIsolated, bool isInn, bool canRideChocobo, bool canStealth, bool isInstanceRaid)
+            : base(id)
+        {
+
+            this.zoneName = zoneName;
+            this.regionId = regionId;
+            this.canStealth = canStealth;
+            this.isIsolated = isIsolated;
+            this.isInn = isInn;
+            this.canRideChocobo = canRideChocobo;
+            this.isInstanceRaid = isInstanceRaid;
+
+            this.bgmDay = bgmDay;
+            this.bgmNight = bgmNight;
+            this.bgmBattle = bgmBattle;
+
+            this.displayNameId = 0;
+            this.customDisplayName = "_areaMaster";
+            this.actorName = String.Format("_areaMaster@{0:X5}",id<<8);
+
+            this.className = className;
+
+            numXBlocks = (maxX - minX) / boundingGridSize;
+            numYBlocks = (maxY - minY) / boundingGridSize;
+            mActorBlock = new List<Actor>[numXBlocks, numYBlocks];
+            halfWidth = numXBlocks / 2;
+            halfHeight = numYBlocks / 2;
+
+            for (int y = 0; y < numYBlocks; y++)
+            {
+                for (int x = 0; x < numXBlocks; x++ )
+                {
+                    mActorBlock[x, y] = new List<Actor>();
+                }
+            }
+                
+        }
+
+        public override SubPacket createScriptBindPacket(uint playerActorId)
+        {
+            List<LuaParam> lParams;
+            lParams = LuaUtils.createLuaParamList(classPath, false, true, zoneName, "/Area/Zone/ZoneDefault", -1, (byte)1, true, false, false, false, false, false, false, false);
+            return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, "ZoneDefault", lParams);
+        }
+
+        public override BasePacket getSpawnPackets(uint playerActorId)
+        {
+            List<SubPacket> subpackets = new List<SubPacket>();
+            subpackets.Add(createAddActorPacket(playerActorId, 0));            
+            subpackets.Add(createSpeedPacket(playerActorId));
+            subpackets.Add(createSpawnPositonPacket(playerActorId, 0x1));
+            subpackets.Add(createNamePacket(playerActorId));
+            subpackets.Add(createStatePacket(playerActorId));
+            subpackets.Add(createIsZoneingPacket(playerActorId));
+            subpackets.Add(createScriptBindPacket(playerActorId));
+            subpackets[6].debugPrintSubPacket();
+            return BasePacket.createPacket(subpackets, true, false);
+        }
+
+        #region Actor Management
+
+        public void addActorToZone(Actor actor)
+        {
+            if (!mActorList.ContainsKey(actor.actorId))
+                mActorList.Add(actor.actorId, actor);
+
+            int gridX = (int)actor.positionX / boundingGridSize;
+            int gridY = (int)actor.positionZ / boundingGridSize;
+
+            gridX += halfWidth;
+            gridY += halfHeight;
+
+            //Boundries
+            if (gridX < 0)
+                gridX = 0;
+            if (gridX >= numXBlocks)
+                gridX = numXBlocks - 1;
+            if (gridY < 0)
+                gridY = 0;
+            if (gridY >= numYBlocks)
+                gridY = numYBlocks - 1;
+
+            lock (mActorBlock)
+                mActorBlock[gridX, gridY].Add(actor);
+        }
+
+        public void removeActorToZone(Actor actor)
+        {
+            mActorList.Remove(actor.actorId);
+
+            int gridX = (int)actor.positionX / boundingGridSize;
+            int gridY = (int)actor.positionZ / boundingGridSize;
+
+            gridX += halfWidth;
+            gridY += halfHeight;
+
+            //Boundries
+            if (gridX < 0)
+                gridX = 0;
+            if (gridX >= numXBlocks)
+                gridX = numXBlocks - 1;
+            if (gridY < 0)
+                gridY = 0;
+            if (gridY >= numYBlocks)
+                gridY = numYBlocks - 1;
+
+            lock (mActorBlock)
+                mActorBlock[gridX, gridY].Remove(actor);
+        }
+
+        public void updateActorPosition(Actor actor)
+        {
+            int gridX = (int)actor.positionX / boundingGridSize;
+            int gridY = (int)actor.positionZ / boundingGridSize;
+
+            gridX += halfWidth;
+            gridY += halfHeight;
+
+            //Boundries
+            if (gridX < 0)
+                gridX = 0;
+            if (gridX >= numXBlocks)
+                gridX = numXBlocks - 1;
+            if (gridY < 0)
+                gridY = 0;
+            if (gridY >= numYBlocks)
+                gridY = numYBlocks - 1;
+
+            int gridOldX = (int)actor.oldPositionX / boundingGridSize;
+            int gridOldY = (int)actor.oldPositionZ / boundingGridSize;
+
+            gridOldX += halfWidth;
+            gridOldY += halfHeight;
+
+            //Boundries
+            if (gridOldX < 0)
+                gridOldX = 0;
+            if (gridOldX >= numXBlocks)
+                gridOldX = numXBlocks - 1;
+            if (gridOldY < 0)
+                gridOldY = 0;
+            if (gridOldY >= numYBlocks)
+                gridOldY = numYBlocks - 1;
+
+            //Still in same block
+            if (gridX == gridOldX && gridY == gridOldY)
+                return;
+
+            lock (mActorBlock)
+            {
+                mActorBlock[gridOldX, gridOldY].Remove(actor);
+                mActorBlock[gridX, gridY].Add(actor);
+            }
+        }
+
+        public List<Actor> getActorsAroundPoint(float x, float y, int checkDistance)
+        {
+            checkDistance /= boundingGridSize;
+
+            int gridX = (int)x/boundingGridSize;
+            int gridY = (int)y/boundingGridSize;
+
+            gridX += halfWidth;
+            gridY += halfHeight;
+
+            //Boundries
+            if (gridX < 0)
+                gridX = 0;
+            if (gridX >= numXBlocks)
+                gridX = numXBlocks - 1;
+            if (gridY < 0)
+                gridY = 0;
+            if (gridY >= numYBlocks)
+                gridY = numYBlocks - 1;
+
+            List<Actor> result = new List<Actor>();
+
+            for (int gx = gridX - checkDistance; gx <= gridX + checkDistance; gx++)
+            {
+                for (int gy = gridY - checkDistance; gy <= gridY + checkDistance; gy++)
+                {
+                    result.AddRange(mActorBlock[gx, gy]);
+                }
+            }
+
+            return result;
+        }
+
+        public List<Actor> getActorsAroundActor(Actor actor, int checkDistance)
+        {
+            checkDistance /= boundingGridSize;
+
+            int gridX = (int)actor.positionX / boundingGridSize;
+            int gridY = (int)actor.positionZ / boundingGridSize;
+
+            gridX += halfWidth;
+            gridY += halfHeight;
+
+            //Boundries
+            if (gridX < 0)
+                gridX = 0;
+            if (gridX >= numXBlocks)
+                gridX = numXBlocks - 1;
+            if (gridY < 0)
+                gridY = 0;
+            if (gridY >= numYBlocks)
+                gridY = numYBlocks - 1;
+
+            List<Actor> result = new List<Actor>();
+
+            for (int gy = ((gridY - checkDistance) < 0 ? 0 : (gridY - checkDistance)); gy <= ((gridY + checkDistance) >= numYBlocks ? numYBlocks - 1 : (gridY + checkDistance)); gy++)
+            {
+                for (int gx = ((gridX - checkDistance) < 0 ? 0 : (gridX - checkDistance)); gx <= ((gridX + checkDistance) >= numXBlocks ? numXBlocks - 1 : (gridX + checkDistance)); gx++)
+                {
+                    result.AddRange(mActorBlock[gx, gy]);
+                }
+            }
+
+            //Remove players if isolation zone
+            if (isIsolated)
+            {
+                for (int i = 0; i < result.Count; i++)
+                {
+                    if (result[i] is Player)
+                        result.RemoveAt(i);
+                }
+            }
+
+            return result;
+        }
+
+        #endregion
+
+        public Actor FindActorInZone(uint id)
+        {
+            if (!mActorList.ContainsKey(id))
+                return null;
+            return mActorList[id];
+        }
+
+        public Player FindPCInZone(string name)
+        {
+            foreach (Actor a in mActorList.Values)
+            {
+                if (a is Player)
+                {
+                    if (((Player)a).customDisplayName.Equals(name))
+                        return (Player)a;
+                }
+            }
+            return null;
+        }
+
+        public Player FindPCInZone(uint id)
+        {
+            if (!mActorList.ContainsKey(id))
+                return null;
+            return (Player)mActorList[id];
+        }
+
+        public void clear()
+        {
+            //Clear All
+            mActorList.Clear();
+            for (int y = 0; y < numYBlocks; y++)
+            {
+                for (int x = 0; x < numXBlocks; x++)
+                {
+                    mActorBlock[x, y].Clear();
+                }
+            }
+        }
+
+        public void broadcastPacketAroundActor(Actor actor, SubPacket packet)
+        {
+            List<Actor> aroundActor = getActorsAroundActor(actor, 50);
+            foreach (Actor a in aroundActor)
+            {
+                if (a is Player)
+                {
+                    SubPacket clonedPacket = new SubPacket(packet, actor.actorId);
+                    Player p = (Player)a;                        
+                    p.queuePacket(clonedPacket);
+                }
+            }            
+        }
+
+    }
+}

FFXIVClassic Map Server/actors/area/PrivateArea.cs

@@ -0,0 +1,32 @@
+using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.Actors;
+using FFXIVClassic_Map_Server.lua;
+using FFXIVClassic_Map_Server.packets.send.actor;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FFXIVClassic_Map_Server.actors.area
+{
+    class PrivateArea : Area    
+    {
+        private Zone parentZone;
+        private string privateAreaName;
+
+        public PrivateArea(Zone parent, uint id, string className, string privateAreaName,ushort bgmDay, ushort bgmNight, ushort bgmBattle)
+            : base(id, parent.zoneName, parent.regionId, className, bgmDay, bgmNight, bgmBattle, parent.isIsolated, parent.isInn, parent.canRideChocobo, parent.canStealth, true)
+        {
+            this.parentZone = parent;
+            this.privateAreaName = privateAreaName;
+        }
+
+        public override SubPacket createScriptBindPacket(uint playerActorId)
+        {
+            List<LuaParam> lParams;
+            lParams = LuaUtils.createLuaParamList("/Area/PrivateArea/" + className, false, true, zoneName, privateAreaName, 0xE1, canRideChocobo ? (byte)1 : (byte)0, canStealth, isInn, false, false, false, false, false, false);
+            return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, lParams);
+        }
+    }
+}

FFXIVClassic Map Server/actors/area/Zone.cs

@@ -1,7 +1,5 @@
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.dataobjects;
-using FFXIVClassic_Map_Server.dataobjects.chara;
+using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
 using System;
@@ -10,298 +8,39 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace FFXIVClassic_Map_Server.Actors
+namespace FFXIVClassic_Map_Server.actors.area
 {
-    class Zone : Actor
+    class Zone : Area
     {
-        public string zoneName;        
-        public ushort regionId;
-        public bool canStealth, isInn, canRideChocobo, isInstanceRaid;
-        public ushort weatherNormal, weatherCommon, weatherRare;
-        public ushort bgmDay, bgmNight, bgmBattle;
-        
-        public int boundingGridSize = 50;
-        public int minX = -1000, minY = -1000, maxX = 1000, maxY = 1000;
-        private int numXBlocks, numYBlocks;
-        private int halfWidth, halfHeight;
+        Dictionary<string, Dictionary<uint, PrivateArea>> privateAreas = new Dictionary<string, Dictionary<uint, PrivateArea>>();
 
-        private Dictionary<uint, Actor> mActorList = new Dictionary<uint,Actor>();
-        private List<Actor>[,] mActorBlock;
-
-        public Zone(uint id, string zoneName, ushort regionId, ushort bgmDay, ushort bgmNight, ushort bgmBattle, bool isInn, bool canRideChocobo, bool canStealth, bool isInstanceRaid)
-            : base(id)
+        public Zone(uint id, string zoneName, ushort regionId, string className, ushort bgmDay, ushort bgmNight, ushort bgmBattle, bool isIsolated, bool isInn, bool canRideChocobo, bool canStealth, bool isInstanceRaid)
+            : base(id, zoneName, regionId, className, bgmDay, bgmNight, bgmBattle, isIsolated, isInn, canRideChocobo, canStealth, isInstanceRaid)
         {
 
-            this.zoneName = zoneName;
-            this.regionId = regionId;
-            this.canStealth = canStealth;
-            this.isInn = isInn;
-            this.canRideChocobo = canRideChocobo;
-            this.isInstanceRaid = isInstanceRaid;
+        }
 
-            this.bgmDay = bgmDay;
-            this.bgmNight = bgmNight;
-            this.bgmBattle = bgmBattle;
-
-            this.displayNameId = 0;
-            this.customDisplayName = "_areaMaster";
-            this.actorName = String.Format("_areaMaster@{0:X5}",id<<8);
-
-            this.className = "ZoneMasterPrvI0";
-
-            numXBlocks = (maxX - minX) / boundingGridSize;
-            numYBlocks = (maxY - minY) / boundingGridSize;
-            mActorBlock = new List<Actor>[numXBlocks, numYBlocks];
-            halfWidth = numXBlocks / 2;
-            halfHeight = numYBlocks / 2;
-
-            for (int y = 0; y < numYBlocks; y++)
+        public PrivateArea getPrivateArea(string type, uint number)
+        {
+            if (privateAreas.ContainsKey(type))
             {
-                for (int x = 0; x < numXBlocks; x++ )
-                {
-                    mActorBlock[x, y] = new List<Actor>();
-                }
+                Dictionary<uint, PrivateArea> instances = privateAreas[type];
+                if (instances.ContainsKey(number))
+                    return instances[number];
+                else
+                    return null;
             }
-                
+            else
+                return null;
         }
 
         public override SubPacket createScriptBindPacket(uint playerActorId)
         {
+            bool isEntranceDesion = false;
+
             List<LuaParam> lParams;
-            lParams = LuaUtils.createLuaParamList("/Area/Zone/ZoneMasterPrvI0", false, true, zoneName, "", -1, canRideChocobo ? (byte)1 : (byte)0, canStealth, isInn, false, false, false, false, false, false);
-            return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, lParams);
-        }
-
-        public override BasePacket getSpawnPackets(uint playerActorId)
-        {
-            List<SubPacket> subpackets = new List<SubPacket>();
-            subpackets.Add(createAddActorPacket(playerActorId, 0));            
-            subpackets.Add(createSpeedPacket(playerActorId));
-            subpackets.Add(createSpawnPositonPacket(playerActorId, 0x1));
-            subpackets.Add(createNamePacket(playerActorId));
-            subpackets.Add(createStatePacket(playerActorId));
-            subpackets.Add(createIsZoneingPacket(playerActorId));
-            subpackets.Add(createScriptBindPacket(playerActorId));
-            subpackets[6].debugPrintSubPacket();
-            return BasePacket.createPacket(subpackets, true, false);
-        }
-
-        #region Actor Management
-
-        public void addActorToZone(Actor actor)
-        {
-            if (!mActorList.ContainsKey(actor.actorId))
-                mActorList.Add(actor.actorId, actor);
-
-            int gridX = (int)actor.positionX / boundingGridSize;
-            int gridY = (int)actor.positionZ / boundingGridSize;
-
-            gridX += halfWidth;
-            gridY += halfHeight;
-
-            //Boundries
-            if (gridX < 0)
-                gridX = 0;
-            if (gridX >= numXBlocks)
-                gridX = numXBlocks - 1;
-            if (gridY < 0)
-                gridY = 0;
-            if (gridY >= numYBlocks)
-                gridY = numYBlocks - 1;
-
-            lock (mActorBlock)
-                mActorBlock[gridX, gridY].Add(actor);
-        }
-
-        public void removeActorToZone(Actor actor)
-        {
-            mActorList.Remove(actor.actorId);
-
-            int gridX = (int)actor.positionX / boundingGridSize;
-            int gridY = (int)actor.positionZ / boundingGridSize;
-
-            gridX += halfWidth;
-            gridY += halfHeight;
-
-            //Boundries
-            if (gridX < 0)
-                gridX = 0;
-            if (gridX >= numXBlocks)
-                gridX = numXBlocks - 1;
-            if (gridY < 0)
-                gridY = 0;
-            if (gridY >= numYBlocks)
-                gridY = numYBlocks - 1;
-
-            lock (mActorBlock)
-                mActorBlock[gridX, gridY].Remove(actor);
-        }
-
-        public void updateActorPosition(Actor actor)
-        {
-            int gridX = (int)actor.positionX / boundingGridSize;
-            int gridY = (int)actor.positionZ / boundingGridSize;
-
-            gridX += halfWidth;
-            gridY += halfHeight;
-
-            //Boundries
-            if (gridX < 0)
-                gridX = 0;
-            if (gridX >= numXBlocks)
-                gridX = numXBlocks - 1;
-            if (gridY < 0)
-                gridY = 0;
-            if (gridY >= numYBlocks)
-                gridY = numYBlocks - 1;
-
-            int gridOldX = (int)actor.oldPositionX / boundingGridSize;
-            int gridOldY = (int)actor.oldPositionZ / boundingGridSize;
-
-            gridOldX += halfWidth;
-            gridOldY += halfHeight;
-
-            //Boundries
-            if (gridOldX < 0)
-                gridOldX = 0;
-            if (gridOldX >= numXBlocks)
-                gridOldX = numXBlocks - 1;
-            if (gridOldY < 0)
-                gridOldY = 0;
-            if (gridOldY >= numYBlocks)
-                gridOldY = numYBlocks - 1;
-
-            //Still in same block
-            if (gridX == gridOldX && gridY == gridOldY)
-                return;
-
-            lock (mActorBlock)
-            {
-                mActorBlock[gridOldX, gridOldY].Remove(actor);
-                mActorBlock[gridX, gridY].Add(actor);
-            }
-        }
-
-        public List<Actor> getActorsAroundPoint(float x, float y, int checkDistance)
-        {
-            checkDistance /= boundingGridSize;
-
-            int gridX = (int)x/boundingGridSize;
-            int gridY = (int)y/boundingGridSize;
-
-            gridX += halfWidth;
-            gridY += halfHeight;
-
-            //Boundries
-            if (gridX < 0)
-                gridX = 0;
-            if (gridX >= numXBlocks)
-                gridX = numXBlocks - 1;
-            if (gridY < 0)
-                gridY = 0;
-            if (gridY >= numYBlocks)
-                gridY = numYBlocks - 1;
-
-            List<Actor> result = new List<Actor>();
-
-            for (int gx = gridX - checkDistance; gx <= gridX + checkDistance; gx++)
-            {
-                for (int gy = gridY - checkDistance; gy <= gridY + checkDistance; gy++)
-                {
-                    result.AddRange(mActorBlock[gx, gy]);
-                }
-            }
-
-            return result;
-        }
-
-        public List<Actor> getActorsAroundActor(Actor actor, int checkDistance)
-        {
-            checkDistance /= boundingGridSize;
-
-            int gridX = (int)actor.positionX / boundingGridSize;
-            int gridY = (int)actor.positionZ / boundingGridSize;
-
-            gridX += halfWidth;
-            gridY += halfHeight;
-
-            //Boundries
-            if (gridX < 0)
-                gridX = 0;
-            if (gridX >= numXBlocks)
-                gridX = numXBlocks - 1;
-            if (gridY < 0)
-                gridY = 0;
-            if (gridY >= numYBlocks)
-                gridY = numYBlocks - 1;
-
-            List<Actor> result = new List<Actor>();
-
-            for (int gy = ((gridY - checkDistance) < 0 ? 0 : (gridY - checkDistance)); gy <= ((gridY + checkDistance) >= numYBlocks ? numYBlocks - 1 : (gridY + checkDistance)); gy++)
-            {
-                for (int gx = ((gridX - checkDistance) < 0 ? 0 : (gridX - checkDistance)); gx <= ((gridX + checkDistance) >= numXBlocks ? numXBlocks - 1 : (gridX + checkDistance)); gx++)
-                {
-                    result.AddRange(mActorBlock[gx, gy]);
-                }
-            }
-
-            return result;
-        }
-
-        #endregion
-
-        public Actor FindActorInZone(uint id)
-        {
-            if (!mActorList.ContainsKey(id))
-                return null;
-            return mActorList[id];
-        }
-
-        public Player FindPCInZone(string name)
-        {
-            foreach (Actor a in mActorList.Values)
-            {
-                if (a is Player)
-                {
-                    if (((Player)a).customDisplayName.Equals(name))
-                        return (Player)a;
-                }
-            }
-            return null;
-        }
-
-        public Player FindPCInZone(uint id)
-        {
-            if (!mActorList.ContainsKey(id))
-                return null;
-            return (Player)mActorList[id];
-        }
-
-        public void clear()
-        {
-            //Clear All
-            mActorList.Clear();
-            for (int y = 0; y < numYBlocks; y++)
-            {
-                for (int x = 0; x < numXBlocks; x++)
-                {
-                    mActorBlock[x, y].Clear();
-                }
-            }
-        }
-
-        public void broadcastPacketAroundActor(Actor actor, SubPacket packet)
-        {
-            List<Actor> aroundActor = getActorsAroundActor(actor, 50);
-            foreach (Actor a in aroundActor)
-            {
-                if (a is Player)
-                {
-                    SubPacket clonedPacket = new SubPacket(packet, actor.actorId);
-                    Player p = (Player)a;                        
-                    p.queuePacket(clonedPacket);
-                }
-            }            
+            lParams = LuaUtils.createLuaParamList("/Area/Zone/" + className, false, true, zoneName, "", -1, canRideChocobo ? (byte)1 : (byte)0, canStealth, isInn, false, false, false, true, isInstanceRaid, isEntranceDesion);
+            return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, lParams);        
         }
 
     }

FFXIVClassic Map Server/actors/chara/player/Player.cs

@@ -1,6 +1,7 @@
 using FFXIVClassic_Lobby_Server;
 using FFXIVClassic_Lobby_Server.common;
 using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.actors.area;
 using FFXIVClassic_Map_Server.dataobjects;
 using FFXIVClassic_Map_Server.dataobjects.chara;
 using FFXIVClassic_Map_Server.lua;
@@ -87,8 +88,9 @@ namespace FFXIVClassic_Map_Server.Actors
             charaWork.property[4] = 1;
 
             charaWork.command[0] =  0xA0F00000 | 21001;
-            charaWork.command[1] =  0xA0F00000 | 21002;
-            charaWork.command[2] =  0xA0F00000 | 12003;
+            charaWork.command[1] =  0xA0F00000 | 21001;
+
+            charaWork.command[2] =  0xA0F00000 | 21002;
             charaWork.command[3] =  0xA0F00000 | 12004;
             charaWork.command[4] =  0xA0F00000 | 21005;
             charaWork.command[5] =  0xA0F00000 | 21006;
@@ -103,9 +105,6 @@ namespace FFXIVClassic_Map_Server.Actors
             charaWork.command[14] = 0xA0F00000 | 29497;
             charaWork.command[15] = 0xA0F00000 | 22015;
 
-            charaWork.command[32] = 0xA0F00000 | 27155;
-            //charaWork.command[33] = 0xA0F00000 | 27150;
-            charaWork.command[34] = 0xA0F00000 | 27300;
 
             charaWork.commandAcquired[27150 - 26000] = true;
 
@@ -120,10 +119,15 @@ namespace FFXIVClassic_Map_Server.Actors
 
             charaWork.battleTemp.generalParameter[3] = 1;
 
-
             charaWork.eventSave.bazaarTax = 5;
             charaWork.battleSave.potencial = 6.6f;
-            
+
+            charaWork.commandCategory[0] = 1;
+            charaWork.commandCategory[1] = 1;
+
+            charaWork.parameterSave.commandSlot_compatibility[0] = true;
+            charaWork.parameterSave.commandSlot_compatibility[1] = true;
+
             charaWork.commandBorder = 0x20;
             
             Database.loadPlayerCharacter(this);
@@ -737,5 +741,18 @@ namespace FFXIVClassic_Map_Server.Actors
             return eventMenuId;
         }
 
+
+        internal void sendInstanceUpdate()
+        {
+           
+            //Update Instance
+            List<BasePacket> instanceUpdatePackets = playerSession.updateInstance(zone.getActorsAroundActor(this, 50));
+            foreach (BasePacket bp in instanceUpdatePackets)
+            {
+                //    bp.debugPrintPacket();
+                queuePacket(bp);
+            }
+        
+        }
     }
 }

FFXIVClassic Map Server/actors/director/WeatherDirector.cs

@@ -14,7 +14,7 @@ namespace FFXIVClassic_Map_Server.Actors
     {
         private uint weatherId;
 
-        public WeatherDirector(uint weatherId, Zone zone)
+        public WeatherDirector(uint weatherId)
             : base(0x5FF80002)
         {
             this.weatherId = weatherId;