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

- Fixed life gain happening whenever a creature with negative attack power would attack a player.

Browse Source
This commit is contained in:
jendave
2011-08-06 03:50:50 +00:00
parent f747302cd3
commit 2a21f40853
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/forge/Combat.java
View File

@@ -92,16 +92,18 @@ public class Combat
//sum unblocked attackers' power //sum unblocked attackers' power
for(int i = 0; i < att.size(); i++) { for(int i = 0; i < att.size(); i++) {
if(! isBlocked(att.get(i)) || (getBlockers(att.get(i)).size() == 0 && att.get(i).getKeyword().contains("Trample")) ){ if(! isBlocked(att.get(i)) || (getBlockers(att.get(i)).size() == 0 && att.get(i).getKeyword().contains("Trample")) ){
int damageDealt = att.get(i).getNetAttack(); int damageDealt = att.get(i).getNetAttack();
if (CombatUtil.isDoranInPlay()) if (CombatUtil.isDoranInPlay())
damageDealt = att.get(i).getNetDefense(); damageDealt = att.get(i).getNetDefense();
//if the creature has first strike do not do damage in the normal combat phase if (damageDealt > 0) {
//if(att.get(i).hasSecondStrike()) //if the creature has first strike do not do damage in the normal combat phase
if(!att.get(i).hasFirstStrike() || (att.get(i).hasFirstStrike() && att.get(i).hasDoubleStrike()) ) //if(att.get(i).hasSecondStrike())
addDefendingDamage(damageDealt, att.get(i)); if(!att.get(i).hasFirstStrike() || (att.get(i).hasFirstStrike() && att.get(i).hasDoubleStrike()) )
} addDefendingDamage(damageDealt, att.get(i));
} }
} //! isBlocked...
}//for
} }
public void setDefendingFirstStrikeDamage() public void setDefendingFirstStrikeDamage()
{ {
@@ -114,14 +116,15 @@ public class Combat
if (CombatUtil.isDoranInPlay()) if (CombatUtil.isDoranInPlay())
damageDealt = att.get(i).getNetDefense(); damageDealt = att.get(i).getNetDefense();
//if the creature has first strike or double strike do damage in the first strike combat phase if (damageDealt > 0) {
//if the creature has first strike or double strike do damage in the first strike combat phase
if(att.get(i).hasFirstStrike() || att.get(i).hasDoubleStrike()){ if(att.get(i).hasFirstStrike() || att.get(i).hasDoubleStrike()){
addDefendingFirstStrikeDamage(damageDealt, att.get(i)); addDefendingFirstStrikeDamage(damageDealt, att.get(i));
}
} }
} }
} } //for
} }
public void addDefendingDamage(int n, Card source) public void addDefendingDamage(int n, Card source)
{ {
if (!defendingDamageMap.containsKey(source)) if (!defendingDamageMap.containsKey(source))