cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-02 19:42:05 -04:00
Code Issues Packages Projects Releases Wiki Activity
958 Commits 4 Branches 2 Tags 22 MiB
ec85cfd590
Commit Graph

655 Commits

Author SHA1 Message Date
yogurt
ec85cfd590 Merged in takhlaq/ffxiv-classic-server (pull request #61) 
Combat changes and fixes.

Approved-by: Filip Maj <filipmaj@gmail.com>
 2019-06-08 22:58:02 +00:00
Filip Maj
a07aa12783 Fixed new positions after realignment not saving. Fixed Dealer info not clearing from the db sometimes. 2019-06-08 14:46:19 -04:00
Filip Maj
3dcd9af6c0 Added "ToString" methods for Items, Packages, and Actors for easier debugging. Rewrote dealing code in InventoryItem as well as the WorldMaster. Rewrote how Bazaar and Retainer inventory is stored on the DB, merging all three tables into one. Removed a bunch of DB code due to the previous point. Random Item cleanup. 2019-06-06 01:43:27 -04:00
Yogurt
f2e34174c4 Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into develop 
Fix Excruciate removign status from enemy rather than caster
 2019-06-05 19:28:02 -07:00
Yogurt
7339e08172 Fix SLOT_OFFHAND conflict 2019-06-05 19:07:46 -07:00
Yogurt
2e906ae090 Combat fixes and additions 
Add default status gain and loss ids for status effects so buffs and
debuffs can have different ids.
Add sleep, slow, and slowcast

Fix sacred prism not slowing casts
Fix some incorrect text ids in battle commands
 2019-06-05 18:57:21 -07:00
Yogurt
8ba3c195f2 Small fixes 
Fix Shoulder Tackle script using Weaponskill function names
Change BattleNPC to not use array.Clone on respawn.
Move custom StatusEffect ids to 300000+ (will break these statuses until
new sql file is pushed)
 2019-06-03 23:45:21 -07:00
Filip Maj
e96cc0c758 Minor edits to the previous commit. 2019-06-04 01:16:39 -04:00
Joseph Mikel Keller
2195b0b7dc Merged in dude22072/ffxiv-classic-server-1 (pull request #57) 
Achievement Progress Request (0x0135) implementation
 2019-06-04 05:11:51 +00:00
Filip Maj
ecf07317fc Inv/Equip load on first character fixed. 2019-06-04 00:41:02 -04:00
Filip Maj
69d4b19979 More inventory fixing after I broke it. Added preliminary final trade code. Moved recalc stats to the end of equipcommand, not on every modification of the referred item package. 2019-06-04 00:11:36 -04:00
Filip Maj
88ff22e55e Added checks before creating the trade group so that a character couldn't be invited twice to trade. 2019-06-02 17:32:08 -04:00
Filip Maj
d49516c03e Added in "LinkedSlot" info in the InventoryItems. The slot sent when using "SendUpdateAsItemPackage" differ from a normal update. This was causing a crash. Checking is working again, trade is working up to the final transaction. 2019-06-02 17:11:14 -04:00
Filip Maj
42ee97d467 Refactored inventory to "ReferencedItemPackage" as this is a more general approach closer to what the FFXIV client uses. Added itempackage code to the LinkedItemList packets (also renamed from EquipmentList). Cleaned up trade code. 2019-06-02 16:57:46 -04:00
Yogurt
3104478263 Combat fixes 
Add actor update flag for hotbar to send hotbar changes all at once.
Add script for equipping all actions for a class/job.

Fix multiple script errors.
Fix multiple status flag errors
Fix battle command db errors
Fix error in spawnnpc and yolo.
 2019-06-01 21:21:21 -07:00
Yogurt
a92ece58c1 Check for PreventMovement flag in BattleNpcController 
Fix typos in some effect scripts
 2019-06-01 03:39:46 -07:00
Yogurt
905cbf7d3c Add GetActionType for scripts. 
Fix miss check for tp gain on attacks
 2019-06-01 03:18:23 -07:00
Yogurt
4c850ea768 Don't generate TP on misses 2019-06-01 03:05:40 -07:00
Yogurt
afe1e59889 Fix hiteffect.lua to not use bor since we can't reference other members 
of the same table

Change hp_penalty onGain and onLose to use the new function signature
 2019-06-01 02:59:41 -07:00
Yogurt
97dcd765eb Add new hit effect flag for hit effects that only show animations 
Fix SetMP setting MaxMP instead of MP

Fix substate updates not being sent
 2019-06-01 02:10:40 -07:00
Yogurt
9cda72f1ab Remove MP and TP before setting combo ids to actually take combo into 
account for MP and TP cost
 2019-05-31 23:42:52 -07:00
Yogurt
a99a129d9a Pass result container to effect script when effect times out 2019-05-31 23:34:37 -07:00
Yogurt
4f80023156 Target flag and bug fixes 
Add new flags for MainTarget's party, which allows for Protect to buff
other parties.

Fixed incorrect script function calls
Fixed bug causing World server to get stuck in a loop
 2019-05-29 22:59:24 -07:00
Yogurt
6127ad44cc Pass BattleCommand to scripts. 2019-05-29 20:19:44 -07:00
Yogurt
d7c383d04a Use a static BattleCommand for auto attacks 
This is temporary until all mob skills are added, including mob auto
attacks.
 2019-05-29 20:06:31 -07:00
Yogurt
357805d04c Remove certain effects on class change 2019-05-29 19:57:36 -07:00
Yogurt
706a9fa721 Auto target self on skills whose main target can only be self. 2019-05-29 19:51:51 -07:00
Yogurt
289e4dc24b More targeting changes 
Added CanUse instead of CanAttack/CanWeaponSkill/CanCast since they all
check the same things anyway.

Fixed some bugs like mp checking against hp in AddMP.
 2019-05-29 19:46:29 -07:00
Yogurt
a458608322 BattleCommand changes 
New targeting flags for BattleCommand and TargetFind. (This breaks
combat until new BattleCommand data is in)
Changed MP and TP to shorts in BattleCommand to handle cases where they
might go negative. (might not be correct?)
 2019-05-29 19:24:58 -07:00
Yogurt
3e58cdbd6c Add SetTextId to CommandResult 2019-05-29 19:11:32 -07:00
Yogurt
3068a0c41b Add new functions for absorbs in CommandResultContainer 2019-05-29 19:10:05 -07:00
Yogurt
26ef649a6c Refactor StatusEffectContainer to better handle messages using 
CommandResultContainer.

Alter Modifiers to be the same as ParamNames.

Add LoseOnClassChange flag for status effects.

Add a few missing status effects.

Fix EndTime for stance status effects to stop icon from blinking.
 2019-05-27 23:05:20 -07:00
Yogurt
cc07e1f453 Pass BattleCommand to combat functions to prepare for passing 
BattleCommand to scripts.

Add CommandResultContainer to status update to handle death from dots.
 2019-05-27 17:31:25 -07:00
Yogurt
75c6708ac5 Handle dying in AddHP instead of OnDamageTaken. 2019-05-27 17:08:06 -07:00
Yogurt
ee1f4b0888 Fix base exp being off by 1 2019-05-27 16:56:15 -07:00
Yogurt
f6104812a5 Add ActionLanded to make some checks cleaner. 
Split physical and magic text id dictionaries.

Add calculation for resists.
 2019-05-27 16:52:56 -07:00
Yogurt
d0dca62a91 Add some helper methods for Modifier and only update stats for the 
visual modifiers.
 2019-05-27 16:26:10 -07:00
Yogurt
3b451849ae Initialize positionUpdates on Actor creation. 2019-05-27 15:45:06 -07:00
Yogurt
9889b6011b Move LookAt's same position check to the one that takes in an X and Y 
position
 2019-05-27 15:37:54 -07:00
Yogurt
9b566abb3d Add new HitEffect flags 2019-05-27 15:00:17 -07:00
Filip Maj
02e1b8a82f Renamed the Inventory class file to ItemPackage (class was already renamed). Moved ItemPackage and Equipment classes to Character folder. Fixed unequip bug introduced by accidently removing InventoryBeginChangePacket. Added documentation to the Equipment class. Cleaned up Equipment packet code. 2019-05-12 16:16:44 -04:00
Filip Maj
267961233f Refactoring Equipment class. Fixed inital inventory setup due to missing addItem() (now addItems) function. Added Jorge's refactored Retainer manager script. 2019-05-12 15:03:34 -04:00
Filip Maj
d673670604 Fixed Issue #3 (Items are being shifted for linked items). Sending the updated equipment packet. 2019-05-08 13:18:53 -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