github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 11:09:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5397 from brodee/master

Browse source 
draftbots and afk autopicks will more aggressivly take rares
This commit is contained in:
Oleg Agafonov 2018-10-28 01:02:04 +04:00 committed by GitHub
commit 92fddeb5d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java
View file

@ -13,6 +13,7 @@ import org.apache.log4j.Logger;
import java.io.InputStream;
import java.util.*;
import mage.constants.Rarity;
import mage.constants.SubType;
/**
@ -71,7 +72,7 @@ public final class RateCard {
type = 6;
}
int score = 10 * getCardRating(card) + 2 * type + getManaCostScore(card, allowedColors)
+ 40 * isRemoval(card);
+ 40 * isRemoval(card) + getRarityScore(card);
if (allowedColors == null)
rated.put(card.getName(), score);
return score;
@ -168,11 +169,13 @@ public final class RateCard {
}
private static final int SINGLE_PENALTY[] = {0, 1, 1, 3, 6, 9};
private static final int MULTICOLOR_BONUS = 15;
/**
* Get manacost score.
* Depends on chosen colors. Returns negative score for those cards that doesn't fit allowed colors.
* If allowed colors are not chosen, then score based on converted cost is returned with penalty for heavy colored cards.
* gives bonus to multicolor cards that fit within allowed colors and if allowed colors is <5
*
*
* @param card
@ -215,9 +218,34 @@ public final class RateCard {
}
if (maxSingleCount > 5)
maxSingleCount = 5;
return 2 * converted + 3 * (10 - SINGLE_PENALTY[maxSingleCount]/*-DOUBLE_PENALTY[doubleCount]*/);
int rate = 2 * converted + 3 * (10 - SINGLE_PENALTY[maxSingleCount]);
if( singleCount.size() > 1 && singleCount.size() < 5){
rate += MULTICOLOR_BONUS;
}
return rate;
}
/**
* Get rarity score.
* nowadays, cards that are more rare are more powerful, lets
* trust that and play the shiny cards.
*
* @param card
* @return integer rating value
*/
private static int getRarityScore(Card card) {
Rarity r = card.getRarity();
if (Rarity.MYTHIC == r){
return 60;
}else if (Rarity.RARE == r){
return 40;
}else if (Rarity.UNCOMMON == r){
return 20;
}else{
return 0;
}
}
/**
* Determines whether mana symbol is color.
*

13
Mage.Tests/src/test/java/org/mage/test/cards/facedown/SummonersEggTest.java
View file

@ -27,17 +27,16 @@ public class SummonersEggTest extends CardTestPlayerBase {
@Test
public void testSummonersEggImprint() {
addCard(Zone.HAND, playerA, "Summoner's Egg");
addCard(Zone.HAND, playerA, "Sejiri Merfolk");
addCard(Zone.HAND, playerA, "Maritime Guard");
addCard(Zone.HAND, playerA, "Goblin Roughrider");
addCard(Zone.BATTLEFIELD, playerA, "Island", 4);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Summoner's Egg");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Summoner's Egg");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertHandCount(playerA, 1);
assertHandCount(playerA, "Sejiri Merfolk", 1);
assertHandCount(playerA, "Maritime Guard", 1);
assertHandCount(playerA, "Goblin Roughrider", 0);
assertExileCount("Goblin Roughrider", 1);
@ -53,7 +52,7 @@ public class SummonersEggTest extends CardTestPlayerBase {
@Test
public void testSummonersEggDies() {
addCard(Zone.HAND, playerA, "Summoner's Egg");
addCard(Zone.HAND, playerA, "Sejiri Merfolk");
addCard(Zone.HAND, playerA, "Maritime Guard");
addCard(Zone.HAND, playerA, "Goblin Roughrider");
addCard(Zone.BATTLEFIELD, playerA, "Island", 4);
addCard(Zone.HAND, playerB, "Char");
@ -67,7 +66,7 @@ public class SummonersEggTest extends CardTestPlayerBase {
execute();
assertHandCount(playerA, 1);
assertHandCount(playerA, "Sejiri Merfolk", 1);
assertHandCount(playerA, "Maritime Guard", 1);
assertHandCount(playerA, "Goblin Roughrider", 0);
assertGraveyardCount(playerA, "Summoner's Egg", 1);

9
Mage.Tests/src/test/java/org/mage/test/cards/single/soi/PrizedAmalgamTest.java
View file

@ -26,8 +26,7 @@ public class PrizedAmalgamTest extends CardTestPlayerBase {
addCard(Zone.GRAVEYARD, playerA, "Prized Amalgam", 1);
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Reanimate");
addTarget(playerA, "Bronze Sable");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Reanimate", "Bronze Sable");
setStopAt(1, PhaseStep.END_TURN);
execute();
@ -72,8 +71,7 @@ public class PrizedAmalgamTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3);
addCard(Zone.GRAVEYARD, playerB, "Prized Amalgam", 1);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Reanimate");
addTarget(playerA, "Hill Giant");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Reanimate", "Hill Giant");
setStopAt(1, PhaseStep.END_TURN);
execute();
@ -95,8 +93,7 @@ public class PrizedAmalgamTest extends CardTestPlayerBase {
// Whenever a creature enters the battlefield, if it entered from your graveyard or you cast it from your graveyard, return Prized Amalgam from your graveyard to the battlefield tapped at the beginning of the next end step.
addCard(Zone.GRAVEYARD, playerB, "Prized Amalgam", 1);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Necromantic Summons");
addTarget(playerA, "Merfolk Looter");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Necromantic Summons", "Merfolk Looter");
setStopAt(1, PhaseStep.END_TURN);
execute();

3
Mage/src/main/java/mage/game/draft/DraftImpl.java
View file

@ -147,7 +147,8 @@ public abstract class DraftImpl implements Draft {
@Override
public void autoPick(UUID playerId) {
this.addPick(playerId, players.get(playerId).getBooster().get(0).getId(), null);
List<Card> booster = players.get(playerId).getBooster();
this.addPick(playerId, booster.get(booster.size()-1).getId(), null);
}
protected void passLeft() {