Upstream/mmocore
1
0
Fork 1
mirror of https://gitlab.com/phoenix-dvpmt/mmocore.git synced 2024-11-27 00:45:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,495 Commits 5 Branches 0 Tags 281 MiB
611272e5bb
Commit Graph

436 Commits

Author SHA1 Message Date
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
Ka0rX
253e2c38e0 Fixed bug #771 that made people die when changing class under some conditions. 2023-04-02 18:13:05 +01:00
Ka0rX
de5bfd5ed1 . 2023-04-02 18:10:29 +01:00
Jules
06fbd52c55 Fixed stat placeholders.. again 2023-04-02 16:24:39 +02:00
Jules
77f436200a Stat placeholder now more lenient 2023-04-01 23:00:46 +02:00
Jules
de011349a1 Updated poms 2023-04-01 20:00:56 +02:00
Ka0rX
af2c68054e Merge branch 'master' into 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
#	README.md
#	pom.xml
 2023-03-31 09:18:33 +01:00
Ka0rX
739f958d5a Refactor of the ClassSelect & ClassConfirmation GUI. Now you can fully customize the GUI depending on each class. Reload the GUI folder & add a class-confirm/... gui for each new class you created. 2023-03-31 09:04:58 +01:00
Ka0rX
b2982a9ffb Made CastableSkill.getModifier() take MMOPlayerData to enable it to check player buffs. 2023-03-31 07:35:47 +01:00
Ka0rX
d19da5f1cc Made it possible to unlock a skill that is not defined in the class. 2023-03-30 21:56:46 +01:00
Ka0rX
13b8b86b7b Bug Fixing 2023-03-30 21:47:07 +01:00
Ka0rX
b6ef6cd4de Bug Fixing 2023-03-30 21:28:42 +01:00
Ka0rX
1908b1d83e Debug for SkillBuffs. 2023-03-30 18:47:05 +01:00
Ka0rX
ddd3034584 . 2023-03-30 18:46:20 +01:00
Ka0rX
7f07f9e349 Transferred the categories formulaEvaluation from SkillSlot to RegisteredSkill. 2023-03-30 18:45:43 +01:00
Ka0rX
0f4699fbea Creation of SkillBuffTrigger. 2023-03-30 18:45:03 +01:00
Ka0rX
14f1a7fcc2 Version 1.12.0 2023-03-30 18:44:36 +01:00
Ka0rX
41aad7b6a1 Transfered unlockedItems from MythicLib to MMOCore. 2023-03-29 23:35:47 +01:00
Ka0rX
b62b0e89e9 Reindent 2023-03-28 16:10:51 +01:00
Ka0rX
9facd8d3df Improved Tab Completion for Skill Unlocking 2023-03-28 16:10:43 +01:00
Ka0rX
9544745cb4 Removed / Modified verbose 2023-03-28 14:30:21 +01:00
Jules
fda62fca84 Update ver nb 2023-03-27 01:10:13 +02:00
Ka0rX
3138f81e43 Fixed issue #691 by adding compatibilty with other party plugins for party buffs. 2023-03-27 00:06:55 +01:00
Jules
4de00ffe67 Merge remote-tracking branch 'origin/master' 2023-03-27 00:08:03 +02:00
Jules
e8fe24ba73 Merge remote-tracking branch 'origin/master' 2023-03-26 23:56:54 +02:00
Ka0rX
0bc1837460 Fixed issue #765 about stellium saving issues when switching server. 2023-03-26 21:14:52 +01:00
Ka0rX
c59473502f Fixed issue #750 about custom model data in Atribute view. 2023-03-26 21:14:29 +01:00
Ka0rX
fbe4314649 Transfer of Unlockable to MythicLib 2023-03-26 20:53:21 +01:00
Jules
8b5a94bf3a Fixed data sync health issue 2023-03-26 10:50:25 +02:00
Jules
588665f0b7 Fixed 'main-exp-split' 2023-03-24 23:34:59 +01:00
Ka0rX
77d4f8e4e4 Command to lock/unlock skill manually. It is better to use triggers as it enables the unlocking.. to go to its initial state after a reallocation. 2023-03-21 21:20:14 +01:00
Ka0rX
713146d9dd Handling of unlockedItems on MySQLPlayerDataManager when loading/saving playerData. 2023-03-21 21:03:35 +01:00
Ka0rX
1deed752f4 Handling of unlockedItems on YamlPlayerDataManager when loading/saving playerData. 2023-03-21 21:01:43 +01:00
Ka0rX
a7231d948e Made unlockedItems class based. 2023-03-21 20:58:50 +01:00
Ka0rX
bbab36ca1b Added unlockedItems in ClassDataContainer. 2023-03-21 20:58:14 +01:00
Ka0rX
e518cafc85 Modifications to make UnlockSkillTrigger work with the rest of MMOCore. 2023-03-21 20:41:30 +01:00
Ka0rX
b1b1a6eddd UnlockSkillTrigger 2023-03-21 20:39:07 +01:00
Ka0rX
aaa777267d Skill Unlocking Mechanic. 2023-03-21 16:49:17 +01:00
Ka0rX
6b91315b57 Class based Ressources that are also saved/set when quitting & connecting to the server. 2023-03-20 16:55:13 +01:00
Ka0rX
4d89fa8fd9 Class based Ressources that are also saved/set when quitting & connecting to the server. 2023-03-19 22:23:33 +01:00
Ka0rX
37bb719381 Buf Fix 2023-03-19 20:46:42 +01:00
Ka0rX
b05ced2660 Added passive & active categories by default 2023-03-19 20:42:43 +01:00
Ka0rX
5edc6ac999 Debug unbinding passive skill. 2023-03-19 20:42:28 +01:00
Ka0rX
10cfc48c9a Removed debug messages 2023-03-19 20:21:47 +01:00
Ka0rX
1d1d28958f Bug Fixing 2023-03-19 20:20:24 +01:00
Ka0rX
d1a78ad83f Coming back to old pom.xml version bc of a strange bug 2023-03-19 20:19:49 +01:00
Ka0rX
0f16c987f0 Bug Fix 2023-03-19 18:20:56 +01:00
Ka0rX
6c89e78f54 Bug Fix 2023-03-19 17:56:23 +01:00
Ka0rX
374ac34f3c Bug Fix 2023-03-19 17:21:10 +01:00
Ka0rX
7bf8a4ee24 Version 2023-03-19 14:21:55 +01:00
Ka0rX
f17b9f2ace MMOCoreDataSynchronizer fix for Bounded Skills. 2023-03-19 14:16:34 +01:00
Ka0rX
1205dd773b ResetCommand fix for Bounded Skills. 2023-03-19 14:14:37 +01:00
Ka0rX
f7a6d92fc8 Saves Bound Skills in MySQLPlayerDataManager 2023-03-19 14:12:33 +01:00
Ka0rX
ca7ee79c73 Saves Bound Skills in YamlPlayerDataManager 2023-03-19 14:07:57 +01:00
Ka0rX
9e16e63bf5 Reformat for mapBoundSkills method. 2023-03-19 14:04:06 +01:00
Ka0rX
c618b0267e Reformat for mapBoundSkills method. 2023-03-19 14:03:48 +01:00
Ka0rX
4244bdbe3c Allowed GenericTypes in addJsonObject method 2023-03-19 14:02:50 +01:00
Ka0rX
037fb131ec Merge branch 'master' into Skills-update 
# Conflicts:
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
 2023-03-19 13:57:20 +01:00
