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
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
7c4091a196
Finished refactoring Map Server. Clear of syntax errors.
2017-06-27 16:55:14 -04: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
