mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-29 16:46:46 +01:00
Gore, Pummel, and Call of The Wild now use the rank system
This commit is contained in:
parent
28e963f1eb
commit
d4d5d9bac1
@ -75,12 +75,12 @@ public enum SubSkillType {
|
|||||||
|
|
||||||
/* Taming */
|
/* Taming */
|
||||||
TAMING_BEAST_LORE(1),
|
TAMING_BEAST_LORE(1),
|
||||||
TAMING_CALL_OF_THE_WILD,
|
TAMING_CALL_OF_THE_WILD(1),
|
||||||
TAMING_ENVIRONMENTALLY_AWARE(1),
|
TAMING_ENVIRONMENTALLY_AWARE(1),
|
||||||
TAMING_FAST_FOOD_SERVICE(1),
|
TAMING_FAST_FOOD_SERVICE(1),
|
||||||
TAMING_GORE,
|
TAMING_GORE(1),
|
||||||
TAMING_HOLY_HOUND(1),
|
TAMING_HOLY_HOUND(1),
|
||||||
TAMING_PUMMEL,
|
TAMING_PUMMEL(1),
|
||||||
TAMING_SHARPENED_CLAWS(1),
|
TAMING_SHARPENED_CLAWS(1),
|
||||||
TAMING_SHOCK_PROOF(1),
|
TAMING_SHOCK_PROOF(1),
|
||||||
TAMING_THICK_FUR(1),
|
TAMING_THICK_FUR(1),
|
||||||
|
@ -64,6 +64,9 @@ public class TamingManager extends SkillManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseGore() {
|
public boolean canUseGore() {
|
||||||
|
if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_GORE))
|
||||||
|
return false;
|
||||||
|
|
||||||
return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.TAMING_GORE);
|
return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.TAMING_GORE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -135,6 +138,9 @@ public class TamingManager extends SkillManager {
|
|||||||
* Summon an ocelot to your side.
|
* Summon an ocelot to your side.
|
||||||
*/
|
*/
|
||||||
public void summonOcelot() {
|
public void summonOcelot() {
|
||||||
|
if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_CALL_OF_THE_WILD))
|
||||||
|
return;
|
||||||
|
|
||||||
if (!Permissions.callOfTheWild(getPlayer(), EntityType.OCELOT)) {
|
if (!Permissions.callOfTheWild(getPlayer(), EntityType.OCELOT)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -146,6 +152,9 @@ public class TamingManager extends SkillManager {
|
|||||||
* Summon a wolf to your side.
|
* Summon a wolf to your side.
|
||||||
*/
|
*/
|
||||||
public void summonWolf() {
|
public void summonWolf() {
|
||||||
|
if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_CALL_OF_THE_WILD))
|
||||||
|
return;
|
||||||
|
|
||||||
if (!Permissions.callOfTheWild(getPlayer(), EntityType.WOLF)) {
|
if (!Permissions.callOfTheWild(getPlayer(), EntityType.WOLF)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -157,6 +166,9 @@ public class TamingManager extends SkillManager {
|
|||||||
* Summon a horse to your side.
|
* Summon a horse to your side.
|
||||||
*/
|
*/
|
||||||
public void summonHorse() {
|
public void summonHorse() {
|
||||||
|
if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_CALL_OF_THE_WILD))
|
||||||
|
return;
|
||||||
|
|
||||||
if (!Permissions.callOfTheWild(getPlayer(), EntityType.HORSE)) {
|
if (!Permissions.callOfTheWild(getPlayer(), EntityType.HORSE)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -195,6 +207,9 @@ public class TamingManager extends SkillManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void pummel(LivingEntity target, Wolf wolf) {
|
public void pummel(LivingEntity target, Wolf wolf) {
|
||||||
|
if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_PUMMEL))
|
||||||
|
return;
|
||||||
|
|
||||||
double chance = 10 / activationChance;
|
double chance = 10 / activationChance;
|
||||||
SubSkillRandomCheckEvent event = new SubSkillRandomCheckEvent(getPlayer(), SubSkillType.TAMING_PUMMEL, chance);
|
SubSkillRandomCheckEvent event = new SubSkillRandomCheckEvent(getPlayer(), SubSkillType.TAMING_PUMMEL, chance);
|
||||||
mcMMO.p.getServer().getPluginManager().callEvent(event);
|
mcMMO.p.getServer().getPluginManager().callEvent(event);
|
||||||
|
@ -161,11 +161,26 @@ Taming:
|
|||||||
Rank_1: 2
|
Rank_1: 2
|
||||||
RetroMode:
|
RetroMode:
|
||||||
Rank_1: 20
|
Rank_1: 20
|
||||||
FastFoodService:
|
Gore:
|
||||||
|
Standard:
|
||||||
|
Rank_1: 15
|
||||||
|
RetroMode:
|
||||||
|
Rank_1: 150
|
||||||
|
CallOfTheWild:
|
||||||
Standard:
|
Standard:
|
||||||
Rank_1: 5
|
Rank_1: 5
|
||||||
RetroMode:
|
RetroMode:
|
||||||
Rank_1: 50
|
Rank_1: 50
|
||||||
|
Pummel:
|
||||||
|
Standard:
|
||||||
|
Rank_1: 20
|
||||||
|
RetroMode:
|
||||||
|
Rank_1: 200
|
||||||
|
FastFoodService:
|
||||||
|
Standard:
|
||||||
|
Rank_1: 20
|
||||||
|
RetroMode:
|
||||||
|
Rank_1: 200
|
||||||
EnvironmentallyAware:
|
EnvironmentallyAware:
|
||||||
Standard:
|
Standard:
|
||||||
Rank_1: 10
|
Rank_1: 10
|
||||||
|
Loading…
Reference in New Issue
Block a user