Adjust message.

* Add colors.
* Add summary message on leaving or contest end.

Archer/archer_lists.txt

@@ -202,4 +202,14 @@ might have to remember force too for projectile launch
 
 check if contest is active at all.
 
-print sign lines on /archer ?
+print sign lines on /archer ?
+
+
+***
+
+notify remaining if a player leaves. Add player names that are left.
+send summary to leaving players.
+
+
+
+

Archer/plugin.yml

@@ -1,6 +1,6 @@
 name: Archer
 main: me.asofold.bpl.archer.Archer
-version: 1.1.3
+version: 1.1.4
 
 commands:
   archer:

Archer/src/me/asofold/bpl/archer/Archer.java

@@ -190,14 +190,16 @@ final void onHit(final ProjectileHitEvent event){
 		if (players.isEmpty() || event.getClass() != ProjectileHitEvent.class) return;
 		final Projectile projectile = event.getEntity();
 		final PlayerData data = getPlayerData(projectile);
-		if (data == null || !data.notifyTargets) return;
+		if (data == null) return;
 		final int entityId = projectile.getEntityId();
 		final Location launchLoc = data.removeLaunch(entityId);
 		if (launchLoc == null) return;
 
 		// TODO: later: add miss / hit events
-		// TODO: Might remove if shots used up... 
+		// TODO: Might remove if shots used up...
 
+		// Target hitting:
+		if (!data.notifyTargets) return;
 		final Vector velocity = projectile.getVelocity();
 		final Location projLoc = projectile.getLocation();
 		final boolean verbose = settings.verbose;
@@ -319,7 +321,7 @@ final void onLaunch(final ProjectileLaunchEvent event){
 		if (tDiff > 60000L) data.clearLaunchs();
 		final Location launchLoc = data.player.getLocation().add(new Vector(0.0, data.player.getEyeHeight(), 0.0));
 		// Check active contests for removal due to shots.
-		List<String> rem = new LinkedList<String>();
+		final List<String> rem = new LinkedList<String>();
 		for (final ContestData cd : data.activeContests.values()){
 			if (cd.contest.addLaunch(data, cd, launchLoc)){
 				rem.add(cd.contest.name.toLowerCase());

Archer/src/me/asofold/bpl/archer/core/Contest.java

@@ -1,6 +1,7 @@
 package me.asofold.bpl.archer.core;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -217,7 +218,7 @@ public boolean checkState() {
 			return false;
 		}
 		started = true;
-		Bukkit.getServer().broadcastMessage("Contest " + name + " starts with players: " + Utils.joinObjects(getOnlineNameList(), ", "));
+		Bukkit.getServer().broadcastMessage("Contest " + name + " starts with players: " + Utils.joinObjects(getOnlineNameList(), ChatColor.DARK_GRAY + ", "));
 		notifyActive(Archer.msgStart + ChatColor.YELLOW + "Contest started: " + ChatColor.GREEN + name);
 		return true;
 	}
@@ -241,13 +242,35 @@ public boolean removePlayer(final PlayerData data, boolean notify) {
 		// TODO: Message other active players.
 		// TODO: Set finished.
 		boolean was = activePlayers.remove(data.playerName.toLowerCase()) != null;
-		if (notify) notifyActive(Archer.msgStart + data.playerName + " left contest: " + name);
+		if (notify){
+			notifyActive(Archer.msgStart + data.playerName + " left contest: " + ChatColor.RED + name + ChatColor.GRAY + ", still in: " + Utils.joinObjects(getOnlineNameList(), ChatColor.DARK_GRAY + ", "));
+		}
 		if (started && minPlayers.nonzero() && minPlayers.value > activePlayers.size()){
 			endContest(null);
 		}
+		sendSummary(data, data.activeContests.get(name.toLowerCase()));
 		return was;
 	}
 
+	private void sendSummary(final PlayerData data, final ContestData cd) {
+		if (cd == null || !cd.interesting() || data.player == null || !data.player.isOnline()){
+			return;
+		}
+		final StringBuilder b = new StringBuilder(200);
+		b.append(Archer.msgStart);
+		b.append("Contest " + name);
+		b.append(ChatColor.YELLOW + name + ChatColor.GRAY + " summary: ");
+		b.append(cd.hitsDealt + " hits (" + cd.hitsTaken +" taken) | ");
+		if (lossScore.nonzero()){
+			b.append(((int) Math.round(cd.score)) + " score (" + ((int) Math.round(cd.scoreSuffered)) + " taken) | ");
+		}
+		if (cd.kills > 0){
+			b.append(cd.kills + " kills | ");
+		}
+		b.append(cd.shotsFired + " shots fired");
+		data.player.sendMessage(b.toString());
+	}
+
 	/**
 	 * 
 	 * @param message If set to null, some standard checks will be done if someone remaining has won.
@@ -279,7 +302,7 @@ public void endContest(String message) {
 		}
 		// Remove players without side effects
 		for (final PlayerData data : activePlayers.values()){
-			data.activeContests.remove(name.toLowerCase());
+			sendSummary(data, data.activeContests.remove(name.toLowerCase()));
 		}
 		activePlayers.clear();
 		this.lastTimeValid = 0;
@@ -289,10 +312,9 @@ public void endContest(String message) {
 	public List<String> getOnlineNameList() {
 		final List<String> names = new ArrayList<String>(activePlayers.size());
 		for (final PlayerData data : activePlayers.values()){
-			if (data.player != null && data.player.isOnline()){
-				names.add(data.playerName);
-			}
+			names.add(((data.player != null && data.player.isOnline()) ? ChatColor.WHITE : ChatColor.GRAY) + data.playerName);
 		}
+		Collections.sort(names); // TODO: Might re-think, size dependent?
 		return names;
 	}
 

Archer/src/me/asofold/bpl/archer/core/ContestData.java

@@ -20,4 +20,7 @@ public ContestData(Contest contest){
 		this.contest = contest;
 	}
 
+	public boolean interesting(){
+		return shotsFired != 0 || hitsTaken != 0;
+	}
 }

Archer/src/me/asofold/bpl/archer/core/ContestManager.java

@@ -214,7 +214,7 @@ public void checkState(boolean notifyTime) {
 					final long time = System.currentTimeMillis();
 					final long timeDiff = time - contest.lastTimeValid;
 					if (timeDiff > 0 && timeDiff < contest.startDelay.value){
-						contest.notifyActive(Archer.msgStart + ChatColor.YELLOW + "Contest " + ChatColor.RED + contest.name + ChatColor.YELLOW + " starting in " + ((int) (contest.startDelay.value - timeDiff) / 1000) + " seconds...");
+						contest.notifyActive(Archer.msgStart + ChatColor.YELLOW + "Contest " + ChatColor.RED + contest.name + ChatColor.YELLOW + " starting in " + ((int) (contest.startDelay.value - timeDiff) / 1000) + " seconds (" + contest.activePlayers.size() + " players)...");
 					}
 				}
 			}