cassidy/project-meteor-server
1
0 Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
885 Commits 4 Branches 2 Tags
044d7e52075aef9dc9ee768a8bbd726b426dd992
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Maj 044d7e5207 More changes. 2019-05-06 16:40:11 -04:00
Filip Maj c1fdad2156 Changed scripts still referencing GetInventory to GetItemPackage. 2019-05-06 16:33:18 -04:00
Filip Maj f038b525c6 Cleaning up imports. 2019-05-06 16:07:06 -04:00
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
Filip Maj 163f240cf9 Removed isExclusive as it is now loaded from gamedata. Cleaned up keys for retainer inventory. 2019-05-06 14:34:59 -04:00
Filip Maj 3066efeebb Cleanup the messy imports. 2019-05-06 13:39:24 -04:00
Filip Maj 10017b7e8c Cleaned up some warnings. 2019-05-04 20:53:08 -04:00
Filip Maj 1e4a1cf263 Merge branch 'ai-open' into develop 
# Conflicts:
#	FFXIVClassic Lobby Server/Database.cs
#	FFXIVClassic Map Server/Database.cs
#	FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
#	FFXIVClassic Map Server/actors/chara/player/Inventory.cs
#	FFXIVClassic Map Server/actors/chara/player/Player.cs
#	FFXIVClassic Map Server/dataobjects/Session.cs
#	FFXIVClassic World Server/Server.cs
 2019-05-04 20:13:29 -04:00
