diff --git a/forge-core/src/main/java/forge/card/ColorSet.java b/forge-core/src/main/java/forge/card/ColorSet.java index 13833be3e88..30a6c5d6571 100644 --- a/forge-core/src/main/java/forge/card/ColorSet.java +++ b/forge-core/src/main/java/forge/card/ColorSet.java @@ -154,19 +154,19 @@ public final class ColorSet implements Comparable, Iterable, Ser */ private float getOrderWeight() { float res = this.countColors(); - if(hasWhite()) { + if (hasWhite()) { res += 0.0005f; } - if(hasBlue()) { + if (hasBlue()) { res += 0.0020f; } - if(hasBlack()) { + if (hasBlack()) { res += 0.0080f; } - if(hasRed()) { + if (hasRed()) { res += 0.0320f; } - if(hasGreen()) { + if (hasGreen()) { res += 0.1280f; } return res; diff --git a/forge-game/src/main/java/forge/game/GameEntity.java b/forge-game/src/main/java/forge/game/GameEntity.java index 2b0785c8573..4f3940b258c 100644 --- a/forge-game/src/main/java/forge/game/GameEntity.java +++ b/forge-game/src/main/java/forge/game/GameEntity.java @@ -318,7 +318,7 @@ public abstract class GameEntity extends GameObject implements IIdentifiable { // As per rule 107.1b return; } - // doesn't really add counters, but is just a telper to add them to the Table + // doesn't really add counters, but is just a helper to add them to the Table // so the Table can handle the Replacement Effect table.put(source, this, counterType, n); } diff --git a/forge-game/src/main/java/forge/game/GameEntityCounterTable.java b/forge-game/src/main/java/forge/game/GameEntityCounterTable.java index cbfef6303bc..afcb9f76530 100644 --- a/forge-game/src/main/java/forge/game/GameEntityCounterTable.java +++ b/forge-game/src/main/java/forge/game/GameEntityCounterTable.java @@ -149,7 +149,7 @@ public class GameEntityCounterTable extends ForwardingTable, Ga // Apply counter after replacement effect for (Map.Entry, Map> e : values.entrySet()) { for (Map.Entry ec : e.getValue().entrySet()) { - gm.getKey().addCounterInternal(ec.getKey(), ec.getValue(), e.getKey().orNull(), effect, result); + gm.getKey().addCounterInternal(ec.getKey(), ec.getValue(), e.getKey().orNull(), true, result); } } } diff --git a/forge-gui/res/cardsfolder/p/peace_talks.txt b/forge-gui/res/cardsfolder/p/peace_talks.txt index a3305e52628..779c371c4b5 100644 --- a/forge-gui/res/cardsfolder/p/peace_talks.txt +++ b/forge-gui/res/cardsfolder/p/peace_talks.txt @@ -4,6 +4,6 @@ Types:Sorcery A:SP$ Effect | Cost$ 1 W | Name$ Peace Talks Effect | StaticAbilities$ STCantAttack,STCantTarget,STCantTargetPlayer | Duration$ ThisTurnAndNextTurn | SpellDescription$ This turn and next turn, creatures can't attack, and players and permanents can't be the targets of spells or activated abilities. SVar:STCantAttack:Mode$ CantAttack | EffectZone$ Command | ValidCard$ Creature | Description$ Creatures can't attack. SVar:STCantTarget:Mode$ CantTarget | ValidCard$ Permanent | EffectZone$ Command | ValidSA$ Spell,Activated | Description$ Permanents can't be the targets of spells or activated abilities. -SVar:STCantTargetPlayer:Mode$ CantTarget | ValidPlayer$ Player | EffectZone$ Command | ValidSA$ Spell,Activated | Description$Players can't be the targets of spells or activated abilities. +SVar:STCantTargetPlayer:Mode$ CantTarget | ValidPlayer$ Player | EffectZone$ Command | ValidSA$ Spell,Activated | Description$ Players can't be the targets of spells or activated abilities. SVar:Picture:http://www.wizards.com/global/images/magic/general/peace_talks.jpg Oracle:This turn and next turn, creatures can't attack, and players and permanents can't be the targets of spells or activated abilities. diff --git a/forge-gui/res/cardsfolder/z/zurs_weirding.txt b/forge-gui/res/cardsfolder/z/zurs_weirding.txt index fae0d7f7ed3..d3b53723a29 100644 --- a/forge-gui/res/cardsfolder/z/zurs_weirding.txt +++ b/forge-gui/res/cardsfolder/z/zurs_weirding.txt @@ -1,7 +1,7 @@ Name:Zur's Weirding ManaCost:3 U Types:Enchantment -S:Mode$ Continuous | AffectedZone$ Hand | MayLookAt$ Player | Description$ Description$ Players play with their hands revealed. +S:Mode$ Continuous | AffectedZone$ Hand | MayLookAt$ Player | Description$ Players play with their hands revealed. R:Event$ Draw | ActiveZones$ Battlefield | ValidPlayer$ Player | ReplaceWith$ RevealTop | Description$ If a player would draw a card, they reveal it instead. Then any other player may pay 2 life. If a player does, put that card into its owner's graveyard. Otherwise, that player draws a card. SVar:RevealTop:DB$ Dig | Defined$ ReplacedPlayer | DigNum$ 1 | NoMove$ True | Reveal$ True | SubAbility$ DBCheck SVar:DBCheck:DB$ StoreSVar | SVar$ ZurCheck | Type$ Number | Expression$ 1 | UnlessPayer$ NonReplacedPlayer | UnlessCost$ PayLife<2> | SubAbility$ DBMill | StackDescription$ None