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

Fix saga chapters

Browse Source
This commit is contained in:
tool4EvEr
2021-12-29 15:13:44 +01:00
parent 79346c2049
commit d17ab3dce1
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-core/src/main/java/forge/card/ColorSet.java
View File

@@ -154,19 +154,19 @@ public final class ColorSet implements Comparable<ColorSet>, Iterable<Byte>, 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;

2
forge-game/src/main/java/forge/game/GameEntity.java
View File

@@ -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);
}

2
forge-game/src/main/java/forge/game/GameEntityCounterTable.java
View File

@@ -149,7 +149,7 @@ public class GameEntityCounterTable extends ForwardingTable<Optional<Player>, Ga
// Apply counter after replacement effect
for (Map.Entry<Optional<Player>, Map<CounterType, Integer>> e : values.entrySet()) {
for (Map.Entry<CounterType, Integer> 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);
}
}
}

2
forge-gui/res/cardsfolder/p/peace_talks.txt
View File

@@ -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.

2
forge-gui/res/cardsfolder/z/zurs_weirding.txt
View File

@@ -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