Browse Source

Buff end game skills

nossr50 1 year ago
parent
commit
9cbe10827f

+ 24 - 6
src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java

@@ -1,16 +1,22 @@
 package com.gmail.nossr50.commands.skills;
 package com.gmail.nossr50.commands.skills;
 
 
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.skills.CombatUtils;
 import com.gmail.nossr50.util.skills.CombatUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
 import com.gmail.nossr50.util.text.TextComponentFactory;
 import com.gmail.nossr50.util.text.TextComponentFactory;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.Component;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Cat;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Player;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
+import static com.gmail.nossr50.datatypes.skills.SubSkillType.*;
+
 public class TridentsCommand extends SkillCommand {
 public class TridentsCommand extends SkillCommand {
 
 
 
 
@@ -27,15 +33,27 @@ public class TridentsCommand extends SkillCommand {
     @Override
     @Override
     protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
     protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
         List<String> messages = new ArrayList<>();
         List<String> messages = new ArrayList<>();
+        McMMOPlayer mmoPlayer = UserManager.getPlayer(player);
+        if (mmoPlayer == null) {
+            return messages;
+        }
+
+        messages.add(ChatColor.DARK_AQUA + "Reminder: " + ChatColor.GOLD + "This is a BETA version of mcMMO, please report any bugs you find!");
+        messages.add(ChatColor.GOLD + "Tridents is a " + ChatColor.RED + "WIP" +ChatColor.GOLD + " skill that is still being developed, please leave feedback in our discord!");
+
+//        if (SkillUtils.canUseSubskill(player, TRIDENTS_SUPER)) {
+//            messages.add("Tridents Super Ability");
+//            //TODO: Implement Tridents Super
+//        }
 
 
-        if (SkillUtils.canUseSubskill(player, SubSkillType.TRIDENTS_SUPER)) {
-            messages.add("Tridents Super Ability");
-            //TODO: Implement Tridents Super
+        if(SkillUtils.canUseSubskill(player, TRIDENTS_TRIDENTS_LIMIT_BREAK)) {
+            messages.add(getStatMessage(TRIDENTS_TRIDENTS_LIMIT_BREAK,
+                    String.valueOf(CombatUtils.getLimitBreakDamageAgainstQuality(player, TRIDENTS_TRIDENTS_LIMIT_BREAK, 1000))));
         }
         }
 
 
-        if(SkillUtils.canUseSubskill(player, SubSkillType.TRIDENTS_TRIDENTS_LIMIT_BREAK)) {
-            messages.add(getStatMessage(SubSkillType.TRIDENTS_TRIDENTS_LIMIT_BREAK,
-                    String.valueOf(CombatUtils.getLimitBreakDamageAgainstQuality(player, SubSkillType.TRIDENTS_TRIDENTS_LIMIT_BREAK, 1000))));
+        if(SkillUtils.canUseSubskill(player, TRIDENTS_IMPALE)) {
+            messages.add(getStatMessage(TRIDENTS_IMPALE,
+                    String.valueOf(mmoPlayer.getTridentsManager().impaleDamageBonus())));
         }
         }
 
 
         return messages;
         return messages;

+ 4 - 4
src/main/resources/advanced.yml

@@ -265,7 +265,7 @@ Skills:
                 Standard: 100
                 Standard: 100
                 RetroMode: 1000
                 RetroMode: 1000
         VerdantBounty:
         VerdantBounty:
-            ChanceMax: 15.0
+            ChanceMax: 50.0
             MaxBonusLevel:
             MaxBonusLevel:
                 Standard: 1000
                 Standard: 1000
                 RetroMode: 10000
                 RetroMode: 10000
@@ -293,7 +293,7 @@ Skills:
             MaxBonusLevel:
             MaxBonusLevel:
                 Standard: 1000
                 Standard: 1000
                 RetroMode: 10000
                 RetroMode: 10000
-            ChanceMax: 15.0
+            ChanceMax: 50.0
         SuperBreaker:
         SuperBreaker:
             AllowTripleDrops: true
             AllowTripleDrops: true
         DoubleDrops:
         DoubleDrops:
@@ -621,8 +621,8 @@ Skills:
         # Triple Drops
         # Triple Drops
         CleanCuts:
         CleanCuts:
             # ChanceMax: Maximum chance of receiving triple drops (100 = 100%)
             # ChanceMax: Maximum chance of receiving triple drops (100 = 100%)
-            # MaxBonusLevel: Level when the maximum chance of receiving double drops is reached
-            ChanceMax: 15.0
+            # MaxBonusLevel: Level when the maximum chance of receiving triple drops is reached
+            ChanceMax: 50.0
             MaxBonusLevel:
             MaxBonusLevel:
                 Standard: 1000
                 Standard: 1000
                 RetroMode: 10000
                 RetroMode: 10000