- Added another icon.

- Some quest fixes.
This commit is contained in:
jendave
2011-08-06 03:46:20 +00:00
parent eff6c3d98a
commit 46346a5b9f
4 changed files with 6 additions and 2 deletions

1
.gitattributes vendored
View File

@@ -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

BIN
res/pics/HeartIcon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

View File

@@ -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();

View File

@@ -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())) {