Skip to content

Commit acba8ae

Browse files
committed
レベリング修正
1 parent 3041bde commit acba8ae

File tree

2 files changed

+13
-27
lines changed

2 files changed

+13
-27
lines changed

src/main/java/com/github/elic0de/thejpspit/spigot/config/Settings.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ public class Settings {
3535
@YamlKey("level")
3636
private List<String> level = Arrays.asList(
3737
"1,15,15," + ChatColor.GRAY.name(),
38-
"10,30,10," + ChatColor.BLUE.name(),
39-
"20,50,20," + ChatColor.DARK_AQUA.name(),
40-
"30,75,30," + ChatColor.DARK_GREEN.name(),
41-
"40,125,40," + ChatColor.GREEN.name(),
42-
"50,250,50," + ChatColor.YELLOW.name(),
43-
"60,600,60," + ChatColor.GOLD.name(),
44-
"70,800,36000," + ChatColor.RED.name(),
45-
"80,900,56000," + ChatColor.DARK_RED.name(),
46-
"90,1000,72000," + ChatColor.AQUA.name()
38+
"10,30,165," + ChatColor.BLUE.name(),
39+
"20,50,480," + ChatColor.DARK_AQUA.name(),
40+
"30,75,1000," + ChatColor.DARK_GREEN.name(),
41+
"40,125,1775," + ChatColor.GREEN.name(),
42+
"50,250,4550," + ChatColor.YELLOW.name(),
43+
"60,600,10800," + ChatColor.GOLD.name(),
44+
"70,800,16000," + ChatColor.RED.name(),
45+
"80,900,28000," + ChatColor.DARK_RED.name(),
46+
"90,1000,381000," + ChatColor.AQUA.name()
4747
);
4848

4949
public String getGithubToken() {

src/main/java/com/github/elic0de/thejpspit/spigot/leveler/Levels.java

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,28 @@ public class Levels {
1414
static {
1515
initialize();
1616
}
17-
1817
public static void initialize() {
1918
Arrays.stream(TheJpsPit.getInstance().getSettings().getLevel().toArray(new String[0]))
2019
.map(text -> text.split(","))
21-
.map(data -> new Level(Integer.parseInt(data[0]), Integer.parseInt(data[1]),Integer.parseInt(data[2]), ChatColor.valueOf(data[3])))
20+
.map(data -> new Level(Integer.parseInt(data[0]), Integer.parseInt(data[1]), Integer.parseInt(data[2]), ChatColor.valueOf(data[3])))
2221
.forEach(level -> LEVELS.put(level.getLevel(), level));
2322

2423
final HashMap<Integer,Level> addedLevels = new HashMap<>();
2524
for (Level level : LEVELS.values()) {
2625
final int l = level.getLevel();
2726
final int neededXp = level.getNeededXP();
2827
final ChatColor color = level.getLevelColor();
29-
30-
int totalXp = level.getNeededXP();
28+
int totalXp = level.getTotalXp();
3129
for (int i = 1; i < 10; i++){
3230
final int nextLevel = l + i;
33-
//if (LEVELS.containsKey(nextLevel)) continue;
31+
if (LEVELS.containsKey(nextLevel)) continue;
3432
totalXp += neededXp;
35-
addedLevels.put(nextLevel, new Level(nextLevel, neededXp, neededXp * nextLevel, color));
33+
addedLevels.put(nextLevel, new Level(nextLevel, neededXp, totalXp, color));
3634
}
3735
}
3836
LEVELS.putAll(addedLevels);
3937
}
4038

41-
/* public static int getPlayerLevel(int playerLevel) {
42-
if (LEVELS.containsKey(playerLevel)) {
43-
final Level level = LEVELS.get(playerLevel);
44-
return level.getLevel();
45-
}
46-
if (LEVELS.containsKey(LEVELS.size() - 1)) {
47-
final int maxLevel = LEVELS.get(LEVELS.size() - 1).getLevel();
48-
return maxLevel;
49-
}
50-
return 0;
51-
}*/
52-
5339
public static int getPlayerLevel(PitPlayer player) {
5440
final List<Integer> requirements = LEVELS.values().stream().map(Level::getTotalXp)
5541
.toList();

0 commit comments

Comments
 (0)