external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve ratios for recruit/study

Browse Source
This commit is contained in:
drdev
2014-12-07 07:59:37 +00:00
parent b83a95d55d
commit c5cde9d34d
1 changed files with 47 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
forge-gui/src/main/java/forge/planarconquest/ConquestController.java
View File

@@ -385,11 +385,6 @@ public class ConquestController {
return false; return false;
} }
ConquestPreferences prefs = FModel.getConquestPreferences();
int rareThreshold = prefs.getPrefInt(CQPref.BOOSTER_RARES);
int uncommonThreshold = rareThreshold + prefs.getPrefInt(CQPref.BOOSTER_UNCOMMONS);
int cardsPerPack = uncommonThreshold + prefs.getPrefInt(CQPref.BOOSTER_COMMONS);
List<PaperCard> rewardPool = null; List<PaperCard> rewardPool = null;
if (rarity != null) { if (rarity != null) {
switch (rarity) { switch (rarity) {
@@ -462,22 +457,55 @@ public class ConquestController {
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
//determine which rarity card to get based on pack ratios if no rarity passed in //determine which rarity card to get based on pack ratios if no rarity passed in
if (rarity == null) { if (rarity == null) {
int value = Aggregates.randomInt(1, cardsPerPack); int value = Aggregates.randomInt(1, 15);
if (value <= rareThreshold) { if (value <= 8) { //reward common about 50% of the time
if (mythics.size() > 0 && Aggregates.randomInt(1, 8) == 1) { rewardPool = commons;
if (rewardPool.isEmpty()) {
rewardPool = uncommons;
if (rewardPool.isEmpty()) {
rewardPool = rares;
if (rewardPool.isEmpty()) {
rewardPool = mythics; rewardPool = mythics;
} }
else {
rewardPool = rares;
} }
} }
else if (value <= uncommonThreshold) { }
else if (value <= 12) { //reward uncommon about 25% of the time
rewardPool = uncommons; rewardPool = uncommons;
if (rewardPool.isEmpty()) {
rewardPool = commons;
if (rewardPool.isEmpty()) {
rewardPool = rares;
if (rewardPool.isEmpty()) {
rewardPool = mythics;
} }
else { }
}
}
else if (value <= 14) { //reward rare about 12.5% of the time
rewardPool = rares;
if (rewardPool.isEmpty()) {
rewardPool = uncommons;
if (rewardPool.isEmpty()) {
rewardPool = commons;
if (rewardPool.isEmpty()) {
rewardPool = mythics;
}
}
}
}
else { //reward mythic about 6.75% of the time
rewardPool = mythics;
if (rewardPool.isEmpty()) {
rewardPool = rares;
if (rewardPool.isEmpty()) {
rewardPool = uncommons;
if (rewardPool.isEmpty()) {
rewardPool = commons; rewardPool = commons;
} }
if (rewardPool.isEmpty()) { continue; } //if no cards in selected pool, determine random pool again }
}
}
} }
int index = Aggregates.randomInt(0, rewardPool.size() - 1); int index = Aggregates.randomInt(0, rewardPool.size() - 1);