Merge branch 'master' into develop

# Conflicts: # FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj # FFXIVClassic Map Server/Database.cs # FFXIVClassic Map Server/FFXIVClassic Map Server.csproj # FFXIVClassic Map Server/PacketProcessor.cs # FFXIVClassic Map Server/WorldManager.cs # FFXIVClassic Map Server/actors/Actor.cs # FFXIVClassic Map Server/actors/area/Area.cs # FFXIVClassic Map Server/actors/chara/player/Player.cs # FFXIVClassic Map Server/lua/LuaPlayer.cs # data/scripts/base/chara/npc/populace/PopulaceChocoboLender.lua # data/scripts/commands/gm/speed.lua # data/scripts/commands/gm/warp.lua # data/scripts/global.lua # data/scripts/player.lua # data/scripts/unique/fst0Town01a/PopulaceStandard/khuma_moshroca.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/ahldskyf.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/angry_river.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/arnegis.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/arthurioux.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/astrid.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/audaine.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/bango_zango.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/bayard.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/bloemerl.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/bmallpa.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/bnhapla.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/chichiroon.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/drowsy-eyed_adventurer.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/eugennoix.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/fickle_beggar.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/hob.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/ivan.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/maetistym.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/mharelak.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/muscle-bound_deckhand.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/pasty-faced_adventurer.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/pearly-toothed_porter.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/ptahjha.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/suspicious-looking_traveler.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/syhrdaeg.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/syngsmyd.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/tatasako.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/tefh_moshroca.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/thata_khamazom.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/thosinbaen.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/tittering_traveler.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/totoruto.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/triaine.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/trinne.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/unconscious_adventurer.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/undsatz.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/vhynho.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/waekbyrt.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/whahtoa.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/wyra_khamazom.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/wyrstmann.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/xavalien.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/zonggo.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/zuzule.lua # sql/server_zones_spawnlocations.sql
2025-05-20 08:26:59 -04:00 · 2017-08-26 13:53:23 -04:00
parent 3b271980cc 358afbace3
commit 74ce5a2fe1
56 changed files with 805 additions and 271 deletions
--- a/Server/actors/chara/player/Inventory.cs
+++ b/Server/actors/chara/player/Inventory.cs
@@ -46,14 +46,24 @@ namespace FFXIVClassic_Map_Server.actors.chara.player
                return null;
        }

-        public InventoryItem GetItemById(ulong itemId)
+        public InventoryItem GetItemByUniqueId(ulong uniqueItemId)
        {
            foreach (InventoryItem item in list)
-            {
-                if (item.uniqueId == itemId)
+            {
+                if (item.uniqueId == uniqueItemId)
                    return item;
            }
            return null;
+        }
+
+        public InventoryItem GetItemByCatelogId(ulong catelogId)
+        {
+            foreach (InventoryItem item in list)
+            {
+                if (item.itemId == catelogId)
+                    return item;
+            }
+            return null;
        }

        public void RefreshItem(InventoryItem item)
--- a/Server/actors/chara/player/Player.cs
+++ b/Server/actors/chara/player/Player.cs
@@ -1,5 +1,4 @@
 using FFXIVClassic.Common;
-
 using FFXIVClassic_Map_Server.actors.chara.player;
 using FFXIVClassic_Map_Server.actors.director;
 using FFXIVClassic_Map_Server.dataobjects;
@@ -8,6 +7,9 @@ using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send;
 using FFXIVClassic_Map_Server.packets.send.actor;
 using FFXIVClassic_Map_Server.packets.send.events;
+using FFXIVClassic_Map_Server.packets.send.actor.events;
+using FFXIVClassic_Map_Server.packets.send.actor.inventory;
+using FFXIVClassic_Map_Server.packets.send.events;
 using FFXIVClassic_Map_Server.packets.send.player;
 using FFXIVClassic_Map_Server.utils;
 using System;
@@ -340,6 +342,7 @@ namespace FFXIVClassic_Map_Server.Actors
                    subpackets.Add(SetHasGoobbuePacket.BuildPacket(actorId, hasGoobbue));

                subpackets.Add(SetAchievementPointsPacket.BuildPacket(actorId, achievementPoints));
+
                subpackets.Add(Database.GetLatestAchievements(this));
                subpackets.Add(Database.GetAchievementsPacket(this));                
            }
@@ -543,6 +546,7 @@ namespace FFXIVClassic_Map_Server.Actors
            playerSession.QueuePacket(worldMasterSpawn);

            //Inn Packets (Dream, Cutscenes, Armoire)
+
            if (zone.isInn)
            {
                SetCutsceneBookPacket cutsceneBookPacket = new SetCutsceneBookPacket();
@@ -569,7 +573,6 @@ namespace FFXIVClassic_Map_Server.Actors

            if (currentContentGroup != null)
                currentContentGroup.SendGroupPackets(playerSession);
-
        }

        private void SendRemoveInventoryPackets(List<ushort> slots)
@@ -600,6 +603,7 @@ namespace FFXIVClassic_Map_Server.Actors
        }        

        public void QueuePacket(SubPacket packet)
+
        {
            playerSession.QueuePacket(packet);
        }
@@ -708,7 +712,7 @@ namespace FFXIVClassic_Map_Server.Actors

            //Save Player
            Database.SavePlayerPlayTime(this);
-            Database.SavePlayerPosition(this);            
+            Database.SavePlayerPosition(this);
        }

        public Area GetZone()
@@ -987,6 +991,7 @@ namespace FFXIVClassic_Map_Server.Actors
            else
            {
                ItemData item = Server.GetItemGamedata(invItem.itemId);
+
                if (item is EquipmentItem)
                {
                    EquipmentItem eqItem = (EquipmentItem)item;
@@ -1021,7 +1026,6 @@ namespace FFXIVClassic_Map_Server.Actors
            }

            Database.SavePlayerAppearance(this);
-
            BroadcastPacket(CreateAppearancePacket(), true);
        }

@@ -1033,6 +1037,14 @@ namespace FFXIVClassic_Map_Server.Actors
                return null;
        }

+        public int GetCurrentGil()
+        {
+            if (GetInventory(Inventory.CURRENCY).HasItem(1000001))
+                return GetInventory(Inventory.CURRENCY).GetItemByCatelogId(1000001).quantity;
+            else
+                return 0;
+        }
+
        public Actor GetActorInInstance(uint actorId)
        {
            foreach (Actor a in playerSession.actorInstanceList)
@@ -1546,7 +1558,7 @@ namespace FFXIVClassic_Map_Server.Actors
        public void SendDataPacket(params object[] parameters)
        {
            List<LuaParam> lParams = LuaUtils.CreateLuaParamList(parameters);
-            SubPacket spacket = InfoRequestResponsePacket.BuildPacket(actorId, lParams);
+            SubPacket spacket = GenericDataPacket.BuildPacket(actorId, lParams);
            spacket.DebugPrintSubPacket();
            QueuePacket(spacket);
        }
@@ -1702,5 +1714,18 @@ namespace FFXIVClassic_Map_Server.Actors
            LuaEngine.GetInstance().CallLuaFunction(this, this, "OnUpdate", true, delta);
        }

+        public void IssueChocobo(byte appearanceId, string nameResponse)
+        {
+            Database.IssuePlayerChocobo(this, appearanceId, nameResponse);
+            hasChocobo = true;
+            chocoboAppearance = appearanceId;
+            chocoboName = nameResponse;
+        }
+
+        public void ChangeChocoboAppearance(byte appearanceId)
+        {
+            Database.ChangePlayerChocoboAppearance(this, appearanceId);
+            chocoboAppearance = appearanceId;
+        }
    }
 }