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

Merge branch 'assorted-fixes' into 'master'

Browse Source 
Adding Rat Colony to card limit exceptions, fixing Goblin Chainwhirler.

Closes #527

See merge request core-developers/forge!470
This commit is contained in:
austinio7116
2018-04-23 06:36:40 +00:00
parent a45f068a39 75d6ea6537
commit e5db8ff8b3
6 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-gui/res/cardsfolder/g/goblin_chainwhirler.txt
View File

@@ -2,6 +2,7 @@ Name:Goblin Chainwhirler
ManaCost:R R R
Types:Creature Goblin Warrior
PT:3/3
K:First Strike
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamageAll | TriggerDescription$ When CARDNAME enters the battlefield, it deals 1 damage to each opponent and each creature and planeswalker they control.
SVar:TrigDamageAll:DB$ DamageAll | ValidPlayers$ Player.Opponent | ValidCards$ Creature.OppCtrl,Planeswalker.OppCtrl | NumDmg$ 1 | ValidDescription$ each opponent and each creature and planeswalker they control.
Oracle:First strike\nWhen Goblin Chainwhirler enters the battlefield, it deals 1 damage to each opponent and each creature and planeswalker they control.

3
forge-gui/src/main/java/forge/quest/QuestSpellShop.java
View File

@@ -4,6 +4,7 @@ import com.google.common.base.Function;
import forge.GuiBase;
import forge.deck.CardPool;
import forge.deck.Deck;
import forge.deck.DeckFormat;
import forge.deck.DeckSection;
import forge.item.*;
import forge.itemmanager.IItemManager;
@@ -345,7 +346,7 @@ public class QuestSpellShop {
PaperCard card = (PaperCard)item.getKey();
int numToKeep = card.getRules().getType().isBasic() ?
FModel.getQuestPreferences().getPrefInt(QPref.PLAYSET_BASIC_LAND_SIZE) : FModel.getQuestPreferences().getPrefInt(QPref.PLAYSET_SIZE);
if (card.getName().equals("Relentless Rats") || card.getName().equals("Shadowborn Apostle")) {
if (DeckFormat.getLimitExceptions().contains(card.getName())) {
numToKeep = FModel.getQuestPreferences().getPrefInt(QPref.PLAYSET_ANY_NUMBER_SIZE);
}
if (numToKeep < item.getValue()) {