Merge pull request #1 from JavaJava19/develop

Develop

Author: Elic0de

src/main/java/com/github/elic0de/thejpspit/TheJpsPit.java

@@ -53,7 +53,7 @@ public void onEnable() {
                 "Please check the supplied database credentials in the config file");
         }
 
-        ratingHelper = new KillRatingHelper(0.5);
+        ratingHelper = new KillRatingHelper(0);
         queueManager = new QueueManager();
 
         //queueTask = new QueueTask();

src/main/java/com/github/elic0de/thejpspit/database/SqLiteDatabase.java

@@ -182,7 +182,7 @@ public CompletableFuture<Optional<PitPlayer>> getPitPlayer(Player player) {
             try {
                 try (PreparedStatement statement = getConnection().prepareStatement(
                     formatStatementTables("""
-                        SELECT `kills`, `deaths`, `rating`, `xp`
+                        SELECT `kills`, `streaks`, `deaths`, `rating`, `xp`
                         FROM `%players_table%`
                         WHERE `uuid`=?"""))) {
 
@@ -192,6 +192,7 @@ public CompletableFuture<Optional<PitPlayer>> getPitPlayer(Player player) {
                     if (resultSet.next()) {
                         return Optional.of(new PitPlayer(player,
                             resultSet.getLong("kills"),
+                            resultSet.getLong("streaks"),
                             resultSet.getLong("deaths"),
                             resultSet.getDouble("rating"),
                             resultSet.getDouble("xp")
@@ -240,14 +241,15 @@ public CompletableFuture<Void> updateUserData(PitPlayer player) {
                 try (PreparedStatement statement = getConnection().prepareStatement(
                     formatStatementTables("""
                         UPDATE `%players_table%`
-                        SET `kills`=?, `deaths`=?, `rating`=?, `xp`=?
+                        SET `kills`=?, `streaks`=?, `deaths`=?, `rating`=?, `xp`=?
                         WHERE `uuid`=?"""))) {
 
                     statement.setLong(1, player.getKills());
-                    statement.setLong(2, player.getDeaths());
-                    statement.setDouble(3, player.getRating());
-                    statement.setDouble(4, player.getXp());
-                    statement.setString(5, player.getUniqueId().toString());
+                    statement.setLong(2, player.getStreaks());
+                    statement.setLong(3, player.getDeaths());
+                    statement.setDouble(4, player.getRating());
+                    statement.setDouble(5, player.getXp());
+                    statement.setString(6, player.getUniqueId().toString());
                     statement.executeUpdate();
                 }
             } catch (SQLException e) {

src/main/java/com/github/elic0de/thejpspit/game/Game.java

@@ -38,8 +38,10 @@ public void death(PitPlayer player) {
         }
 
         player.increaseDeaths();
+        player.resetStreaks();
         killer.increaseKills();
         killer.increaseXP();
+        killer.increaseStreaks();
         killer.addReward();
 
         pit.getRatingHelper().initRating(player);

src/main/java/com/github/elic0de/thejpspit/player/PitPlayer.java

@@ -30,6 +30,8 @@ public class PitPlayer {
         new ItemStack(Material.IRON_CHESTPLATE)
     };
     private long kills;
+
+    private long streaks;
     private long deaths;
     private double rating;
     private double xp;
@@ -38,16 +40,18 @@ public class PitPlayer {
     public PitPlayer(Player player) {
         this.player = player;
         this.kills = 0;
+        this.streaks= 0;
         this.deaths = 0;
         this.rating = 0;
         this.xp = 0;
         this.board = new FastBoard(player);
         this.board.updateTitle(ChatColor.translateAlternateColorCodes('&', "&eTHE JPS PIT"));
     }
 
-    public PitPlayer(Player player, long kills, long deaths, double rating, double xp) {
+    public PitPlayer(Player player, long kills, long streaks, long deaths, double rating, double xp) {
         this.player = player;
         this.kills = kills;
+        this.streaks = streaks;
         this.deaths = deaths;
         this.rating = rating;
         this.xp = xp;
@@ -141,6 +145,10 @@ public long getKills() {
         return kills;
     }
 
+    public long getStreaks() {
+        return streaks;
+    }
+
     public long getDeaths() {
         return deaths;
     }
@@ -165,6 +173,9 @@ public void increaseKills() {
         this.kills++;
     }
 
+    public void increaseStreaks() {
+        this.streaks ++;
+    }
     public void increaseDeaths() {
         this.deaths++;
     }
@@ -178,4 +189,8 @@ public void increaseHealth() {
         player.setHealth(Math.min(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(),
             player.getHealth() + 1));
     }
+
+    public void resetStreaks() {
+        streaks = 0;
+    }
 }

src/main/java/com/github/elic0de/thejpspit/scoreboard/GameScoreboard.java

@@ -29,13 +29,14 @@ public List<String> boardLines(PitPlayer player) {
             "K/Dレート: &c%rating%",
             "次のレベルまで：&a%neededXp%",
             "",
-            "連続キル数:",
+            "連続キル数: &a%streaks%",
             "",
             "&ejapanpvpserver.net"
         ).map(s ->
             s.replaceAll("%level%", Levels.getPlayerLevel(player) + "")
                 .replaceAll("%neededXp%", Levels.getPlayerNeededXP(player) + "")
                 .replaceAll("%rating%", player.getRating() + "%")
+                .replaceAll("%streaks%", player.getStreaks() + "")
         ).collect(Collectors.toList());
     }
 

src/main/java/com/github/elic0de/thejpspit/util/KillRatingHelper.java

@@ -6,23 +6,24 @@
 
 public class KillRatingHelper {
 
-    private static final double roundingFactor = 10000;
+    // 少数第二で四捨五入
+    private static final double roundingFactor = 10;
     private final double defaultRating;
 
     public KillRatingHelper(double defaultRating) {
         this.defaultRating = defaultRating;
     }
 
     public void initRating(PitPlayer player) {
-        player.setRating(calculateWinningRatio(player));
+        player.setRating(calculateKillingRatio(player));
     }
 
-    private double calculateWinningRatio(PitPlayer player) {
+    private double calculateKillingRatio(PitPlayer player) {
         long deaths = player.getDeaths();
         long kills = player.getKills();
         long total = deaths + kills;
         if (deaths >= 0 && kills >= 0 && total > 0) {
-            return round((double) kills / total * roundingFactor) / roundingFactor;
+            return round((double) kills / deaths * roundingFactor) / roundingFactor;
         } else {
             return defaultRating;
         }

src/main/resources/database/sqlite_schema.sql

@@ -3,6 +3,7 @@ CREATE TABLE IF NOT EXISTS `%players_table%`
     `uuid`              char(36)    NOT NULL UNIQUE,
     `username`          varchar(16) NOT NULL,
     `kills`             integer     NOT NULL DEFAULT 0,
+    `streaks`           integer     NOT NULL DEFAULT 0,
     `deaths`            integer     NOT NULL DEFAULT 0,
     `rating`            integer     NOT NULL DEFAULT 0,
     `xp`                integer     NOT NULL DEFAULT 0,