From d6d8ae92873cb231467934d91e7bb69fd905d38b Mon Sep 17 00:00:00 2001 From: "jakub.salavec" Date: Thu, 19 Jun 2025 11:27:17 +0200 Subject: [PATCH] Fixed - daily prizes description; Added - Show Prizes but to queues in waiting tables section; Modified - my 'WinForAward' prizes now also give 1 tengwar to the winner --- .../src/main/web/js/gemp-022/hallUi.js | 30 +++++++++++++++++++ .../tournament/DailyTournamentPrizes.java | 8 ++++- .../WinForAwardTournamentPrizes.java | 10 ++++++- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js index 76b45e9ed..e84bccd3c 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js @@ -1065,6 +1065,36 @@ var GempLotrHallUI = Class.extend({ } } } + + var prizesBut = $(""); + $(prizesBut).button().click(( + function(queueInfo) { + return function() { + var infoDialog = $("
") + .dialog({ + autoOpen:false, + closeOnEscape:true, + resizable:false, + title:"Prizes details", + closeText: "" + }); + + var prizeDescription = $(queueInfo.getAttribute("prizes")).attr("value"); + if (prizeDescription) { + infoDialog.html(prizeDescription); + } else { + infoDialog.html("

No prize information available.

"); + } + + infoDialog.html(prizeDescription); + + infoDialog.dialog({width: 300, height: 150}); + infoDialog.dialog("open"); + } + })(queue)); + actionsField.append(prizesBut); + + var type = queue.getAttribute("type"); if(type !== null) type = type.toLowerCase(); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DailyTournamentPrizes.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DailyTournamentPrizes.java index 26f1a0b6f..441becae6 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DailyTournamentPrizes.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DailyTournamentPrizes.java @@ -76,6 +76,12 @@ public class DailyTournamentPrizes implements TournamentPrizes { @Override public String getPrizeDescription() { return """ -
Prize Breakdown
"""; +
Prize Breakdown
+ """; } } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/WinForAwardTournamentPrizes.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/WinForAwardTournamentPrizes.java index f96754578..e9a477a92 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/WinForAwardTournamentPrizes.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/WinForAwardTournamentPrizes.java @@ -25,6 +25,10 @@ public class WinForAwardTournamentPrizes implements TournamentPrizes { int hasBye = playerStanding.byeRound > 0 ? 1 : 0; int numberOfWins = playerStanding.playerWins + hasBye; prize.addItem("Placement Random Chase Card Selector", numberOfWins, true); + // The winner also gets one tengwar card + if (playerStanding.standing == 1) { + prize.addItem("(S)Tengwar", 1, true); + } if (prize.getAll().iterator().hasNext()) return prize; @@ -44,6 +48,10 @@ public class WinForAwardTournamentPrizes implements TournamentPrizes { @Override public String getPrizeDescription() { return """ -
Prize Breakdown
"""; +
Prize Breakdown
"""; } }