Ver código fonte

ranklist shorts added for better reset

Marvin Löschenkohl 3 anos atrás
pai
commit
9659b9fd37
2 arquivos alterados com 51 adições e 91 exclusões
  1. 43 90
      system/ranklist.txt
  2. 8 1
      utils/u_games.txt

+ 43 - 90
system/ranklist.txt

@@ -10,26 +10,26 @@ list.add(inverting_list, "5x5cl");
 list.add(inverting_list, "7x7cl");
 list.add(inverting_list, "10x10cl");
 
-ranking.add("§b", "BedWars", "bwranks", "All Kills", "DESC", null);
-ranking.add("§c", "RageMode", "rmranks", "All Kills", "DESC", null);
-ranking.add("§a", "Jump'n'Run", "jumpranks", "Points Record", "DESC", null);
-ranking.add("§5", "Rebuild", "rebuildranks", "All solved patterns", "DESC", null);
-ranking.add("§d", "FastBridge", "fastbridgeranks", "Points Record", "DESC", null);
-ranking.add("§6", "SnowGame", "snowranks", "Kills", "DESC", null);
-ranking.add("§6", "TJR", "tjrranks", "Checkpoints", "DESC", "ASC");
-ranking.add("§b", "IJR", "icejrranks", "Checkpoints", "DESC", null);
-ranking.add("§d", "Letters", "letterranks", "Time", "ASC", null);
-ranking.add("§a", "Sammelfieber", "sfsingle", "Points Record", "DESC", null);
-ranking.add("§2", "Buttons", "buttonranks", "Points Record", "DESC", null);
-ranking.add("§9", "Catch", "fncranks", "Wins", "DESC", null);
-ranking.add("§9", "Inverting", "invertranks", "Points Record", "ASC", null);
-ranking.add("§9", "Spleef", "spleefranks", "Wins", "DESC", null);
-ranking.add("§c", "Knockfight", "knockranks", "All Kills", "DESC", null);
-ranking.add("§9", "Leapfrog", "leapfrogranks", "Points Record", "DESC", null);
-ranking.add("§6", "Parcour", "parcourranks1", "Time", "ASC", null);
-ranking.add("§e", "Halma", "halmaranks", "Wins", "DESC", null);
-ranking.add("§e", "ShoppingChaos", "shoppingranks", "Wins", "DESC", null);
-ranking.add("§e", "MengerRun", "mrranks", "Wins", "DESC", null);
+ranking.add("§b", "BedWars", "bw", "bwranks", "All Kills", "DESC", null);
+ranking.add("§c", "RageMode", "rm", "rmranks", "All Kills", "DESC", null);
+ranking.add("§a", "Jump'n'Run", "jr", "jumpranks", "Points Record", "DESC", null);
+ranking.add("§5", "Rebuild", "rebuild", "rebuildranks", "All solved patterns", "DESC", null);
+ranking.add("§d", "FastBridge", "fb", "fastbridgeranks", "Points Record", "DESC", null);
+ranking.add("§6", "SnowGame", "snow", "snowranks", "Kills", "DESC", null);
+ranking.add("§6", "TJR", "tjr", "tjrranks", "Checkpoints", "DESC", "ASC");
+ranking.add("§b", "IJR", "ijr", "icejrranks", "Checkpoints", "DESC", null);
+ranking.add("§d", "Letters", "letter", "letterranks", "Time", "ASC", null);
+ranking.add("§a", "Sammelfieber", "sfsingle", "sfsingle", "Points Record", "DESC", null);
+ranking.add("§2", "Buttons", "button", "buttonranks", "Points Record", "DESC", null);
+ranking.add("§9", "HideAndSeek", "hs", "fncranks", "Wins", "DESC", null);
+ranking.add("§9", "Inverting", "inv", "invertranks", "Points Record", "ASC", null);
+ranking.add("§9", "Spleef", "spleef", "spleefranks", "Wins", "DESC", null);
+ranking.add("§c", "Knockfight", "knock", "knockranks", "All Kills", "DESC", null);
+ranking.add("§9", "Leapfrog", "lf", "leapfrogranks", "Points Record", "DESC", null);
+ranking.add("§6", "Parcour", null, "parcourranks1", "Time", "ASC", null);
+ranking.add("§e", "Halma", "halma", "halmaranks", "Wins", "DESC", null);
+ranking.add("§e", "ShoppingChaos", "sc", "shoppingranks", "Wins", "DESC", null);
+ranking.add("§e", "MengerRun", "mr", "mrranks", "Wins", "DESC", null);
 
 ranking.register("invertranks5x5");
 ranking.register("invertranks7x7");
@@ -124,72 +124,18 @@ if(event == "custom_command") {
 					goto("wait");
 				}
 				p_uuid = player.getUuid(p_name);
-				p_id = player.getId(p_uuid);
-				if(table == "rmranks") {
-					minigame.setWon(p_id, "rm", 0);
-				} elseif(table == "fastbridgeranks") {
-					minigame.setWon(p_id, "fb", 0);
-				} elseif(table == "knockranks") {
-					minigame.setWon(p_id, "knock", 0);
+				if(p_uuid == null) {
+					p_uuid = player.getUuid(arg1);
 				}
-				ranking.removePlayer(p_id, table);
+				p_id = player.getId(p_uuid);
+				game_short = game.getShort(gamename);
+				ranking.removePlayer(p_id, table, game_short);
 				msg.prefix(player, stats_prefix, concat("§e", p_name, "§r from statistic removed."));
 				goto("wait");
 			}
 		}
 		goto("statshelp");
 	}
