Merge pull request #99 from boltgolt/dev

version 1.5.0

package.json

@@ -1,5 +1,5 @@
 {
   "name": "boltobserv",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "_whatisthis": "Older versions of Boltobserv used this file to check for updates, so it can't be deleted. The real package.json is in /src"
 }

src/config/config.json5

@@ -73,6 +73,14 @@
 		// Show Boltobserv, Simple Radar and Lexogrine logos
 		"showLogos": true,
 
+		// Show the player name on the dot, options are:
+		// "never"  only show the spec number (observer slot)
+		// "both"   show the name of the player under the dot
+		// "always" replace the spec number by the player name
+		"showName": "never",
+		// Truncate the name of the player after this many characters
+		"maxNameLength": 8,
+
 		// Show muzzle flashes for players shooting
 		"shooting": true,
 		// Show red indicators on player dots when their health gets lower

src/css/map.css

@@ -147,7 +147,8 @@ div.dot.dead > div {
 
 div.label {
 	background: none;
-	text-align: center;
+	display: flex;
+	justify-content: center;
 	color: black;
 	font-weight: bold;
 	text-shadow: 0 0 1.2vmin rgba(255, 255, 255, .2);
@@ -165,6 +166,18 @@ div.label.dead {
 	display: none;
 }
 
+div.label span {
+	display: block;
+	position: absolute;
+	left: 50%;
+	top: 100%;
+	transform: translateX(-50%);
+	font-size: .7em;
+	color: #FFF;
+	text-shadow: 0 0 .3em #000;
+	opacity: .85;
+}
+
 #bomb {
 	position: absolute;
 	background-image: url("../img/bomb-dropped.webp");

src/gsi.js

@@ -102,6 +102,7 @@ function handleRequest(req, res) {
 				playerArr.push({
 					id: id,
 					num: player.observer_slot,
+					name: player.name,
 					team: player.team,
 					health: player.state.health,
 					active: isActive,

src/html/map.html

@@ -31,25 +31,25 @@
 				<div id="bomb"></div>
 
 				<div id="dot1" class="dot"><div id="height1"></div></div>
-				<div id="label1" class="label">1</div>
+				<div id="label1" class="label">2<span></span></div>
 				<div id="dot2" class="dot"><div id="height2"></div></div>
-				<div id="label2" class="label">2</div>
+				<div id="label2" class="label">3<span></span></div>
 				<div id="dot3" class="dot"><div id="height3"></div></div>
-				<div id="label3" class="label">3</div>
+				<div id="label3" class="label">4<span></span></div>
 				<div id="dot4" class="dot"><div id="height4"></div></div>
-				<div id="label4" class="label">4</div>
+				<div id="label4" class="label">5<span></span></div>
 				<div id="dot5" class="dot"><div id="height5"></div></div>
-				<div id="label5" class="label">5</div>
+				<div id="label5" class="label">6<span></span></div>
 				<div id="dot6" class="dot"><div id="height6"></div></div>
-				<div id="label6" class="label">6</div>
+				<div id="label6" class="label">7<span></span></div>
 				<div id="dot7" class="dot"><div id="height7"></div></div>
-				<div id="label7" class="label">7</div>
+				<div id="label7" class="label">8<span></span></div>
 				<div id="dot8" class="dot"><div id="height8"></div></div>
-				<div id="label8" class="label">8</div>
+				<div id="label8" class="label">9<span></span></div>
 				<div id="dot9" class="dot"><div id="height9"></div></div>
-				<div id="label9" class="label">9</div>
+				<div id="label9" class="label">0<span></span></div>
 				<div id="dot0" class="dot"><div id="height0"></div></div>
-				<div id="label0" class="label">0</div>
+				<div id="label0" class="label">1<span></span></div>
 
 
 				<div id="advisory" class="none">

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "boltobserv",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "External radar for CSGO observers",
   "main": "index.js",
   "homepage": "https://github.com/boltgolt/boltobserv/",

src/renderers/advisory.js

@@ -18,7 +18,10 @@ function updateAdvisory() {
 	for (let name in advisories) {
 		if (advisories[name] != -1) {
 			document.getElementById("advisory").className = name
-			document.getElementById("advisory").children[0].innerHTML = idToNum[advisories[name]]
+			document.getElementById("advisory").children[0].innerHTML = idToNum[advisories[name]] + 1
+			if (document.getElementById("advisory").children[0].innerHTML == 10) {
+				document.getElementById("advisory").children[0].innerHTML = 0
+			}
 			return
 		}
 	}

src/renderers/playerPosition.js

@@ -70,6 +70,13 @@ socket.element.addEventListener("players", event => {
 
 		// Set the player alive attribute (used in autozoom)
 		global.playerPos[player.num].alive = player.health > 0
+
+		if (global.config.radar.showName == "both") {
+			playerLabel.children[0].textContent = player.name.substring(0, global.config.radar.maxNameLength)
+		}
+		if (global.config.radar.showName == "always") {
+			playerLabel.textContent = player.name.substring(0, global.config.radar.maxNameLength)
+		}
 	}
 })