mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-28 20:27:46 +00:00
Code Activity
2980 commits 10 branches 14 tags 26 MiB
Commit graph

2324 commits

Author SHA1 Message Date
collett
32b677ad4d Merge remote-tracking branch 'remotes/origin/develop' into action_data_update_pr 2020-01-14 17:10:54 +09:00
collett
8698ea415a clean up 2020-01-14 17:02:11 +09:00
collett
685fd9c3bf move applyShieldProtection to chara 2020-01-13 03:49:25 +09:00
collett
0573138e1b Implement shield buff, and script for adloquium as a demo. 2020-01-13 03:05:54 +09:00
collett
659786590c cannot absorb more than target remaining hp 2020-01-12 21:17:36 +09:00
collett
511fc2b35a Implement hp absorb. 2020-01-12 20:58:32 +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
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
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
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
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
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
Adam
38392be3bf
Merge pull request #625 from collett8192/crit_and_dh 
Critical and direct hit.
 2020-01-09 12:03:49 +11: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
collett
ddb08ff59c rip vs2019 right click rename 2020-01-08 17:59:02 +09:00
collett
4bdfb1ef1f oops 2020-01-08 17:32:15 +09:00
collett
76a9e1eca3 effect entry field rename 2020-01-08 17:21:01 +09:00
collett
c460b007a1 less op test value 2020-01-07 19:46:07 +09:00
collett
586a1ab0bb crit & dh 2020-01-07 19:16:13 +09:00
collett
5083b51bf2 Play the sound effect when buying items from shop. 
When selling the sound effect is also played (and shop switch to buy back tab as well) but the selling logic code is not there so...
 2020-01-06 19:57:18 +09:00
collett
c696cb2c80 Allow action scripts to add effect. 2020-01-06 19:25:01 +09:00
NotAdam
204ff7ec84 fix linux build 2020-01-06 20:23:03 +11:00
NotAdam
3de42fc670 action_parse can take an exd path as a launch arg now 2020-01-06 20:23:03 +11:00
collett
05480df1d9 no need to return the list 2020-01-06 17:52:45 +09:00
collett
4e11690a45 Fix skill animation for other players. 2020-01-06 04:31:09 +09:00
コレット
4c324bf602
Merge branch 'develop' into action 2020-01-06 00:37:57 +09:00
collett
cfd23755fb combo fix 2020-01-06 00:25:42 +09:00
collett
4f0533bb0d local var rename 2020-01-05 21:31:54 +09:00
collett
fc07ec09b2 more clean up 2020-01-05 20:54:49 +09:00
collett
a27098390b Minor tweaks and code clean up. 2020-01-05 20:49:50 +09:00
Adam
89450e30c6
Merge pull request #622 from SapphireServer/exit_poprange 
use lgbs to handle zonelines/aetherytes/discovery instead of db table
 2020-01-05 21:03:43 +11:00
NotAdam
cb0c93dc6d opcode fixes 2020-01-05 20:52:51 +11:00
NotAdam
f7d953bd5e fix InstanceObjectCache crashing if expansion is not installed 2020-01-05 20:36:52 +11:00
NotAdam
2824c30342 Merge branch 'develop' into exit_poprange 2020-01-05 20:06:31 +11:00
collett
1ae1bcd54d Fix base stats calc. 
Better max hp.
 2020-01-05 17:41:38 +09:00
collett
08283ebcc5 oops 2020-01-05 17:26:49 +09:00
collett
9cd17b3caa Action system updates. 2020-01-05 17:09:27 +09:00
Adam
3090de3b20
Merge pull request #619 from collett8192/inventory_fixes 
Inventory fixes.
 2020-01-05 09:24:51 +11:00
Adam
6f9c299a04
Merge pull request #618 from collett8192/quest_reward 
Fix quest reward choice.
 2020-01-05 09:24:40 +11:00
collett
bab1d384c2 Inventory fixes. 2020-01-05 06:20:50 +09:00
collett
a588adca8c Fix quest reward choice. 
Quest scripts need to call player.giveQuestRewards( getId(), result.param3 ) for it to work.
 2020-01-05 05:25:35 +09:00
collett
7f4184bfbc Move quest finish packet to where it belongs to so we can abandon quests. 2020-01-05 05:19:05 +09:00
Adam
6df0dcffe9
Merge pull request #616 from collett8192/event_battle 
Fix event battle.
 2020-01-04 01:20:56 +11:00