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

Work on leagues.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-11-21 16:03:00 +00:00
parent 7e81f9d3fa
commit b7734f2476
2 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/packs/LeagueBoosterBox.java
View File

@@ -1,6 +1,5 @@
package com.gempukku.lotro.cards.packs;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Side;
import com.gempukku.lotro.game.LotroCardBlueprint;
import com.gempukku.lotro.game.LotroCardBlueprintLibrary;
@@ -28,7 +27,7 @@ public class LeagueBoosterBox {
public synchronized List<String> getBooster(String setNo) {
if (!setNo.equals("1"))
throw new IllegalArgumentException("Invalid setNo: "+setNo);
throw new IllegalArgumentException("Invalid setNo: " + setNo);
initializeFotR();
boolean hasFoil = _random.nextInt(6) == 0;
@@ -38,11 +37,11 @@ public class LeagueBoosterBox {
if (hasFoil) {
int type = _random.nextInt(11);
if (type == 0)
result.add(_foilRares.get(_random.nextInt(_foilRares.size()))+"*");
result.add(_foilRares.get(_random.nextInt(_foilRares.size())) + "*");
else if (type < 4)
result.add(_foilUncommons.get(_random.nextInt(_foilUncommons.size()))+"*");
result.add(_foilUncommons.get(_random.nextInt(_foilUncommons.size())) + "*");
else
result.add(_foilCommons.get(_random.nextInt(_foilCommons.size()))+"*");
result.add(_foilCommons.get(_random.nextInt(_foilCommons.size())) + "*");
}
// Add rare
@@ -54,8 +53,8 @@ public class LeagueBoosterBox {
result.add(_leagueShadowUncommons.get(_random.nextInt(_leagueShadowUncommons.size())));
result.add(_leagueFPUncommons.get(_random.nextInt(_leagueFPUncommons.size())));
Collections.shuffle(_leagueShadowCommons);
Collections.shuffle(_leagueFPCommons);
Collections.shuffle(_leagueShadowCommons, _random);
Collections.shuffle(_leagueFPCommons, _random);
result.add(_leagueShadowCommons.get(0));
result.add(_leagueFPCommons.get(0));
@@ -72,7 +71,7 @@ public class LeagueBoosterBox {
else
result.add(_leagueFPCommons.get(3));
}
return result;
}

18
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java
View File

@@ -26,25 +26,15 @@ public class LeagueService {
return _leagueDao.getActiveLeagues();
}
public CardCollection getLeagueCollection(Player player, String type) {
final CardCollection collectionForPlayer = _collectionDao.getCollectionForPlayer(player, type);
public CardCollection getLeagueCollection(Player player, League league) {
final CardCollection collectionForPlayer = _collectionDao.getCollectionForPlayer(player, league.getType());
if (collectionForPlayer == null) {
final League leagueByType = getLeagueByType(type);
if (leagueByType != null)
return leagueByType.getBaseCollection();
return league.getBaseCollection();
}
return collectionForPlayer;
}
private League getLeagueByType(String type) {
for (League league : getActiveLeagues()) {
if (league.getType().equals(type))
return league;
}
return null;
}
public LotroFormat getLeagueFormat(String type) {
public LotroFormat getLeagueFormat(League league) {
return new LeagueFormat(_library, true);
}
}