Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Removed CardsStorage.

Browse source
This commit is contained in:
North 2012-11-05 20:09:09 +02:00
parent c936777cae
commit cc306b2119
2 changed files with 2 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

74
Mage.Client/src/main/java/mage/client/cards/CardsStorage.java
View file

@ -1,74 +0,0 @@
package mage.client.cards;
import mage.cards.Card;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
import java.util.Scanner;
/**
* Stores all implemented cards on client side.
* Used by deck editor, deck generator, collection viewer, etc.
*
* @author nantuko
*/
public class CardsStorage {
private static Map<String, Integer> ratings;
private static Integer min = Integer.MAX_VALUE, max = 0;
/**
* Rating that is given for new cards.
* Ratings are in [1,10] range, so setting it high will make new cards appear more often.
*/
private static final int DEFAULT_NOT_RATED_CARD_RATING = 6;
/**
* Return rating of a card: 1-10.
*
* @param card
* @return
*/
public static int rateCard(Card card) {
if (ratings == null) {
readRatings();
}
if (ratings.containsKey(card.getName())) {
int r = ratings.get(card.getName());
float f = 10.0f * (r - min) / (max - min);
// normalize to [1..10]
return (int) Math.round(f);
}
return DEFAULT_NOT_RATED_CARD_RATING;
}
private synchronized static void readRatings() {
if (ratings == null) {
ratings = new HashMap<String, Integer>();
String filename = "/ratings.txt";
try {
InputStream is = CardsStorage.class.getResourceAsStream(filename);
Scanner scanner = new Scanner(is);
while (scanner.hasNextLine()) {
String line = scanner.nextLine();
String[] s = line.split(":");
if (s.length == 2) {
Integer rating = Integer.parseInt(s[0].trim());
String name = s[1].trim();
if (rating > max) {
max = rating;
}
if (rating < min) {
min = rating;
}
ratings.put(name, rating);
}
}
} catch (Exception e) {
e.printStackTrace();
ratings.clear(); // no rating available on exception
}
}
}
}

6
Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java
View file

@ -9,7 +9,6 @@ import mage.cards.repository.CardCriteria;
import mage.cards.repository.CardInfo;
import mage.cards.repository.CardRepository;
import mage.client.MageFrame;
import mage.client.cards.CardsStorage;
import mage.client.util.gui.ColorsChooser;
import mage.client.util.sets.ConstructedFormats;
import mage.interfaces.rate.RateCallback;
@ -163,7 +162,7 @@ public class DeckGenerator {
deck = DeckBuilder.buildDeck(spellCardPool, allowedColors, landCardPool, new RateCallback() {
@Override
public int rateCard(Card card) {
return CardsStorage.rateCard(card);
return 6;
}
@Override
@ -173,8 +172,7 @@ public class DeckGenerator {
do {
land = DeckGenerator.getBestBasicLand(color);
tries--;
if (tries < 0) break;
} while (!setsToUseFinal.contains(land.getExpansionSetCode()));
} while (!setsToUseFinal.contains(land.getExpansionSetCode()) && tries >= 0);
return land;
}
});