github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-22 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

momir game: fixed game error on start, added momir emblem image

Browse source
This commit is contained in:
Oleg Agafonov 2023-06-17 08:19:22 +04:00
parent ef8535314f
commit afe89a1056
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java
View file

@ -2006,6 +2006,10 @@ public class ScryfallImageSupportTokens {
put("ODY/Wurm", "https://api.scryfall.com/cards/pr2/6/en?format=image"); put("ODY/Wurm", "https://api.scryfall.com/cards/pr2/6/en?format=image");
put("ODY/Zombie", "https://api.scryfall.com/cards/pr2/4/en?format=image"); put("ODY/Zombie", "https://api.scryfall.com/cards/pr2/4/en?format=image");
// DIS
put("DIS/Emblem Momir", "https://api.scryfall.com/cards/pmoa/61/en?format=image");
// generate supported sets // generate supported sets
supportedSets.clear(); supportedSets.clear();
for (String cardName : this.keySet()) { for (String cardName : this.keySet()) {

6
Mage.Server.Plugins/Mage.Game.MomirGame/src/mage/game/MomirGame.java
View file

@ -49,7 +49,11 @@ public class MomirGame extends GameImpl {
for (UUID playerId : state.getPlayerList(startingPlayerId)) { for (UUID playerId : state.getPlayerList(startingPlayerId)) {
Player player = getPlayer(playerId); Player player = getPlayer(playerId);
if (player != null) { if (player != null) {
CardInfo cardInfo = CardRepository.instance.findCard("Momir Vig, Simic Visionary"); CardInfo cardInfo = CardRepository.instance.findCardWithPreferredSetAndNumber("Momir Vig, Simic Visionary", "DIS", "118");
if (cardInfo == null) {
// how-to fix: make sure that a Momir Emblem and a source card uses same set (DIS - Dissension)
throw new IllegalStateException("Wrong code usage: momir card and emblem must exists in the same set (DIS)");
}
addEmblem(new MomirEmblem(), cardInfo.getCard(), playerId); addEmblem(new MomirEmblem(), cardInfo.getCard(), playerId);
} }
} }

2
Mage/src/main/java/mage/game/command/emblems/MomirEmblem.java
View file

@ -32,7 +32,7 @@ public final class MomirEmblem extends Emblem {
// Faking Vanguard as an Emblem; need to come back to this and add a new type of CommandObject // Faking Vanguard as an Emblem; need to come back to this and add a new type of CommandObject
public MomirEmblem() { public MomirEmblem() {
super("Emblem Momir Vig, Simic Visionary"); super("Emblem Momir");
// {X}, Discard a card: Create a token that's a copy of a creature card with converted mana cost X chosen at random. // {X}, Discard a card: Create a token that's a copy of a creature card with converted mana cost X chosen at random.
// Activate this ability only any time you could cast a sorcery and only once each turn. // Activate this ability only any time you could cast a sorcery and only once each turn.

1
Mage/src/main/resources/tokens-database.txt
View file

@ -114,6 +114,7 @@
|Generate|EMBLEM:MOM|Emblem Wrenn|||WrennAndRealmbreakerEmblem| |Generate|EMBLEM:MOM|Emblem Wrenn|||WrennAndRealmbreakerEmblem|
|Generate|EMBLEM:MOC|Emblem Elspeth|||ElspethSunsChampionEmblem| |Generate|EMBLEM:MOC|Emblem Elspeth|||ElspethSunsChampionEmblem|
|Generate|EMBLEM:MOC|Emblem Teferi|||TeferisTalentEmblem| |Generate|EMBLEM:MOC|Emblem Teferi|||TeferisTalentEmblem|
|Generate|EMBLEM:DIS|Emblem Momir|||MomirEmblem|
# ALL PLANES # ALL PLANES
# Usage hints: # Usage hints: