SteamWar/FightSystem
SteamWar/FightSystem
Archiviert
13
1
Fork 0
Code Issues 6 Pull-Requests Releases Wiki Aktivität

Add ranked rework #336

Zusammengeführt
Lixfel hat 6 Commits von Ranked nach master 2022-03-10 12:07:24 +01:00 zusammengeführt
Diskussion 0 Commits 6 Geänderte Dateien 7 +101 -145
8 geänderte Dateien mit 101 neuen und 145 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen
Nur Änderungen aus Commit f4ffd17c55 werden angezeigt - Alle Commits anzeigen

8
FightSystem_Core/src/de/steamwar/fightsystem/ArenaMode.java
Datei anzeigen

@ -25,7 +25,6 @@ import java.util.Set;
public enum ArenaMode {
NORMAL,
RANKED,
EVENT,
TEST,
CHECK,
@ -38,7 +37,6 @@ public enum ArenaMode {
public static final Set<ArenaMode> Check = Collections.unmodifiableSet(EnumSet.of(CHECK));
public static final Set<ArenaMode> Event = Collections.unmodifiableSet(EnumSet.of(EVENT));
public static final Set<ArenaMode> Test = Collections.unmodifiableSet(EnumSet.of(TEST, CHECK));
public static final Set<ArenaMode> Ranked = Collections.unmodifiableSet(EnumSet.of(RANKED));
public static final Set<ArenaMode> Prepare = Collections.unmodifiableSet(EnumSet.of(PREPARE));
public static final Set<ArenaMode> Replay = Collections.unmodifiableSet(EnumSet.of(REPLAY, TEST));
@ -46,9 +44,9 @@ public enum ArenaMode {
public static final Set<ArenaMode> AntiTest = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(TEST, CHECK)));
public static final Set<ArenaMode> AntiEvent = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(EVENT)));
public static final Set<ArenaMode> AntiPrepare = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(PREPARE)));
public static final Set<ArenaMode> VariableTeams = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(RANKED, EVENT, REPLAY)));
public static final Set<ArenaMode> RankedEvent = Collections.unmodifiableSet(EnumSet.of(RANKED, EVENT, REPLAY));
public static final Set<ArenaMode> Restartable = Collections.unmodifiableSet(EnumSet.of(NORMAL, RANKED));
public static final Set<ArenaMode> VariableTeams = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(EVENT, REPLAY)));
public static final Set<ArenaMode> RankedEvent = Collections.unmodifiableSet(EnumSet.of(EVENT, REPLAY));
public static final Set<ArenaMode> Restartable = Collections.unmodifiableSet(EnumSet.of(NORMAL));
public static final Set<ArenaMode> NotRestartable = Collections.unmodifiableSet(EnumSet.of(EVENT, REPLAY));
public static final Set<ArenaMode> SoloLeader = Collections.unmodifiableSet(EnumSet.of(TEST, CHECK, PREPARE));
public static final Set<ArenaMode> NotOnBau = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(TEST, CHECK, PREPARE, REPLAY)));

9
FightSystem_Core/src/de/steamwar/fightsystem/Config.java
Datei anzeigen

