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

Some fixes (#6575)

Browse Source
This commit is contained in:
tool4ever
2024-11-14 10:34:05 +01:00
committed by GitHub
parent 919832cc06
commit ac96890f44
10 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/res/cardsfolder/i/infernal_vessel.txt
View File

@@ -2,7 +2,7 @@ Name:Infernal Vessel
ManaCost:2 B
Types:Creature Human Cleric
PT:2/1
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+notDemon | Execute$ TrigReturn | TriggerDescription$ When this creature dies, if it wasn't a Demon, return it to the battlefield under its owner's control with two +1/+1 counters on it. It's a Demon in addition to its other types.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+nonDemon | Execute$ TrigReturn | TriggerDescription$ When this creature dies, if it wasn't a Demon, return it to the battlefield under its owner's control with two +1/+1 counters on it. It's a Demon in addition to its other types.
SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ TriggeredNewCardLKICopy | WithCountersType$ P1P1 | WithCountersAmount$ 2 | AnimateSubAbility$ DBAnimate
SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Types$ Demon | Duration$ Permanent
Oracle:When this creature dies, if it wasn't a Demon, return it to the battlefield under its owner's control with two +1/+1 counters on it. It's a Demon in addition to its other types.

2
forge-gui/res/cardsfolder/k/king_of_the_oathbreakers.txt
View File

@@ -3,7 +3,7 @@ ManaCost:2 W B
Types:Legendary Creature Spirit Noble
PT:3/3
K:Flying
T:Mode$ BecomesTarget | ValidTarget$ Card.Self,Spirit.YouCtrl+Other | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigPhaseOut | TriggerDescription$ Whenever CARDNAME or another Spirit you control becomes the target of a spell, it phases out. (Treat it and anything attached to it as though they don't exist until your next turn.)
T:Mode$ BecomesTarget | ValidTarget$ Card.Self,Spirit.YouCtrl+Other+inZoneBattlefield | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigPhaseOut | TriggerDescription$ Whenever CARDNAME or another Spirit you control becomes the target of a spell, it phases out. (Treat it and anything attached to it as though they don't exist until your next turn.)
SVar:TrigPhaseOut:DB$ Phases | Defined$ TriggeredTargetLKICopy
T:Mode$ PhaseIn | ValidCard$ Card.Self,Spirit.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another Spirit you control phases in, create a tapped 1/1 white Spirit creature token with flying.
SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ You | TokenTapped$ True

2
forge-gui/res/cardsfolder/n/needletooth_pack.txt
View File

@@ -2,7 +2,7 @@ Name:Needletooth Pack
ManaCost:3 G G
Types:Creature Dinosaur
PT:4/5
T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ Morbid | SVarCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Morbid — At the beginning of your end step, if a creature died this turn, put two +1/+1 counters on target creature you control.
T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | CheckSVar$ Morbid | SVarCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Morbid — At the beginning of your end step, if a creature died this turn, put two +1/+1 counters on target creature you control.
SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 2
SVar:Morbid:Count$Morbid.1.0
Oracle:Morbid — At the beginning of your end step, if a creature died this turn, put two +1/+1 counters on target creature you control.

2
forge-gui/res/cardsfolder/t/the_mindskinner.txt
View File

@@ -3,7 +3,7 @@ ManaCost:U U U
Types:Legendary Enchantment Creature Nightmare
PT:10/1
S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.YouCtrl,Emblem.YouCtrl | ValidTarget$ Opponent | ReplaceWith$ Mill | PreventionEffect$ True | ExecuteMode$ PerTarget | Description$ If a source you control would deal damage to an opponent, prevent that damage and each opponent mills that many cards.
R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.YouCtrl,Emblem.YouCtrl | ValidTarget$ Opponent | ReplaceWith$ Mill | PreventionEffect$ True | ExecuteMode$ PerSource | Description$ If a source you control would deal damage to an opponent, prevent that damage and each opponent mills that many cards.
SVar:Mill:DB$ Mill | Defined$ Opponent | NumCards$ X
SVar:X:ReplaceCount$DamageAmount
Oracle:The Mindskinner can't be blocked.\nIf a source you control would deal damage to an opponent, prevent that damage and each opponent mills that many cards.

20
forge-gui/src/main/java/forge/gamemodes/match/GameLobby.java
View File

@@ -443,17 +443,13 @@ public abstract class GameLobby implements IHasGameType {
Deck deck = slot.getDeck();
RegisteredPlayer rp = new RegisteredPlayer(deck);
if (variantTypes.isEmpty()) {
rp.setTeamNumber(team);
players.add(rp.setPlayer(lobbyPlayer));
}
else {
if (!variantTypes.isEmpty()) {
if (isCommanderMatch) {
final GameType commanderGameType =
isOathbreakerMatch ? GameType.Oathbreaker :
isTinyLeadersMatch ? GameType.TinyLeaders :
isBrawlMatch ? GameType.Brawl :
GameType.Commander;
isTinyLeadersMatch ? GameType.TinyLeaders :
isBrawlMatch ? GameType.Brawl :
GameType.Commander;
if (checkLegality) {
final String errMsg = commanderGameType.getDeckFormat().getDeckConformanceProblem(deck);
if (errMsg != null) {
@@ -481,7 +477,6 @@ public abstract class GameLobby implements IHasGameType {
Iterable<PaperCard> schemes = null;
Iterable<PaperCard> planes = null;
//Archenemy
if (variantTypes.contains(GameType.ArchenemyRumble)
|| (variantTypes.contains(GameType.Archenemy) && isArchenemy)) {
final CardPool schemePool = deck.get(DeckSection.Schemes);
@@ -495,7 +490,6 @@ public abstract class GameLobby implements IHasGameType {
schemes = schemePool == null ? Collections.emptyList() : schemePool.toFlatList();
}
//Planechase
if (variantTypes.contains(GameType.Planechase)) {
final CardPool planePool = deck.get(DeckSection.Planes);
if (checkLegality) {
@@ -508,7 +502,6 @@ public abstract class GameLobby implements IHasGameType {
planes = planePool == null ? Collections.emptyList() : planePool.toFlatList();
}
//Vanguard
if (variantTypes.contains(GameType.Vanguard)) {
if (avatarPool == null || avatarPool.countAll() == 0) { //ERROR! null if avatar deselected on list
SOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblNoSelectedVanguardAvatarForPlayer", name));
@@ -517,10 +510,11 @@ public abstract class GameLobby implements IHasGameType {
}
rp = RegisteredPlayer.forVariants(activeSlots.size(), variantTypes, deck, schemes, isArchenemy, planes, avatarPool);
rp.setTeamNumber(team);
players.add(rp.setPlayer(lobbyPlayer));
}
rp.setTeamNumber(team);
players.add(rp.setPlayer(lobbyPlayer));
if (!isAI) {
guis.put(rp, gui);
}