diff --git a/index.js b/index.js index ca8faf6..3773cfa 100644 --- a/index.js +++ b/index.js @@ -11,8 +11,8 @@ function createWindow () { let win = new electron.BrowserWindow({ width: 600, height: 600, - minHeight: 100, - minWidth: 100, + minHeight: 200, + minWidth: 200, frame: false, resizable: true, nodeIntegration: false, diff --git a/maprenderer.js b/maprenderer.js index ca7592e..b4be605 100644 --- a/maprenderer.js +++ b/maprenderer.js @@ -138,12 +138,12 @@ renderer.on("players", (event, data) => { playerElement.style.bottom = bufferPercY + "%" } - if (ctsAlive.length == 1) { + if (ctsAlive.length == 1 && advisory.type == "none") { advisory.type = "solesurvivor" advisory.player = ctsAlive[0].num } - if (tsAlive.length == 1) { + if (tsAlive.length == 1 && advisory.type == "none") { advisory.type = "solesurvivor" advisory.player = tsAlive[0].num } diff --git a/maps/de_inferno/meta.json5 b/maps/de_inferno/meta.json5 index 389b1cf..4c9ceef 100644 --- a/maps/de_inferno/meta.json5 +++ b/maps/de_inferno/meta.json5 @@ -21,19 +21,19 @@ "bombsites": { "a": { // Bottom left point - "x1": 1740, - "y1": 140, + "x1": 1770, + "y1": 170, // Top right point "x2": 2240, - "y2": 820 + "y2": 890 }, "b": { // Bottom left point - "x1": 100, - "y1": 2520, + "x1": 80, + "y1": 2600, // Top right point - "x2": 670, - "y2": 3140 + "x2": 660, + "y2": 3210 } }, diff --git a/style/map.css b/style/map.css index 9391b6f..69dcd61 100644 --- a/style/map.css +++ b/style/map.css @@ -76,10 +76,10 @@ div.player.bomb { width: 14%; height: 7%; background: #f00; - border-radius: 3vh 8vh 8vh 3vh; + border-radius: 3vmin 8vmin 8vmin 3vmin; background: linear-gradient(to right, #222, #292929); color: #000; - box-shadow: 0 0 .4vh .3vh rgba(255, 255, 255, .05); + box-shadow: 0 0 .4vmin .3vmin rgba(255, 255, 255, .05); display: none; } @@ -103,13 +103,13 @@ div.player.bomb { width: 40%; border-radius: 100%; box-sizing: border-box; - box-shadow: 0 0 .4vh .3vh rgba(255, 255, 255, .2) inset; + box-shadow: 0 0 .4vmin .3v rgba(255, 255, 255, .2) inset; background: #000; text-align: center; color: #000; - line-height: 5.9vh; + line-height: 5.9vmin; + font-size: 5vmin; font-weight: bold; - font-size: 4vh; } #advisory.holdingbombA::before { @@ -122,7 +122,7 @@ div.player.bomb { #advisory.holdingbombA, #advisory.holdingbombB { background: linear-gradient(to right, #AD9A3C, #ECCD37); - box-shadow: 0 0 .4vh .3vh rgba(255,252,0,.2); + box-shadow: 0 0 .4vmin .3vmin rgba(255,252,0,.2); } #advisory.defuse::before { @@ -131,7 +131,7 @@ div.player.bomb { #advisory.defuse { background: linear-gradient(to right, #39536d, #3a7eb1); - box-shadow: 0 0 .4vh .3vh rgba(0,41,255,.2); + box-shadow: 0 0 .4vmin .3vmin rgba(0,41,255,.2); } #advisory.solesurvivor::before { @@ -140,7 +140,7 @@ div.player.bomb { #advisory.solesurvivor { background: linear-gradient(to right, #436C39, #40B13A); - box-shadow: 0 0 .4vh .3vh rgba(13,255,0,.2); + box-shadow: 0 0 .4vmin .3vmin rgba(13,255,0,.2); } #advisory.holdingbombA span, #advisory.holdingbombB span, #advisory.defuse span, #advisory.solesurvivor span {