Ka0rX
8fc13a70b9 Adapted YamlDataStorage to the new formatting for boundSkills. 2023-03-19 13:51:29 +01:00
Ka0rX
8fc5b5a51c Map representation for BoundSkill in SavedClassInformation.java 2023-03-19 13:43:35 +01:00
Ka0rX
7538b66673 Modification to have the skillSlots seen has as a Map<Integer,ClassSkill> rather than a List<ClassSkill> 2023-03-19 13:42:21 +01:00
Ka0rX
ae9c396c25 Fixed Multiple Servers Skill Tree Bug 2023-03-19 13:33:13 +01:00
Ka0rX
57fe9f1f1b Blocks MMOCore party commands when another Module has been loaded. 2023-03-19 13:15:45 +01:00
Ka0rX
2ec66e92ef Skill Slots Update 2023-03-19 10:53:40 +01:00
Jules
68fe326035 Using new debug methods 2023-03-18 23:23:40 +01:00
Jules
a3166b1049 Fixed combat placeholders 2023-03-18 21:56:14 +01:00
Jules
e1011d449f Fixed %mmocore_in_combat% 2023-03-18 21:20:43 +01:00
Ka0rX
1718e04ba5 Removed reference to passive/active skills. 2023-03-16 14:36:07 +01:00
Ka0rX
f5b312691f Modif for SkillSlots (skillSlot map in PlayerClass) 2023-03-16 14:35:18 +01:00
Ka0rX
3b40b2ef30 Removed SkillSlotLimit in PlayerData. 2023-03-16 14:31:51 +01:00
Ka0rX
456ecb9da1 SkillSlot modifications 2023-03-16 14:31:16 +01:00
Jules
a84d240a4e Placeholder for invulnerability 2023-03-11 18:52:58 +01:00
Jules
e5743a7011 Max combat level difference 2023-03-11 18:39:59 +01:00
Jules
b8624733da Messages for combat level restriction 2023-03-11 18:32:46 +01:00
Jules
5c9b73e3ec Fixed merge 2023-03-11 18:02:30 +01:00
Jules
fe2340f8cb Min combat level 2023-03-11 17:59:01 +01:00
Jules
482eeb9e8b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java
 2023-03-11 17:45:16 +01:00
