EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Taming's Beast Lore now uses a rank system

Browse Source
This commit is contained in:
nossr50
2019-01-26 11:21:25 -08:00
parent b39340227f
commit baf1796b08
7 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java
View File

@ -74,7 +74,7 @@ public enum SubSkillType {
SWORDS_SERRATED_STRIKES(1),
/* Taming */
TAMING_BEAST_LORE,
TAMING_BEAST_LORE(1),
TAMING_CALL_OF_THE_WILD,
TAMING_ENVIRONMENTALLY_AWARE(1),
TAMING_FAST_FOOD_SERVICE(1),

9
src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
View File

@ -40,6 +40,9 @@ public class HerbalismManager extends SkillManager {
}
public boolean canGreenThumbBlock(BlockState blockState) {
if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.HERBALISM_GREEN_THUMB))
return false;
Player player = getPlayer();
ItemStack item = player.getInventory().getItemInMainHand();
@ -47,6 +50,9 @@ public class HerbalismManager extends SkillManager {
}
public boolean canUseShroomThumb(BlockState blockState) {
if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.HERBALISM_SHROOM_THUMB))
return false;
Player player = getPlayer();
PlayerInventory inventory = player.getInventory();
Material itemType = inventory.getItemInMainHand().getType();
@ -55,6 +61,9 @@ public class HerbalismManager extends SkillManager {
}
public boolean canUseHylianLuck() {
if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.HERBALISM_HYLIAN_LUCK))
return false;
return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.HERBALISM_HYLIAN_LUCK);
}

6
src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
View File

@ -37,6 +37,9 @@ public class MiningManager extends SkillManager {
}
public boolean canUseDemolitionsExpertise() {
if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.MINING_DEMOLITIONS_EXPERTISE))
return false;
return getSkillLevel() >= BlastMining.getDemolitionExpertUnlockLevel() && Permissions.demolitionsExpertise(getPlayer());
}
@ -52,6 +55,9 @@ public class MiningManager extends SkillManager {
}
public boolean canUseBiggerBombs() {
if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.MINING_BIGGER_BOMBS))
return false;
return getSkillLevel() >= BlastMining.getBiggerBombsUnlockLevel() && Permissions.biggerBombs(getPlayer());
}

6
src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java
View File

@ -36,10 +36,16 @@ public class SwordsManager extends SkillManager {
}
public boolean canUseCounterAttack(Entity target) {
if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.SWORDS_COUNTER_ATTACK))
return false;
return target instanceof LivingEntity && Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.SWORDS_COUNTER_ATTACK);
}
public boolean canUseSerratedStrike() {
if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.SWORDS_SERRATED_STRIKES))
return false;
return mcMMOPlayer.getAbilityMode(SuperAbilityType.SERRATED_STRIKES) && Permissions.serratedStrikes(getPlayer());
}

4
src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
View File

@ -21,6 +21,7 @@ import com.gmail.nossr50.util.player.NotificationManager;
import com.gmail.nossr50.util.player.UserManager;
import com.gmail.nossr50.util.random.RandomChanceUtil;
import com.gmail.nossr50.util.skills.ParticleEffectUtils;
import com.gmail.nossr50.util.skills.RankUtils;
import com.gmail.nossr50.util.skills.SkillActivationType;
import org.bukkit.Location;
import org.bukkit.Sound;
@ -67,6 +68,9 @@ public class TamingManager extends SkillManager {
}
public boolean canUseBeastLore() {
if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_BEAST_LORE))
return false;
return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.TAMING_BEAST_LORE);
}