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

- Added Reflections (09) boosters.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-03-16 14:31:27 +00:00
parent 70659e8af5
commit bb38e09f04
7 changed files with 66 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/MerchantService.java
View File

@@ -70,6 +70,8 @@ public class MerchantService {
addBooster("HU - Booster", 1000);
addBooster("RoS - Booster", 1000);
addBooster("TaD - Booster", 1000);
addBooster("REF - Booster", 2000);
}
private void addBooster(String blueprintId, int price) {

10
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/packs/RarityPackBox.java
View File

@@ -22,20 +22,20 @@ public class RarityPackBox implements PackBox {
if (hasFoil) {
int foilRarity = _random.nextInt(11);
if (foilRarity == 0) {
List<String> possibleCards = new LinkedList<String>();
List<String> possibleCards = new ArrayList<String>();
possibleCards.addAll(_setRarity.getCardsOfRarity("R"));
possibleCards.addAll(_setRarity.getCardsOfRarity("P"));
possibleCards.addAll(_setRarity.getCardsOfRarity("A"));
Collections.shuffle(possibleCards, _random);
addCards(result, possibleCards.subList(0, 1), true);
} else if (foilRarity < 4) {
List<String> possibleCards = new LinkedList<String>();
List<String> possibleCards = new ArrayList<String>();
possibleCards.addAll(_setRarity.getCardsOfRarity("U"));
possibleCards.addAll(_setRarity.getCardsOfRarity("S"));
Collections.shuffle(possibleCards, _random);
addCards(result, possibleCards.subList(0, 1), true);
} else {
List<String> possibleCards = new LinkedList<String>(_setRarity.getCardsOfRarity("C"));
List<String> possibleCards = new ArrayList<String>(_setRarity.getCardsOfRarity("C"));
Collections.shuffle(possibleCards, _random);
addCards(result, possibleCards.subList(0, 1), true);
}
@@ -47,7 +47,7 @@ public class RarityPackBox implements PackBox {
}
private void addRandomRareCard(List<CardCollection.Item> result, int count) {
List<String> possibleCards = new LinkedList<String>();
List<String> possibleCards = new ArrayList<String>();
possibleCards.addAll(_setRarity.getCardsOfRarity("R"));
possibleCards.addAll(_setRarity.getCardsOfRarity("R"));
possibleCards.addAll(_setRarity.getCardsOfRarity("R"));
@@ -57,7 +57,7 @@ public class RarityPackBox implements PackBox {
}
private void addRandomCardsOfRarity(List<CardCollection.Item> result, int count, String rarity) {
List<String> possibleCards = new LinkedList<String>(_setRarity.getCardsOfRarity(rarity));
List<String> possibleCards = new ArrayList<String>(_setRarity.getCardsOfRarity(rarity));
Collections.shuffle(possibleCards, _random);
addCards(result, possibleCards.subList(0, count), false);
}

51
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/packs/ReflectionsPackBox.java Normal file
View File

@@ -0,0 +1,51 @@
package com.gempukku.lotro.packs;
import com.gempukku.lotro.cards.packs.RarityReader;
import com.gempukku.lotro.cards.packs.SetRarity;
import com.gempukku.lotro.game.CardCollection;
import java.util.*;
public class ReflectionsPackBox implements PackBox {
private Random _random = new Random();
private SetRarity _reflectionsRarity;
private List<String> _previousSetCards = new ArrayList<String>();
public ReflectionsPackBox() {
RarityReader rarityReader = new RarityReader();
_reflectionsRarity = rarityReader.getSetRarity("9");
for (int set = 1; set <= 6; set++) {
final SetRarity setRarity = rarityReader.getSetRarity(String.valueOf(set));
_previousSetCards.addAll(setRarity.getCardsOfRarity("R"));
_previousSetCards.addAll(setRarity.getCardsOfRarity("P"));
for (int i = 0; i < 3; i++)
_previousSetCards.addAll(setRarity.getCardsOfRarity("U"));
for (int i = 0; i < 7; i++)
_previousSetCards.addAll(setRarity.getCardsOfRarity("C"));
}
}
@Override
public List<CardCollection.Item> openPack() {
List<CardCollection.Item> result = new LinkedList<CardCollection.Item>();
result.add(new CardCollection.Item(CardCollection.Item.Type.CARD, 1, getRandomReflectionsCard() + "*"));
result.add(new CardCollection.Item(CardCollection.Item.Type.CARD, 1, getRandomReflectionsCard() + "*"));
for (int i = 0; i < 16; i++)
result.add(new CardCollection.Item(CardCollection.Item.Type.CARD, 1, _previousSetCards.get(_random.nextInt(_previousSetCards.size()))));
return result;
}
public String getRandomReflectionsCard() {
List<String> possibleCards = new ArrayList<String>();
possibleCards.addAll(_reflectionsRarity.getCardsOfRarity("R"));
possibleCards.addAll(_reflectionsRarity.getCardsOfRarity("R"));
possibleCards.addAll(_reflectionsRarity.getCardsOfRarity("R"));
possibleCards.addAll(_reflectionsRarity.getCardsOfRarity("R"));
possibleCards.addAll(_reflectionsRarity.getCardsOfRarity("X"));
Collections.shuffle(possibleCards, _random);
return possibleCards.get(0);
}
}

3
gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt
View File

@@ -38,4 +38,5 @@ BL - Booster
(S)SH - Tengwar
HU - Booster
RoS - Booster
TaD - Booster
TaD - Booster
REF - Booster

2
gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/PacksStorageProvider.java
View File

@@ -89,6 +89,8 @@ public class PacksStorageProvider implements Injectable<PacksStorage>, Injectabl
packStorage.addPackBox("RoS - Booster", new RarityPackBox(17));
packStorage.addPackBox("TaD - Booster", new RarityPackBox(18));
packStorage.addPackBox("REF - Booster", new ReflectionsPackBox());
return packStorage;
} catch (IOException exp) {
_logger.error("Error while creating resource", exp);

1
gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
View File

@@ -2,6 +2,7 @@
<b>16 Mar. 2012</b>
- When "Mountain-troll" is played with discarding 5 minions, now it should properly gain Fierce.
- "Gimli, Feared Axeman" should now properly be usable when a card is discarded by an action of an opponent.
- Added Reflections (09) boosters.
<b>15 Mar. 2012</b>
- "Mount Doom" should finally work.

4
gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
View File

@@ -87,7 +87,9 @@ var packBlueprints = {
"TaD - Faramir Starter": "/gemp-lotr/images/boosters/eof_faramir_starter.png",
"TaD - Witch-king Starter": "/gemp-lotr/images/boosters/eof_witch_king_starter.png",
"TaD - Booster": "/gemp-lotr/images/boosters/tad_booster.png"
"TaD - Booster": "/gemp-lotr/images/boosters/tad_booster.png",
"REF - Booster": "/gemp-lotr/images/boosters/ref_booster.png"
};
var Card = Class.extend({