Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small changes.

master
ubeefx 2010-11-28 21:32:39 +00:00
parent 2f23e1e4f5
commit c91a0ff7b6
4 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
launch4j/Readme.txt Normal file
View File

@ -0,0 +1,6 @@
There must be a Java Runtime 6 (java.com) installed on your computer to play.
Installing is quite simple, just put Magarena.exe on your desktop and execute.
Do not forget to download images in the Arena menu the first time.
Otherwise you will see a lot of question marks.
Have fun!

2
launch4j/arena.xml
View File

@ -1,7 +1,7 @@
<launch4jConfig>
<dontWrapJar>false</dontWrapJar>
<headerType>gui</headerType>
<jar>arena.jar</jar>
<jar>Magarena.jar</jar>
<outfile>Magarena.exe</outfile>
<errTitle></errTitle>
<cmdLine></cmdLine>

1
src/magic/test/TestGameBuilder.java
View File

@ -106,6 +106,7 @@ public class TestGameBuilder {
addToHand(player,"Lightning Bolt",1);
addToHand(player,"Fire Servant",1);
createPermanent(game,player,"Fire Servant",false,1);
createPermanent(game,player,"Akroma, Angel of Wrath",true,1);
createPermanent(game,opponent,"Forest",true,1);
createPermanent(game,opponent,"Bottle Gnomes",false,1);
createPermanent(game,opponent,"Deadly Recluse",true,1);

47
src/magic/ui/viewer/ImagePermanentViewer.java
View File

@ -233,6 +233,29 @@ public class ImagePermanentViewer extends JPanel {
g.drawImage(image,x1,y1,x2,y2,0,0,CardImages.CARD_WIDTH,CardImages.CARD_HEIGHT,this);
}
if (permanentInfo.creature) {
// Common combat ability icons.
final long abilityFlags=linkedInfo.abilityFlags;
int ax=x1;
int ay=y2-17;
if (MagicAbility.Flying.hasAbility(abilityFlags)) {
g.drawImage(IconImages.FLYING.getImage(),ax,ay,this);
ax+=16;
}
if (MagicAbility.FirstStrike.hasAbility(abilityFlags)||MagicAbility.DoubleStrike.hasAbility(abilityFlags)) {
g.drawImage(IconImages.STRIKE.getImage(),ax,ay,this);
ax+=16;
}
if (MagicAbility.Trample.hasAbility(abilityFlags)) {
g.drawImage(IconImages.TRAMPLE.getImage(),ax,ay,this);
ax+=16;
}
if (MagicAbility.Deathtouch.hasAbility(abilityFlags)) {
g.drawImage(IconImages.DEATHTOUCH.getImage(),ax,ay,this);
ax+=16;
}
}
final String pt=linkedInfo.powerToughness;
if (!pt.isEmpty()) {
final String damage=linkedInfo.damage>0?String.valueOf(linkedInfo.damage):null;
@ -243,29 +266,7 @@ public class ImagePermanentViewer extends JPanel {
drawCreatureInfo(g,metrics,pt,ptWidth,damage,x2-ptWidth-4,y2-(damage!=null?32:18),true);
}
}
if (permanentInfo.creature) {
// Common combat ability icons.
final long abilityFlags=permanentInfo.abilityFlags;
int ax=x1+4;
if (MagicAbility.Flying.hasAbility(abilityFlags)) {
g.drawImage(IconImages.FLYING.getImage(),ax,y1+(y2-y1)/2-8,this);
ax+=16;
}
if (MagicAbility.FirstStrike.hasAbility(abilityFlags)||MagicAbility.DoubleStrike.hasAbility(abilityFlags)) {
g.drawImage(IconImages.STRIKE.getImage(),ax,y1+(y2-y1)/2-8,this);
ax+=16;
}
if (MagicAbility.Trample.hasAbility(abilityFlags)) {
g.drawImage(IconImages.TRAMPLE.getImage(),ax,y1+(y2-y1)/2-8,this);
ax+=16;
}
if (MagicAbility.Deathtouch.hasAbility(abilityFlags)) {
g.drawImage(IconImages.DEATHTOUCH.getImage(),ax,y1+(y2-y1)/2-8,this);
ax+=16;
}
}
if (viewer.isValidChoice(linkedInfo)) {
g2d.setPaint(viewer.getController().isCombatChoice()?FontsAndBorders.COMBAT_TARGET_COLOR:FontsAndBorders.TARGET_COLOR);
g2d.fillRect(x1-1,y1-1,x2-x1+2,y2-y1+2);