1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-26 03:27:44 +00:00
Commit graph

3268 commits

Author SHA1 Message Date
collett
f5b6dc7282 Merge branch 'action_data_update_pr' into develop_c 2020-01-13 03:06:07 +09:00
collett
0573138e1b Implement shield buff, and script for adloquium as a demo. 2020-01-13 03:05:54 +09:00
collett
df472ae3e3 Merge branch 'action_data_update_pr' into develop_c 2020-01-12 21:17:48 +09:00
collett
659786590c cannot absorb more than target remaining hp 2020-01-12 21:17:36 +09:00
collett
86e37ef7f7 Merge branch 'action_data_update_pr' into develop_c 2020-01-12 20:59:00 +09:00
collett
511fc2b35a Implement hp absorb. 2020-01-12 20:58:32 +09:00
collett
57635ac69b Merge branch 'action_data_update_pr' into develop_c 2020-01-12 18:19:39 +09:00
collett
b9eaef6a85 must be correct combo to apply status if a combo action is used. 2020-01-12 18:19:23 +09:00
collett
2ba1c4d940 Merge branch 'action_data_update_pr' into develop_c 2020-01-12 18:00:57 +09:00
collett
64a1c4033b Create lut entry for auto attacks so we won't have three different places that do damage.
of course more dumb mistake fixes.
2020-01-12 17:46:18 +09:00
collett
30461e8583 Merge branch 'action_data_update_pr' into develop_c 2020-01-12 03:48:53 +09:00
collett
e08643f380 Implement damage reflect trigger.
Replace consts with enums in Common.h
Use effect builder for autoattacks.
Dumb mistake fixed.
2020-01-12 03:29:52 +09:00
collett
24358891ad Merge branch 'action_data_update' into develop_c 2020-01-11 21:37:25 +09:00
collett
b83c70589e scale npc aa damage base on level 2020-01-11 21:37:07 +09:00
collett
fecd838fe7 Merge branch 'misc_fix' into action_data_update 2020-01-11 21:05:10 +09:00
collett
36fe4a72e6 Merge branch 'action_data_update_pr' into action_data_update 2020-01-11 21:05:01 +09:00
collett
0620aaa932 Update EffectResult packet and send proper animation lock time. 2020-01-11 21:02:11 +09:00
collett
8d7c6f5188 Actually it is working and I'm going to do a separate PR alongside with some other related changes.
This reverts commit ed51e1537e.
2020-01-11 20:54:24 +09:00
collett
a2958601a1 Merge branch 'action_data_update_pr' into action_data_update 2020-01-11 19:40:38 +09:00
collett
ed51e1537e this seems like a better value matching retail experience after playing with some artificial latency, and set the not functioning value just to match retail packet. 2020-01-11 19:39:18 +09:00
collett
a556d8dce4 fix status applying too fast. 2020-01-11 18:05:12 +09:00
collett
3b140f36d3 Merge remote-tracking branch 'remotes/origin/develop' into action_data_update 2020-01-11 17:53:58 +09:00
collett
a9108f8dfc Merge branch 'action_data_update_pr' into action_data_update 2020-01-11 17:53:50 +09:00
collett
43bf40cbb6 Merge remote-tracking branch 'remotes/origin/develop' into develop_c 2020-01-11 17:19:23 +09:00
Adam
5d5763c74e
Merge pull request #627 from NotAdam/develop
fix some warnings & world shouldn't crash when warming up object cache
2020-01-11 18:42:19 +11:00
collett
b15864b541 move attack type enum to common.h 2020-01-11 16:33:19 +09:00
NotAdam
755c6b55c0 fix some warnings & world shouldn't crash when warming up object cache 2020-01-11 18:20:06 +11:00
collett
96a25c9a9e fix enum type 2020-01-10 23:51:09 +09:00
collett
0724364d69 update attackType.
remove healType as such thing does not exist.
2020-01-10 23:42:20 +09:00
collett
896ce73175 Generic action handler update with status support. 2020-01-10 21:24:35 +09:00
collett
b391bc4aad remove gain job resource 2020-01-10 20:33:50 +09:00
collett
a6daa4ea8e more clean up 2020-01-10 19:58:53 +09:00
collett
f7ca365c8d status effect: heal cast multiplier, crit dh bonus
fix multipliers not applying to dots/hots
clean up hard-coded values.
2020-01-10 19:39:44 +09:00
collett
b744941620 status effect: heal receive multiplier 2020-01-10 02:17:41 +09:00
collett
e30ec77091 Merge branch 'develop_c' into action_data_update 2020-01-10 01:30:43 +09:00
collett
4496e5fe1f Merge remote-tracking branch 'remotes/origin/develop' into develop_c 2020-01-10 01:30:12 +09:00
collett
e79d262442 update parse data 2020-01-10 01:27:44 +09:00
collett
92173f778b minor fix 2020-01-10 01:19:33 +09:00
collett
77a6904220 status effect: dots & hots 2020-01-10 01:11:13 +09:00
collett
384404bb33 clean up 2020-01-09 21:10:49 +09:00
collett
a5884fd604 status effect: damage receive multiplier 2020-01-09 21:04:43 +09:00
collett
da17eecac5 status effect: damage multiplier 2020-01-09 19:37:50 +09:00
collett
8247a04d3a fix derp 2020-01-09 17:31:23 +09:00
Adam
38392be3bf
Merge pull request #625 from collett8192/crit_and_dh
Critical and direct hit.
2020-01-09 12:03:49 +11:00
Adam
d327e40b53
Merge pull request #624 from collett8192/money_sound_effect
Play the coin sound effect when buying items from shop.
2020-01-09 12:00:49 +11:00
collett
761b6cc94d Action data update.
All values are parsed from ffxiv act plugin at https://github.com/ravahn/FFXIV_ACT_Plugin
2020-01-09 01:29:09 +09:00
collett
6eaa4c407f Merge branch 'money_sound_effect' into develop_c 2020-01-08 20:32:06 +09:00
collett
7f5a6c8203 Merge branch 'crit_and_dh' into develop_c 2020-01-08 20:29:45 +09:00
collett
f7f44e9c15 rename 2020-01-08 18:28:19 +09:00
collett
00d8c0eef7 Fix shop packet. 2020-01-08 18:26:11 +09:00