-	if(command == "sfstats") {
-		if(size != 2) {
-			goto("wait");
-		}
-		p_name = list.getIndex(args, 0);
-		if(!checkIfEverOnline(p_name)) {
-			goto("wait");
-		}
-		table = list.getIndex(args, 1);
-		if(!list.contains(sf_list, table)) {
-			goto("wait");
-		}
-		gamename = "Sammelfieber";
-		message = game.getMessage(gamename);
-		color = game.getColor(gamename);
-		msg.prefix(player, concat(color, gamename), concat("§eWertung nach: §r", message));
-		showPlayerStats(player, gamename, table, p_name);
-		goto("wait");
-	}
-	if(command == "topsfstats") {
-		if(size != 1) {
-			goto("wait");
-		}
-		table = list.getIndex(args, 0);
-		if(!list.contains(sf_list, table)) {
-			goto("wait");
-		}
-		gamename = "Sammelfieber";
-		showTopStats(player, gamename, table);
-		goto("wait");
-	}
-	if(command == "removesfstats") {
-		if(size != 2) {
-			goto("wait");
-		}
-		p_name = list.getIndex(args, 0);
-		if(!checkIfEverOnline(p_name)) {
-			goto("wait");
-		}
-		table = list.getIndex(args, 1);
-		if(!list.contains(sf_list, table)) {
-			goto("wait");
-		}
-		gamename = "Sammelfieber";
-		p_uuid = player.getUuid(p_name);
-		p_id = player.getId(p_uuid);
-		p_name = player.getNameFromId(p_id);
-		ranking.removePlayer(p_id, table);
-		msg.prefix(player, stats_prefix, concat("§e", p_name, "§r from statistic removed."));
-		goto("wait");
-	}
 	if(command == "invstats") {
 		if(size != 2) {
 			goto("wait");
@@ -243,7 +189,8 @@ if(event == "custom_command") {
 		p_name = player.getNameFromId(p_id);
 		table = game.getRankingTable(gamename);
 		table = concat(table, sub_game);
-		ranking.removePlayer(p_id, table);
+		game_short = concat(game.getShort(gamename), sub_game);
+		ranking.removePlayer(p_id, table, game_short);
 		msg.prefix(player, stats_prefix, concat("§e", p_name, "§r from statistic removed."));
 		goto("wait");
 	}
@@ -332,14 +279,15 @@ function showTopStats(player, gamename, table) {
 	showPlayerStats(player, gamename, table, player.getName(player));
 }
 
-function ranking.add(colorcode, name, rankingtable, message, order, order2) {
-	a = array.new(6);
+function ranking.add(colorcode, name, game_short, rankingtable, message, order, order2) {
+	a = array.new(7);
 	a[0] = colorcode;
 	a[1] = name;
-	a[2] = rankingtable;
-	a[3] = message;
-	a[4] = order;
-	a[5] = order2;
+	a[2] = game_short;
+	a[3] = rankingtable;
+	a[4] = message;
+	a[5] = order;
+	a[6] = order2;
 	list.add($games, a);
 	if(rankingtable == "invertranks") {
 		return;
@@ -363,26 +311,31 @@ function game.getColor(gamename) {
 	return a[0];
 }
 
-function game.getRankingTable(gamename) {
+function game.getShort(gamename) {
 	a = game.getArray(gamename);
 	return a[2];
 }
 
-function game.getMessage(gamename) {
+function game.getRankingTable(gamename) {
 	a = game.getArray(gamename);
 	return a[3];
 }
 
-function game.getOrder(gamename) {
+function game.getMessage(gamename) {
 	a = game.getArray(gamename);
 	return a[4];
 }
 
-function game.getOrder2(gamename) {
+function game.getOrder(gamename) {
 	a = game.getArray(gamename);
 	return a[5];
 }
 
+function game.getOrder2(gamename) {
+	a = game.getArray(gamename);
+	return a[6];
+}
+
 function sendRank(player, p_name, rang, points) {
 	msg(player, concat("§6", text.number(rang), "  §r", p_name, "  §e", text.number(points)));
 }

+ 8 - 1
utils/u_games.txt

@@ -563,10 +563,17 @@ function ranking.getPlayerRank(player_id, rankingtable, order, order2) {
 }
 
 //Entfernt einen Spieler aus der Statistik
-function ranking.removePlayer(player_id, rankingtable) {
+function ranking.removePlayer(player_id, rankingtable, game_short) {
 	stmt = databank.prepare(concat("DELETE FROM ", rankingtable, " WHERE player_id = ?;"));
 	databank.setInt(stmt, 1, player_id);
 	databank.workerExecute(stmt);
+	
+	if(minigame.getWon(player_id, game_short) != 0) {
+		minigame.setWon(player_id, game_short, 0);
+	}
+	if(minigame.getPlayed(player_id, game_short) != 0) {
+		minigame.setPlayed(player_id, game_short, 0);
+	}
 }
 
 //--------------------------------------------------