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

Merge pull request #1 from MarcinSc/master

Browse Source 
Bringing fork up-to-date again
This commit is contained in:
PhallenCassidy
2018-08-27 10:59:07 -04:00
committed by GitHub
parent bd40225e95 c8f33f298b
commit bb7f2dd9a6
50 changed files with 346 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
gemp-lotr/gemp-lotr-async/src/main/web/ban.html
View File

@@ -23,30 +23,30 @@
<script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
<script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
<script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-020/common.js"></script>
<script type="text/javascript" src="js/gemp-020/logging.js"></script>
<script type="text/javascript" src="js/gemp-020/chat.js"></script>
<script type="text/javascript" src="js/gemp-020/communication.js"></script>
<script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-021/common.js"></script>
<script type="text/javascript" src="js/gemp-021/logging.js"></script>
<script type="text/javascript" src="js/gemp-021/chat.js"></script>
<script type="text/javascript" src="js/gemp-021/communication.js"></script>
<script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-020/set20.js"></script>
<script type="text/javascript" src="js/gemp-020/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-020/jCards.js"></script>
<script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-021/set20.js"></script>
<script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-021/jCards.js"></script>
<script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
<script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
<script type="text/javascript">
function submitFormToAddress(url, formElem, success, error) {

44
gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
View File

@@ -17,30 +17,30 @@
<script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
<script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
<script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-020/common.js"></script>
<script type="text/javascript" src="js/gemp-020/logging.js"></script>
<script type="text/javascript" src="js/gemp-020/chat.js"></script>
<script type="text/javascript" src="js/gemp-020/communication.js"></script>
<script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-021/common.js"></script>
<script type="text/javascript" src="js/gemp-021/logging.js"></script>
<script type="text/javascript" src="js/gemp-021/chat.js"></script>
<script type="text/javascript" src="js/gemp-021/communication.js"></script>
<script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-020/set20.js"></script>
<script type="text/javascript" src="js/gemp-020/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-020/jCards.js"></script>
<script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-021/set20.js"></script>
<script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-021/jCards.js"></script>
<script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
<script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
<script type="text/javascript">

22
gemp-lotr/gemp-lotr-async/src/main/web/deckBuild2.html
View File

@@ -58,8 +58,8 @@
<script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
<script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
<script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-020/common.js"></script>
<script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-021/common.js"></script>
<script type="text/javascript" src="/generic-tcg/js/CardContainer.js"></script>
<script type="text/javascript" src="/generic-tcg/js/CardGroup.js"></script>
@@ -67,15 +67,15 @@
<script type="text/javascript" src="/generic-tcg/js/AttachedCardsLayoutCardGroup.js"></script>
<script type="text/javascript" src="/generic-tcg/js/jquery/jquery-sizes.js"></script>
<script type="text/javascript" src="js/gemp-020/communication.js"></script>
<script type="text/javascript" src="js/gemp-020/logging.js"></script>
<script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-020/set20.js"></script>
<script type="text/javascript" src="js/gemp-020/jCards.js"></script>
<script type="text/javascript" src="js/gemp-020/cardFilter2.js"></script>
<script type="text/javascript" src="js/gemp-020/DeckPanel.js"></script>
<script type="text/javascript" src="js/gemp-020/CardInformationDialog.js"></script>
<script type="text/javascript" src="js/gemp-020/deckBuildingUi2.js"></script>
<script type="text/javascript" src="js/gemp-021/communication.js"></script>
<script type="text/javascript" src="js/gemp-021/logging.js"></script>
<script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-021/set20.js"></script>
<script type="text/javascript" src="js/gemp-021/jCards.js"></script>
<script type="text/javascript" src="js/gemp-021/cardFilter2.js"></script>
<script type="text/javascript" src="js/gemp-021/DeckPanel.js"></script>
<script type="text/javascript" src="js/gemp-021/CardInformationDialog.js"></script>
<script type="text/javascript" src="js/gemp-021/deckBuildingUi2.js"></script>
<script type="text/javascript">

44
gemp-lotr/gemp-lotr-async/src/main/web/game.html
View File

@@ -17,30 +17,30 @@
<script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
<script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
<script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-020/common.js"></script>
<script type="text/javascript" src="js/gemp-020/logging.js"></script>
<script type="text/javascript" src="js/gemp-020/chat.js"></script>
<script type="text/javascript" src="js/gemp-020/communication.js"></script>
<script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-021/common.js"></script>
<script type="text/javascript" src="js/gemp-021/logging.js"></script>
<script type="text/javascript" src="js/gemp-021/chat.js"></script>
<script type="text/javascript" src="js/gemp-021/communication.js"></script>
<script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-020/set20.js"></script>
<script type="text/javascript" src="js/gemp-020/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-020/jCards.js"></script>
<script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-021/set20.js"></script>
<script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-021/jCards.js"></script>
<script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
<script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
<script type="text/javascript">

44
gemp-lotr/gemp-lotr-async/src/main/web/hall.html
View File

@@ -17,30 +17,30 @@
<script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
<script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
<script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-020/common.js"></script>
<script type="text/javascript" src="js/gemp-020/logging.js"></script>
<script type="text/javascript" src="js/gemp-020/chat.js"></script>
<script type="text/javascript" src="js/gemp-020/communication.js"></script>
<script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-021/common.js"></script>
<script type="text/javascript" src="js/gemp-021/logging.js"></script>
<script type="text/javascript" src="js/gemp-021/chat.js"></script>
<script type="text/javascript" src="js/gemp-021/communication.js"></script>
<script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-020/set20.js"></script>
<script type="text/javascript" src="js/gemp-020/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-020/jCards.js"></script>
<script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-021/set20.js"></script>
<script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-021/jCards.js"></script>
<script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
<script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
<script type="text/javascript">
var chat;

9
gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
View File

@@ -1,4 +1,13 @@
<pre style="font-size:80%">
<b>Most recent update</b>
- Added Draft for Fellowship block, The Two Towers block, and The Hobbit
- Added prize support for Draft games
- Users can now select what kind of foiling they want to see under the "Settings" tab in-game
- The Free Peoples will now properly lose initiative when playing events
- Allies with different home sites can no longer transfer possessions to one another
- "Loud and Strong" can no longer be used while in hand
- "Orkish Sneak" assignment ability now works as intended
<b>18 Apr. 2018</b>
- Draft play is now available!
- The Deckbuilder now filters out sites which are not legal for the selected format.

44
gemp-lotr/gemp-lotr-async/src/main/web/index.html
View File

@@ -26,30 +26,30 @@
<script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
<script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
<script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-020/common.js"></script>
<script type="text/javascript" src="js/gemp-020/logging.js"></script>
<script type="text/javascript" src="js/gemp-020/chat.js"></script>
<script type="text/javascript" src="js/gemp-020/communication.js"></script>
<script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-021/common.js"></script>
<script type="text/javascript" src="js/gemp-021/logging.js"></script>
<script type="text/javascript" src="js/gemp-021/chat.js"></script>
<script type="text/javascript" src="js/gemp-021/communication.js"></script>
<script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-020/set20.js"></script>
<script type="text/javascript" src="js/gemp-020/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-020/jCards.js"></script>
<script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-021/set20.js"></script>
<script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-021/jCards.js"></script>
<script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
<script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
<script type="text/javascript">
jQuery.fn.center = function () {

40
gemp-lotr/gemp-lotr-async/src/main/web/js.inc
View File

@@ -9,25 +9,25 @@
<script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
<script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
<script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-020/common.js"></script>
<script type="text/javascript" src="js/gemp-020/logging.js"></script>
<script type="text/javascript" src="js/gemp-020/chat.js"></script>
<script type="text/javascript" src="js/gemp-020/communication.js"></script>
<script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-021/common.js"></script>
<script type="text/javascript" src="js/gemp-021/logging.js"></script>
<script type="text/javascript" src="js/gemp-021/chat.js"></script>
<script type="text/javascript" src="js/gemp-021/communication.js"></script>
<script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-020/jCards.js"></script>
<script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-021/jCards.js"></script>
<script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
<script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/CardInformationDialog.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/CardInformationDialog.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/DeckPanel.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/DeckPanel.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/cardFilter.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/cardFilter.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/cardFilter2.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/cardFilter2.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/chat.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/chat.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/common.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/common.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/commonUi.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/commonUi.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/communication.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/communication.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/deckBuildingUi.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/deckBuildingUi.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/deckBuildingUi2.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/deckBuildingUi2.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/deliveryService.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/deliveryService.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/gameAnimations.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/gameAnimations.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/gameHistoryUi.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/gameHistoryUi.js
View File

15
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/gameUi.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/gameUi.js
View File

@@ -56,6 +56,7 @@ var GempLotrGameUI = Class.extend({
communication:null,
channelNumber:null,
settingsFoilPresentation:false,
settingsAutoPass:false,
settingsAutoAccept:false,
settingsAlwaysDropDown:false,
@@ -397,6 +398,20 @@ var GempLotrGameUI = Class.extend({
this.chatBoxDiv = $("#chatBox");
$("#settingsBox").append("<input id='foilPresentation' type='checkbox' value='selected' /><label for='foilPresentation'>Use animated foiling</label><br />");
var foilPresentation = $.cookie("foilPresentation");
if (foilPresentation == "true" || foilPresentation == null) {
$("#foilPresentation").prop("checked", true);
this.settingsFoilPresentation = true;
}
$("#foilPresentation").bind("change", function () {
var selected = $("#foilPresentation").prop("checked");
that.settingsFoilPresentation = selected;
$.cookie("foilPresentation", "" + selected, { expires:365 });
});
$("#settingsBox").append("<input id='autoAccept' type='checkbox' value='selected' /><label for='autoAccept'>Auto-accept after selecting action or card</label><br />");
var autoAccept = $.cookie("autoAccept");

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/hallUi.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/hallUi.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/hobbit.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/hobbit.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/inheritance.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/inheritance.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/jCardGroup.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/jCardGroup.js
View File

15
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/jCards.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/jCards.js
View File

@@ -418,7 +418,7 @@ function createCardDiv(image, text, foil, tokens, noBorder, errata) {
}
if (foil) {
var foilDiv = $("<div class='foilOverlay'><img src='/gemp-lotr/images/foil.gif' width='100%' height='100%'></div>");
var foilDiv = $("<div class='foilOverlay'><img src='/gemp-lotr/images/"+getFoilImg()+"' width='100%' height='100%'></div>");
cardDiv.append(foilDiv);
}
@@ -434,6 +434,15 @@ function createCardDiv(image, text, foil, tokens, noBorder, errata) {
return cardDiv;
}
function getFoilImg() {
var foilPresentation = $.cookie("foilPresentation");
if (foilPresentation == "true" || foilPresentation == null) {
return "foil.gif";
} else {
return "holo.jpg";
}
}
function createFullCardDiv(image, foil, horizontal, noBorder) {
if (horizontal) {
var cardDiv = $("<div style='position: relative;width:497px;height:357px;'></div>");
@@ -448,7 +457,7 @@ function createFullCardDiv(image, foil, horizontal, noBorder) {
}
if (foil) {
var foilDiv = $("<div class='foilOverlay' style='position:absolute;width:497px;height:357px'><img src='/gemp-lotr/images/foil.gif' width='100%' height='100%'></div>");
var foilDiv = $("<div class='foilOverlay' style='position:absolute;width:497px;height:357px'><img src='/gemp-lotr/images/"+getFoilImg()+"' width='100%' height='100%'></div>");
cardDiv.append(foilDiv);
}
} else {
@@ -464,7 +473,7 @@ function createFullCardDiv(image, foil, horizontal, noBorder) {
}
if (foil) {
var foilDiv = $("<div class='foilOverlay' style='position:absolute;width:357px;height:497px'><img src='/gemp-lotr/images/foil.gif' width='100%' height='100%'></div>");
var foilDiv = $("<div class='foilOverlay' style='position:absolute;width:357px;height:497px'><img src='/gemp-lotr/images/"+getFoilImg()+"' width='100%' height='100%'></div>");
cardDiv.append(foilDiv);
}
}

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/leagueResultsUi.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/leagueResultsUi.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/logging.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/logging.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/merchantUi.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/merchantUi.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/playerStatsUi.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/playerStatsUi.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/set20.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/set20.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/soloDraftUi.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/soloDraftUi.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/statsUi.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/statsUi.js
View File

0
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/tournamentResultsUi.js → gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/tournamentResultsUi.js
View File

44
gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
View File

@@ -31,30 +31,30 @@
<script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
<script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
<script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-020/common.js"></script>
<script type="text/javascript" src="js/gemp-020/logging.js"></script>
<script type="text/javascript" src="js/gemp-020/chat.js"></script>
<script type="text/javascript" src="js/gemp-020/communication.js"></script>
<script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-021/common.js"></script>
<script type="text/javascript" src="js/gemp-021/logging.js"></script>
<script type="text/javascript" src="js/gemp-021/chat.js"></script>
<script type="text/javascript" src="js/gemp-021/communication.js"></script>
<script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-020/set20.js"></script>
<script type="text/javascript" src="js/gemp-020/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-020/jCards.js"></script>
<script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-021/set20.js"></script>
<script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-021/jCards.js"></script>
<script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
<script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
<script type="text/javascript">
function submitFormToAddress(url, formElem, success, error) {

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

@@ -17,30 +17,30 @@
<script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
<script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
<script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-020/common.js"></script>
<script type="text/javascript" src="js/gemp-020/logging.js"></script>
<script type="text/javascript" src="js/gemp-020/chat.js"></script>
<script type="text/javascript" src="js/gemp-020/communication.js"></script>
<script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-021/common.js"></script>
<script type="text/javascript" src="js/gemp-021/logging.js"></script>
<script type="text/javascript" src="js/gemp-021/chat.js"></script>
<script type="text/javascript" src="js/gemp-021/communication.js"></script>
<script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-020/set20.js"></script>
<script type="text/javascript" src="js/gemp-020/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-020/jCards.js"></script>
<script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-021/set20.js"></script>
<script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-021/jCards.js"></script>
<script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
<script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
<script type="text/javascript">

46
gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
View File

@@ -17,31 +17,31 @@
<script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
<script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
<script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-020/common.js"></script>
<script type="text/javascript" src="js/gemp-020/logging.js"></script>
<script type="text/javascript" src="js/gemp-020/chat.js"></script>
<script type="text/javascript" src="js/gemp-020/communication.js"></script>
<script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-021/common.js"></script>
<script type="text/javascript" src="js/gemp-021/logging.js"></script>
<script type="text/javascript" src="js/gemp-021/chat.js"></script>
<script type="text/javascript" src="js/gemp-021/communication.js"></script>
<script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-020/set20.js"></script>
<script type="text/javascript" src="js/gemp-020/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-020/jCards.js"></script>
<script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-021/set20.js"></script>
<script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-021/jCards.js"></script>
<script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
<script type="text/javascript" src="js/gemp-020/soloDraftUi.js"></script>
<script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
<script type="text/javascript" src="js/gemp-021/soloDraftUi.js"></script>
<script type="text/javascript">

10
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java
View File

@@ -71,6 +71,16 @@ public class AbstractAlly extends AbstractPermanent {
return null;
}
@Override
public int[] getAllyHomeSiteNumbers() {
return _siteNumbers;
}
@Override
public Block getAllyHomeSiteBlock() {
return _siteBlock;
}
@Override
public final boolean isAllyAtHome(int siteNumber, Block block) {
if (block != _siteBlock)

8
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java
View File

@@ -44,7 +44,8 @@ public abstract class AbstractAttachableFPPossession extends AbstractAttachable
Filter validTransferFilter;
LotroCardBlueprint attachedTo = self.getAttachedTo().getBlueprint();
PhysicalCard attachedToCard = self.getAttachedTo();
LotroCardBlueprint attachedTo = attachedToCard.getBlueprint();
if (attachedTo.getCardType() == CardType.COMPANION) {
validTransferFilter = Filters.and(validTargetFilter,
Filters.or(
@@ -54,11 +55,10 @@ public abstract class AbstractAttachableFPPossession extends AbstractAttachable
validTransferFilter = Filters.and(validTargetFilter,
Filters.or(
CardType.COMPANION,
Filters.allyAtHome));
Filters.allyWithSameHome(attachedToCard)));
} else {
validTransferFilter = Filters.and(validTargetFilter,
CardType.ALLY, Filters.allyAtHome
);
Filters.allyWithSameHome(attachedToCard));
}
validTransferFilter = Filters.and(validTransferFilter,

10
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractLotroCardBlueprint.java
View File

@@ -148,6 +148,16 @@ public abstract class AbstractLotroCardBlueprint implements LotroCardBlueprint {
throw new UnsupportedOperationException("This method should not be called on this card");
}
@Override
public int[] getAllyHomeSiteNumbers() {
throw new UnsupportedOperationException("This method should not be called on this card");
}
@Override
public Block getAllyHomeSiteBlock() {
throw new UnsupportedOperationException("This method should not be called on this card");
}
@Override
public boolean isAllyAtHome(int siteNumber, Block siteBlock) {
throw new UnsupportedOperationException("This method should not be called on this card");

8
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PlayEventEffect.java
View File

@@ -7,6 +7,8 @@ import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.effects.PlayCardEffect;
import java.util.Collections;
public class PlayEventEffect extends PlayCardEffect {
private PhysicalCard _cardPlayed;
private PlayEventResult _playEventResult;
@@ -23,6 +25,12 @@ public class PlayEventEffect extends PlayCardEffect {
@Override
protected FullEffectResult playEffectReturningResult(LotroGame game) {
if (_cardPlayed.getZone() == Zone.VOID_FROM_HAND) {
// At this point, card should change initiative if played
game.getGameState().removeCardsFromZone(_cardPlayed.getOwner(), Collections.singleton(_cardPlayed));
game.getGameState().addCardToZone(game, _cardPlayed, Zone.VOID);
}
game.getActionsEnvironment().emitEffectResult(_playEventResult);
return new FullEffectResult(true);
}

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/dwarven/Card12_009.java
View File

@@ -32,7 +32,8 @@ public class Card12_009 extends AbstractPermanent {
@Override
protected List<? extends Action> getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) {
if (PlayConditions.canDiscardFromHand(game, playerId, 1, Culture.DWARVEN)
if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self)
&& PlayConditions.canDiscardFromHand(game, playerId, 1, Culture.DWARVEN)
&& PlayConditions.canSpot(game, CardType.MINION, Filters.inSkirmishAgainst(Race.DWARF))) {
final ActivateCardAction action = new ActivateCardAction(self);
action.appendCost(

47
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/orc/Card18_091.java
View File

@@ -16,7 +16,9 @@ import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.GameUtils;
import com.gempukku.lotro.logic.actions.ActivateCardAction;
import com.gempukku.lotro.logic.decisions.YesNoDecision;
import com.gempukku.lotro.logic.effects.DiscardCardsFromPlayEffect;
import com.gempukku.lotro.logic.effects.PlayoutDecisionEffect;
import com.gempukku.lotro.logic.effects.StackActionEffect;
import com.gempukku.lotro.logic.timing.Action;
import com.gempukku.lotro.logic.timing.Effect;
@@ -50,27 +52,32 @@ public class Card18_091 extends AbstractMinion {
action.appendEffect(
new ChooseAndAssignCharacterToMinionEffect(action, playerId, self, Filters.ringBearer, Filters.not(Culture.SHIRE)));
String fpPlayer = game.getGameState().getCurrentPlayerId();
List<Effect> possibleCosts = new LinkedList<Effect>();
possibleCosts.add(
new AddBurdenEffect(fpPlayer, self, 1));
possibleCosts.add(
new ChooseAndExertCharactersEffect(action, fpPlayer, 1, 1, 2, Filters.ringBearer));
SubCostToEffectAction subAction = new SubCostToEffectAction(action);
action.appendCost(
new ChoiceEffect(subAction, fpPlayer, possibleCosts));
final String fpPlayer = game.getGameState().getCurrentPlayerId();
action.appendEffect(
new DiscardCardsFromPlayEffect(playerId, self, self));
action.appendEffect(
new OptionalEffect(action, game.getGameState().getCurrentPlayerId(),
new StackActionEffect(subAction) {
@Override
public String getText(LotroGame game) {
return "Add burden or exert the Ring-bearer twice to discard " + GameUtils.getFullName(self);
}
}));
new PlayoutDecisionEffect(fpPlayer,
new YesNoDecision("Do you want to add burden or exert the Ring-bearer twice to discard " + GameUtils.getFullName(self) + "?") {
@Override
protected void yes() {
List<Effect> possibleCosts = new LinkedList<Effect>();
possibleCosts.add(
new AddBurdenEffect(fpPlayer, self, 1));
possibleCosts.add(
new ChooseAndExertCharactersEffect(action, fpPlayer, 1, 1, 2, Filters.ringBearer) {
@Override
public String getText(LotroGame game) {
return "Exert the Ring-bearer twice";
}
});
SubCostToEffectAction subAction = new SubCostToEffectAction(action);
action.appendCost(
new ChoiceEffect(subAction, fpPlayer, possibleCosts));
action.appendEffect(
new DiscardCardsFromPlayEffect(playerId, self, self));
}
}));
return Collections.singletonList(action);
}
return null;
};
return null;
}
}

21
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
View File

@@ -689,6 +689,27 @@ public class Filters {
}
});
public static Filter allyWithSameHome(final PhysicalCard card) {
return Filters.and(
CardType.ALLY,
new Filter() {
@Override
public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
LotroCardBlueprint blueprint = card.getBlueprint();
if (blueprint.getCardType() == CardType.ALLY) {
Block homeBlock = blueprint.getAllyHomeSiteBlock();
int[] homeSites = blueprint.getAllyHomeSiteNumbers();
for (int homeSite : homeSites) {
if (physicalCard.getBlueprint().isAllyAtHome(homeSite, homeBlock)) {
return true;
}
}
}
return false;
}
});
}
public static final Filter currentSite = new Filter() {
@Override
public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java
View File

@@ -46,6 +46,10 @@ public interface LotroCardBlueprint {
public int getResistance();
public int[] getAllyHomeSiteNumbers();
public Block getAllyHomeSiteBlock();
public boolean isAllyAtHome(int siteNumber, Block siteBlock);
public List<? extends Modifier> getAlwaysOnModifiers(LotroGame game, PhysicalCard self);

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/ServerBuilder.java
View File

@@ -152,7 +152,7 @@ public class ServerBuilder {
private static boolean isMtgEnabled() {
String mtgEnabled = ApplicationConfiguration.getProperty("mtg.enabled");
return mtgEnabled == null || mtgEnabled.equals("true");
return mtgEnabled != null && mtgEnabled.equals("true");
}
public static void destroyObjects(Map<Type, Object> objectMap) {

4
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/LotroFormatLibrary.java
View File

@@ -99,9 +99,7 @@ public class LotroFormatLibrary {
_allFormats.put(formatCode, format);
Boolean hallFormat = (Boolean) formatDef.get("hall");
if (hallFormat == null)
hallFormat = true;
if (hallFormat)
if (hallFormat == null || hallFormat)
_hallFormats.put(formatCode, format);
}
} catch (ParseException exp) {

25
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java
View File

@@ -64,12 +64,11 @@ public class SoloDraftLeagueData implements LeagueData {
public CardCollection joinLeague(CollectionsManager collectionsManager, Player player, int currentTime) {
MutableCardCollection startingCollection = new DefaultCardCollection();
long seed = getSeed(player);
if (currentTime >= _serie.getStart()) {
CardCollection leagueProduct = _draft.initializeNewCollection(seed);
for (Map.Entry<String, CardCollection.Item> serieCollectionItem : leagueProduct.getAll().entrySet())
startingCollection.addItem(serieCollectionItem.getKey(), serieCollectionItem.getValue().getCount());
}
CardCollection leagueProduct = _draft.initializeNewCollection(seed);
for (Map.Entry<String, CardCollection.Item> serieCollectionItem : leagueProduct.getAll().entrySet())
startingCollection.addItem(serieCollectionItem.getKey(), serieCollectionItem.getValue().getCount());
startingCollection.setExtraInformation(createExtraInformation(seed));
collectionsManager.addPlayerCollection(false, "Sealed league product", player, _collectionType, startingCollection);
@@ -88,23 +87,9 @@ public class SoloDraftLeagueData implements LeagueData {
public int process(CollectionsManager collectionsManager, List<PlayerStanding> leagueStandings, int oldStatus, int currentTime) {
int status = oldStatus;
if (status == 0) {
if (currentTime >= _serie.getStart()) {
Map<Player, CardCollection> map = collectionsManager.getPlayersCollection(_collectionType.getCode());
for (Map.Entry<Player, CardCollection> playerCardCollectionEntry : map.entrySet()) {
Player player = playerCardCollectionEntry.getKey();
CardCollection leagueProduct = _draft.initializeNewCollection(getSeed(player));
collectionsManager.addItemsToPlayerCollection(false, "New sealed league product", player, _collectionType, leagueProduct.getAll().values());
}
status = 1;
}
}
int maxGamesTotal = _serie.getMaxMatches();
if (status == 1) {
if (status == 0) {
if (currentTime > DateUtils.offsetDate(_serie.getEnd(), 1)) {
for (PlayerStanding leagueStanding : leagueStandings) {
CardCollection leaguePrize = _leaguePrizes.getPrizeForLeague(leagueStanding.getStanding(), leagueStandings.size(), leagueStanding.getGamesPlayed(), maxGamesTotal, _collectionType);

10
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/mtg/provider/mtggoldfish/MtgGoldfishProvider.java
View File

@@ -150,7 +150,7 @@ public class MtgGoldfishProvider implements MtgDataProvider {
String link = "http://www.mtggoldfish.com/index/" + mtgCardSet.getUrlPostfix();
Document doc = Jsoup.parse(new URL(link), TIMEOUT);
boolean isInPaper = (doc.select("#priceHistoryTabs [href=#tab-paper]").size() > 0);
if (isInPaper) {
if (isInPaper && !containsLinkSet(result, link)) {
List<CardData> allCards = new LinkedList<CardData>();
Elements cardElements = doc.select(".index-price-table-paper tbody tr");
@@ -169,6 +169,14 @@ public class MtgGoldfishProvider implements MtgDataProvider {
}
}
private boolean containsLinkSet(List<SetCardData> result, String link) {
for (SetCardData setCardData : result) {
if (setCardData.getSetLink().equals(link))
return true;
}
return false;
}
private int getSleepTime() {
Random rnd = new Random();
return SLEEP_MINIMUM + rnd.nextInt(SLEEP_MAXIMUM - SLEEP_MINIMUM);