Merge pull request nuclear-unicorn#120 from Brent-Call/fixASCOH

Fix ASCOH

Author: bloodrizer

js/challenges.js

@@ -1097,7 +1097,6 @@ dojo.declare("classes.ui.ReservesPanel", com.nuclearunicorn.game.ui.Panel, {
 		if (resKit.length && this.game.prestige.getPerk("ascoh").researched) {
 			//Create a list of all the cryochambers we have stored in reserved & all kittens in them:
 			var kittensTable = dojo.create("table", {}, panelContainer);
-			var census = new classes.ui.village.Census(this.game);
 			for (var i = 0; i < resKit.length; i += 1) {
 				var kitten = resKit[i];
 
@@ -1109,7 +1108,7 @@ dojo.declare("classes.ui.ReservesPanel", com.nuclearunicorn.game.ui.Panel, {
 					break;
 				}
 				//Otherwise, we still can display more kittens:
-				dojo.create("td", { innerHTML: census.getStyledName(kitten, false /*is leader panel*/), style: "padding-right: 8px" }, tr);
+				dojo.create("td", { innerHTML: this.game.village.getStyledName(kitten, false /*is leader panel*/), style: "padding-right: 8px" }, tr);
 				var traitLabel = kitten.trait.title;
 				var rank = kitten.rank;
 				//Note that if we are fractured, the name will be randomized, & we'll obscure other info as well.

js/jsx/queue.jsx.js

@@ -98,6 +98,9 @@ WQueueItem = React.createClass({
     isStorageLimited: function() {
         var game = this.props.game;
         var model = game.time.queue.getQueueElementModel(this.props.item);
+        if (!model) { //This might be an invalid queue item
+            return true; //Mark as storage-limited to try to get the player's attention
+        }
         return game.resPool.isStorageLimited(model.prices);
     }
 });

res/theme_catnip.css

@@ -880,6 +880,13 @@ body.scheme_catnip {
 	border: 1px solid rgba(0, 0 , 0, 0.25);
 	border-radius: 5px;
 }
+.scheme_catnip .tabInner.Challenges td.craftStuffPanel + td.craftStuffPanel > table { /* list of kittens in reserve */
+	background-color: rgba(0 ,0 ,0 , 0.6); /* copied from census-block because inside we have a list of kitten names*/
+	border: 1px solid rgba(0, 0, 0, 0.1);
+	border-radius: 5px;
+	font-size: 0.9em;
+	color: #d6dacb;
+}
 
 /* ******************************************************** */
 /* ******************* ACHIEVEMENTS TAB ******************* */

res/theme_chocolate.css

@@ -812,6 +812,13 @@ body.scheme_chocolate.with_background_image {
 	padding: 10px 20px; /* default padding-top: 20px; */
 	color: #120f0c;
 }
+.scheme_chocolate .tabInner.Challenges td.craftStuffPanel + td.craftStuffPanel > table { /* list of kittens in reserve */
+	background-color: rgba(36, 27, 19, 0.25); /* copied from census-block because inside we have a list of kitten names*/
+	border: 1px solid;
+	border-radius: 9px;
+	font-size: 0.9em;
+	color: #c0a787;
+}
 
 /**********************************************************/
 /******************** ACHIEVEMENTS TAB ********************/