Merge pull request #297 from Trimps/dev

fixes

Author: Trimps

css/style.css

@@ -7630,4 +7630,11 @@ input[type="checkbox"] {
     -webkit-appearance: none;
     -moz-appearance: none;
 	appearance: none;
-}
+}
+
+label {
+	display: inline !important;
+	max-width: inherit !important;
+	margin-bottom: inherit !important;
+	font-weight: inherit !important;
+  }

main.js

@@ -11222,7 +11222,7 @@ function makeIconEffectHTML(title, text, icon, spanClasses, ids=[], iconText="",
 	let display = ``
 	let containerID = (ids[0] ? `id="${ids[0]}" `: "")
 	let textID = (ids[1] ? ` id="${ids[1]}"`: "")
-	let iconID = (ids[2] ? `id="${ids[2]} "`: "")
+	let iconID = (ids[2] ? `id="${ids[2]}"`: "")
 	let tooltipType = ((text) ? "'customText'" :  tooltipOverride ? `'${tooltipOverride}'` : 'null')
 	if (usingScreenReader) {
 		tooltip = `tabindex="0" onkeydown="keyTooltip(event, '${title}', ${tooltipType}, '${text}')"`

objects.js

@@ -4966,6 +4966,7 @@ var u2Mutations = {
         var cost = getNextTalentCost();
         if (cost == -1) return "";
         if (game.global.essence >= cost) return '&nbsp;<span class="alert badge">!</span>&nbsp;&nbsp;';
+        return "";
     },
     toggleRespec: function(displayOnly, forceHide){
         var mutRespecBtn = document.getElementById('respecMutatorsBtn');

playerSpire.js

@@ -952,7 +952,8 @@ var playerSpire = {
 				<div id='spireTrapsWindow'></div>
 				<div id='playerSpireUpgradesArea'></div>
 			</div>`
-
+		if (this.smallMode) this.shrink();
+		else this.enlarge();
         this.drawSpire();
         this.drawInfo();
     },
@@ -1791,6 +1792,8 @@ var playerSpire = {
         this.updateTabColor();
     }
 
+	
+
 }
 
 var playerSpireTraps = {
@@ -2370,7 +2373,7 @@ var playerSpireTraps = {
     }
 }
 
-var TDFloatingText = (function(floatingCombatText) {
+var TDFloatingText = (function() {
     //Floating combat text brought to you by your friendly neighborhood Grabarz
     var frameTime = 30;
     var elements = [];
@@ -2428,7 +2431,7 @@ var TDFloatingText = (function(floatingCombatText) {
         elem.style.left = (x * 100) + "%";
         elem.style.top = (y * 100) + "%";
 
-        floatingCombatText.appendChild(elem);
+        document.getElementById("floatingCombatText").appendChild(elem);
 
         elements.push({
             elem: elem,
@@ -2441,6 +2444,7 @@ var TDFloatingText = (function(floatingCombatText) {
     }
 
     function update() {
+		var floatingCombatText = document.getElementById("floatingCombatText")
         var i;
         for(i = 0; i < elements.length; i++) {
             var element = elements[i];
@@ -2465,4 +2469,4 @@ var TDFloatingText = (function(floatingCombatText) {
         update: update,
         setFrameTime: setFrameTime
     }
-})(document.getElementById("floatingCombatText"));
+})();

updates.js

@@ -521,7 +521,7 @@ function tooltip(what, isItIn, event, textString, attachFunction, numCheck, rena
 				max = ((setting && setting.buyMax) ? setting.buyMax : 0 );
 				if (max > 1e4) max = max.toExponential().replace('+', '');
 				sciMax = max;
-				if (percentJobs.length < 4) tooltipText += "</td><td style='width: 60%'><div class='row' style='width: 50%; border: 0; text-align: left;'><span style='padding-left: 0.4vw'>&nbsp;</span><label>Up To: <input class='jobConfigQuantity' id='autoJobQuant" + item + "' value='" + prettify(max) + "'/></label></div></td>"
+				if (percentJobs.length < 4) tooltipText += "</td><td style='width: 60%'><div class='row' style='width: 50%; border: 0; text-align: left;'><span style='padding-left: 15px'>&nbsp;</span><label>Up To: <input class='jobConfigQuantity' id='autoJobQuant" + item + "' value='" + prettify(max) + "'/></label></div></td>"
 			}
 			else tooltipText += "</td>";
 			if (percentJobs.length > x){
@@ -532,7 +532,7 @@ function tooltip(what, isItIn, event, textString, attachFunction, numCheck, rena
 				if (max > 1e4) max = max.toExponential().replace('+', '');	
 				checkbox = buildNiceCheckbox('autoJobCheckbox' + item, 'autoCheckbox', (setting && setting.enabled));	
 				var options = "<option value='0.1'" + ((selectedPerc == 0.001) ? " selected" : "") + ">0.1%</option><option value='1'" + ((selectedPerc == .01) ? " selected" : "") + ">1%</option><option value='5'" + ((selectedPerc == .05) ? " selected" : "") + ">5%</option><option value='10'" + ((selectedPerc == .10) ? " selected" : "") + ">10%</option><option value='25'" + ((selectedPerc == .25) ? " selected" : "") + ">25%</option><option value='50'" + ((selectedPerc == .50) ? " selected" : "") + ">50%</option><option value='99'" + ((selectedPerc == .99) ? " selected" : "") + ">99%</option>";
-				tooltipText += "<td style='width: 60%'><div class='row'><div class='col-xs-5' style='padding-right: 5px'><label>" + checkbox + "&nbsp;&nbsp;<span>" + item + "</span></label></div><div style='text-align: center; padding-left: 0px;' class='col-xs-2'><select aria-label='Spend' id='autoJobSelect" + item + "'>" + options + "</select></div><div class='col-xs-5 lowPad' style='text-align: right'><label>Up To: <input class='jobConfigQuantity' id='autoJobQuant" + item + "'  value='" + prettify(max) + "'/></label></div></div></td></tr>";	
+				tooltipText += "<td style='width: 60%'><div class='row'><div class='col-xs-5' style='padding-right: 5px;'><label>" + checkbox + "&nbsp;&nbsp;<span>" + item + "</span></label></div><div style='text-align: center; padding-left: 0px;' class='col-xs-2'><select aria-label='Spend' id='autoJobSelect" + item + "'>" + options + "</select></div><div class='col-xs-5 lowPad' style='text-align: right'><label>Up To: <input class='jobConfigQuantity' id='autoJobQuant" + item + "'  value='" + prettify(max) + "'/></label></div></div></td></tr>";	
 			}
 		}
 		if (percentJobs.length >= 4) tooltipText += "<tr><td style='width: 40%'><div class='row'><div class='col-xs-6' style='padding-right: 5px'>&nbsp;</div><div class='col-xs-6 lowPad' style='text-align: right'>Up To: <input class='jobConfigQuantity' id='autoJobQuantScientist2' value='" + prettify(sciMax) + "'></div></div></td><td style='width: 60%'>&nbsp;</td></tr>";