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

- Added the property "controllerWasDealtCombatDamageByThisTurn".

Browse Source
This commit is contained in:
Sloth
2011-11-18 12:42:03 +00:00
parent b1fa58d015
commit d81463a43d
3 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/main/java/forge/Card.java
View File

@@ -329,6 +329,8 @@ public class Card extends GameEntity implements Comparable<Card> {
private boolean creatureGotBlockedThisTurn = false;
private boolean dealtDmgToHumanThisTurn = false;
private boolean dealtDmgToComputerThisTurn = false;
private boolean dealtCombatDmgToHumanThisTurn = false;
private boolean dealtCombatDmgToComputerThisTurn = false;
private boolean sirenAttackOrDestroy = false;
private final ArrayList<Card> mustBlockCards = new ArrayList<Card>();
@@ -1068,7 +1070,7 @@ public class Card extends GameEntity implements Comparable<Card> {
/**
* <p>
* Getter for the field <code>dealtDmgToComputerThisTurn</code>.
* Getter for the field <code>dealtCombatDmgToComputerThisTurn</code>.
* </p>
*
* @return a boolean.
@@ -1077,6 +1079,52 @@ public class Card extends GameEntity implements Comparable<Card> {
return this.dealtDmgToComputerThisTurn;
}
/**
* <p>
* Setter for the field <code>dealtCombatDmgToHumanThisTurn</code>.
* </p>
*
* @param b
* a boolean.
*/
public final void setDealtCombatDmgToHumanThisTurn(final boolean b) {
this.dealtCombatDmgToHumanThisTurn = b;
}
/**
* <p>
* Getter for the field <code>dealtDmgToHumanThisTurn</code>.
* </p>
*
* @return a boolean.
*/
public final boolean getDealtCombatDmgToHumanThisTurn() {
return this.dealtCombatDmgToHumanThisTurn;
}
/**
* <p>
* Setter for the field <code>dealtCombatDmgToComputerThisTurn</code>.
* </p>
*
* @param b
* a boolean.
*/
public final void setDealtCombatDmgToComputerThisTurn(final boolean b) {
this.dealtCombatDmgToComputerThisTurn = b;
}
/**
* <p>
* Getter for the field <code>dealtDmgToComputerThisTurn</code>.
* </p>
*
* @return a boolean.
*/
public final boolean getDealtCombatDmgToComputerThisTurn() {
return this.dealtCombatDmgToComputerThisTurn;
}
/**
* <p>
* Setter for the field <code>sirenAttackOrDestroy</code>.
@@ -6732,8 +6780,13 @@ public class Card extends GameEntity implements Comparable<Card> {
return false;
}
} else if (property.startsWith("dealtDamageToYouThisTurn")) {
if (!(this.dealtDmgToHumanThisTurn && this.getController().isPlayer(AllZone.getComputerPlayer()))
&& !(this.dealtDmgToComputerThisTurn && this.getController().isPlayer(AllZone.getHumanPlayer()))) {
if (!(dealtDmgToHumanThisTurn && sourceController.isHuman())
&& !(dealtDmgToComputerThisTurn && sourceController.isComputer())) {
return false;
}
} else if (property.startsWith("controllerWasDealtCombatDamageByThisTurn")) {
if (!(source.dealtCombatDmgToHumanThisTurn && this.getController().isPlayer(AllZone.getHumanPlayer()))
&& !(source.dealtCombatDmgToComputerThisTurn && this.getController().isPlayer(AllZone.getComputerPlayer()))) {
return false;
}
} else if (property.startsWith("wasDealtDamageThisTurn")) {

7
src/main/java/forge/GameActionUtil.java
View File

@@ -931,6 +931,13 @@ public final class GameActionUtil {
executeCelestialMantle(c);
}
if (player.isPlayer(AllZone.getHumanPlayer())) {
c.setDealtCombatDmgToHumanThisTurn(true);
}
if (player.isPlayer(AllZone.getComputerPlayer())) {
c.setDealtCombatDmgToComputerThisTurn(true);
}
} // executeCombatDamageToPlayerEffects
/**

2
src/main/java/forge/Phase.java
View File

@@ -380,6 +380,8 @@ public class Phase extends MyObservable implements java.io.Serializable {
c.resetDealtDamageToThisTurn();
c.setDealtDmgToHumanThisTurn(false);
c.setDealtDmgToComputerThisTurn(false);
c.setDealtCombatDmgToHumanThisTurn(false);
c.setDealtCombatDmgToComputerThisTurn(false);
c.setRegeneratedThisTurn(0);
c.clearMustBlockCards();
if (AllZone.getPhase().isPlayerTurn(AllZone.getComputerPlayer())) {