Ka0rX
81f245a4ce Removed passive skill from the skill list GUI 2023-03-09 23:10:49 +01:00
Ka0rX
b7d3aa07eb Removed all references to passiveBoundSkill in playerData 2023-03-09 19:03:20 +01:00
Ka0rX
8e6ac3755d Removed references to PassiveBoundSlots in SavedClassInformation.java 2023-03-09 19:01:38 +01:00
Ka0rX
8e37898d33 Changed PlayerClass to make it compatible with SkillSlots 2023-03-09 19:00:38 +01:00
Ka0rX
e9a7097a8d Removed the boundPassiveSkill method in DataContainer 2023-03-09 18:59:29 +01:00
Ka0rX
ef173a2336 Added categories to registeredSkills 2023-03-09 18:58:17 +01:00
Ka0rX
4dce534d74 Creation of skillSlot class 2023-03-09 18:57:07 +01:00
Jules
42f583ac8d Merge remote-tracking branch 'origin/master' 2023-03-09 17:54:01 +01:00
Jules
3239b9ca17 Test push 2023-03-09 17:53:54 +01:00
Ka0rX
25e3b478d5 test 2023-03-09 17:50:41 +01:00
Ka0rX
8b6e31651f Fixed bug for ressources + class based ressource system 2023-03-09 17:49:55 +01:00
Ka0rX
e338c0fd25 Fixed bug for ressources + class based ressource system 2023-03-09 17:22:58 +01:00
Ka0rX
825473c8c6 Debug ressources loading. 2023-03-03 21:59:47 +01:00
Jules
bbd3708393 Removed default exp holos for the exp trigger. 2023-03-03 16:12:37 +01:00
Jules
393fddf497 Cleanup 2023-03-03 16:00:45 +01:00
Jules
5e73e41fa8 Cleanup 2023-03-03 15:22:54 +01:00
Jules
46ea648414 Moved close script to party module listener 2023-03-03 14:55:29 +01:00
Jules
8c0d8da483 Moved "class-confirmation-gui-name" option from class-select to class-confirm GUI 2023-03-03 14:22:43 +01:00
Jules
8ac6af34af Cleanup 2023-03-03 14:20:56 +01:00
Ka0rX
2b5932756f Debug Model Data Skill Tree GUI. 2023-03-03 10:27:45 +01:00
Ka0rX
a9ebca0f4d Enabled to have customizable ClassConfirmation GUI names. 2023-03-02 22:03:03 +01:00
Ka0rX
6ac3267059 Fixed bug that occured w/ perm stats when changing to a new class. 2023-03-02 21:31:42 +01:00
Ka0rX
b3c3218d87 Fixed bug that occured w perm stats when doing /mmocore reload 2023-03-02 21:09:31 +01:00
Ka0rX
d847049e90 Merge remote-tracking branch 'origin/master' 2023-03-02 21:08:37 +01:00
Jules
9ae2b3e661 Fixed UClans comp 2023-02-28 18:05:45 +01:00
Jules
ff75a08e42 Fixed DungeonsXL comp 2023-02-28 18:05:24 +01:00
Jules
79e26086ae Combat registers when logging in/changing world 2023-02-28 10:50:15 +01:00
Jules
f750326fe3 Added messages for guild/party module hook 2023-02-23 00:07:14 +01:00
Jules
deffae106a Updated KingdomsX dep 2023-02-23 00:07:02 +01:00
Jules
b966508c2d Messages sent only when dmg > 0 2023-02-22 23:59:00 +01:00
Jules
afa4a0467e Final commit for combat mode 2023-02-22 23:56:51 +01:00
Jules
14c015645d Reduced confusion for guild module 2023-02-22 23:40:37 +01:00
Jules
05355688e2 Fixed support for Kingdomsx 2023-02-22 22:53:27 +01:00
Jules
fb270bf1b6 Placeholder for pvp mode 2023-02-22 22:31:01 +01:00
Jules
cebbfcf5c8 New options for combat mode 2023-02-22 17:33:22 +01:00
Ka0rX
b37c461092 Fixed prefix bug for stat triggers. 2023-02-21 22:02:50 +01:00
Ka0rX
b44283abcb Bug Fixing for Skill Trees. 2023-02-21 21:23:09 +01:00
Jules
07a61b900e Added invulnerability when using /pvpmode inside of region 2023-02-21 14:56:25 +01:00
Jules
9bd830efb7 Fixed pvp mode 2023-02-21 14:29:15 +01:00
Jules
9e8daf4842 Fixed party exp splitting + new option 2023-02-18 15:17:45 +01:00
Jules
4ae7fa4387 Fixed pvp mode 2023-02-17 15:37:48 +01:00
Jules
f23e520635 Fixed stat trigger issue with multiple players 2023-02-16 19:52:03 +01:00
Jules
25391039bc Fixed ints in exp source 2023-02-16 19:41:33 +01:00