Merge pull request #118 from boltgolt/dev

version 1.6.0

Author: boltgolt

src/config/config.json5

@@ -4,7 +4,7 @@
 // without making changes here. This makes your config a lot more portable.
 
 {
-	"_version": "1.5.2",
+	"_version": "1.6.0",
 
 	// Settings related to the Boltobserv window
 	"window": {
@@ -73,6 +73,11 @@
 		// Show Boltobserv, Simple Radar and Lexogrine logos
 		"showLogos": true,
 
+		// When the bomb is planted, show how far away players have to be to survive the blast, options are:
+		// "never"   disable this feature
+		// "active"  shown when bomb countdown under 10s, distance every player has to run to survive
+		"showBlastRadius": "active",
+
 		// 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
@@ -137,7 +142,7 @@
 		"minZoom": 1.3
 	},
 
-	// Settings related to the CSGO game
+	// Settings related to the game client
 	"game": {
 		// Seconds of inactivity before considering a connection to the game client as lost
 		// Set to -1 to never timeout
@@ -146,7 +151,7 @@
 		// The port GSI will try to connect to
 		"networkPort": 36363,
 
-		// Tries to detect the CSGO game on the machine and prompts to install the CFG file if it hasn't already
+		// Tries to detect the game files on the machine and prompts to install the CFG file if it hasn't already
 		"installCfg": true,
 
 		// The hostname for the GSI server to listen on

src/css/map.css

@@ -36,7 +36,7 @@ body {
 	transition: opacity .4s;
 }
 
-#smokes, #entities, #flashbangs, #projectiles, #trails {
+#blasts, #smokes, #entities, #flashbangs, #projectiles, #trails {
 	position: absolute;
 	height: 100%;
 	width: 100%;
@@ -220,6 +220,25 @@ div.label span {
 	}
 }
 
+#blasts > svg {
+	position: absolute;
+	height: 100%;
+	width: 100%;
+	stroke: rgba(255, 255, 255, 0.4);
+	stroke-width: .5px;
+	stroke-linecap: round;
+}
+
+#blasts > div {
+	position: absolute;
+	border-radius: 100%;
+	opacity: .6;
+	transform-origin: center;
+	overflow: hidden;
+	border: .6vmin solid #757575;
+	transform: translate(-50%, 50%);
+}
+
 #smokes > div {
 	position: absolute;
 	border-radius: 100%;

src/gamestate_integration_boltobserv.cfg

