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

- Fixed the logic in how some parameters are checked in Player.java.

Browse Source 
- Added Hope of Ghirapur (AER).
This commit is contained in:
Agetian
2017-01-16 16:08:53 +00:00
parent 50483b679b
commit 0fc3d3c01f
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -8052,6 +8052,7 @@ forge-gui/res/cardsfolder/h/hooting_mandrills.txt -text
forge-gui/res/cardsfolder/h/hope_against_hope.txt -text
forge-gui/res/cardsfolder/h/hope_and_glory.txt svneol=native#text/plain
forge-gui/res/cardsfolder/h/hope_charm.txt svneol=native#text/plain
forge-gui/res/cardsfolder/h/hope_of_ghirapur.txt -text
forge-gui/res/cardsfolder/h/hopeful_eidolon.txt -text
forge-gui/res/cardsfolder/h/hopping_automaton.txt svneol=native#text/plain
forge-gui/res/cardsfolder/h/horde_ambusher.txt -text

6
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -2066,7 +2066,7 @@ public class Player extends GameEntity implements Comparable<Player> {
if (!found) {
return false;
}
} else if (property.equals("wasDealtDamageThisGameBy ")) {
} else if (property.startsWith("wasDealtDamageThisGameBy ")) {
final String v = property.split(" ")[1];
final List<Card> cards = AbilityUtils.getDefinedCards(source, v, spellAbility);
boolean found = false;
@@ -2079,7 +2079,7 @@ public class Player extends GameEntity implements Comparable<Player> {
if (!found) {
return false;
}
} else if (property.equals("wasDealtDamageThisTurnBy ")) {
} else if (property.startsWith("wasDealtDamageThisTurnBy ")) {
final String v = property.split(" ")[1];
final List<Card> cards = AbilityUtils.getDefinedCards(source, v, spellAbility);
boolean found = false;
@@ -2092,7 +2092,7 @@ public class Player extends GameEntity implements Comparable<Player> {
if (!found) {
return false;
}
} else if (property.equals("wasDealtCombatDamageThisTurnBy ")) {
} else if (property.startsWith("wasDealtCombatDamageThisTurnBy ")) {
final String v = property.split(" ")[1];
final List<Card> cards = AbilityUtils.getDefinedCards(source, v, spellAbility);

9
forge-gui/res/cardsfolder/h/hope_of_ghirapur.txt Normal file
View File

@@ -0,0 +1,9 @@
Name:Hope of Ghirapur
ManaCost:1
Types:Legendary Artifact Creature Thopter
PT:1/1
K:Flying
A:AB$ Effect | Cost$ Sac<1/CARDNAME> | ValidTgts$ Player.wasDealtCombatDamageThisTurnBy Self | Name$ Hope of Ghirapur Effect | StaticAbilities$ STCantBeCast | RememberObjects$ Targeted | Duration$ UntilYourNextTurn | SpellDescription$ Target player can't cast noncreature spells this turn.
SVar:STCantBeCast:Mode$ CantBeCast | EffectZone$ Command | ValidCard$ Card.nonCreature | Caster$ Player.IsRemembered | Description$ Until your next turn, target player who was dealt combat damage by Hope of Ghirapur this turn can't cast noncreature spells.
SVar:Picture:http://www.wizards.com/global/images/magic/general/hope_of_ghirapur.jpg
Oracle:Flying\nSacrifice Hope of Ghirapur: Until your next turn, target player who was dealt combat damage by Hope of Ghirapur this turn can't cast noncreature spells.