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
3066efeebb
Cleanup the messy imports.
2019-05-06 13:39:24 -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
yogurt
c5ce2ec771
Combat additions
...
Added formulas for base EXP gain and chain experience
Added basic scripts for most player abilities and effects
Added stat gains for some abilities
Changed status flags
Fixed bug with player death
Fixed bug where auto attacks didnt work when not locked on
Added traits
2018-04-18 16:06:41 -05: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
7c4091a196
Finished refactoring Map Server. Clear of syntax errors.
2017-06-27 16:55:14 -04:00
Filip Maj
2de4934c41
Fixed battle npcs appearing strangely (no nameplate, wrong colour, etc), and implemented content groups!
2017-04-15 16:33:56 -04:00
Filip Maj
16c9b741bf
Kicked/Promote leader added but broke login. D/Cing now.
2016-12-21 18:02:50 -05:00
Filip Maj
b2c1c2895d
Added new packets for controlling BG objects. Added group delete packet. Fixed crash if tried to warp to non-existent zone. Added a create LS db method.
2016-12-11 23:31:13 -05:00
Filip Maj
18e9ee5f63
Forgot the "SynchGroupWorkValuesPacket" and some merging stuff.
2016-12-04 10:18:04 -05:00
Filip Maj
df6e16103c
Manually added the group packets and dataobjects into dev branch because the working_on_groups branch is so old it probably will break stuff.
2016-12-04 09:52:57 -05:00
