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

- Added Wheel of Sun and Moon.

Browse Source
This commit is contained in:
Sloth
2012-02-07 12:58:22 +00:00
parent a206cd0c9a
commit 9263887409
5 changed files with 82 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -9912,6 +9912,7 @@ res/cardsfolder/w/whalebone_glider.txt svneol=native#text/plain
res/cardsfolder/w/wheel_and_deal.txt svneol=native#text/plain
res/cardsfolder/w/wheel_of_fate.txt svneol=native#text/plain
res/cardsfolder/w/wheel_of_fortune.txt svneol=native#text/plain
res/cardsfolder/w/wheel_of_sun_and_moon.txt -text
res/cardsfolder/w/wheel_of_torture.txt svneol=native#text/plain
res/cardsfolder/w/where_ancients_tread.txt svneol=native#text/plain
res/cardsfolder/w/whetstone.txt svneol=native#text/plain

14
res/cardsfolder/w/wheel_of_sun_and_moon.txt Normal file
View File

@@ -0,0 +1,14 @@
Name:Wheel of Sun and Moon
ManaCost:GW GW
Types:Enchantment Aura
Text:no text
K:Enchant player
A:SP$ Attach | Cost$ GW GW | ValidTgts$ Player
R:Event$ Moved | Destination$ Graveyard | ValidCard$ Card.OwnedBy Player.EnchantedBy | ReplaceWith$ Reveal | Description$ If a card would be put into enchanted player's graveyard from anywhere, instead that card is revealed and put on the bottom of that player's library.
SVar:Reveal:AB$ ChangeZone | Cost$ 0 | Hidden$ True | Destination$ Library | Defined$ ReplacedCard | LibraryPosition$ -1 | Reveal$ True
SVar:RemRandomDeck:True
SVar:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/wheel_of_sun_and_moon.jpg
SetInfo:SHM|Rare|http://magiccards.info/scans/en/shm/243.jpg
Oracle:Enchant player\nIf a card would be put into enchanted player's graveyard from anywhere, instead that card is revealed and put on the bottom of that player's library.
End

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

