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

Merge pull request #53 from PhallenCassidy/master

Browse Source 
Minor adjustment to game hall & some fixes
This commit is contained in:
Marcin Sciesinski
2019-08-11 02:30:04 -07:00
committed by GitHub
parent f71efd39c5 1971166183
commit 97f5aa053b
4 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,28 @@
<pre style="font-size:80%"> <pre style="font-size:80%">
<b>Most recent update</b> <b>Most recent update</b>
- Increased Slow game speed decision timeout to 10 minutes
- Fixed an issue where iPhone/iPad users could not create a table
- Corrected Second Edition images
- Additonal refactoring
- "Faramir's Bow, Ithilien Longbow" now properly exhausts a minion Faramir is skirmishing
- Second Edition "Gathering Evil" and "The Palantir of Orthanc, Corruptor of Wizards" are now properly unique
<b>8 Aug. 2019</b>
- Added Second Edition!
- Added game timer options
- Corrected another Draft League issue
- Players can no longer spectate League games
- Spectating players can no participate in game chat
- Code refactoring
- "Grousing Hillman" is now properly strength +3 while you control a site
<b>17 June 2019</b>
- Added Hunter Block constructed league
<b>2 Mar. 2019</b>
- Minor fixes
<b>18 Feb. 2019</b>
- Fixed an error in which the deck builder would not check for format legality after adding a site - Fixed an error in which the deck builder would not check for format legality after adding a site
- Players may now kill characters if the cost of an action is to wound - Players may now kill characters if the cost of an action is to wound
- "Drawn to Its Power" can no longer add a burden if The Ring-Bearer was killed - "Drawn to Its Power" can no longer add a burden if The Ring-Bearer was killed

8
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
View File

@@ -69,7 +69,7 @@ var GempLotrHallUI = Class.extend({
this.pocketDiv.css({"float":"right", width:95, height:18}); this.pocketDiv.css({"float":"right", width:95, height:18});
this.buttonsDiv.append(this.pocketDiv); this.buttonsDiv.append(this.pocketDiv);
this.supportedFormatsSelect = $("<select style='width: 220px'></select>"); this.supportedFormatsSelect = $("<select style='width: 180px'></select>");
this.supportedFormatsSelect.hide(); this.supportedFormatsSelect.hide();
this.createTableButton = $("<button>Create table</button>"); this.createTableButton = $("<button>Create table</button>");
@@ -91,8 +91,8 @@ var GempLotrHallUI = Class.extend({
this.decksSelect = $("<select style='width: 220px'></select>"); this.decksSelect = $("<select style='width: 220px'></select>");
this.decksSelect.hide(); this.decksSelect.hide();
this.timerSelect = $("<select style='width: 170px'></select>"); this.timerSelect = $("<select style='width: 135px'></select>");
this.addTimer("default", "Default Speed (80m/5m)"); this.addTimer("default", "Default (80m/5m)");
this.addTimer("blitz", "Blitz! (30m/2m)"); this.addTimer("blitz", "Blitz! (30m/2m)");
this.addTimer("slow", "Slow (2h/10m)"); this.addTimer("slow", "Slow (2h/10m)");
this.addTimer("glacial", "Glacial (3d/1d)"); this.addTimer("glacial", "Glacial (3d/1d)");
@@ -742,4 +742,4 @@ var GempLotrHallUI = Class.extend({
}, 100); }, 100);
} }
} }
}); });

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_029.java
View File

@@ -57,7 +57,7 @@ public class Card17_029 extends AbstractAttachableFPPossession {
action.appendCost( action.appendCost(
new ExertCharactersEffect(action, self, self.getAttachedTo())); new ExertCharactersEffect(action, self, self.getAttachedTo()));
action.appendEffect( action.appendEffect(
new ChooseAndExhaustCharactersEffect(action, playerId, 1, 1, CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self)))); new ChooseAndExhaustCharactersEffect(action, playerId, 1, 1, CardType.MINION, Filters.inSkirmishAgainst(Filters.name("Faramir"))));
return Collections.singletonList(action); return Collections.singletonList(action);
} }
return null; return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/isengard/Card40_132.java
View File

@@ -33,7 +33,7 @@ import java.util.Set;
*/ */
public class Card40_132 extends AbstractPermanent { public class Card40_132 extends AbstractPermanent {
public Card40_132() { public Card40_132() {
super(Side.SHADOW, 0, CardType.ARTIFACT, Culture.ISENGARD, "The Palantir or Orthanc", "Corruptor of Wizards", true); super(Side.SHADOW, 0, CardType.ARTIFACT, Culture.ISENGARD, "The Palantir of Orthanc", "Corruptor of Wizards", true);
} }
@Override @Override