Commit Graph

555 Commits

Author SHA1 Message Date
Ka0rX
c0f3ac0638 Merge branch 'master' of https://gitlab.com/phoenix-dvpmt/mmocore 2023-06-25 10:10:21 +01:00
Ka0rX
77ecc005b4 Merge branch 'master' into casting-events-enter-exit
# Conflicts:
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/api/event/PlayerEnterCastingModeEvent.java
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/api/event/PlayerExitCastingModeEvent.java
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/cast/listener/KeyCombos.java
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/cast/listener/SkillBar.java
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/cast/listener/SkillScroller.java
2023-06-25 10:23:32 +01:00
Ka0rX
066dc44a4f Merge branch 'master' into casting-events-enter-exit 2023-06-25 10:08:53 +01:00
Guillaume
f8758ebe74 Revert "Merge branch 'custom-sound-case-sensitivity-fix' into 'master'"
This reverts merge request !28
2023-06-25 08:04:42 +00:00
Guillaume
a0ec9542fd Merge branch 'custom-sound-case-sensitivity-fix' into 'master'
Custom sound case sensitivity fix (#878)

Closes #878

See merge request phoenix-dvpmt/mmocore!28
2023-06-25 08:04:25 +00:00
Jules
611272e5bb Catch malformed json errors on class loading 2023-06-25 02:32:35 +02:00
Jules
dc9f1bc1aa Support for latest ML 2023-06-25 02:22:55 +02:00
Jules
be82279540 Permission to skip waypoint waiting time 2023-06-25 02:22:50 +02:00
Jules
441cea0208 Merge branch 'weather-time-conditions' into 'master'
feat(conditions): Add Weather and Time conditions

See merge request phoenix-dvpmt/mmocore!22
2023-06-25 00:19:03 +00:00
Ka0rX
9b7d0c35b7 Added the possibility to give vanilla exp with fishing drop items. 2023-06-24 22:46:45 +01:00
Ka0rX
8000bc9b89 Skill Tree refactor & enabled to translate the skill tree node states. 2023-06-24 22:46:05 +01:00
Rosenthalk0
51f4f7be1b Cleaning up the events, removing lambok from events, and making leaveCastingMode and setCastingMode as booleans to reflect the events they fire! 2023-06-24 15:06:17 -05:00
Rosenthalk0
a40e7b119c Fix for case insensitivity 2023-06-23 16:48:27 -05:00
Rosenthalk0
09e1241735 Fix for case insensitivity 2023-06-23 16:48:13 -05:00
Rosenthalk0
e90a1cea28 Fix for case insensitivity 2023-06-23 16:47:49 -05:00
Rosenthalk0
96ac7a9c00 API method for leaveSkillCasting to fire event! 2023-06-23 14:00:48 -05:00
Rosenthalk0
839ccd4942 Use MMOCore PlayerDataEvent 2023-06-23 13:39:28 -05:00
Rosenthalk0
6088c8b343 Fix of small bugs relate to the events! 2023-06-18 15:36:00 -05:00
Jules
74a170e66c !Use of newest methods of ML for data saving 2023-06-18 16:51:08 +02:00
Rosenthalk0
222fbfc833 Events for Casting Mode 2023-06-12 13:06:57 -05:00
Ka0rX
df78c21aa3 Added the needs-bound option in class skills section in order to set which passive skills need to be bound and which don't. 2023-06-05 22:14:09 +01:00
Ka0rX
2b6f00d7fa Fixed issue #860 about a comp bug with KingdomsX. 2023-06-05 21:29:20 +01:00
Ka0rX
9af5c358dd . 2023-06-04 21:42:10 +01:00
Ka0rX
72f14547d9 Fixed issue #857 about progress not being properly saved for skill trees with skill modifier. (Skill modifier is now the name we will give to skill buffs. mana, delay... are now called skill parameters). 2023-06-04 21:23:06 +01:00
Ka0rX
90e0c349a4 Fixed a bug related to lore parsing in skill-list.yml 2023-06-01 08:41:55 +01:00
Ka0rX
fb0dbad80f Bug Fixing related to Skill Tree not working properly with MMOProfiles. 2023-06-01 08:41:30 +01:00
Ka0rX
178bb35d59 Added the status unlockable for path in skill-tree.yml (Check wiki), make sure to reload gui/skill-tree.yml to benefit from this modification. 2023-05-31 17:54:24 +01:00
Ka0rX
4065737f35 Added the possibility to redefine the display section inside of skill-tree folder in order to have different display for each skill-tree. (Check wiki) 2023-05-31 17:25:32 +01:00
Ka0rX
38065a1120 Added up,down,left & right type for nodes in the display section of skill-tree.yml. Make sure to reload this file to have everything working properly. 2023-05-31 17:24:20 +01:00
Ka0rX
c73ee476da Fixed a bug related to %mmocore_skill_parameter_<parameter>:<skill-name>% placeholder. 2023-05-31 16:36:49 +01:00
Ka0rX
f130f2aac9 Added {skill-lore} placeholder for SlotItem in gui/skill-list.yml acccodring to issue #854 2023-05-31 16:15:18 +01:00
Ka0rX
bcc501176f Fixed issue #833 about console spamming when using /mmocore reload 2023-05-29 11:29:49 +01:00
Ka0rX
b093d325dd Refactored MMOCore skill modifiers to call them skill parameters as in MythicLib, Fixed issue #834. 2023-05-29 10:25:04 +01:00
Ka0rX
b87de32bbb Fixed issue #849 about some data not saving properly for MySQL. 2023-05-29 09:25:11 +01:00
Ka0rX
4812a48b3c Fixed issue #837 &838 about key combos being offset of 1 skill slot. 2023-05-29 09:23:22 +01:00
Ka0rX
0acff060eb Fixed issue #847 related to "selected" item not showing the right model data in the skill GUI. 2023-05-29 09:22:06 +01:00
Ka0rX
0f1ced9744 Fixed issue #841 related to SubclassSelect showing subclasses despite not having the required level. 2023-05-29 09:21:13 +01:00
Ka0rX
ddf041aa30 Fixed issue related to wrong display for skill tree paths. 2023-05-28 06:59:08 +01:00
Ka0rX
54bb1f2632 Added the option skill-tree-scroll-step-x/y in config.yml to control the scroll speed in skill tree GUI. 2023-05-28 06:39:38 +01:00
Ka0rX
4d98b8b307 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/comp/placeholder/RPGPlaceholders.java
2023-05-19 20:10:18 +01:00
Jules
c0373750cd Fixed compile errors 2023-05-15 00:10:06 +02:00
Jules
f1d90589a4 Update lib 2023-05-15 00:07:54 +02:00
Jules
2ba9c1f0ec Removed unused sound 2023-05-15 00:06:34 +02:00
Jules
ac36e3eaa1 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/binding/BoundSkillInfo.java
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/cast/listener/SkillBar.java
#	MMOCore-Dist/src/main/resources/config.yml
2023-05-15 00:06:02 +02:00
Jules
7e134aac1d Force class on profile selection 2023-05-14 23:27:11 +02:00
Jules
651e46697e force-class-selection fixes 2023-05-14 16:34:43 +02:00
Ka0rX
0627c73378 Added placeholder for skill modifiers relative to ticket #829. 2023-05-13 11:46:29 +01:00
Ka0rX
7bf3b9ace7 Bug Fixing for Issue#802 about passive-skill-need-bound not working. 2023-05-09 08:32:48 +01:00
Jules
e939b6e868 Merge remote-tracking branch 'origin/jules' into jules 2023-05-08 11:43:07 +02:00
Jules
a09c23ecf5 Fixed NoClassDefFound 2023-05-08 11:43:01 +02:00
Ka0rX
1a1371b5f9 Little debug for placeholders 2023-05-08 09:12:44 +01:00
Ka0rX
27d5c93ba7 Heavy debugging and refactor for skill trees. 2023-05-07 19:15:28 +01:00
Ka0rX
a18a42ea2f Heavy debugging and refactor for skill trees. 2023-05-07 18:12:37 +01:00
Jules
2bcd505bf8 Support for profile placeholders 2023-05-07 18:29:31 +02:00
Ka0rX
a64faa02fd Bug Fixing for Skill Tree 2023-05-07 16:50:43 +01:00
Ka0rX
8e504e1a10 Implemented feature associated to ticket #824 by adding incompatible-parents field in skill tree node config. 2023-05-07 16:28:18 +01:00
Ka0rX
a125320dd0 Fixed a bug related to SubClassSelect GUI. 2023-05-07 16:26:37 +01:00
Ka0rX
aa6a1d7101 Fixed issue #820 about skills not being locked when reallocating skill tree. 2023-05-07 15:11:20 +01:00
Ka0rX
13440600a8 Fixed issue #821 about skill tree nodes not loading properly. 2023-05-07 14:29:27 +01:00
Jules
09d76dab1b API method to force into skill casting 2023-05-07 09:33:18 +02:00
Ka0rX
fe0996b01b Little modifications for the formula parser. 2023-05-05 11:18:40 +01:00
Ka0rX
5523e875cf Permission requirement for skill tree node according to ticket #801.
Check the wiki for further info. Make sure to reload messages.yml.
2023-05-04 11:21:11 +01:00
Ka0rX
b0cab10da2 Fixed issue #811. 2023-05-04 10:05:38 +01:00
Ka0rX
1cdbd08d6b Fixed issue #818 about decimal format not being applied to some placeholders. 2023-05-04 09:48:54 +01:00
Ka0rX
d2d03e322c Fixed issue #809 about passive skill being shown in the skill casting bar. 2023-05-04 09:40:25 +01:00
Ka0rX
edc873a6c7 Fixed issue #804 about custom display not working properly for the status fully-locked. 2023-05-04 09:34:22 +01:00
Ka0rX
9344ff99a6 Fixed issue #805 about placeholders not being parsed in the profile GUI. 2023-05-04 09:30:16 +01:00
Ka0rX
4b2cc5ea61 Fixed issue #810 about %mmocore_bound_<int>% placeholder bug. 2023-05-04 09:14:34 +01:00
Ka0rX
fc91ace143 Fixed issue #806 about skill slot lore not displaying on GUI and modified slightly skill-list.yml GUI for that. 2023-05-04 09:12:26 +01:00
Ka0rX
f3aa07288f Fixed issue #812 about a bug with slot_unlock trigger. 2023-05-04 09:11:17 +01:00
Ka0rX
061ced2207 Better error handling for slot lock command. 2023-05-04 09:10:36 +01:00
Ka0rX
fa9c24589b Fixed issue #817 about skill tree path not working as intented in GUI. 2023-05-04 09:10:16 +01:00
Starmism
71b7727a15 feat(conditions): Add Weather and Time conditions 2023-04-24 14:40:23 -06:00
Ka0rX
79b007f144 Merge remote-tracking branch 'origin/master' 2023-04-24 07:24:53 +01:00
Jules
590801203d Fixed NPE with yaml data loading 2023-04-23 22:08:30 +02:00
Jules
41617f722c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
2023-04-23 21:42:10 +02:00
Jules
f4b2147226 Basic support for DungeonParties 2023-04-22 16:54:55 +02:00
Jules
966cd333c1 Basic support for OBTeam 2023-04-22 15:59:54 +02:00
Ka0rX
a37287cf0c Refactor /typo 2023-04-22 11:39:40 +01:00
Ka0rX
523f910113 Bug Fixing for the specific display associated to each node. 2023-04-21 08:07:08 +01:00
Ka0rX
5fdfc36fcc Renaming for skill tree GUI. 2023-04-21 08:06:40 +01:00
Ka0rX
ad6b7fa0ff Enabled each skillTreeNode to have its own display by filling item & custom-model-data in its config. 2023-04-21 07:22:59 +01:00
Ka0rX
50f2de287c Fixed a bug linked to perm stats not being modified when changing class. 2023-04-20 21:27:28 +01:00
Ka0rX
f4be0ab409 Fixed issue #796. 2023-04-20 20:54:15 +01:00
Ka0rX
4d8df79dc2 Removed debugging message. 2023-04-20 20:45:34 +01:00
Ka0rX
ebed0d3983 Fixed issue #795 about bugs linked to the party GUI. 2023-04-20 20:33:03 +01:00
Ka0rX
d1be5cbce7 Fixed issue #794 about passive-skill-need-bound being disabled. 2023-04-20 20:12:03 +01:00
Ka0rX
c99caff22d Passive skill bug fixing. 2023-04-20 20:01:17 +01:00
Ka0rX
8b3d553183 Big modification for the skilltree GUI. Make sure to reload gui/skilltree.yml and look at the wiki. 2023-04-20 19:52:09 +01:00
Ka0rX
77f543f347 Added placeholder %mmocore_attribute_points_spent_<attribute_id>%. 2023-04-16 21:32:53 +01:00
Ka0rX
f9fdbfa127 Fixed bug #782. 2023-04-16 21:13:43 +01:00
Ka0rX
021cd960da Bug Fix 2023-04-16 20:09:49 +01:00
Ka0rX
048ed1364d Fixed issue #788. 2023-04-16 20:09:35 +01:00
Ka0rX
4de49070a0 Fixed issue #792 by adding the possibility to put a "custom-model-data" for skill trees. 2023-04-16 18:29:39 +01:00
Ka0rX
56a84015ac Bug fixing related to the "selected" item. 2023-04-16 18:28:23 +01:00
Ka0rX
a1e817f22c Added a "selected" item that replicates the skill that is selected in skill list GUI. 2023-04-16 18:15:24 +01:00
Jules
baf664a608 SQL Update commit 1 2023-04-16 00:56:17 +02:00
Jules
547775a33e Removed debug msg 2023-04-15 00:27:58 +02:00
Jules
afe3eec3fb New placeholders 2023-04-14 17:57:49 +02:00
Jules
039baed3d3 New triggers for skill management 2023-04-14 17:32:02 +02:00
Jules
39f95634a0 Fixed skills not unregistering on logout/changing class 2023-04-14 16:39:58 +02:00
Jules
0bcd11cf68 Fixed guild loading NPE 2023-04-14 15:45:04 +02:00
Jules
f9a4f65860 Fixed subclass confirmation 2023-04-13 19:43:43 +02:00
Jules
3904b9a8b7 Skill bar now displays correct ints 2023-04-13 19:16:46 +02:00
Jules
634eda113b Added fixed level for exp tables!! 2023-04-11 00:49:18 +02:00
Jules
e4637194c3 Improved implementation of boundSkills 2023-04-11 00:48:54 +02:00
Jules
d020673105 Fixed bound skills not saving for yaml 2023-04-10 23:49:25 +02:00
Jules
7a336cab27 Fixed skill buffs 2023-04-10 17:42:12 +02:00
Jules
bb73fb57df Fixed skills not updating when using /mmocore reload 2023-04-10 17:30:50 +02:00
Jules
f13957b119 Fixed /skills when having no skill 2023-04-10 17:30:02 +02:00
Jules
c104c8230d Last cleanup 2023-04-10 16:46:05 +02:00
Jules
2c9a6773f5 Skill slots now use icon from bound skill 2023-04-10 16:46:00 +02:00
Jules
9b2c972ca4 More cleaning up 2023-04-10 16:12:57 +02:00
Jules
b694cf8cf4 Fixed skill binding offset 2023-04-10 16:12:48 +02:00
Jules
dff176042b Newest commits 2023-04-10 13:36:01 +02:00
Jules
1cbf0f0ea1 Resuming cleanup 2023-04-10 13:11:11 +02:00
Jules
1a5f5986aa Refactor before dev build 2023-04-09 15:09:47 +02:00
Jules
786d1881bf Merging skill update 1 2023-04-09 11:31:08 +02:00
Jules
841264df95 Started cleaning up 2023-04-08 14:31:05 +02:00
Jules
c8932e3a5d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/profess/SavedClassInformation.java
#	README.md
2023-04-08 14:28:40 +02:00
Jules
2746d7cda9 Merge remote-tracking branch 'origin/Skills-update'
# Conflicts:
#	MMOCore-API/pom.xml
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/profess/SavedClassInformation.java
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLDataProvider.java
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/player/DefaultPlayerData.java
#	MMOCore-Dist/pom.xml
#	pom.xml
2023-04-08 14:20:55 +02:00
Jules
33d137f308 Merge remote-tracking branch 'origin/master' 2023-04-07 16:36:41 +02:00
Jules
2a4e509a8b Fixed /mmocore admin exportdata 2023-04-07 16:34:41 +02:00
Ka0rX
0d950bcd48 Bug Fixing for "point-consumed" field for skill Trees. You can now set the number of points that are consumed each time you level up a node. 2023-04-06 16:06:37 +01:00
Ka0rX
6fd15725bb The skill buffs associated to a slot will only trigger if the item bound matches the corresponding formula. 2023-04-06 12:08:06 +01:00
Ka0rX
8e93c83c0d Fixed SQL bug. 2023-04-06 12:07:37 +01:00
Ka0rX
816fbc5722 Added default config for class-confirm GUI and made the subclass-select.yml GUI as the class-select GUI. 2023-04-06 09:57:19 +01:00
Ka0rX
333ffe08d5 Merge branch 'master' into Skills-update
# Conflicts:
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/command/SkillsCommand.java
2023-04-04 21:11:49 +01:00
Ka0rX
2cbc1666f2 Merge remote-tracking branch 'origin/master' 2023-04-04 21:10:53 +01:00
Ka0rX
520516ded8 Possibility to select a bound skill and thus upgrade it even if it is not unlocked. 2023-04-04 21:10:44 +01:00
Ka0rX
943553632b can-manually-bind option for SkillSlots and possibility to bind/unbind a skill to a slot through /mmocore admin slot bind <slot> <skill>. 2023-04-04 14:58:14 +01:00
Ka0rX
08b8239291 Added option to have more than 1 skill tree point required for a certain some skill tree. 2023-04-04 13:05:27 +01:00
Jules
c94795fc89 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java
2023-04-04 13:04:44 +02:00
Ka0rX
a54bfc03a0 Added permission associated with every MMOCore command. 2023-04-04 07:11:16 +01:00
Ka0rX
015f4544ce Made all the slots Unlockable with an associated command & trigger. 2023-04-03 17:25:50 +01:00
Ka0rX
8f2da7a865 . 2023-04-03 07:28:36 +01:00
Ka0rX
e62c13f849 Merge remote-tracking branch 'origin/master' 2023-04-03 06:03:26 +01:00
Ka0rX
8192d6caa8 Test 2023-04-02 23:41:22 +01:00
Ka0rX
d7db3f6d68 Fixed bug related to fetching player health when he is offline. 2023-04-02 23:23:11 +01:00
Ka0rX
c31a3fcec1 Fixed the bug where player die when joining server. 2023-04-02 23:09:37 +01:00
Ka0rX
cedc6ae6c8 Bug Fixing 2023-04-02 21:15:39 +01:00
Ka0rX
c6b9372026 Fixed bug when class doesn't have any skills. 2023-04-02 20:20:55 +01:00
Ka0rX
c64b88e36d Fixed error message when the class doesn't have any skills. 2023-04-02 20:02:56 +01:00
Ka0rX
8ce90c3363 Merge branch 'master' into Skills-update 2023-04-02 19:55:55 +01:00
Ka0rX
7bd7dcc2d7 Merge fixes. 2023-04-02 19:55:45 +01:00
Ka0rX
395844c25a Better error handling & console messages for the new class-confirm GUI. 2023-04-02 19:47:58 +01:00
Ka0rX
3a9b3b6f56 Fixed health issue when changing class. 2023-04-02 19:47:30 +01:00
Ka0rX
9e98cd0640 Made it possible to have SkillBuffs associated to a SkillSlot. 2023-04-02 19:18:13 +01:00
Ka0rX
2f17d56c40 Fixed bug #772 about trigger at the end of a quest to launch a new one. 2023-04-02 18:29:14 +01:00
Ka0rX
3bc0ba515b Merge remote-tracking branch 'origin/master' 2023-04-02 18:13:16 +01:00