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

- AI improvements to the DealDamage AF.

Browse Source
This commit is contained in:
jendave
2011-08-06 11:07:58 +00:00
parent c50e1f2832
commit ec9e6a9ee8
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/forge/AbilityFactory_DealDamage.java
View File

@@ -174,6 +174,10 @@ import java.util.Random;
} }
private boolean shouldTgtP(int d) { private boolean shouldTgtP(int d) {
if (AllZone.HumanPlayer.reducePlayerDamageToZero(AF.getHostCard(), false)
|| !AllZone.HumanPlayer.canTarget(AF.getHostCard())) return false;
PlayerZone compHand = AllZone.getZone(Constant.Zone.Hand, AllZone.ComputerPlayer); PlayerZone compHand = AllZone.getZone(Constant.Zone.Hand, AllZone.ComputerPlayer);
CardList hand = new CardList(compHand.getCards()); CardList hand = new CardList(compHand.getCards());
@@ -227,7 +231,7 @@ import java.util.Random;
} }
if (AF.getAbCost().getSubCounter()) { if (AF.getAbCost().getSubCounter()) {
// +1/+1 counters only if damage from this ability would kill the human, otherwise ok // +1/+1 counters only if damage from this ability would kill the human, otherwise ok
if(AllZone.HumanPlayer.getLife() - damage > 0 || !AF.getAbCost().getCounterType().equals(Counters.P1P1)) if(AllZone.HumanPlayer.getLife() - damage > 0 && AF.getAbCost().getCounterType().equals(Counters.P1P1))
return false; return false;
} }
if (AF.getAbCost().getLifeCost()) { if (AF.getAbCost().getLifeCost()) {

2
src/forge/AbilityFactory_Pump.java
View File

@@ -268,7 +268,7 @@ public class AbilityFactory_Pump {
if (addsKeywords) { if (addsKeywords) {
list = list.filter(new CardListFilter() { list = list.filter(new CardListFilter() {
public boolean addCard(Card c) { public boolean addCard(Card c) {
return c.hasAnyKeyword(KWs); // don't add duplicate negative keywords return !c.hasAnyKeyword(KWs); // don't add duplicate negative keywords
} }
}); });
} }

2
src/forge/Player.java
View File

@@ -211,7 +211,7 @@ public abstract class Player extends MyObservable{
GameActionUtil.executePlayerDamageEffects(this, source, damageToDo, false); GameActionUtil.executePlayerDamageEffects(this, source, damageToDo, false);
} }
private boolean reducePlayerDamageToZero(final Card source, final boolean isCombat) { public boolean reducePlayerDamageToZero(final Card source, final boolean isCombat) {
boolean reduce = false; boolean reduce = false;
if(isCombat) { if(isCombat) {
//for future use //for future use