Filip Maj 080f9ea23d Fixed bug where when a mob was insta-killed they would disappear (not die). More renames for action -> result. Reverted result packet unknown from 0x801 to 0x810. Added hitnum. Fixed isolation. 2019-05-04 18:53:00 -04:00
Filip Maj e236e1d207 Renamed BattleActionPacket -> CommandResultPacket as it better defines what these packets do. A command fires -> here is what happened due to it. 2019-01-29 00:02:09 -05:00
Filip Maj 7c7742fb35 Update substate and implemented it into Character. Cleaned up more code mix. 2018-10-20 13:15:58 -04:00
Filip Maj c55145d715 Added substate modifications to characters. 2018-10-20 13:02:14 -04:00
Filip Maj 42aa3d7512 Fixed some errors from the previous changes. 2018-10-20 12:31:24 -04:00
Filip Maj 07c467e1af Fixed JSON lib being broken from downgrade. 2018-10-20 12:16:34 -04:00
Filip Maj bec0cae0eb Removed more dapper code and unsupported syntax. 2018-10-20 12:08:47 -04:00
Filip Maj 5bb3cc3b4e Cleaned up unused nuget packages. Downgraded JSON lib as the latest one has dependencies. Cleaned up some DB code using dapper (since it's deleted). 2018-10-08 15:31:41 -04:00
Filip Maj d614ea6968 Rewrote code written in the new C# format to use older functions. Let's keep compatibility with older VS but also keep the code style consistent (already got enough inconsistencies). 2018-10-08 15:11:43 -04:00
Filip Maj 0209f3e617 Added patching server web files. 2018-05-29 01:06:44 -04:00
Filip Maj e799e8327f These should not have been here 2018-05-29 01:05:50 -04:00
Filip Maj 0492bc4c59 Added compression code to packet. 2018-04-12 14:18:40 -04:00
Filip Maj 7abfbd5953 Forgot script. 2018-04-10 01:07:38 -04:00
Filip Maj 1d3dd99414 Got linkshell creation working. 2018-04-10 01:07:11 -04:00
Filip Maj c3c19c3592 Fixed retainer script. 2018-04-07 18:19:56 -04:00
Filip Maj a19517cce4 No longer need to do this as 0x131 is handled. Was crashing retainer. 2018-04-07 18:15:12 -04:00
Filip Maj 880b1f3066 Fixed the crash when class change is to a level 0 class. Now autosets to level 1. 2018-04-07 15:34:11 -04:00
Filip Maj 0b13b590a0 Renamed Inventory class to ItemPackage to reflect client naming. 2018-04-07 14:48:43 -04:00
Filip Maj 8aeaee1b19 SQL Files for new inventory. 2018-04-07 14:30:17 -04:00
Filip Maj 29e3f61b6b Fixed my lua fuckery some more. 2018-04-07 14:24:33 -04:00
Filip Maj bbd4fcef3b Reversed all my lua fuckery. 2018-04-07 14:04:22 -04:00
Filip Maj 13727caf14 Database changes added. 2018-04-07 13:58:31 -04:00
Filip Maj aba748cb5d Map Server Packet fix. 2018-04-07 13:50:43 -04:00
Filip Maj 611140568e Fixed broken KickEvent. Cleaned up Retainers to use the ItemPacakageUpdate packet. Fixed db references for retainer inventory. 2018-04-07 13:47:31 -04:00
Filip Maj 08dfd22bfa Removed the inventory lock stuff. 2018-04-07 13:47:09 -04:00
Filip Maj 5fd48fad6b Commited changed scripts. 2018-04-07 13:46:57 -04:00
Filip Maj 7e2246e8d8 If kickEvent is fired, the current event is popped. Commited Inventory changes. 2018-04-07 13:46:37 -04:00
Filip Maj 1e9d61c838 Fixed the refresh not sending inv change packets. 2018-04-07 13:45:05 -04:00
Filip Maj 127ac15936 Fixed bazaar flags for seek item. Finished seek item trading. 2017-12-10 23:52:10 -05:00
Filip Maj 0cb2fe1a68 Added bazaar scripts and missing class file. 2017-12-10 22:54:47 -05:00
Filip Maj c0312079ef Added broadcast packet list to Player. Fixed bazaar flags not working. Added the seeking item trade code. 2017-12-10 22:53:37 -05:00
Filip Maj a9d4e621e3 Events are now pushed onto a stack and popped off. Turns out multiple events *CAN* happen. Fixed quantity bugs when saving to DB. Fixed buying stacks. 2017-12-10 22:32:24 -05:00
Filip Maj 08c5980b22 Moved SendItemPackage to character class. Added a flag check after a bazaar purchase is made. Discovered a flag in InventoryBeginChangePacket that either modifies the client package or clears and refills it. Implemented this mode for a bunch of "SendFullInventory" methods. 2017-12-10 15:13:33 -05:00
Filip Maj f5ea82f735 Added the UpdateItemPackage packet used to signal the server to send bazaar item info. Added a transaction method in WorldManager. Fixed some inventory bugs. InvItems now track what player, itempackage, and itemslot they are in... and may have their quantity set from there. Fixed DB SetQuantity bug. 2017-12-10 13:38:53 -05:00
Filip Maj b2e273d7cf Finished fixing bugs in the bazaar code. 2017-12-04 22:58:18 -05:00
Filip Maj 88233cf6d2 Fixed error, removed RabbitMQ package as it isn't used. 2017-11-17 17:03:47 -05:00
Filip Maj 05eca7f22e Fixed bad merge. 2017-11-17 16:51:35 -05:00
Filip Maj 7a02d38e94 Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into develop 
# Conflicts:
#	FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
 2017-11-17 15:14:58 -05:00
Filip Maj af121f52bd Added packets for various search things Showmo found. 2017-11-17 15:13:38 -05:00
Filip Maj e8c9904e1d More refactoring. Adding to bazaar now works for selling and seeking by gil. 2017-11-11 17:05:07 -05:00
Filip Maj bbac4b0fce Renamed Type7Param to ItemRefParam. Changed a lot of "inventoryType" names to "itemPackage". Moved inventory code to Character class for easier use and auto-choosing the correct package. 2017-11-11 13:46:12 -05:00
Filip Maj 3850860440 Added seek nameplate code. Added bazaar transaction stuff to WorldManager and DB. Added Item Gamedata to InventoryItem class. 2017-11-11 10:56:15 -05:00
Filip Maj b191da416b Modified ItemWasteCommand so it uses the given itempackage. This lets you discard loot. 2017-10-21 13:09:04 -04:00
Filip Maj 2a489953db Added the skeletons of the rest of the item commands. 2017-10-21 13:01:14 -04:00
Filip Maj fe4b9cb2bf Added more helper methods and constants for inventory item. 2017-10-21 11:29:28 -04:00
Filip Maj 95b003cc2b More inventory item refactoring. 2017-10-15 23:56:04 -04:00
Filip Maj 59e3b2379a Implemented mode trade methods. Figured out the modifiers portion of the item packet and rewrote how they are stored. 2017-10-08 12:26:22 -04:00
Filip Maj 8ae4fbc045 Forgot project file. 2017-10-05 13:31:15 -04:00
Filip Maj e819603432 Added new search packets. 2017-10-04 10:25:16 -04:00
Filip Maj 441c1a6383 Implemented countdowns. 2017-10-01 12:39:46 -04:00
Filip Maj 58334a0e5f Implemented newly discovered packets (Dalamud, Countdown). 2017-10-01 12:31:45 -04:00
Filip Maj 94491903f7 More trade work. 2017-10-01 12:23:54 -04:00
Filip Maj c7e38b8b00 Implemented trade invitation code. 2017-09-17 15:04:29 -04:00
Filip Maj 9649d755a9 Fixed a bug in inventories. If no null gap was found endOfListIndex would go to -1. 2017-09-16 13:57:16 -04:00
Filip Maj e581727625 Added errors to AddItem so a script writer knows if the inventory was full or not. 2017-09-16 13:28:37 -04:00
Filip Maj 06e0c32062 Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into develop 2017-09-16 13:19:50 -04:00
Filip Maj 77203bca4c Fixed multiparams not being returned on CallClientFunction(). Was due to bad merge. Added Jorge's scripts. 2017-09-16 13:19:41 -04:00
Filip Maj 7b1f95cd77 Fixed multiparams not being returned on CallClientFunction(). Was due to bad merge. Added Jorge's scripts. 2017-09-16 13:19:10 -04:00
Filip Maj a309e651da Fixed issues Jorge found. 2017-09-09 16:30:29 -04:00
Filip Maj 16e99040e0 Forgot Retainers_Inventory sql file. 2017-09-09 14:34:44 -04:00
Filip Maj 3f82ca1244 Added Retainer actor classes and some new spawns. 2017-09-09 14:34:04 -04:00
Filip Maj 8f487689ba Pushed new db schema for inventory and retainers. 2017-09-09 14:32:08 -04:00
Filip Maj b092d447cc Retainer name was not set. 2017-09-09 14:28:02 -04:00
Filip Maj 4160622556 Scripts for retainers. Adds item storage functionality. 2017-09-09 14:12:38 -04:00
Filip Maj 64006d2351 Added retainer inventory code. Renamed CURRENCY inv type to CURRENCY_CRYSTALS so I don't forget. 2017-09-09 14:11:35 -04:00
Filip Maj 52c707d66e More cleanup. 2017-09-09 12:42:00 -04:00
Filip Maj 9174801fdb Moved all DB update code into it's own method. 2017-09-09 12:37:24 -04:00
Filip Maj 9529a1374e Merge branch 'inventory_overhaul' into retainers 2017-09-09 12:21:51 -04:00
Filip Maj 8755ca4f33 Fixed a bunch of SQL errors. Added checks for quality so a remove command didn't take out items regardless of quality. Fixed errors. 2017-09-09 12:21:37 -04:00
Filip Maj a14e36fadc Bad old SQL line was adding exponentially increasing duplicates. 2017-09-09 11:33:23 -04:00
Filip Maj bc95c139de Implement DB updates for player. Cleaned up DB calls. No longer track slot, it's ordered by index id (no concept of slots anyway in client). 2017-09-09 11:25:58 -04:00
Filip Maj 40ad1d8a29 Figured out and implemented the Retainer scripts. 2017-09-09 10:56:11 -04:00
Filip Maj 76f073d85f Got retainer meeting group working and cleaned up retainer instancing. Added a RemoveItemAtSlot with quantity. 2017-09-09 10:54:40 -04:00
Filip Maj 5bec522c8e Fixed bugs in the new inventory code. 2017-09-05 15:35:33 -04:00
Filip Maj 81d82cd7a8 Rewrote the inventory code, splitting the packet updates from the list updates. 2017-09-05 14:44:06 -04:00
Filip Maj f437b36f5a Started implementing retainers. Added a instanced retainer spawn. Documented retainer scripts. 2017-09-05 12:37:23 -04:00
Filip Maj b5054debea Added first set of item search packets. 2017-09-03 17:02:08 -04:00
Filip Maj 4e39b082f1 Added new scripts, implemented some old ones. 2017-09-03 16:44:10 -04:00
Filip Maj 62484e2f87 Fixed the retainer database error. Loading code now matches the new retainer db schema. 2017-09-03 16:37:05 -04:00
Filip Maj 4762811347 Fixed global.lua be screwed up by merge. 2017-08-30 19:43:20 -04:00
Filip Maj 4c7928da78 Fixed screwed up cast animation. 2017-08-29 22:27:32 -04:00
Filip Maj 91afda04ca Added interrupt animation. 2017-08-29 00:52:57 -04:00
Filip Maj e60da4f7b4 Wasn't actually sending packets. Changed casting animation back and moved castbar removal to cleanup. 2017-08-29 00:38:07 -04:00
Filip Maj 67485eafc0 Fixed infinite loop with DoBattleAction. Added some casting logic. 2017-08-29 00:33:23 -04:00
Filip Maj d81832f256 Cleaned up hotbar database stuff (slot starts at 0 now!) and fixed a few bugs in the state system. 2017-08-28 23:21:21 -04:00
Filip Maj 7ad40f625a Refactored Demo's battle action code and cleaned things up. 2017-08-28 21:45:01 -04:00
Filip Maj 71d5bbc9ff Merge branch 'ai-open' of https://bitbucket.org/takhlaq/ffxiv-classic-server into ai-open 2017-08-28 20:26:27 -04:00
Filip Maj 37b8203dae Rewrote the BattleActionPacket classes to standardize them. Added a method in Character.cs to fire off BattleActions. 2017-08-28 20:26:21 -04:00
Filip Maj 7e4fc52b9e Some extra documentation for the Parley script. 2017-08-26 17:04:36 -04:00
Filip Maj e5a9658b5a Added Parley code to experiment with. 2017-08-26 16:59:15 -04:00
Filip Maj ce2d22d984 Added sellprice assignment to ItemData.cs. Forgot it! 2017-08-26 14:24:39 -04:00
Filip Maj 52da0a671f Updated method names of "RemoveItem" as Lua hates overloads. 2017-08-26 14:21:54 -04:00