Merge pull request #60 from boltgolt/dev

Version 1.1.0
boltgolt · May 30, 2022 · 3bf230b · 3bf230b
2 parents 1affe32 + e681fd1
commit 3bf230b
Show file tree

Hide file tree

Showing 44 changed files with 1,030 additions and 484 deletions.
diff --git a/README.md b/README.md
@@ -83,8 +83,9 @@ Most functions of Boltoberv are configurable. To make your own config, go to `/r
 
 ## Special thanks
 
-Thanks to [Inygon](https://inygon.com/) for supporting open source development on Boltobserv
+Thanks to [PGL](https://www.pglesports.com/) and [Inygon](https://inygon.com/) for supporting open source development on Boltobserv
 
+[![PGL](https://i.imgur.com/0LaJULP.png)](https://www.pglesports.com/)
 [![Inygon](https://i.imgur.com/bQjz86D.png)](https://inygon.com/)
 
 If you want to support development on specific functionality, don't hesitate to contact me. Supporting me through [Github Sponsors](https://github.com/sponsors/boltgolt/) is also very appreciated.

diff --git a/config/config.json5 b/config/config.json5
@@ -4,7 +4,7 @@
 // without making changes here. This makes your config a lot more portable.
 
 {
-	"_version": "1.0.2",
+	"_version": "1.1.0",
 
 	// Settings related to the Boltobserv window
 	"window": {
@@ -75,9 +75,18 @@
 		"damage": true,
 		// Show flashed players in a lighter color
 		"flashes": true,
+		// Show flying projectiles on the map
+		"projectiles": true,
+
+		// Give active smokes the color of the team that threw it
+		"smokeColors": true,
+		// Show projectiles as very plain and clear letter combinations
+		"plainProjectiles": true,
 
 		// Frames to smooth out player movement
 		"playerSmoothing": 13,
+		// Frames to smooth out flying projectile movement
+		"projectileSmoothing": 5,
 
 		// Amount of scaling to apply to player dots on the radar
 		// Values above 1 might be blurry
@@ -124,7 +133,10 @@
 		"networkPort": 36363,
 
 		// Tries to detect the CSGO game on the machine and prompts to install the CFG file if it hasn't already
-		"installCfg": true
+		"installCfg": true,
+
+		// The hostname for the GSI server to listen on
+		"host": "0.0.0.0"
 	},
 
 	// Settings that should not be used in normal operation, but help to find issues

diff --git a/css/map.css b/css/map.css
@@ -31,7 +31,7 @@ body {
 	transition: opacity .4s;
 }
 
-#smokes, #entities, #flashbangs {
+#smokes, #entities, #flashbangs, #projectiles, #trails {
 	position: absolute;
 	height: 100%;
 	width: 100%;
@@ -167,7 +167,7 @@ div.label.dead {
 
 #bomb {
 	position: absolute;
-	background-image: url("../img/bomb-dropped.png");
+	background-image: url("../img/bomb-dropped.webp");
 	background-size: contain;
 	height: 2.2vmin;
 	width: 2.2vmin;
@@ -178,12 +178,12 @@ div.label.dead {
 }
 
 #bomb.defused {
-	background-image: url("../img/bomb-defused.png");
+	background-image: url("../img/bomb-defused.webp");
 	filter: drop-shadow(0 0 .4vmin rgba(0, 255, 0, .3));
 }
 
 #bomb.planted {
-	background-image: url("../img/bomb-planted.png");
+	background-image: url("../img/bomb-planted.webp");
 	animation: beep 1s infinite;
 }
 
@@ -206,14 +206,24 @@ div.label.dead {
 	position: absolute;
 	border-radius: 100%;
 	opacity: .8;
-	background: #9F9D9D;
 	box-sizing: border-box;
 	transform-origin: center;
+	background: #9F9D9D;
 	border: #D7D7D7 solid .6vmin;
 	transform: translate(-50%, 50%);
 	transition: opacity .3s;
 }
 
+#smokes > div.CT {
+	background: #678FAA;
+	border: #77C5F6 solid .6vmin;
+}
+
+#smokes > div.T {
+	background: #CCBA7D;
+	border: #F1D369 solid .6vmin;
+}
+
 #smokes > div.hide {
 	opacity: 0;
 }
@@ -265,6 +275,31 @@ div.label.dead {
 	transition: opacity .3s;
 }
 
+#flashbangs > div.full {
+	opacity: .8;
+}
+
+#flashbangs > div.hide {
+	opacity: 0;
+}
+
+#trails path {
+	stroke-linejoin: round;
+	fill: none;
+}
+
+#projectiles > div {
+	position: absolute;
+	box-sizing: border-box;
+	transform-origin: center;
+	transform: translate(-50%, 50%);
+	background-repeat: no-repeat;
+	background-size: contain;
+	background-position: center;
+	height: 4vmin;
+	width: 4vmin;
+}
+
 #advisory {
 	position: absolute;
 	width: 14%;
@@ -307,7 +342,7 @@ div.label.dead {
 }
 
 #advisory.planting::before {
-	background-image: url("../img/adv-plant.png");
+	background-image: url("../img/adv-plant.webp");
 }
 
 #advisory.planting {
@@ -316,7 +351,7 @@ div.label.dead {
 }
 
 #advisory.defuse::before {
-	background-image: url("../img/adv-defuse.png");
+	background-image: url("../img/adv-defuse.webp");
 }
 
 #advisory.defuse {
@@ -325,7 +360,7 @@ div.label.dead {
 }
 
 #advisory.solesurvivor::before {
-	background-image: url("../img/adv-solesurvivor.png");
+	background-image: url("../img/adv-solesurvivor.webp");
 }
 
 #advisory.solesurvivor {

diff --git a/gamestate_integration_boltobserv.cfg b/gamestate_integration_boltobserv.cfg
@@ -1,22 +1,28 @@
-"Boltobserv integration v2 | https://github.com/boltgolt/boltobserv"
+"Boltobserv integration v3 | https://github.com/boltgolt/boltobserv"
 {
- "uri" "http://localhost:36363"
- "timeout" "0.1"
- "buffer"  "0.008"
- "throttle" "0.0"
- "heartbeat" "1.0"
- "data"
- {
-   "provider"            "1"
-   "map"                 "1"
-   "bomb"                "1"
-   "round"               "1"
-   "player_id"           "1"
-   "allplayers_id"       "1"
-   "allplayers_state"    "1"
-   "allplayers_weapons"  "1"
-   "allplayers_position" "1"
-   "phase_countdowns"    "1"
-   "allgrenades"         "1"
- }
+  "uri" "http://localhost:36363"
+  "timeout"   "0.1"
+  "buffer"    "0.0"
+  "throttle"  "0.0"
+  "heartbeat" "2.0"
+  "data"
+  {
+    "provider"            "1"
+    "map"                 "1"
+    "bomb"                "1"
+    "round"               "1"
+    "player_id"           "1"
+    "allplayers_id"       "1"
+    "allplayers_state"    "1"
+    "allplayers_weapons"  "1"
+    "allplayers_position" "1"
+    "phase_countdowns"    "1"
+    "allgrenades"         "1"
+  }
+  "output"
+  {
+    "precision_time"      "3"
+    "precision_position"  "3"
+    "precision_vector"    "3"
+  }
 }