Skip to content

Commit

Permalink
rework the experience command to rely on spigot api
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Nov 27, 2018
1 parent 34d29ed commit 54415c5
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 115 deletions.
4 changes: 2 additions & 2 deletions plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/BukkitCommandRegistry.java
View file
Expand Up @@ -1271,9 +1271,9 @@ public void registerCoreMembers() {
// @Name Experience
// @Syntax experience [{set}/give/take] (level) [<#>]
// @Required 2
// @Stable stable
// @Stable unstable
// @Short Gives or takes experience points to the player.
// @Author aufdemrand
// @Author aufdemrand, mcmonkey
// @Group player
//
// @Description
Expand Down
136 changes: 23 additions & 113 deletions plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ExperienceCommand.java
View file
Expand Up @@ -14,113 +14,35 @@ public class ExperienceCommand extends AbstractCommand {

private enum Type {SET, GIVE, TAKE}

/**
* with help from author: alkarin
* https://github.com/alkarinv/BattleArena/blob/master/src/mc/alk/arena/util/ExpUtil.java
*/
public static int getTotalExperience(Player p) {
return getTotalExperience(p.getLevel(), p.getExp());
}

public static int getTotalExperience(int level, double bar) {
return getTotalExpToLevel(level) + (int) (getExpToLevel(level + 1) * bar + 0.5);
}

public static int getExpToLevel(int level) {
if (level < 16) {
return 17;
}
else if (level < 31) {
return 3 * level - 31;
}
else {
return 7 * level - 155;
}
}

public static int getTotalExpToLevel(int level) {
if (level < 16) {
return 17 * level;
}
else if (level < 31) {
return (int) (1.5 * level * level - 29.5 * level + 360);
}
else {
return (int) (3.5 * level * level - 151.5 * level + 2220);
}
}

public static void resetExperience(Player player) {
player.setTotalExperience(0);
player.setLevel(0);
player.setExp(0);
}

public static void setTotalExperience(Player player, int exp) {
resetExperience(player);

if (exp > 0) {
player.giveExp(exp);
}
player.setTotalExperience(exp);
}

public static void setLevel(Player player, int level) {
resetExperience(player);

if (level > 0) {
player.giveExp(getExpToLevel(level));
}
player.setLevel(level);
}

public static void giveExperience(Player player, int exp) {
final int currentExp = getTotalExperience(player);
resetExperience(player);
final int newexp = currentExp + exp;

if (newexp > 0) {
player.giveExp(newexp);
}
}

/* Tail recursive way to count the level for the given exp, maybe better with iteration */
public static int countLevel(int exp, int toLevel, int level) {
if (exp < toLevel) {
return level;
}
else {
return countLevel(exp - toLevel, getTotalExpToLevel(level + 2) - getTotalExpToLevel(level + 1), ++level);
}
}

/* Setting the new level and exp using the setExp and setLevel methods, should be soundless (not yet tested) */
public static void setSilentTotalExperience(Player player, int exp) {
resetExperience(player);

if (exp > 0) {
final int level = countLevel(exp, 17, 0);
player.setLevel(level);
final int expToLvl = exp - getTotalExpToLevel(level);
player.setExp(expToLvl < 0 ? 0 : expToLvl / getExpToLevel(level + 1));
}
player.giveExp(exp);
}

/* Adding experience using the setExp and setLevel methods, should be soundless (not tested) */
public static void giveSilentExperience(Player player, int exp) {
final int currentExp = getTotalExperience(player);
resetExperience(player);
final int newexp = currentExp + exp;

if (newexp > 0) {
final int level = countLevel(newexp, 17, 0);
player.setLevel(level);
final int expToLvl = newexp - getTotalExpToLevel(level);
player.setExp(expToLvl < 0 ? 0.0f : (float) expToLvl / (float) getExpToLevel(level + 1));
public static void takeExperience(Player player, int toTake) {
int pastLevelStart = (int) (player.getExp() * player.getExpToLevel());
while (toTake >= pastLevelStart) {
toTake -= pastLevelStart;
player.setExp(0);
if (player.getLevel() == 0) {
return;
}
player.setLevel(player.getLevel() - 1);
pastLevelStart = player.getExpToLevel();
}
int newAmount = pastLevelStart - toTake;
player.setExp(newAmount / (float) player.getExpToLevel());
}

@Override
public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
// TODO: UPDATE COMMAND PARSING
int amount = 0;
Type type = Type.SET;
boolean level = false;
Expand Down Expand Up @@ -157,14 +79,14 @@ else if (arg.matches("SILENT")) {
public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {

Type type = (Type) scriptEntry.getObject("type");
Integer quantity = (Integer) scriptEntry.getObject("quantity");
int quantity = (int) scriptEntry.getObject("quantity");
Boolean level = (Boolean) scriptEntry.getObject("level");
Boolean silent = (Boolean) scriptEntry.getObject("silent");
//Boolean silent = (Boolean) scriptEntry.getObject("silent");

if (scriptEntry.dbCallShouldDebug()) {

dB.report(scriptEntry, name, aH.debugObj("Type", type.toString())
+ aH.debugObj("Quantity", level ? quantity.toString() + " levels" : quantity.toString())
+ aH.debugObj("Quantity", level ? quantity + " levels" : quantity)
+ aH.debugObj("Player", ((BukkitScriptEntryData) scriptEntry.entryData).getPlayer().getName()));

}
Expand All @@ -176,39 +98,27 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
if (level) {
((BukkitScriptEntryData) scriptEntry.entryData).getPlayer().setLevel(quantity);
}
else if (!silent) {
player.setExp(quantity);
//setTotalExperience(player, quantity);
}
else {
setSilentTotalExperience(player, quantity);
setTotalExperience(player, quantity);
}
break;

case GIVE:
if (level) {
player.setLevel(player.getLevel() + quantity);
}
else if (!silent) {
//giveExperience(player, quantity);
player.giveExp(quantity);
}
else {
giveSilentExperience(player, quantity);
player.giveExp(quantity);
}
break;

case TAKE:
if (level) {
int value = ((BukkitScriptEntryData) scriptEntry.entryData).getPlayer().getPlayerEntity().getLevel() - quantity;
((BukkitScriptEntryData) scriptEntry.entryData).getPlayer().setLevel(value <= 0 ? 0 : value);
}
else if (!silent) {
player.setExp(player.getExp() - quantity);
//giveExperience(player, -quantity);
int value = player.getLevel() - quantity;
player.setLevel(value <= 0 ? 0 : value);
}
else {
giveSilentExperience(player, -quantity);
takeExperience(player, quantity);
}
break;
}
Expand Down

0 comments on commit 54415c5

Please sign in to comment.