diff --git a/.gitattributes b/.gitattributes index 4271852c08a..292633d0450 100644 --- a/.gitattributes +++ b/.gitattributes @@ -28,6 +28,7 @@ res/lib/substance.jar -text svneol=unset#unset res/main.properties svneol=native#text/plain res/pics/BookIcon.png -text svneol=unset#image/png res/pics/GoldIcon.png -text svneol=unset#image/png +res/pics/HeartIcon.png -text svneol=unset#image/png res/pics_link/card-pictures_a.txt -text svneol=native#text/plain res/pics_link/card-pictures_b.txt -text svneol=native#text/plain res/pics_link/card-pictures_c.txt -text svneol=native#text/plain diff --git a/res/pics/HeartIcon.png b/res/pics/HeartIcon.png new file mode 100644 index 00000000000..8337955e043 Binary files /dev/null and b/res/pics/HeartIcon.png differ diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java index f819ace701e..eedc4a72c9b 100644 --- a/src/forge/GameAction.java +++ b/src/forge/GameAction.java @@ -794,7 +794,7 @@ public class GameAction { int gameNumber = 0; if (Constant.Runtime.WinLose.getWin()==1) gameNumber = 1; - Constant.Runtime.WinLose.setWinMethod(gameNumber,"Battle of Wits"); + Constant.Runtime.WinLose.setWinMethod(gameNumber,"Milled"); life.setLife(0); checkStateEffects(); diff --git a/src/forge/Gui_WinLose.java b/src/forge/Gui_WinLose.java index cc8f4f81b73..7b29cfbb33f 100644 --- a/src/forge/Gui_WinLose.java +++ b/src/forge/Gui_WinLose.java @@ -246,7 +246,10 @@ public class Gui_WinLose extends JFrame implements NewConstants { else { quest.subtractCredits(15); - JOptionPane.showMessageDialog(null, "You FAIL! You have lost 15 credits."); + String fileName = "HeartIcon.png"; + ImageIcon icon = getIcon(fileName); + + JOptionPane.showMessageDialog(null, "You FAIL! You have lost 15 credits.", "Awwww", JOptionPane.INFORMATION_MESSAGE, icon); } if(quest.shouldAddAdditionalCards(winLose.didWinRecently())) {