Fixed format page not rendering. Added wiki links to the bottom of all card info displays.

gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/CardInfoDialog.js

@@ -6,6 +6,8 @@ class CardInfoDialog {
 	imageDiv = null;
 	detailsDiv = null;
 	hasDetails = false;
+	footerDiv = null;
+	hasFooter = false;
 
 	cardDisplay = null;
 
@@ -20,6 +22,7 @@ class CardInfoDialog {
 
 	static DetailsWidth = 400;
 	static DialogPadding = 25;
+	static FooterHeight = 20;
 	//Any narrower than this and the title wraps
 	static MinWidth = 175;
 
@@ -107,6 +110,15 @@ class CardInfoDialog {
 			"flex-grow": "1",
 			padding: 20
 		}).appendTo(inner);
+		
+		
+		this.footerDiv = $("<div>", {
+			class: "card-info-footer"
+		}).css({
+			"flex-grow": "0",
+			padding: 5,
+			"text-align": "center"
+		}).appendTo(this.outerDiv);
 
 		var swipeOptions = {
 			threshold: 20,
@@ -167,7 +179,7 @@ class CardInfoDialog {
 		let width = this.cardDisplay.width() + CardInfoDialog.DialogPadding + (this.hasDetails ? CardInfoDialog.DetailsWidth : 0)
 		width = Math.max(width, CardInfoDialog.MinWidth);
 
-		let height = this.cardDisplay.height() + (CardInfoDialog.DialogPadding * 2);
+		let height = this.cardDisplay.height() + (CardInfoDialog.DialogPadding * 2)  + (this.hasFooter ? CardInfoDialog.FooterHeight : 0);
 		//height = Math.min(height, maxLong);
 
 		this.infoDialog.dialog({ 
@@ -189,13 +201,26 @@ class CardInfoDialog {
 		}
 	}
 
-	setDetails(html) {
+	setDetails(html) {		
 		this.detailsDiv.html(html);
 		this.detailsDiv.css({
 			padding: 20
 		});
 		this.hasDetails = true;
 	}
+	
+	setFooter() {
+		if(this.card && this.card.hasWikiInfo()) {			
+			this.footerDiv.html("<div><a href='" + this.card.getWikiLink() + "' target='_blank'>Go to Wiki Page</a></div>");
+			this.footerDiv.show();
+			this.hasFooter = true;
+		}
+		else {
+			this.footerDiv.html("");
+			this.footerDiv.hide();
+			this.hasFooter = false;
+		}
+	}
 
 	isOpen() {
 		return this.infoDialog.dialog("isOpen");
@@ -231,6 +256,7 @@ class CardInfoDialog {
 
 	setCard(card) {
 		this.card = card;
+		this.setFooter();
 
 		this.cardDisplay.reloadFromCard(card, this.maxWidth, this.maxHeight);
 

gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java

@@ -376,10 +376,19 @@ public class LotroCardBlueprintLibrary {
             if (_blueprints.containsKey(blueprintId)) {
                 bp = _blueprints.get(blueprintId);
             }
-            collectionReady.release();
 
-            if (bp == null)
-                throw new CardNotFoundException(blueprintId);
+            if(bp == null) {
+                if(_blueprintMapping.containsKey(blueprintId)) {
+                    bp = _blueprints.get(_blueprintMapping.get(blueprintId));
+                }
+                else {
+                    collectionReady.release();
+                    throw new CardNotFoundException(blueprintId);
+                }
+
+            }
+
+            collectionReady.release();
 
             return bp;
         } catch (InterruptedException exp) {