mirror of
https://gitlab.com/phoenix-dvpmt/mmocore.git
synced 2024-11-26 00:35:17 +01:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
fdd1234d68
@ -36,7 +36,8 @@ public class SoundObject {
|
||||
}
|
||||
|
||||
this.sound = sound;
|
||||
this.key = key;
|
||||
this.key = key != null ? key.toLowerCase() : null;
|
||||
|
||||
|
||||
volume = split.length > 1 ? Float.parseFloat(split[1]) : 1;
|
||||
pitch = split.length > 2 ? Float.parseFloat(split[2]) : 1;
|
||||
@ -54,7 +55,7 @@ public class SoundObject {
|
||||
}
|
||||
|
||||
this.sound = sound;
|
||||
this.key = key;
|
||||
this.key = key != null ? key.toLowerCase() : null;
|
||||
|
||||
volume = (float) config.getDouble("volume", 1);
|
||||
pitch = (float) config.getDouble("pitch", 1);
|
||||
@ -62,7 +63,7 @@ public class SoundObject {
|
||||
|
||||
/**
|
||||
* @return If this object is custom a custom sound, potentially
|
||||
* from a resource pack
|
||||
* from a resource pack
|
||||
*/
|
||||
public boolean isCustom() {
|
||||
return sound == null;
|
||||
|
@ -6,6 +6,7 @@ import io.lumine.mythic.lib.api.stat.StatInstance;
|
||||
import io.lumine.mythic.lib.api.stat.modifier.StatModifier;
|
||||
import io.lumine.mythic.lib.data.SynchronizedDataHolder;
|
||||
import io.lumine.mythic.lib.player.cooldown.CooldownMap;
|
||||
import io.lumine.mythic.lib.util.Closeable;
|
||||
import net.Indyuce.mmocore.MMOCore;
|
||||
import net.Indyuce.mmocore.api.ConfigMessage;
|
||||
import net.Indyuce.mmocore.api.SoundEvent;
|
||||
@ -23,7 +24,6 @@ import net.Indyuce.mmocore.api.player.stats.PlayerStats;
|
||||
import net.Indyuce.mmocore.api.quest.PlayerQuests;
|
||||
import net.Indyuce.mmocore.api.quest.trigger.StatTrigger;
|
||||
import net.Indyuce.mmocore.api.quest.trigger.Trigger;
|
||||
import net.Indyuce.mmocore.api.util.Closable;
|
||||
import net.Indyuce.mmocore.api.util.MMOCoreUtils;
|
||||
import net.Indyuce.mmocore.experience.EXPSource;
|
||||
import net.Indyuce.mmocore.experience.ExperienceObject;
|
||||
@ -67,7 +67,7 @@ import java.util.*;
|
||||
import java.util.logging.Level;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerData, Closable, ExperienceTableClaimer, ClassDataContainer {
|
||||
public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerData, Closeable, ExperienceTableClaimer, ClassDataContainer {
|
||||
|
||||
/**
|
||||
* Can be null, the {@link #getProfess()} method will return the
|
||||
@ -1162,8 +1162,6 @@ public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerD
|
||||
boundSkills.forEach((slot, info) -> info.close());
|
||||
boundSkills.clear();
|
||||
|
||||
//Update skill tree.
|
||||
setupSkillTree();
|
||||
// Update stats
|
||||
if (isOnline()) getStats().updateStats();
|
||||
}
|
||||
|
@ -1,15 +1,14 @@
|
||||
package net.Indyuce.mmocore.api.quest;
|
||||
|
||||
import io.lumine.mythic.lib.util.Closeable;
|
||||
import net.Indyuce.mmocore.MMOCore;
|
||||
import net.Indyuce.mmocore.api.player.PlayerData;
|
||||
import net.Indyuce.mmocore.api.util.Closable;
|
||||
import net.Indyuce.mmocore.api.quest.objective.Objective;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.event.HandlerList;
|
||||
import org.bukkit.event.Listener;
|
||||
|
||||
import net.Indyuce.mmocore.api.quest.objective.Objective;
|
||||
|
||||
public abstract class ObjectiveProgress implements Closable {
|
||||
public abstract class ObjectiveProgress implements Closeable {
|
||||
private final Objective objective;
|
||||
private final QuestProgress questProgress;
|
||||
|
||||
|
@ -3,9 +3,9 @@ package net.Indyuce.mmocore.api.quest;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import io.lumine.mythic.lib.util.Closeable;
|
||||
import net.Indyuce.mmocore.MMOCore;
|
||||
import net.Indyuce.mmocore.api.player.PlayerData;
|
||||
import net.Indyuce.mmocore.api.util.Closable;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.NamespacedKey;
|
||||
import org.bukkit.boss.BarColor;
|
||||
@ -21,7 +21,7 @@ import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
import java.util.logging.Level;
|
||||
|
||||
public class PlayerQuests implements Closable {
|
||||
public class PlayerQuests implements Closeable {
|
||||
private final PlayerData playerData;
|
||||
private final Map<String, Long> finished = new HashMap<>();
|
||||
|
||||
|
@ -1,15 +0,0 @@
|
||||
package net.Indyuce.mmocore.api.util;
|
||||
|
||||
/**
|
||||
* Indicates that a class temporarily registers something
|
||||
* such as a Bukkit event, which needs to be unregistered
|
||||
* when the class is finally garbage collected.
|
||||
*/
|
||||
public interface Closable {
|
||||
|
||||
/**
|
||||
* Method that must be called before the class
|
||||
* is garbage collected
|
||||
*/
|
||||
void close();
|
||||
}
|
@ -123,14 +123,14 @@ public class MMOCoreDataSynchronizer extends SQLDataSynchronizer<PlayerData> {
|
||||
* These should be loaded after to make sure that the
|
||||
* MAX_MANA, MAX_STAMINA & MAX_STELLIUM stats are already loaded.
|
||||
*/
|
||||
getData().setHealth(result.getDouble("health"));
|
||||
double health = result.getDouble("health");
|
||||
getData().setMana(result.getDouble("mana"));
|
||||
getData().setStamina(result.getDouble("stamina"));
|
||||
getData().setStellium(result.getDouble("stellium"));
|
||||
|
||||
if (getData().isOnline()) {
|
||||
double health = getData().getHealth();
|
||||
health = health == 0 ? getData().getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() : health;
|
||||
//If the player is not dead and the health is 0, this means that the data was
|
||||
//missing from the data base and it gives full health to the player.
|
||||
health = health == 0 && !getData().getPlayer().isDead() ? getData().getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() : health;
|
||||
health = Math.max(Math.min(health, getData().getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()), 0);
|
||||
getData().getPlayer().setHealth(health);
|
||||
}
|
||||
|
@ -1,16 +1,16 @@
|
||||
package net.Indyuce.mmocore.player;
|
||||
|
||||
import io.lumine.mythic.lib.util.Closeable;
|
||||
import net.Indyuce.mmocore.MMOCore;
|
||||
import net.Indyuce.mmocore.api.event.PlayerCombatEvent;
|
||||
import net.Indyuce.mmocore.api.player.PlayerData;
|
||||
import net.Indyuce.mmocore.api.util.Closable;
|
||||
import net.Indyuce.mmocore.command.PvpModeCommand;
|
||||
import org.apache.commons.lang.Validate;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public class CombatHandler implements Closable {
|
||||
public class CombatHandler implements Closeable {
|
||||
private final PlayerData player;
|
||||
private long lastEntry = System.currentTimeMillis(), lastHit = System.currentTimeMillis(), invulnerableTill;
|
||||
|
||||
|
@ -149,7 +149,10 @@ public class ClassSkill implements CooldownObject, Unlockable {
|
||||
|
||||
// Calculate placeholders
|
||||
Placeholders placeholders = new Placeholders();
|
||||
parameters.keySet().forEach(modifier -> placeholders.register(modifier, MythicLib.plugin.getMMOConfig().decimal.format(data.getMMOPlayerData().getSkillModifierMap().getInstance(skill.getHandler(), modifier).getTotal(parameters.get(modifier).calculate(x)))));
|
||||
parameters.keySet()
|
||||
.forEach(param -> {
|
||||
placeholders.register(param, skill.getDecimalFormat(param).format(data.getMMOPlayerData().getSkillModifierMap().getInstance(skill.getHandler(), param).getTotal(parameters.get(param).calculate(x))));
|
||||
});
|
||||
placeholders.register("mana_name", data.getProfess().getManaDisplay().getName());
|
||||
placeholders.register("mana_color", data.getProfess().getManaDisplay().getFull().toString());
|
||||
|
||||
|
@ -13,12 +13,16 @@ import org.bukkit.inventory.ItemStack;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.*;
|
||||
|
||||
public class RegisteredSkill {
|
||||
private final SkillHandler<?> handler;
|
||||
private final String name;
|
||||
private final Map<String, LinearValue> defaultParameters = new HashMap<>();
|
||||
|
||||
private final Map<String, DecimalFormat> parameterDecimalFormats = new HashMap<>();
|
||||
|
||||
private final ItemStack icon;
|
||||
private final List<String> lore;
|
||||
private final List<String> categories;
|
||||
@ -42,10 +46,15 @@ public class RegisteredSkill {
|
||||
else
|
||||
categories.add("ACTIVE");
|
||||
|
||||
|
||||
// Load default modifier formulas
|
||||
for (String param : handler.getParameters())
|
||||
for (String param : handler.getParameters()) {
|
||||
if (config.contains(param + ".decimal-format"))
|
||||
parameterDecimalFormats.put(param, new DecimalFormat(config.getString(param + ".decimal-format")));
|
||||
defaultParameters.put(param, config.contains(param) ? new LinearValue(config.getConfigurationSection(param)) : LinearValue.ZERO);
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* This is so that SkillAPI skill level matches the MMOCore skill level
|
||||
* https://gitlab.com/phoenix-dvpmt/mmocore/-/issues/531
|
||||
@ -111,6 +120,10 @@ public class RegisteredSkill {
|
||||
defaultParameters.put(parameter, linear);
|
||||
}
|
||||
|
||||
public DecimalFormat getDecimalFormat(String parameter) {
|
||||
return parameterDecimalFormats.getOrDefault(parameter, MythicLib.plugin.getMMOConfig().decimal);
|
||||
}
|
||||
|
||||
|
||||
@Deprecated
|
||||
public void addModifierIfNone(String mod, LinearValue defaultValue) {
|
||||
|
@ -1,15 +1,15 @@
|
||||
package net.Indyuce.mmocore.skill.binding;
|
||||
|
||||
import io.lumine.mythic.lib.player.skill.PassiveSkill;
|
||||
import io.lumine.mythic.lib.util.Closeable;
|
||||
import net.Indyuce.mmocore.api.player.PlayerData;
|
||||
import net.Indyuce.mmocore.api.quest.trigger.SkillModifierTrigger;
|
||||
import net.Indyuce.mmocore.api.util.Closable;
|
||||
import net.Indyuce.mmocore.skill.ClassSkill;
|
||||
import org.apache.commons.lang.Validate;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public class BoundSkillInfo implements Closable {
|
||||
public class BoundSkillInfo implements Closeable {
|
||||
private final SkillSlot skillSlot;
|
||||
private final PlayerData playerData;
|
||||
private final ClassSkill classSkill;
|
||||
|
@ -12,6 +12,9 @@ mana:
|
||||
per-level: 1.0
|
||||
max: 0.0
|
||||
min: 0.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
|
||||
stamina:
|
||||
base: 2.0
|
||||
per-level: 1.0
|
||||
|
@ -11,6 +11,8 @@ duration:
|
||||
per-level: 1
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -9,6 +9,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 2
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -7,6 +7,8 @@ material: FLINT
|
||||
mana:
|
||||
base: 8.0
|
||||
per-level: 1.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
stamina:
|
||||
base: 2.0
|
||||
per-level: 1.0
|
||||
|
@ -11,6 +11,8 @@ material: BLACK_DYE
|
||||
duration:
|
||||
base: 4
|
||||
per-level: 0.5
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -9,6 +9,8 @@ material: ENDER_EYE
|
||||
duration:
|
||||
base: 5
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
delay:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -10,6 +10,8 @@ material: SNOWBALL
|
||||
duration:
|
||||
base: 5
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -8,6 +8,8 @@ material: REDSTONE
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
amount:
|
||||
base: 2
|
||||
per-level: 1
|
||||
|
@ -10,6 +10,8 @@ material: FIRE_CHARGE
|
||||
timer:
|
||||
base: 2
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 2
|
||||
per-level: 1
|
||||
|
@ -9,6 +9,8 @@ material: RABBIT_FOOT
|
||||
duration:
|
||||
base: 6
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -8,6 +8,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 4
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -10,6 +10,8 @@ material: CAMPFIRE
|
||||
duration:
|
||||
base: 2
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -9,6 +9,8 @@ material: EGG
|
||||
duration:
|
||||
base: 4
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -11,6 +11,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 2
|
||||
per-level: 1
|
||||
|
@ -9,6 +9,8 @@ material: IRON_SWORD
|
||||
damage:
|
||||
base: 9.0
|
||||
per-level: 1.3
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
mana:
|
||||
base: 10.0
|
||||
per-level: -0.1
|
||||
|
@ -11,6 +11,8 @@ timer:
|
||||
per-level: 1
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
delay:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -9,6 +9,8 @@ material: POTION
|
||||
duration:
|
||||
base: 4
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -11,6 +11,8 @@ material: MAGENTA_DYE
|
||||
duration:
|
||||
base: 2.0
|
||||
per-level: 1.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
mana:
|
||||
base: 15.0
|
||||
per-level: 1.5
|
||||
|
@ -10,6 +10,8 @@ material: LIME_DYE
|
||||
duration:
|
||||
base: 4
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 2
|
||||
per-level: 1
|
||||
|
@ -9,6 +9,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 4
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 2
|
||||
per-level: 1
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 2
|
||||
per-level: 1
|
||||
|
@ -10,6 +10,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 3
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -8,6 +8,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 5
|
||||
per-level: 0.5
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -10,6 +10,8 @@ material: REDSTONE
|
||||
damage:
|
||||
base: 5.0
|
||||
per-level: 1.5
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
mana:
|
||||
base: 8.0
|
||||
per-level: 3.0
|
||||
|
@ -8,6 +8,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 5
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -11,6 +11,8 @@ material: BONE_MEAL
|
||||
mana:
|
||||
base: 4.0
|
||||
per-level: 1.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
stamina:
|
||||
base: 2.0
|
||||
per-level: 1.0
|
||||
|
@ -11,6 +11,8 @@ duration:
|
||||
per-level: 1.3
|
||||
max: 10.0
|
||||
min: 2.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
mana:
|
||||
base: 8.0
|
||||
per-level: 3.0
|
||||
|
@ -10,6 +10,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 4
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -7,6 +7,8 @@ mana:
|
||||
per-level: 1.0
|
||||
max: 0.0
|
||||
min: 0.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
stamina:
|
||||
base: 2.0
|
||||
per-level: 1.0
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 2
|
||||
per-level: 1
|
||||
|
@ -11,6 +11,8 @@ material: FIRE_CHARGE
|
||||
duration:
|
||||
base: 8.0
|
||||
per-level: 1.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 5.0
|
||||
per-level: 3.0
|
||||
|
@ -11,6 +11,8 @@ material: BLAZE_POWDER
|
||||
damage:
|
||||
base: 5.0
|
||||
per-level: 3.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
ignite:
|
||||
base: 2.0
|
||||
per-level: 1.1
|
||||
|
@ -14,6 +14,8 @@ material: FIRE_CHARGE
|
||||
damage:
|
||||
base: 5.0
|
||||
per-level: 3.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
ignite:
|
||||
base: 2.0
|
||||
per-level: 1.1
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 3
|
||||
per-level: 1
|
||||
|
@ -10,6 +10,8 @@ material: FLINT_AND_STEEL
|
||||
duration:
|
||||
base: 5
|
||||
per-level: 2
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -10,6 +10,8 @@ material: SNOWBALL
|
||||
duration:
|
||||
base: 5
|
||||
per-level: 2
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -10,6 +10,8 @@ material: SNOWBALL
|
||||
duration:
|
||||
base: 3
|
||||
per-level: 2
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -11,6 +11,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 10
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 2
|
||||
per-level: 1
|
||||
|
@ -10,6 +10,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 10
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -9,6 +9,8 @@ material: COAL
|
||||
damage:
|
||||
base: 5.0
|
||||
per-level: 1.5
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
mana:
|
||||
base: 8.0
|
||||
per-level: 3.0
|
||||
|
@ -11,6 +11,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
delay:
|
||||
base: 2
|
||||
per-level: 1
|
||||
|
@ -9,6 +9,8 @@ material: GOLDEN_APPLE
|
||||
mana:
|
||||
base: 4.0
|
||||
per-level: 2.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
stamina:
|
||||
base: 2.0
|
||||
per-level: 1.0
|
||||
|
@ -11,6 +11,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
delay:
|
||||
base: 2
|
||||
per-level: 0.1
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 5
|
||||
per-level: 0.3
|
||||
|
@ -13,6 +13,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
delay:
|
||||
base: 2
|
||||
per-level: 1
|
||||
|
@ -10,11 +10,14 @@ material: BOOK
|
||||
duration:
|
||||
base: 4
|
||||
per-level: 3
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
|
||||
damage:
|
||||
base: 3
|
||||
per-level: 0.5
|
||||
|
@ -14,6 +14,8 @@ redirect:
|
||||
per-level: -2.0
|
||||
max: 30.0
|
||||
min: 20.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
duration:
|
||||
base: 7.0
|
||||
per-level: 1.0
|
||||
|
@ -10,6 +10,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 4
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -11,6 +11,8 @@ material: SNOWBALL
|
||||
damage:
|
||||
base: 3.0
|
||||
per-level: 1.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
mana:
|
||||
base: 20.0
|
||||
per-level: 2.0
|
||||
|
@ -10,6 +10,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 2
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 2
|
||||
per-level: 1
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 4
|
||||
per-level: 1.1
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
delay:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 2
|
||||
per-level: 1
|
||||
|
@ -13,6 +13,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 6
|
||||
per-level: 0.3
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 3
|
||||
per-level: 0.5
|
||||
|
@ -10,6 +10,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 5
|
||||
per-level: 0.5
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -9,6 +9,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 10
|
||||
per-level: 3
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -11,6 +11,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
ignite:
|
||||
base: 3
|
||||
per-level: 0.3
|
||||
|
@ -11,6 +11,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 3
|
||||
per-level: 0.1
|
||||
|
@ -9,6 +9,8 @@ material: GOLDEN_APPLE
|
||||
mana:
|
||||
base: 4.0
|
||||
per-level: 2.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
stamina:
|
||||
base: 2.0
|
||||
per-level: 1.0
|
||||
|
@ -5,3 +5,5 @@ material: LILY_PAD
|
||||
extra:
|
||||
base: 30.0
|
||||
per-level: 5.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
|
@ -15,6 +15,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 6
|
||||
per-level: 1.2
|
||||
|
@ -11,6 +11,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 10
|
||||
per-level: 0.3
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -17,6 +17,8 @@ material: WITHER_SKELETON_SKULL
|
||||
duration:
|
||||
base: 10.0
|
||||
per-level: 1.1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
mana:
|
||||
base: 2.0
|
||||
per-level: 1.0
|
||||
|
@ -11,6 +11,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 4
|
||||
per-level: 0.5
|
||||
|
@ -10,6 +10,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 5
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -9,6 +9,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 10
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -10,6 +10,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 6
|
||||
per-level: 1.3
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
delay:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 4
|
||||
per-level: 1.5
|
||||
|
@ -13,6 +13,8 @@ duration:
|
||||
per-level: -0.5
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 4
|
||||
per-level: 1.1
|
||||
|
@ -8,6 +8,8 @@ material: DIAMOND_SWORD
|
||||
mana:
|
||||
base: 8.0
|
||||
per-level: 1.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
stamina:
|
||||
base: 2.0
|
||||
per-level: 1.0
|
||||
|
@ -12,6 +12,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 6
|
||||
per-level: 0.5
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 4
|
||||
per-level: 0.5
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
delay:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 4.2
|
||||
per-level: 1.1
|
||||
|
@ -10,6 +10,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 6
|
||||
per-level: 0.2
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -10,6 +10,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 10
|
||||
per-level: 0.5
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -10,6 +10,8 @@ material: BOOK
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 4
|
||||
per-level: 0.5
|
||||
|
@ -13,6 +13,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
ignite:
|
||||
base: 3
|
||||
per-level: 0.5
|
||||
|
@ -12,6 +12,8 @@ duration:
|
||||
per-level: 1.1
|
||||
max: 6.0
|
||||
min: 3.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
mana:
|
||||
base: 20.0
|
||||
per-level: 2.0
|
||||
|
@ -10,6 +10,8 @@ material: BOOK
|
||||
duration:
|
||||
base: 3
|
||||
per-level: 1.1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -12,6 +12,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 6
|
||||
per-level: 0.3
|
||||
|
@ -13,6 +13,8 @@ timer:
|
||||
per-level: 0
|
||||
min: 0
|
||||
max: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
delay:
|
||||
base: 0
|
||||
per-level: 0
|
||||
|
@ -10,6 +10,8 @@ material: BOOK
|
||||
timer:
|
||||
base: 2
|
||||
per-level: 1
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
delay:
|
||||
base: 2
|
||||
per-level: 1
|
||||
|
@ -11,6 +11,8 @@ material: BOOK
|
||||
timer:
|
||||
base: 0
|
||||
per-level: 0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
damage:
|
||||
base: 6
|
||||
per-level: 0.5
|
||||
|
@ -9,6 +9,8 @@ material: ENDER_PEARL
|
||||
mana:
|
||||
base: 8.0
|
||||
per-level: 3.0
|
||||
#Optional: The decimal format used for this skill parameter.
|
||||
decimal-format: '0.#'
|
||||
stamina:
|
||||
base: 2.0
|
||||
per-level: 1.0
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user