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

Update DuelScene.java

Browse Source 
fix avatar and player extra cards overwritten by blank effects.. (effect cards uses setcardsonbattlefields)
This commit is contained in:
Anthony Calosa
2022-08-11 20:43:05 +08:00
committed by GitHub
parent acaec64078
commit 3c186e38de
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-gui-mobile/src/forge/adventure/scene/DuelScene.java
View File

@@ -90,8 +90,8 @@ public class DuelScene extends ForgeScene {
FThreads.invokeInEdtNowOrLater(() -> FOptionPane.showMessageDialog(message, enemyName, new FBufferedImage(120, 120) { FThreads.invokeInEdtNowOrLater(() -> FOptionPane.showMessageDialog(message, enemyName, new FBufferedImage(120, 120) {
@Override @Override
protected void draw(Graphics g, float w, float h) { protected void draw(Graphics g, float w, float h) {
if (FSkin.getAvatars().get(90000) != null) if (FSkin.getAvatars().get(90001) != null)
g.drawImage(FSkin.getAvatars().get(90000), 0, 0, w, h); g.drawImage(FSkin.getAvatars().get(90001), 0, 0, w, h);
} }
}, new Callback<Integer>() { }, new Callback<Integer>() {
@Override @Override
@@ -135,7 +135,7 @@ public class DuelScene extends ForgeScene {
changeStartCards+= data.changeStartCards; changeStartCards+= data.changeStartCards;
startCards.addAll(data.startBattleWithCards()); startCards.addAll(data.startBattleWithCards());
} }
player.addExtraCardsOnBattlefield(startCards); player.setCardsOnBattlefield(startCards);
player.setStartingLife(Math.max(1,lifeMod+player.getStartingLife())); player.setStartingLife(Math.max(1,lifeMod+player.getStartingLife()));
player.setStartingHand(player.getStartingHand()+changeStartCards); player.setStartingHand(player.getStartingHand()+changeStartCards);
} }
@@ -309,11 +309,11 @@ public class DuelScene extends ForgeScene {
"It's all or nothing!","It's all on the line!","You can't back down now!","Do you have what it takes?","What will happen next?", "It's all or nothing!","It's all on the line!","You can't back down now!","Do you have what it takes?","What will happen next?",
"Don't blink!","You can't lose here!","There's no turning back!","It's all or nothing now!"); "Don't blink!","You can't lose here!","There's no turning back!","It's all or nothing now!");
String message = Aggregates.random(list); String message = Aggregates.random(list);
FThreads.delayInEDT(600, () -> FThreads.invokeInEdtNowOrLater(() -> FOptionPane.showMessageDialog(message, enemy.getName(), new FBufferedImage(120, 120) { FThreads.delayInEDT(600, () -> FThreads.invokeInEdtNowOrLater(() -> FOptionPane.showMessageDialog(message, enemy.nameOverride.isEmpty() ? enemy.getData().name : enemy.nameOverride, new FBufferedImage(120, 120) {
@Override @Override
protected void draw(Graphics g, float w, float h) { protected void draw(Graphics g, float w, float h) {
if (FSkin.getAvatars().get(90000) != null) if (FSkin.getAvatars().get(90001) != null)
g.drawImage(FSkin.getAvatars().get(90000), 0, 0, w, h); g.drawImage(FSkin.getAvatars().get(90001), 0, 0, w, h);
} }
}))); })));
} }