EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-24 22:26:46 +01:00
Code Issues Projects Releases Wiki Activity

Add some missing things for new skill commands

Browse Source
This commit is contained in:
nossr50 2020-07-29 10:22:18 -07:00
parent 8112973dbe
commit a82b899eb6
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java
View File

@ -2,7 +2,9 @@ package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.skills.crossbows.CrossbowManager;
import com.gmail.nossr50.util.TextComponentFactory;
import com.gmail.nossr50.util.player.UserManager;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.entity.Player;
@ -28,20 +30,14 @@ public class CrossbowsCommand extends SkillCommand {
protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
/*
List<String> messages = new ArrayList<>();
CrossbowManager crossbowManager = UserManager.getPlayer(player).getCrossbowManager();
ExcavationManager excavationManager = UserManager.getPlayer(player).getExcavationManager();
if (canGigaDrill) {
messages.add(getStatMessage(SubSkillType.EXCAVATION_GIGA_DRILL_BREAKER, gigaDrillBreakerLength)
+ (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", gigaDrillBreakerLengthEndurance) : ""));
*/
if(canUseSubskill(player, SubSkillType.CROSSBOWS_SUPER_SHOTGUN)) {
String additionalArrowCount = String.valueOf(crossbowManager.getSuperShotgunAdditionalArrowCount());
messages.add(getStatMessage(SubSkillType.CROSSBOWS_CROSSBOWS_LIMIT_BREAK, additionalArrowCount));
}
return null;
return messages;
}
@Override

4
src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowManager.java
View File

@ -72,13 +72,13 @@ public class CrossbowManager extends SkillManager {
Vector originUnitVector = originVector.clone().normalize();
for(int i = 0; i < getConeOfDeathProjectileCount(); i++) {
for(int i = 0; i < getSuperShotgunAdditionalArrowCount(); i++) {
Vector newProjectileVector = byRotateVector(originUnitVector, 0);
spawnTrackedProjectile(originProjectile, world, originProjectileMagnitude, newProjectileVector, getRandomizedSpreadValue());
}
}
private int getConeOfDeathProjectileCount() {
public int getSuperShotgunAdditionalArrowCount() {
switch(RankUtils.getRank(mcMMOPlayer.getPlayer(), SubSkillType.CROSSBOWS_SUPER_SHOTGUN)) {
case 1:
return 9;

7
src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java
View File

@ -111,6 +111,13 @@ public final class CommandRegistrationManager {
command.setExecutor(new WoodcuttingCommand());
break;
case CROSSBOWS:
command.setExecutor(new CrossbowsCommand());
break;
case TRIDENTS:
command.setExecutor(new TridentsCommand());
break;
default:
break;
}

11
src/main/resources/locale/locale_en_US.properties
View File

@ -30,6 +30,8 @@ JSON.Swords=Swords
JSON.Taming=Taming
JSON.Unarmed=Unarmed
JSON.Woodcutting=Woodcutting
JSON.Crossbows=Crossbows
JSON.Tridents=Tridents
JSON.URL.Website=The official mcMMO Website!
JSON.URL.Discord=The official mcMMO Discord server!
JSON.URL.Patreon=Support nossr50 and his work for mcMMO on Patreon!
@ -556,10 +558,17 @@ Woodcutting.Skills.TreeFeller.Threshold=That tree is too large!
Tridents.SubSkill.TridentsLimitBreak.Name=Tridents Limit Break
Tridents.SubSkill.TridentsLimitBreak.Description=Breaking your limits. Increased damage against tough opponents. Intended for PVP, up to server settings for whether or not it will boost damage in PVE.
Tridents.SubSkill.TridentsLimitBreak.Stat=Limit Break Max DMG
Tridents.Listener=Tridents:
Tridents.SkillName=TRIDENTS
#CROSSBOWS
Crossbows.SubSkill.CrossbowsLimitBreak.Name=Crossbows Limit Break
Crossbows.SubSkill.CrossbowsLimitBreak.Description=Breaking your limits. Increased damage against tough opponents. Intended for PVP, up to server settings for whether or not it will boost damage in PVE.
Crossbows.SubSkill.CrossbowsLimitBreak.Stat=Limit Break Max DMG
Crossbows.SubSkill.SuperShotgun.Description=Shoot a spread of weaker arrows that ignore invulnerability frames
Crossbows.SubSkill.SuperShotgun.Stat=+{0} Extra Arrows
Crossbows.Listener=Crossbows:
Crossbows.SkillName=CROSSBOWS
#ABILITIY
@ -839,6 +848,8 @@ Commands.XPGain.Swords=Attacking Monsters
Commands.XPGain.Taming=Animal Taming, or combat w/ your wolves
Commands.XPGain.Unarmed=Attacking Monsters
Commands.XPGain.Woodcutting=Chopping down trees
Commands.XPGain.Crossbows=Attacking Monsters
Commands.XPGain.Tridents=Attacking Monsters
Commands.XPGain=[[DARK_GRAY]]XP GAIN: [[WHITE]]{0}
Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}!
Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]!