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

New merchant code, and couple of new bans.

Browse Source
This commit is contained in:
marcins78
2013-12-03 16:57:04 +00:00
parent bd3cfc5375
commit f40b5d992a
2 changed files with 95 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroHttpRequestHandler.java
View File

@@ -40,7 +40,7 @@ public class LotroHttpRequestHandler extends SimpleChannelUpstreamHandler {
_uriRequestHandler = uriRequestHandler;
}
private Collection<String> _bannedIps = Arrays.asList("108.251.13.101", "188.123.232.46", "193.235.73.197", "5.228.68.175", "89.88.173.207");
private Collection<String> _bannedIps = Arrays.asList("108.251.13.101", "188.123.232.46", "193.235.73.197", "5.228.68.175", "89.88.173.207", "76.171.226.172", "97.73.50.119", "108.251.13.101");
private Collection<String> _bannedRanges = Arrays.asList("46.165.200.", "63.141.204.", "216.177.129.", "204.14.79.", "50.117.80.");
@Override

94
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/RarityBasedMerchant.java Normal file
View File

@@ -0,0 +1,94 @@
package com.gempukku.lotro.merchant;
import com.gempukku.lotro.cards.CardSets;
import com.gempukku.lotro.cards.packs.SetDefinition;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
public class RarityBasedMerchant implements Merchant {
private Map<String, SetDefinition> _rarity = new HashMap<String, SetDefinition>();
public RarityBasedMerchant(CardSets cardSets) {
for (SetDefinition setDefinition : cardSets.getSetDefinitions().values()) {
if (setDefinition.hasFlag("merchantable"))
_rarity.put(setDefinition.getSetId(), setDefinition);
}
}
@Override
public Integer getCardSellPrice(String blueprintId, Date currentTime) {
boolean foil = false;
if (blueprintId.endsWith("*")) {
foil = true;
blueprintId = blueprintId.substring(0, blueprintId.length() - 1);
}
boolean tengwar = false;
if (blueprintId.endsWith("T")) {
tengwar = true;
blueprintId = blueprintId.substring(0, blueprintId.length() - 1);
}
if (foil || tengwar)
return null;
final Integer cardBasePrice = getCardBasePrice(blueprintId);
if (cardBasePrice == null)
return null;
return cardBasePrice;
}
@Override
public Integer getCardBuyPrice(String blueprintId, Date currentTime) {
boolean foil = false;
if (blueprintId.endsWith("*")) {
foil = true;
blueprintId = blueprintId.substring(0, blueprintId.length() - 1);
}
boolean tengwar = false;
if (blueprintId.endsWith("T")) {
tengwar = true;
blueprintId = blueprintId.substring(0, blueprintId.length() - 1);
}
Integer cardBasePrice = getCardBasePrice(blueprintId);
if (cardBasePrice == null)
return null;
if (tengwar)
cardBasePrice *= 2;
if (foil)
cardBasePrice *= 4;
return cardBasePrice / 4;
}
private Integer getCardBasePrice(String blueprintId) {
SetDefinition rarity = _rarity.get(blueprintId.substring(0, blueprintId.indexOf("_")));
if (rarity == null)
return null;
String cardRarity = rarity.getCardRarity(blueprintId);
if (cardRarity.equals("C"))
return 50;
else if (cardRarity.equals("U") || cardRarity.equals("S"))
return 100;
else if (cardRarity.equals("R") || cardRarity.equals("P"))
return 1000;
else if (cardRarity.equals("X"))
return 2000;
else
throw new RuntimeException("Unknown rarity for priced card: " + cardRarity);
}
@Override
public void cardBought(String blueprintId, Date currentTime, int price) {
// NO-OP
}
@Override
public void cardSold(String blueprintId, Date currentTime, int price) {
// NO-OP
}
}