@@ -6687,6 +6687,11 @@ public class Card extends GameEntity implements Comparable<Card> {
if (this.getOwner().isPlayer(sourceController)) {
return false;
}
} else if (property.startsWith("OwnedBy")) {
final String valid = property.substring(8);
if (!this.getOwner().isValid(valid, sourceController, source)) {
return false;
}
} else if (property.startsWith("OwnerDoesntControl")) {
if (this.getOwner().isPlayer(this.getController())) {
return false;

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

@@ -131,7 +131,7 @@ public class GameAction {
repParams.put("Destination", zone.getZoneType());
if (AllZone.getReplacementHandler().run(repParams)) {
if (AllZone.getStack().isResolving(c)) {
if (AllZone.getStack().isResolving(c) && !zone.is(Constant.Zone.Graveyard)) {
return AllZone.getGameAction().moveToGraveyard(c);
}
return c;

63
src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
View File

@@ -215,7 +215,10 @@ public final class AbilityFactoryChangeZone {
*/
private static void setMiscellaneous(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams();
final List<Constant.Zone> origin = Constant.Zone.listValueOf(params.get("Origin"));
List<Constant.Zone> origin = new ArrayList<Constant.Zone>();
if (params.containsKey("Origin")) {
origin = Constant.Zone.listValueOf(params.get("Origin"));
}
final Target tgt = sa.getTarget();
@@ -244,7 +247,10 @@ public final class AbilityFactoryChangeZone {
*/
private static boolean changeZoneCanPlayAI(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams();
final String origin = params.get("Origin");
String origin = "";
if (params.containsKey("Origin")) {
origin = params.get("Origin");
}
if (AbilityFactoryChangeZone.isHidden(origin, params.containsKey("Hidden"))) {
return AbilityFactoryChangeZone.changeHiddenOriginCanPlayAI(af, sa);
@@ -268,7 +274,10 @@ public final class AbilityFactoryChangeZone {
*/
private static boolean changeZonePlayDrawbackAI(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams();
final String origin = params.get("Origin");
String origin = "";
if (params.containsKey("Origin")) {
origin = params.get("Origin");
}
if (AbilityFactoryChangeZone.isHidden(origin, params.containsKey("Hidden"))) {
return AbilityFactoryChangeZone.changeHiddenOriginPlayDrawbackAI(af, sa);
@@ -294,7 +303,10 @@ public final class AbilityFactoryChangeZone {
*/
private static boolean changeZoneTriggerAI(final AbilityFactory af, final SpellAbility sa, final boolean mandatory) {
final HashMap<String, String> params = af.getMapParams();
final String origin = params.get("Origin");
String origin = "";
if (params.containsKey("Origin")) {
origin = params.get("Origin");
}
if (AbilityFactoryChangeZone.isHidden(origin, params.containsKey("Hidden"))) {
return AbilityFactoryChangeZone.changeHiddenTriggerAI(af, sa, mandatory);
@@ -318,7 +330,10 @@ public final class AbilityFactoryChangeZone {
*/
private static String changeZoneDescription(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams();
final String origin = params.get("Origin");
String origin = "";
if (params.containsKey("Origin")) {
origin = params.get("Origin");
}
if (AbilityFactoryChangeZone.isHidden(origin, params.containsKey("Hidden"))) {
return AbilityFactoryChangeZone.changeHiddenOriginStackDescription(af, sa);
@@ -341,7 +356,10 @@ public final class AbilityFactoryChangeZone {
*/
private static void changeZoneResolve(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams();
final String origin = params.get("Origin");
String origin = "";
if (params.containsKey("Origin")) {
origin = params.get("Origin");
}
if (AbilityFactoryChangeZone.isHidden(origin, params.containsKey("Hidden")) && !params.containsKey("Ninjutsu")) {
AbilityFactoryChangeZone.changeHiddenOriginResolve(af, sa);
@@ -378,7 +396,10 @@ public final class AbilityFactoryChangeZone {
final Cost abCost = af.getAbCost();
final Card source = af.getHostCard();
final HashMap<String, String> params = af.getMapParams();
final Constant.Zone origin = Constant.Zone.smartValueOf(params.get("Origin"));
Constant.Zone origin = null;
if (params.containsKey("Origin")) {
origin = Constant.Zone.smartValueOf(params.get("Origin"));
}
final String destination = params.get("Destination");
if (abCost != null) {
@@ -503,8 +524,11 @@ public final class AbilityFactoryChangeZone {
final Card source = sa.getSourceCard();
final HashMap<String, String> params = af.getMapParams();
// String destination = params.get("Destination");
final List<Zone> origin = Zone.listValueOf(params.get("Origin"));
List<Zone> origin = new ArrayList<Zone>();
if (params.containsKey("Origin")) {
origin = Zone.listValueOf(params.get("Origin"));
}
// this works for hidden because the mana is paid first.
final String type = params.get("ChangeType");
@@ -596,7 +620,10 @@ public final class AbilityFactoryChangeZone {
if (params.containsKey("StackDescription")) {
sb.append(params.get("StackDescription"));
} else {
final String origin = params.get("Origin");
String origin = "";
if (params.containsKey("Origin")) {
origin = params.get("Origin");
}
final String destination = params.get("Destination");
final String type = params.containsKey("ChangeType") ? params.get("ChangeType") : "Card";
@@ -753,7 +780,10 @@ public final class AbilityFactoryChangeZone {
}
}
List<Zone> origin = Zone.listValueOf(params.get("Origin"));
List<Zone> origin = new ArrayList<Zone>();
if (params.containsKey("Origin")) {
origin = Zone.listValueOf(params.get("Origin"));
}
Zone destination = Zone.smartValueOf(params.get("Destination"));
// this needs to be zero indexed. Top = 0, Third = 2
int libraryPos = params.containsKey("LibraryPosition") ? Integer.parseInt(params.get("LibraryPosition")) : 0;
@@ -793,6 +823,7 @@ public final class AbilityFactoryChangeZone {
fetchList = player.getCardsIn(origin);
}
if (!defined) {
if (origin.contains(Zone.Library) && !defined) { // Look at whole
// library before
// moving onto choosing
@@ -806,8 +837,6 @@ public final class AbilityFactoryChangeZone {
GuiUtils.getChoiceOptional(af.getHostCard().getName() + " - Looking at Opponent's Hand",
player.getCardsIn(Zone.Hand).toArray());
}
if (!defined) {
fetchList = AbilityFactory.filterListByType(fetchList, params.get("ChangeType"), sa);
}
@@ -847,6 +876,9 @@ public final class AbilityFactoryChangeZone {
if (destination.equals(Zone.Library)) {
// do not shuffle the library once we have placed a fetched
// card on top.
if (params.containsKey("Reveal")) {
GuiUtils.getChoice(card + " - Revealed card: ", c);
}
if (origin.contains(Zone.Library) && (i < 1)) {
player.shuffle();
}
@@ -939,7 +971,10 @@ public final class AbilityFactoryChangeZone {
}
}
final List<Zone> origin = Zone.listValueOf(params.get("Origin"));
List<Zone> origin = new ArrayList<Zone>();
if (params.containsKey("Origin")) {
origin = Zone.listValueOf(params.get("Origin"));
}
String type = params.get("ChangeType");
if (type == null) {