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

Merge pull request #43 from PhallenCassidy/Fixes-and-New-Leagues

Browse Source 
Typos, new leagues, edit to the deckbuilder
This commit is contained in:
Marcin Sciesinski
2018-04-16 12:51:18 -07:00
committed by GitHub
parent fd2a0166dd f5e91eafbf
commit e81a24b5ab
9 changed files with 73 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/cardFilter.js
View File

@@ -111,7 +111,7 @@ var CardFilter = Class.extend({
+ "<option value='war_block'>War of the Ring Block</option>"
+ "<option value='hunter_block'>Hunters Block</option>"
+ "<option value='towers_standard'>Towers Standard</option>"
+ "<option value='king_standard'>King Standard</option>"
+ "<option value='rotk_sta'>King Standard</option>"
+ "<option value='movie'>Movie Block</option>"
+ "<option value='war_standard'>War of the Ring standard</option>"
+ "<option value='standard'>Standard</option>"

42
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/hobbit.js
View File

@@ -152,21 +152,21 @@ var hobbit = {
'32_24': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Saruman.png',
'32_25': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Bolg_Commander.png',
'32_26': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Hidden_Attack.png',
'32_27': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Orkish_Bow.png',
'32_28': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Orkish_Pursuer.png',
'32_29': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Orkish_Veteran.png',
'32_30': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Orc_Army.png',
'32_27': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Orc_Army.png',
'32_28': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Orkish_Bow.png',
'32_29': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Orkish_Pursuer.png',
'32_30': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Orkish_Veteran.png',
'32_31': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Alfrid.png',
'32_32': 'http://hobbitdraftgame.free.fr/Cards_Good_def/War_for_Gold.png',
'32_33': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Assaulting_Goblin.png',
'32_34': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Azog_Commander.png',
'32_35': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Azog_s_Mace.png',
'32_36': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Azog_Servant.png',
'32_37': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Dark_Bats.png',
'32_38': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Demolition_Troll.png',
'32_39': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Wolves_Army.png',
'32_40': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Vicious_Warg.png',
'32_41': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Were_worms.png',
'32_36': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Dark_Bats.png',
'32_37': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Demolition_Troll.png',
'32_38': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Vicious_Warg.png',
'32_39': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Were_worms.png',
'32_40': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Wolves_Army.png',
'32_41': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Azog_Servant.png',
'32_42': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Danger_Wrapped_in_Shadows.png',
'32_43': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Jail.png',
'32_44': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Shadow_Ring_of_Thror.png',
@@ -190,15 +190,15 @@ var hobbit = {
'32_62': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Twisted_Gold_of_Dragon.png',
'32_63': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Wrath_of_the_Dragon.png',
'32_64': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Dol_Guldur_Blade.png',
'32_65': 'http://hobbitdraftgame.free.fr/Cards_Good_def/He_is_summoning_his_servants.png',
'32_66': 'http://hobbitdraftgame.free.fr/Cards_Good_def/The_Great_Enemy.png',
'32_67': 'http://hobbitdraftgame.free.fr/Cards_Good_def/The_Witch_King.png',
'32_68': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Attea.png',
'32_69': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Cantea.png',
'32_70': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Enquea.png',
'32_71': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Lemenya.png',
'32_72': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Nelya.png',
'32_73': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Nertea.png',
'32_74': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Otsea.png',
'32_75': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Toldea.png'
'32_65': 'http://hobbitdraftgame.free.fr/Cards_Good_def/The_Great_Enemy.png',
'32_66': 'http://hobbitdraftgame.free.fr/Cards_Good_def/He_is_summoning_his_servants.png',
'32_67': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Attea.png',
'32_68': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Cantea.png',
'32_69': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Enquea.png',
'32_70': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Lemenya.png',
'32_71': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Nelya.png',
'32_72': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Nertea.png',
'32_73': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Otsea.png',
'32_74': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Toldea.png',
'32_75': 'http://hobbitdraftgame.free.fr/Cards_Good_def/The_Witch_King.png'
}

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

@@ -248,6 +248,7 @@
<option value="movie7">Movie block - Sets 1-7</option>
<option value="movie8">Movie block - Sets 1-8</option>
<option value="movie9">Movie block - Sets 1-9</option>
<option value="movie_sans9">Movie block - Sets 1-8,10</option>
<option value="war_block">War of the Ring block</option>
<option value="war_block11">War of the Ring block - Set 11</option>
<option value="war_block12">War of the Ring block - Sets 11-12</option>
@@ -255,6 +256,7 @@
<option value="war_standard">War of the Ring standard</option>
<option value="standard">Standard</option>
<option value="open">Open</option>
<option value="open_legacy">Open - Sets 1-4</option>
<option value="expanded">Expanded</option>
</select><br/>
Series duration in days: <input type="text" name="serieDuration"><br/>

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_067.java
View File

@@ -61,7 +61,7 @@ public class Card18_067 extends AbstractMinion {
}
if (game.getGameState().getTwilightPool() >= 4) {
ActivateCardAction action = new ActivateCardAction(self);
action.setText("Remove (4) to exert and unbound companion");
action.setText("Remove (4) to exert an unbound companion");
action.appendCost(
new RemoveTwilightEffect(4));
action.appendEffect(

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_017.java
View File

@@ -30,7 +30,7 @@ import java.util.List;
*/
public class Card2_017 extends AbstractResponseOldEvent {
public Card2_017() {
super(Side.FREE_PEOPLE, Culture.ELVEN, "Dismay Our Enemiers");
super(Side.FREE_PEOPLE, Culture.ELVEN, "Dismay Our Enemies");
}
@Override

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_114.java
View File

@@ -31,7 +31,7 @@ import java.util.List;
*/
public class Card5_114 extends AbstractAttachable {
public Card5_114() {
super(Side.FREE_PEOPLE, CardType.CONDITION, 1, Culture.SHIRE, null, "Rare Good Balast", null, true);
super(Side.FREE_PEOPLE, CardType.CONDITION, 1, Culture.SHIRE, null, "Rare Good Ballast", null, true);
}
@Override

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/shire/Card8_111.java
View File

@@ -25,7 +25,7 @@ import com.gempukku.lotro.logic.effects.AddThreatsEffect;
*/
public class Card8_111 extends AbstractEvent {
public Card8_111() {
super(Side.FREE_PEOPLE, 1, Culture.SHIRE, "So Fair, So Desparate", Phase.SKIRMISH);
super(Side.FREE_PEOPLE, 1, Culture.SHIRE, "So Fair, So Desperate", Phase.SKIRMISH);
}
@Override

31
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java
View File

@@ -1,6 +1,7 @@
package com.gempukku.lotro.game;
import com.gempukku.lotro.cards.packs.SetDefinition;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Keyword;
@@ -90,7 +91,7 @@ public class SortAndFilterCards {
final LotroCardBlueprint blueprint = cardBlueprint.get(blueprintId);
if (side == null || blueprint.getSide() == side)
if (rarity == null || isRarity(blueprintId, rarity, library, rarities))
if (sets == null || isInSets(blueprintId, sets, library, formatLibrary))
if (sets == null || isInSets(blueprintId, sets, library, formatLibrary, cardBlueprint))
if (cardTypes == null || cardTypes.contains(blueprint.getCardType()))
if (cultures == null || cultures.contains(blueprint.getCulture()))
if (containsAllKeywords(blueprint, keywords))
@@ -149,16 +150,40 @@ public class SortAndFilterCards {
return true;
}
private boolean isInSets(String blueprintId, String[] sets, LotroCardBlueprintLibrary library, LotroFormatLibrary formatLibrary) {
private boolean isInSets(String blueprintId, String[] sets, LotroCardBlueprintLibrary library, LotroFormatLibrary formatLibrary, Map<String, LotroCardBlueprint> cardBlueprint) {
for (String set : sets) {
LotroFormat format = formatLibrary.getFormat(set);
if (format != null) {
try {
format.validateCard(blueprintId);
return true;
} catch (DeckInvalidException exp) {
return false;
}
final LotroCardBlueprint blueprint = cardBlueprint.get(blueprintId);
if (blueprint.getCardType() == CardType.SITE) {
if (blueprint.getSiteBlock() == Block.FELLOWSHIP) {
if ("fotr_block".contains(set)) {
return true;
}
return false;
}
if (blueprint.getSiteBlock() == Block.TWO_TOWERS) {
if ("towers_standard,ttt_block".contains(set)) {
return true;
}
return false;
}
if (blueprint.getSiteBlock() == Block.KING) {
if ("king_block,rotk_sta,movie".contains(set)) {
return true;
}
return false;
}
return true;
} else {
return true;
}
} else {
if (blueprintId.startsWith(set + "_") || library.hasAlternateInSet(blueprintId, Integer.parseInt(set)))
return true;

18
gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
View File

@@ -43,6 +43,14 @@
"set":[1, 2, 3],
"hall":false
},
{
"name":"Open - Sets 1-4",
"code":"open_legacy",
"sites":"TWO_TOWERS",
"cancelRingBearerSkirmish":true,
"set":[1, 2, 3, 4],
"hall":false
},
{
"name":"Towers block",
"code":"ttt_block",
@@ -119,7 +127,7 @@
},
{
"name":"King Standard",
"code":"king_standard",
"code":"rotk_sta",
"sites":"KING",
"cancelRingBearerSkirmish":true,
"banned":["1_40", "1_45","1_80", "1_108", "1_139", "1_195", "1_234", "1_248", "1_313", "2_32", "2_101", "2_108", "3_38", "3_42", "3_67", "3_68", "3_106", "3_108"],
@@ -182,6 +190,14 @@
"set":[1, 2, 3, 4, 5, 6, 7, 8, 9],
"hall":false
},
{
"name":"Movie block - Sets 1-8, 10",
"code":"movie_sans9",
"sites":"KING",
"banned":["8_1", "3_38", "3_106", "1_40", "2_32", "1_248", "3_108", "1_45", "7_96", "3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", "7_49", "1_313", "1_234"],
"set":[1, 2, 3, 4, 5, 6, 7, 8, 10],
"hall":false
},
{
"name":"War of the Ring block",
"code":"war_block",