diff --git a/css/gradient.css b/css/gradient.css index aab0cdd9..ada6aa65 100644 --- a/css/gradient.css +++ b/css/gradient.css @@ -530,3 +530,7 @@ #grid.gridOverlayGreenGradient .battleRow, #grid.gridOverlayGreenGradientliquid .battleRow, #grid.gridOverlayGreenGradientliquid .cellColorCurrent { background: none !important; } + +.battleRow{ + margin: -2px -2px; +} \ No newline at end of file diff --git a/css/style.css b/css/style.css index f9ff7e49..2e462fc4 100644 --- a/css/style.css +++ b/css/style.css @@ -1079,6 +1079,17 @@ body { } +#togglesaveAndExit.settingBtn0{ + background-color: black; + color: red; + border-color: white !important; +} + +#togglesaveAndExit.settingBtn0:hover{ + background-color: #292929; + border-color: #dedbdb !important; +} + .settingBtntrue, .settingBtn1{ background-color: #5cb85c; } diff --git a/main.js b/main.js index 92e2745d..f8a661fb 100644 --- a/main.js +++ b/main.js @@ -1072,7 +1072,8 @@ function load(saveString, autoLoad, fromPf) { if (game.buildings.Tribute.locked === 0 || game.options.menu.useAverages.enabled) fadeIn("gemsPs", 10); if (game.global.autoCraftModifier > 0) document.getElementById("foremenCount").innerHTML = (game.global.autoCraftModifier * 4) + " Foremen"; - if (game.global.fighting) startFight(); + if (game.global.fighting && game.global.soldierHealth <= 0) fight(); + else if (game.global.fighting) startFight(); if (game.options.menu.darkTheme.enabled != 1) game.options.menu.darkTheme.onToggle(); updateLabels(); if (game.global.viewingUpgrades){