joachim/fop-projekt
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Update JokerPanel.java

Browse source 
bug fixes
This commit is contained in:
Dennis Weinberger 2019-03-26 18:40:51 +00:00
parent 551cb5ac90
commit 3727b4ea88
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Projektgruppe_175/src/gui/components/JokerPanel.java
View file

@ -106,9 +106,9 @@ public class JokerPanel extends JPanel implements MouseListener{
if(choice == 1) if(choice == 1)
return; return;
game.getCurrentPlayer().addTroops(5); game.getCurrentPlayer().addTroops(5);
game.getCurrentPlayer().setJoker(index, JokerTypes.ADD_TROOPS_USED);
gv.updateStats(); gv.updateStats();
gv.repaint(); gv.repaint();
setJoker(index, JokerTypes.ADD_TROOPS_USED);
} }
if(index == 1) { if(index == 1) {
@ -120,9 +120,8 @@ public class JokerPanel extends JPanel implements MouseListener{
if(choice == 1) if(choice == 1)
return; return;
System.out.println("Joker used");
map.setIsChoosingJoker(true); map.setIsChoosingJoker(true);
setJoker(index, JokerTypes.SCARE_TROOPS_USED); game.getCurrentPlayer().setJoker(index, JokerTypes.SCARE_TROOPS_USED);
} }
} }
@ -145,8 +144,7 @@ public class JokerPanel extends JPanel implements MouseListener{
for(int i = 0; i < jokers.length; i++) { for(int i = 0; i < jokers.length; i++) {
System.out.print("i: " + i + jokers[i] + " "); g.drawImage(resources.getJokers()[game.getCurrentPlayer().getJokers()[i].ordinal()], 9 + 32 * i + 10 * i, 5, 32, 32, null);
g.drawImage(resources.getJokers()[jokers[i].ordinal()], 9 + 32 * i + 10 * i, 5, 32, 32, null);
} }
} }
@ -154,10 +152,9 @@ public class JokerPanel extends JPanel implements MouseListener{
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
System.out.println("X: " + e.getX() + " Y: " + e.getY());
if(e.getX() <= 41 && jokers[0] == JokerTypes.ADD_TROOPS) { if(e.getX() <= 41 && jokers[0] == JokerTypes.ADD_TROOPS) {
playJoker(0); playJoker(0);
} else } else if(e.getX() > 50 && e.getX() < 100 && jokers[1] == JokerTypes.SCARE_TROOPS)
playJoker(1); playJoker(1);
} }