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

6929 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
6fd5720f74
Merge pull request #948 from Skyliegirl33/actions-war 
[3.x] Sync action branch to master
 2023-08-01 15:56:39 +02:00
Rushi
047798f408
Merge pull request #1 from Kooper16/status-application 
Fixed script skill processing
 2023-07-24 00:34:03 +02:00
Kooper16
8a288f34f3 Fixed script skill processing 2023-07-23 22:01:26 +02:00
Rushi
97e1772d7f Merge upstream 2023-07-23 20:05:08 +02:00
Rushi
83590fc5cf Some calculation work 2023-07-23 19:23:20 +02:00
Mordred
96c1c4c042
Merge pull request #935 from pinapelz/master 
SubWil/ManWil MSQ and adding Item Icons to quest notices
 2023-05-11 16:43:35 +02:00
Pinapelz
511d227862
Fixed typo 2023-05-10 18:11:03 -07:00
Pinapelz
3b274cd9ae Central Thanalan SubWil MSQ 
- SubWil026
- SubWil073
- SubWil080
 2023-05-10 16:47:24 -07:00
Pinapelz
99b802c7c2 Added missing HIDE_HOTBAR 2023-05-10 16:46:31 -07:00
Pinapelz
bce9df158f Added ItemIcons to quest notices with multiple vars 2023-05-10 14:59:55 -07:00
Pinapelz
8581a96a40 Central Thanalan SubWil MSQ pt.1 2023-05-10 02:32:19 -07:00
Pinapelz
fe140ab2d6 Added Item Icons to notices in some existing quests 
- Miner Job Quest
- White Mage Quest
- MSQ
 2023-05-09 17:06:50 -07:00
Pinapelz
6fb07971c7 Added ItemIcons to quest notice, logic fixes, set Bitflag8 for SubsSea quests 2023-05-09 16:35:57 -07:00
Pinapelz
0a70db8686 Underneath the Sultantree quest + questbattle implementation 
ManWil005 MSQ. HP values are likely to be wrong
 2023-05-07 01:43:22 -07:00
Mordred
4992503308
Merge pull request #933 from collett8192/3.0_master 
fix some PlayerCondition flags
 2023-05-01 18:14:26 +02:00
collett
78b860d9f8 fix some PlayerCondition flags 2023-04-30 19:36:24 +09:00
Mordred
e7cfe87fef
Merge pull request #930 from T00fy/master 
Some bug fixes and very minor refactoring
 2023-04-25 15:12:44 +02:00
Toofy
b3e86d3877 Formatting 2023-04-23 16:42:24 +01:00
Toofy
f0e1990cbd Some bug fixes 2023-04-18 17:33:29 +01:00
Toofy
d4d8c3c155 Moving around level up logic to make gm level up command behave 'normally' 2023-04-18 16:42:25 +01:00
Mordred
a65b23778b
Merge pull request #927 from hkAlice/faster-but-not-enough 
[3.x] overall optimizations; add getRows to exd data;
 2023-03-25 08:24:57 +01:00
Mordred
928729326c Gambit packs added. Basic timelines for bnpc actions can be defined. 2023-03-24 22:52:38 +01:00
Alice Ogeda
631abf48aa remove extra call; 2023-03-24 18:09:12 -03:00
Alice Ogeda
dedf66f28d add getRows to exd; optimize iterative exd calls further; split namespace for slim header structs; 2023-03-24 17:38:58 -03:00
Alice Ogeda
f6ce8207b2 switchy; 2023-03-24 14:11:07 -03:00
Alice Ogeda
09d0469c96 emplace_back for in-place move const for shared ptr; 2023-03-24 13:32:36 -03:00
Alice Ogeda
d5c4739a77 use cache in getterritorydetail; remove unused bgpath; avoid throwing exceptions when possible; 2023-03-24 13:31:50 -03:00
Mordred
4f3f866531 Fill Bnpc link info in spawn packet if available 2023-03-20 22:59:34 +01:00
Mordred
c97a67ffe6 Implementation of the state machine for bnpcs, missing hp recovering after lost hate. 2023-03-20 10:29:56 +01:00
Mordred
c7b50ca1e9 Keep cells active for 20 seconds even after all players left. 
Also reset target and autoattack state on player on change zone.
 2023-03-17 22:01:06 +01:00
Mordred
e72fe535f6 Added the framework for a fsm for future use on bnpcs. 2023-03-17 15:43:44 +01:00
Mordred
fe9a2ef974 Cleanup cleanup cleanup 2023-03-16 21:56:57 +01:00
Mordred
9b3e793a5c
Merge pull request #920 from Skyliegirl33/actions-war 
[3.x] Move modifier logic to StatusEffect, add parry, remove wrath
 2023-03-15 20:51:37 +01:00
Mordred
33463f45a9 More cleanup of actions 2023-03-15 15:21:03 +01:00
Mordred
aafb77ecbb Use attack type for action hit effect, further simply action code. 2023-03-14 22:32:55 +01:00
Mordred
9ba263da00
Merge pull request #923 from collett8192/3.0_master 
3.x crit, fix random generator and remove direct hit
 2023-03-14 10:54:04 +01:00
collett
123dad2e23 update rng to RandGenerator 2023-03-14 18:22:41 +09:00
collett
5fb62b75ec support 3.x crit damage and remove direct hit 2023-03-14 18:06:02 +09:00
Mordred
658d2fa7aa minor cleanup of actionResultBuilder 2023-03-13 23:26:50 +01:00
Lucy
434eaa6163 indentation fix 2023-03-13 12:11:20 +01:00
Lucy
db9d10630c Add flag to overloaded applyStatusEffectSelf 2023-03-13 12:03:14 +01:00
Lucy
12f289e99c Merge branch 'master' of https://github.com/SapphireServer/Sapphire into actions-war 2023-03-13 11:59:34 +01:00
Lucy
a6125168ba Merge branch 'master' of https://github.com/SapphireServer/Sapphire into actions-war 2023-03-13 11:58:10 +01:00
Mordred
f1cd218e85 Include Common::ActionResultFlag::EffectOnSource on source status effects 2023-03-13 11:44:09 +01:00
Mordred
09db0ee7d2 There is now an applyStatusEffectSelf for status effects which same source and target. 2023-03-13 11:21:42 +01:00
Lucy
f001ee11b6 Improve offensive action check 2023-03-12 22:22:02 +01:00
Lucy
8bd74ba26e Merge branch 'master' of https://github.com/SapphireServer/Sapphire into actions-war 2023-03-12 21:20:29 +01:00
Mordred
b98f63eb75 Statuseffect fix #3 2023-03-12 21:19:44 +01:00
Lucy
8337d5ddca Merge branch 'master' of https://github.com/SapphireServer/Sapphire into actions-war 2023-03-12 21:11:45 +01:00
Mordred
0edff5ab85 Statuseffect fix #2 2023-03-12 21:06:37 +01:00