Filip Maj bcb609e4f6 Merge branch 'inventory_refactor' into develop ... # Conflicts: # FFXIVClassic Map Server/Database.cs # FFXIVClassic Map Server/FFXIVClassic Map Server.csproj # FFXIVClassic Map Server/WorldManager.cs # FFXIVClassic Map Server/actors/area/Area.cs # FFXIVClassic Map Server/actors/area/Zone.cs # FFXIVClassic Map Server/actors/chara/Character.cs # FFXIVClassic Map Server/actors/chara/npc/Npc.cs # FFXIVClassic Map Server/actors/chara/player/Inventory.cs # FFXIVClassic Map Server/actors/chara/player/Player.cs # FFXIVClassic Map Server/dataobjects/ZoneConnection.cs # FFXIVClassic Map Server/lua/LuaEngine.cs # FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs # FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs # FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs # FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs # FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs # FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs # FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs # FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs # FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs # FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs # FFXIVClassic Map Server/packets/send/Actor/battle/CommandResultX00Packet.cs # FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs # FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs # data/scripts/commands/gm/giveitem.lua		2019-05-06 15:59:09 -04:00
..
shop	Inventory.cs - GetItemQuantity() added	2017-10-09 23:40:38 -04:00
PopulaceAchievement.lua	More script work.	2016-06-19 23:16:31 -04:00
PopulaceBlackMarketeer.lua	Inventory.cs - GetItemQuantity() added	2017-10-09 23:40:38 -04:00
PopulaceBountyPresenter.lua	Added script for ItemStorage npc. Added scripts for both types of inn exit doors. Added BountyPresenter script (YoshiP).	2017-06-19 22:23:27 -04:00
PopulaceBranchsVendor.lua	Added new scripts, implemented some old ones.	2017-09-03 16:44:10 -04:00
PopulaceCampMaster.lua	Fixed issue where spawn packets were sent on zone out. Added all npcs to Camp Bearded Rock. Rewrote how mapobjs get loaded in, no more hardcodes. Added tons mapobjs to the DB. Added ferry npcs.	2017-06-14 22:24:09 -04:00
PopulaceCampSubMaster.lua	Fixed issue where spawn packets were sent on zone out. Added all npcs to Camp Bearded Rock. Rewrote how mapobjs get loaded in, no more hardcodes. Added tons mapobjs to the DB. Added ferry npcs.	2017-06-14 22:24:09 -04:00
PopulaceCaravanAdviser.lua	Actor script fixes, documented populace classes and misc things	2017-12-13 15:09:10 -05:00
PopulaceCaravanGuide.lua	Actor script fixes, documented populace classes and misc things	2017-12-13 15:09:10 -05:00
PopulaceCaravanManager.lua	Actor script fixes, documented populace classes and misc things	2017-12-13 15:09:10 -05:00
PopulaceChocoboLender.lua	Merge branch 'master' into develop	2017-08-26 13:53:23 -04:00
PopulaceCompanyBuffer.lua	Inventory.cs - GetItemQuantity() added	2017-10-09 23:40:38 -04:00
PopulaceCompanyGLPublisher.lua	Inventory.cs - GetItemQuantity() added	2017-10-09 23:40:38 -04:00
PopulaceCompanyGuide.lua	Inventory.cs - GetItemQuantity() added	2017-10-09 23:40:38 -04:00
PopulaceCompanyOfficer.lua	Fixed multiparams not being returned on CallClientFunction(). Was due to bad merge. Added Jorge's scripts.	2017-09-16 13:19:41 -04:00
PopulaceCompanyShop.lua	Inventory.cs - GetItemQuantity() added	2017-10-09 23:40:38 -04:00
PopulaceCompanySupply.lua	Inventory.cs - GetItemQuantity() added	2017-10-09 23:40:38 -04:00
PopulaceCompanyWarp.lua	Fixed multiparams not being returned on CallClientFunction(). Was due to bad merge. Added Jorge's scripts.	2017-09-16 13:19:41 -04:00
PopulaceCutscenePlayer.lua	Cleaned up the new scripting code. Added a helper function to do the yielding automatically. Modified all the scripts to use the new system and added a few new ones.	2016-06-19 18:52:34 -04:00
PopulaceFlyingShip.lua	Added Gridania scripts and various others. Fixed error messages popping for scripts that may not use certain functions.	2016-08-05 18:23:59 -04:00
PopulaceGuildlevePublisher.lua	Cleaned up the new scripting code. Added a helper function to do the yielding automatically. Modified all the scripts to use the new system and added a few new ones.	2016-06-19 18:52:34 -04:00
PopulaceItemRepairer.lua	Added new scripts, implemented some old ones.	2017-09-03 16:44:10 -04:00
PopulaceLinkshellManager.lua	Forgot script.	2018-04-10 01:07:38 -04:00
PopulaceNMReward.lua	More script work.	2016-06-19 23:16:31 -04:00
PopulacePassiveGLPublisher.lua	More script work.	2016-06-19 23:16:31 -04:00
PopulaceRequestWarden.lua	Fixed issue where spawn packets were sent on zone out. Added all npcs to Camp Bearded Rock. Rewrote how mapobjs get loaded in, no more hardcodes. Added tons mapobjs to the DB. Added ferry npcs.	2017-06-14 22:24:09 -04:00
PopulaceRetainerManager.lua	Cleaned up the new scripting code. Added a helper function to do the yielding automatically. Modified all the scripts to use the new system and added a few new ones.	2016-06-19 18:52:34 -04:00
PopulaceSpecialEventCryer.lua	Actor script fixes, documented populace classes and misc things	2017-12-13 15:09:10 -05:00
PopulaceStandard.lua	fixed method casing in lua	2016-06-15 03:41:23 +01:00