@@ -1,4 +1,4 @@
-"Boltobserv integration v3 | https://github.com/boltgolt/boltobserv"
+"Boltobserv integration v4 | https://github.com/boltgolt/boltobserv"
 {
   "uri" "http://localhost:36363"
   "timeout"   "0.1"
@@ -12,6 +12,7 @@
     "bomb"                "1"
     "round"               "1"
     "player_id"           "1"
+    "player_state"        "1"
     "allplayers_id"       "1"
     "allplayers_state"    "1"
     "allplayers_weapons"  "1"

src/gsi.js

@@ -25,10 +25,10 @@ function handleRequest(req, res) {
 
 	// On end if packet data
 	req.on("end", () => {
-		// Send back empty response immediatly
+		// Send back empty response immediately
 		res.end("")
 
-		// Patch incomming JSON to convert large integers to strings
+		// Patch incoming JSON to convert large integers to strings
 		body = body.replace(/"owner": ([0-9]{10,})/g, '"owner": "$1"')
 		// Parse JSON packet
 		let game = JSON.parse(body)
@@ -38,10 +38,8 @@ function handleRequest(req, res) {
 				status: "up"
 			}
 
-			if (game.player) {
-				if (game.player.activity != "playing") {
-					connObject.player = game.player.name
-				}
+			if (game.player && game.player.activity != "playing") {
+				connObject.player = game.player.name
 			}
 
 			process.send({
@@ -105,6 +103,7 @@ function handleRequest(req, res) {
 					name: player.name,
 					team: player.team,
 					health: player.state.health,
+					armor: player.state.armor,
 					active: isActive,
 					flashed: player.state.flashed,
 					bomb: hasBomb,
@@ -242,6 +241,7 @@ function handleRequest(req, res) {
 				data: {
 					state: game.bomb.state,
 					player: game.bomb.player,
+					countdown: game.bomb.countdown ? parseFloat(game.bomb.countdown) : Infinity,
 					position: {
 						x: parseFloat(pos[0]),
 						y: parseFloat(pos[1]),

src/html/map.html

@@ -18,6 +18,7 @@
 			</div>
 
 			<!-- Lowest layer: Area of effect -->
+			<div id="blasts"></div>
 			<div id="smokes"></div>
 			<div id="infernos"></div>
 			<div id="flashbangs"></div>

src/keybinds.js

@@ -35,30 +35,33 @@ function executeAction(subject, command) {
 			key: subject,
 			value: effects[subject]
 		}
+
 	})
 
+
 	switch (subject) {
 		case "window.fullscreen":
 			win.setFullScreen(effects[subject])
 			break
 		case "window.mousePassthrough":
 			win.setIgnoreMouseEvents(effects[subject])
 			break
+
 	}
 }
 
 
 function parseBind(binds) {
-	function nextBind(binds) {
-		if (binds.length > 0) parseBind(binds)
+	// If binds is not an array, convert it to one
+	if (!Array.isArray(binds)) {
+		binds = [binds]
 	}
 
-	let bind = binds
+	// If there are no more binds to process, return
+	if (binds.length === 0) return
 
-	if (typeof binds == "object") {
-		bind = binds[0]
-		binds.shift()
-	}
+	// Get the current bind and remove it from the array
+	let bind = binds.shift()
 
 	let actionRegex = /([\w\.]*?)\s?->\s?(\w*)/
 	let functionRegex = /([\w\.]*?)\((.*?)\)/
@@ -67,6 +70,7 @@ function parseBind(binds) {
 		let parsed = actionRegex.exec(bind)
 		executeAction(parsed[1], parsed[2])
 
+		// Process remaining binds
 		if (binds.length > 0) parseBind(binds)
 	}
 	else if (bind.match(functionRegex)) {
@@ -94,22 +98,29 @@ function parseBind(binds) {
 				break
 
 			case "window.width":
-				win.setSize(Math.min(0, argument), win.getSize()[1])
-				return nextBind(binds)
+				win.setSize(Math.max(0, parseInt(argument)), win.getSize()[1])
+				if (binds.length > 0) parseBind(binds)
+				break
+
 			case "window.height":
-				win.setSize(win.getSize()[0], Math.min(0, argument))
-				return nextBind(binds)
+				win.setSize(win.getSize()[0], Math.max(0, parseInt(argument)))
+				if (binds.length > 0) parseBind(binds)
+				break
 
 			case "window.left":
 				win.setBounds({x: parseInt(argument)})
-				return nextBind(binds)
+				if (binds.length > 0) parseBind(binds)
+				break
+
 			case "window.top":
 				win.setBounds({y: parseInt(argument)})
-				return nextBind(binds)
+				if (binds.length > 0) parseBind(binds)
+				break
 
 			default:
-				console.warn(`WARNING: Unkown keybind function in keybind "${bind}"`)
-				return
+				console.warn(`WARNING: Unknown keybind function in keybind "${bind}"`)
+				if (binds.length > 0) parseBind(binds)
+				break
 		}
 	}
 }

src/maps/de_ancient/meta.json5

@@ -1,9 +1,9 @@
 {
 	"version": {
 		// The version of this meta file
-		"radar": 2,
+		"radar": 3,
 		// The object format version this file is using
-		"format": 3
+		"format": 4
 	},
 
 	// The amount of in-game units per pixel of the 1024px radar image
@@ -28,5 +28,9 @@
 	"zRange": {
 		"min": -95,
 		"max": 220
-	}
+	},
+
+	// Distance in units from bomb explosion that a player can survive, depending on health
+	// The first value is the distance at 1 health, the second at 5 health, then 10, etc
+	"survivableDistance": [615, 574, 549, 527, 507, 490, 473, 458, 443, 429, 398, 403, 391, 380, 368, 358, 347, 337, 327, 317, 320]
 }

src/maps/de_anubis/meta.json5

@@ -3,7 +3,7 @@
 		// The version of this meta file
 		"radar": 1,
 		// The object format version this file is using
-		"format": 3
+		"format": 4
 	},
 
 	// The amount of in-game units per pixel of the 1024px radar image

src/maps/de_cache/meta.json5

@@ -3,7 +3,7 @@
 		// The version of this meta file
 		"radar": 2,
 		// The object format version this file is using
-		"format": 3
+		"format": 4
 	},
 
 	// The amount of in-game units per pixel of the 1024px radar image

src/maps/de_dust2/meta.json5

@@ -1,9 +1,9 @@
 {
 	"version": {
 		// The version of this meta file
-		"radar": 3,
+		"radar": 4,
 		// The object format version this file is using
-		"format": 3
+		"format": 4
 	},
 
 	// The amount of in-game units per pixel of the 1024px radar image
@@ -28,5 +28,9 @@
 	"zRange": {
 		"min": -50,
 		"max": 185
-	}
+	},
+
+	// Distance in units from bomb explosion that a player can survive, depending on health
+	// The first value is the distance at 1 health, the second at 5 health, then 10, etc
+	"survivableDistance": [460, 424, 402, 383, 366, 350, 336, 323, 310, 298, 270, 276, 265, 255, 245, 236, 227, 218, 209, 201, 205]
 }