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
958 Commits 4 Branches 2 Tags
ec85cfd5902eb0decc130ae332baa8e49419eb51
Commit Graph
91 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yogurt ec85cfd590 Merged in takhlaq/ffxiv-classic-server (pull request #61) 
Combat changes and fixes.

Approved-by: Filip Maj <[email protected]>
 2019-06-08 22:58:02 +00:00
yogurt 4fbc388457 Merged in skeletonhorn/ffxiv-classic-server-ai-fork/develop (pull request #13) 
Develop
 2019-06-06 02:29:23 +00: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 90078eb2e8 Merged in skeletonhorn/ffxiv-classic-server-ai-fork/develop (pull request #12) 
Fix SLOT_OFFHAND conflict
 2019-06-06 02:08:39 +00:00
Yogurt 7339e08172 Fix SLOT_OFFHAND conflict 2019-06-05 19:07:46 -07:00
yogurt 1fddfd50a6 Merged in skeletonhorn/ffxiv-classic-server-ai-fork/develop (pull request #11) 
Develop
 2019-06-06 02:06:19 +00: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
yogurt fdb767f155 Merged in skeletonhorn/ffxiv-classic-server-ai-fork/develop (pull request #10) 
Push udpated traits db file
 2019-06-03 00:35:30 +00:00
Yogurt e1c86a4898 Push udpated traits db file 2019-06-02 17:33:05 -07:00
yogurt 8f92fde00e Merged in skeletonhorn/ffxiv-classic-server-ai-fork/develop (pull request #9) 
Combat fixes
 2019-06-02 04:25:22 +00: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 6fcfd58b33 Merged in skeletonhorn/ffxiv-classic-server-ai-fork/develop (pull request #8) 
Fix hiteffect.lua to not use bor since we can't reference other members of the same table
 2019-06-01 10:20:19 +00: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 f3fe8c1de8 Merged in skeletonhorn/ffxiv-classic-server-ai-fork/develop (pull request #7) 
Develop
 2019-06-01 09:19:13 +00:00
Yogurt 4e054ca947 Add DoAction to raise so it at least plays the animation 2019-06-01 02:16:44 -07:00
Yogurt eb949a8602 Move chimera abilities to Weaponskills 2019-06-01 02:14:21 -07:00
Yogurt 315452d121 Move shoulder tackle to abilities folder 
Add Convert
 2019-06-01 02:13:41 -07:00
Yogurt 1a9a8c2116 Fix wrong flag in esuna 2019-06-01 02:12:37 -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 e00bb48386 Fix some incorrect CommandTypes in database 2019-06-01 00:57:31 -07:00
Yogurt ef117204b3 Move raise in Teleport command so that it gets caught if isInn is true 2019-06-01 00:39:22 -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 6ae181fa0a Merged in skeletonhorn/ffxiv-classic-server-ai-fork/develop (pull request #6) 
Update develop and pr combat changes to demo's fork
 2019-05-30 06:33:30 +00:00
Yogurt 1f3c98312c Fix World getting stuck in group packet loop for real 2019-05-29 23:20:15 -07:00
Yogurt db0aac3647 New database files for commands effects 2019-05-29 23:08:02 -07:00
Yogurt 00017468cc New scripts 
New scripts for commands and effects that use the new function
signatures and work with the new statuseffectcontainer
 2019-05-29 23:05:40 -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
yogurt 1579aa3d6a Bug fixes 
Fixed LookAt resetting rotation when looking at self
Fixed BattleNpcs running to their target's exact position instead of the closest position they can attack from
 2018-07-03 04:46:34 -05:00
yogurt cf30eef39e AoE rewrite and bug fixes 
Rewrote aoe checks for cone and line aoes and added minimum distance values
Added height checks for commands
Fixed combo effects repeating for every target hit by AoE attacks
Fixed teleport sometimes not raising (I think)
Fixed gear checks in some command scripts
 2018-07-02 00:45:06 -05:00
yogurt 8c5375f609 Fixed a typo in blind's effect script 2018-06-25 23:44:04 -05:00
yogurt c442dc9ecd Script fixes and new effects. 
Cleaned up unneeded requires in some scripts
Fixed Second Wind
Added new effect scripts
Added bard song scripts that mostly work
 2018-06-25 23:36:18 -05:00
yogurt ace4dfe58f Small fixes 
Fixed final message for multi-hit attacks.
Fixed self targeting for commands
Made it so player.lua doesn't skip over home points setting, just the quest setitng.
Began adding knockback effect handling
 2018-06-25 18:20:20 -05:00
yogurt 79f2edf406 Bug fixes 
Fixed some bugs with targeting flags
Fixed action equip bug for real this time
Fixed server crash when commands hit no targets
 2018-05-31 11:25:55 -05:00
yogurt 0f7e6f359d Added class-specific exp messages for non-english languages 
Fixed status effect loss message not being sent
Fixed party bug where people in the same party were considered to be in different parties
 2018-05-28 16:28:44 -05:00
yogurt 0739532c7d Reverting changes to characters_statuseffect sql file 2018-05-28 02:10:14 -05:00
yogurt d23a84d6cf Undid change that broke parties 2018-05-27 23:02:08 -05:00
yogurt 8de606051a More bug fixes 
Fixed loading status effects on login
Fixed barrage issues
Added untraited version of Protect
Added sanguine rite
 2018-05-27 18:07:52 -05:00
yogurt a7e59fa7e4 Merge branch 'ai-open' of https://bitbucket.org/takhlaq/ffxiv-classic-server into ai-open 2018-05-27 15:17:00 -05:00
yogurt 922fb80f3d Bug fixes. 
Added stoneskin effect to database.
Fixed Rampage not working
Fixed bug where abilities didn't equip correctly when leveling up
Added a temporary fix for returning while dead
Added handling for abilities that don't have an actiontype set, like elusive jump
 2018-05-27 14:51:39 -05:00
yogurt 8c9f841d63 Merged in skeletonhorn/ffxiv-classic-server-ai-fork/ai-open (pull request #5) 
Combat Changes
 2018-04-19 00:49:46 +00: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
yogurt b8d6a943aa Combat changes and bug fixes 
Added the combo and proc systems
Added scripts for most weaponskill and spells as well as some abilities and status effects
Added support for multihit attacks
Added AbilityState for abilities
Added hiteffects that change based on an attack's parameters
Added positionals

Changed how targeting works for battlecommands

Fixed bug that occurred when moving or swapping hotbar commands
Fixed bug that occurred when losing status effects
 2018-02-15 13:20:46 -06:00
yogurt 837c7a9223 Health updating fix, temp r0 fix 2017-12-10 09:20:42 -06:00
yogurt 205d3619d6 Merging 2017-12-08 02:08:13 -06:00
yogurt 1275c8b5da Added party to Gridania opening, fixed BattleActionx18 and made it so x18 is used for packets with more than 10 targets. Changed how death works. Added respawn time and roam modifiers. Added TryAggro functions and moved aggroing out of roaming and helpplayers. Fixed high cpu usage in zone's OnUpdate function. Fixed work value in player update 2017-12-08 00:58:39 -06:00
yogurt 460722d3d5 Opening changes 2017-10-11 06:42:06 -05:00
yogurt 92de857cda opening quest stuff 2017-10-10 13:32:47 -05:00
yogurt 9fc99faa5c Merge branch 'ai-open' of https://bitbucket.org/takhlaq/ffxiv-classic-server into ai-open 2017-10-06 20:45:36 -05:00
yogurt 116a573f85 Save class/level parameter save info on level up 2017-10-06 20:45:10 -05:00
yogurt f3a823af03 Only send current class's exp on login. Exp now updates on class change 2017-09-30 20:04:45 -05:00
yogurt 5dfbc0f249 EXP and levels now get saved and loaded from database, changed battlecommand id dictionary to hold lists to account for archer and DoH/DoLs getting multiple abilities at certain levels. Level 1 abilities are now added to the hotbar on character creation. 2017-09-30 07:28:08 -05:00
yogurt ab98f3662f Removed old EquipAbility function from player.cs 2017-09-27 18:12:02 -05:00
yogurt 33f8709d76 Added exp and leveling functions, redid equip ability functions to allow adding abilities that aren't for the player's current class and made functions more clear, added dictionary of BattleCommand ids indexed by a tuple containing classId and level. 2017-09-27 18:10:22 -05:00
yogurt 9077c60b96 Merged in skeletonhorn/ffxiv-classic-server-ai-fork/ai-open (pull request #4) 
Minor changes to fix equipability bugs
 2017-09-08 14:22:41 +00:00
yogurt 50b4f517f2 Fix FindFirstCommandSlotById to be able to find empty slots again 2017-09-03 11:18:35 -05:00
yogurt 2b5a6997f4 Merge branch 'ai-open' of https://bitbucket.org/takhlaq/ffxiv-classic-server into ai-open 2017-09-02 22:41:02 -05:00
yogurt 6e1983031b Merge branch 'ai-open' of https://bitbucket.org/takhlaq/ffxiv-classic-server into ai-open 2017-09-02 10:25:17 -05:00
yogurt c55acba1b6 Changed primary key for characters_hotbar.sql and removed id column. 2017-08-30 16:26:28 -05:00
yogurt 2cee5ff573 Merged in skeletonhorn/ffxiv-classic-server-ai-fork/ai-open (pull request #3) 
EquipAbility refactor
 2017-08-29 14:59:29 +00:00
yogurt c3fd8f917e Added UnequipAbility function, made EquipAbility work with zero indexed hotbar database, added new checks to EquipAbilityCommand.lua 2017-08-29 09:00:09 -05:00
yogurt c79b5c9992 Merged in skeletonhorn/ffxiv-classic-server-ai-fork/ai-open (pull request #2) 
Ai open
 2017-08-22 20:17:50 +00:00
yogurt e390138258 Removed unneeded recast timer parameter in EquipAbility call in EquipAbilityCommand.lua 2017-08-22 14:56:57 -05:00
yogurt 35f9251056 Split update hotbar function into seperate command and recast functions, fixed recast packet spam, recast timers now reset when commands are added to the hotbar and when changing classes, and are now saved in the databse correctly and sent on login. Merged demo's changes. 2017-08-22 14:50:53 -05:00
yogurt 3734f22fc2 Merged in skeletonhorn/ffxiv-classic-server-ai-fork/ai-open (pull request #1) 
equip ability functions
 2017-07-11 19:52:04 +00:00
yogurt 4032258e76 More merge fixes! 2017-07-11 11:52:54 -05:00
yogurt 4dee26e136 Fixing more merge errors. I'm bad at this 2017-07-11 09:50:54 -05:00
yogurt 86a2e4aff3 Fixing merge error 2017-07-11 09:45:11 -05:00
yogurt b2e86d282a Merge branch 'ai-open' of https://bitbucket.org/takhlaq/ffxiv-classic-server into ai-open 2017-07-11 09:40:10 -05:00
yogurt efdec5e472 Add equip ability functions 
Fix EquipAbility SQL query
 2017-07-11 09:08:50 -05:00