ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing Merchant being unusable

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2024-12-07 11:03:54 -06:00
parent 0fa5a42bd5
commit 535b55471b
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js
View File

@@ -1,4 +1,4 @@
var CardFilter = Class.extend({
var LegacyCardFilter = Class.extend({
clearCollectionFunc: null,
addCardFunc: null,
finishCollectionFunc: null,
@@ -543,10 +543,12 @@ var CardFilter = Class.extend({
sort = " sort:" + sort;
var cardName = this.nameInput.val();
var cardNameElems = cardName.split(" ");
cardName = "";
for (var i = 0; i < cardNameElems.length; i++)
cardName += " name:" + cardNameElems[i];
if(cardName) {
var cardNameElems = cardName.split(" ");
cardName = "";
for (var i = 0; i < cardNameElems.length; i++)
cardName += " name:" + cardNameElems[i];
}
var rarity = $("option:selected", this.raritySelect).prop("value");
if (rarity != "")

2
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/CardFilter.js
View File

@@ -872,7 +872,7 @@ var CardFilter = Class.extend({
block = " block:" + block;
}
else {
block = "":
block = "";
}
var set = $("#setSelect option:selected").prop("value");

10
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/merchantUi.js
View File

@@ -23,7 +23,7 @@ var GempLotrMerchantUI = Class.extend({
this.comm = new GempLotrCommunication("/gemp-lotr-server", that.processError);
this.cardFilter = new CardFilter(cardFilterElem,
this.cardFilter = new LegacyCardFilter(cardFilterElem,
function (filter, start, count, callback) {
that.comm.getMerchant(filter, that.ownedMin, start, count, callback);
},
@@ -188,7 +188,7 @@ var GempLotrMerchantUI = Class.extend({
displayCardInfo:function (card) {
this.infoDialog.html("");
this.infoDialog.html("<div style='scroll: auto'></div>");
this.infoDialog.append(createFullCardDiv(card.imageUrl, card.foil, card.horizontal, card.isPack()));
this.infoDialog.append(Card.CreateFullCardDiv(card.imageUrl, null, card.foil, card.horizontal, card.isPack()));
if (card.hasWikiInfo())
this.infoDialog.append("<div><a href='" + card.getWikiLink() + "' target='_blank'>Wiki</a></div>");
var windowWidth = $(window).width();
@@ -233,13 +233,13 @@ var GempLotrMerchantUI = Class.extend({
if (type == "pack") {
card = new Card(blueprintId, "merchant", "collection", "player");
cardDiv = createCardDiv(card.imageUrl, null, false, true, true, false);
cardDiv = Card.CreateCardDiv(card.imageUrl, null, null, false, true, true, false, false);
cardDiv.data("card", card);
cardDiv.data("sizeListeners", sizeListeners);
this.cardsDiv.append(cardDiv);
} else if (type == "card") {
card = new Card(blueprintId, "merchant", "collection", "player");
cardDiv = createCardDiv(card.imageUrl, null, card.isFoil(), true, false, card.hasErrata());
cardDiv = Card.CreateCardDiv(card.imageUrl, null, null, card.isFoil(), true, false, card.hasErrata(), false);
cardDiv.data("card", card);
cardDiv.data("sizeListeners", sizeListeners);
this.cardsDiv.append(cardDiv);
@@ -303,7 +303,7 @@ var GempLotrMerchantUI = Class.extend({
this.questionDialog.html("");
this.questionDialog.html("<div style='scroll: auto'></div>");
var floatCardDiv = $("<div style='float: left;'></div>");
floatCardDiv.append(createFullCardDiv(card.imageUrl, card.foil, card.horizontal, card.isPack()));
floatCardDiv.append(Card.CreateFullCardDiv(card.imageUrl, null, card.foil, card.horizontal, card.isPack()));
if (card.hasWikiInfo())
floatCardDiv.append("<div><a href='" + card.getWikiLink() + "' target='_blank'>Wiki</a></div>");
this.questionDialog.append(floatCardDiv);

2
gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
View File

@@ -30,7 +30,7 @@
<script type="text/javascript" src="js/gemp-022/communication.js"></script>
<script type="text/javascript" src="js/gemp-022/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-022/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-022/cards/CardFilter.js"></script>
<script type="text/javascript" src="js/gemp-022/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-022/cards/CardGroup.js"></script>
<script type="text/javascript" src="js/gemp-022/cards/Card.js"></script>