@ -92,7 +92,7 @@ public class Config {
public static final String TeamChatDetection;
public static final UUID BlueLeader;
public static final UUID RedLeader;
public static final boolean Ranked;
public static final boolean RankedEnabled;
//Active win conditions
public static final Set<Winconditions> ActiveWinconditions;
@ -150,6 +150,8 @@ public class Config {
}
FileConfiguration worldconfig = YamlConfiguration.loadConfiguration(worldConfigFile);
RankedEnabled = config.getBoolean("Server.Ranked", false);
NoPlayerOnlineDuration = config.getInt("Times.NoPlayersOnlineDuration", 30);
PreSchemPasteDuration = config.getInt("Times.PreSchemPasteDuration", 120);
SetupDuration = config.getInt("Times.SetupDuration", 300);
@ -370,12 +372,9 @@ public class Config {
CheckSchemID = Integer.parseInt(System.getProperty("checkSchemID", "0"));
PrepareSchemID = Integer.parseInt(System.getProperty("prepareSchemID", "0"));
Ranked = Boolean.parseBoolean(System.getProperty("ranked", "false"));
ReplayID = Integer.parseInt(System.getProperty("replay", "0"));
if(Ranked){
mode = ArenaMode.RANKED;
}else if(CheckSchemID != 0){
if(CheckSchemID != 0){
mode = ArenaMode.CHECK;
}else if(PrepareSchemID != 0){
mode = ArenaMode.PREPARE;

2
FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java
Datei anzeigen

@ -87,7 +87,6 @@ public class FightSystem extends JavaPlugin {
new PrepareSchem();
new TestJoin();
new NormalJoin();
new RankedJoin();
new RunningWorldInteraction();
new PersonalKitCreator();
new ArrowStopper();
@ -114,7 +113,6 @@ public class FightSystem extends JavaPlugin {
new WinconditionHeartRatioTimeout();
new WinconditionTimeTechKO();
new EventTeamOffWincondition();
new RankedPlayerLeftWincondition();
new WinconditionPercentTimeout();
new HellsBells();

3
FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.properties
Datei anzeigen

@ -180,7 +180,7 @@ UI_PLAYER_LEAVES=
UI_LEADER_JOINS=§a§l» {0}Leader {1}
UI_PLAYER_DEATH={0}{1} §7ist gestorben
UI_PLAYER_LEAVE={0}{1} §7hat den Kampf verlassen
UI_ELO=§7ELO von {0}{1}§8: §7{2}§8»§e{3}
UI_ELO_PLAYER=§7Elo§8: §7{0}§8»§7{1}
UI_WIN={0}Sieg {1}
UI_DRAW=§7Unentschieden
@ -232,7 +232,6 @@ WIN_FIGHTLEADER=
WIN_PERCENT={0} §7zu beschädigt
WIN_OFFLINE_BOTH=§7Beide Teams offline
WIN_OFFLINE={0} §7offline
WIN_RANKED_LEFT={0} §7hat den Kampf verlassen
WIN_ALL_DEAD={0}Alle Spieler kampfunfähig
WIN_LEADER_DEAD={0} kampfunfähig
WIN_TIME_OVER=§7Zeit abgelaufen

6
FightSystem_Core/src/de/steamwar/fightsystem/countdown/Countdown.java
Datei anzeigen

@ -45,6 +45,7 @@ public abstract class Countdown {
private final boolean level;
protected int time;
protected int timeElapsed;
private BukkitTask task = null;
public abstract void countdownFinished();
@ -110,8 +111,13 @@ public abstract class Countdown {
return time;
}
public int getTimeElapsed(){
return timeElapsed;
}
private void count() {
time--;
timeElapsed++;
show();
}

52
FightSystem_Core/src/de/steamwar/fightsystem/listener/RankedJoin.java
Datei anzeigen

@ -1,52 +0,0 @@
/*
This file is a part of the SteamWar software.
Copyright (C) 2020 SteamWar.de-Serverteam
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.fightsystem.listener;
import de.steamwar.fightsystem.ArenaMode;
import de.steamwar.fightsystem.Config;
import de.steamwar.fightsystem.fight.Fight;
import de.steamwar.fightsystem.fight.FightTeam;
import de.steamwar.fightsystem.states.FightState;
import de.steamwar.fightsystem.states.StateDependentListener;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
public class RankedJoin implements Listener {
public RankedJoin() {
new StateDependentListener(ArenaMode.Ranked, FightState.PreLeaderSetup, this);
}
@EventHandler
public void handlePlayerJoin(PlayerJoinEvent event) {
Player player = event.getPlayer();
FightTeam fightTeam = Fight.getPlayerTeam(player);
if (fightTeam == null) {
if(!player.getUniqueId().equals(Config.RedLeader) && Fight.getBlueTeam().canbeLeader(player)) {
Fight.getBlueTeam().addMember(player);
}else if(Fight.getRedTeam().canbeLeader(player)) {
Fight.getRedTeam().addMember(player);
}
}
}
}

84
FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java
Datei anzeigen

@ -39,6 +39,9 @@ import java.io.FileInputStream;
import java.sql.Timestamp;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import static de.steamwar.sql.Fight.create;
@ -95,22 +98,32 @@ public class FightStatistics {
}
Integer blueSchem;
Integer blueSchemRank;
Integer redSchem;
Integer redSchemRank;
try {
blueSchem = SchematicNode.getSchematicNode(Fight.getBlueTeam().getSchematic()).getId();
SchematicNode schematicNode = SchematicNode.getSchematicNode(Fight.getBlueTeam().getSchematic());
blueSchem = schematicNode.getId();
blueSchemRank = schematicNode.getRank();
} catch (SecurityException e) {
blueSchem = null;
blueSchemRank = null;
}
try {
redSchem = SchematicNode.getSchematicNode(Fight.getRedTeam().getSchematic()).getId();
SchematicNode schematicNode = SchematicNode.getSchematicNode(Fight.getRedTeam().getSchematic());
redSchem = schematicNode.getId();
redSchemRank = schematicNode.getRank();
} catch (SecurityException e) {
redSchem = null;
redSchemRank = null;
}
int remainingTime = 0;
int timeElapsed = 0;
Countdown timeOverCountdown = Wincondition.getTimeOverCountdown();
if (timeOverCountdown != null) {
remainingTime = timeOverCountdown.getTimeLeft();
timeElapsed = timeOverCountdown.getTimeElapsed();
}
try {
@ -136,17 +149,62 @@ public class FightStatistics {
}
replayLock = false;
if(Config.Ranked){
int blueElo = Elo.getElo(blueLeader, gameMode);
int redElo = Elo.getElo(redLeader, gameMode);
double redWinExpectation = 1 / (1 + Math.pow(10, (blueElo - redElo) / 400f));
double blueWinExpectation = 1 / (1 + Math.pow(10, (redElo - blueElo) / 400f));
int newBlueElo = (int) Math.round(blueElo + K * (blueResult - blueWinExpectation));
int newRedElo = (int) Math.round(redElo + K * (1 - blueResult - redWinExpectation));
Elo.setElo(blueLeader, gameMode, newBlueElo);
Elo.setElo(redLeader, gameMode, newRedElo);
FightSystem.broadcast("UI_ELO", Fight.getBlueTeam().getPrefix(), SteamwarUser.get(blueLeader).getUserName(), blueElo, newBlueElo);
FightSystem.broadcast("UI_ELO", Fight.getRedTeam().getPrefix(), SteamwarUser.get(redLeader).getUserName(), redElo, newRedElo);
calculateEloIfNeeded(timeElapsed, blueSchemRank, redSchemRank, blueResult, gameMode);
}
private void calculateEloIfNeeded(int timeElapsed, Integer blueSchemRank, Integer redSchemRank, double blueResult, String gameMode) {
if (!Config.RankedEnabled) {
return;
}
if (timeElapsed < 30) { // Too short fights are not worth elo change
return;
}
if (blueSchemRank == null || redSchemRank == null) { // Schematics are not ranked
return;
}
if (blueSchemRank != redSchemRank) { // Different schematics ranks are not worth elo change
return;
}
Collection<FightPlayer> bluePlayers = Fight.getBlueTeam().getPlayers();
Collection<FightPlayer> redPlayers = Fight.getRedTeam().getPlayers();
double playerDiff = 1 - (Math.min(bluePlayers.size(), redPlayers.size()) / (double) Math.max(bluePlayers.size(), redPlayers.size()));
if (playerDiff >= 0.4) { // Too many players, not worth elo change
return;
}
int blueElo = 0;
int redElo = 0;
Map<FightPlayer, Integer> blueElos = new HashMap<>();
Map<FightPlayer, Integer> redElos = new HashMap<>();
for (FightPlayer fp : bluePlayers) {
int elo = Elo.getElo(SteamwarUser.get(fp.getPlayer()).getId(), gameMode);
blueElo += elo;
blueElos.put(fp, elo);
}
for (FightPlayer fp : redPlayers) {
int elo = Elo.getElo(SteamwarUser.get(fp.getPlayer()).getId(), gameMode);
redElo += elo;
redElos.put(fp, elo);
}
double redWinExpectation = 1 / (1 + Math.pow(10, (blueElo - redElo) / 600f));
double blueWinExpectation = 1 / (1 + Math.pow(10, (redElo - blueElo) / 600f));
double diffBlueElo = K * (blueResult - blueWinExpectation);
double diffRedElo = K * (1 - blueResult - redWinExpectation);
for (FightPlayer fp : bluePlayers) {
int nElo = (int) Math.round(blueElos.get(fp) + diffBlueElo / bluePlayers.size());
Elo.setElo(SteamwarUser.get(fp.getPlayer()).getId(), gameMode, nElo);
FightSystem.getMessage().send("UI_ELO_PLAYER", fp.getPlayer(), redElos.get(fp), nElo);
}
for (FightPlayer fp : redPlayers) {
int nElo = (int) Math.round(redElos.get(fp) + diffRedElo / redPlayers.size());
Elo.setElo(SteamwarUser.get(fp.getPlayer()).getId(), gameMode, nElo);
FightSystem.getMessage().send("UI_ELO_PLAYER", fp.getPlayer(), redElos.get(fp), nElo);
}
}

50
FightSystem_Core/src/de/steamwar/fightsystem/winconditions/RankedPlayerLeftWincondition.java
Datei anzeigen

@ -1,50 +0,0 @@
/*
This file is a part of the SteamWar software.
Copyright (C) 2020 SteamWar.de-Serverteam
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.fightsystem.winconditions;
import de.steamwar.fightsystem.ArenaMode;
import de.steamwar.fightsystem.fight.Fight;
import de.steamwar.fightsystem.fight.FightTeam;
import de.steamwar.fightsystem.states.FightState;
import de.steamwar.fightsystem.states.StateDependentListener;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerQuitEvent;
public class RankedPlayerLeftWincondition extends Wincondition implements Listener {
public RankedPlayerLeftWincondition(){
super("LeaderQuit");
new StateDependentListener(ArenaMode.Ranked, FightState.Setup, this);
}
@EventHandler
public void handlePlayerQuit(PlayerQuitEvent event) {
Player player = event.getPlayer();
FightTeam team = isTarget(player);
if(team == null)
return;
if(team.isPlayerLeader(player)) {
win(Fight.getOpposite(team), "WIN_RANKED_LEFT", team.getPrefix() + team.getLeader().getPlayer().getName());
}
}
}