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

¿?¿?¿?¿?¿?¿?¿?¿?¿?¿?¿?¿?¿?¿?¿?

Browse source
This commit is contained in:
Dennis Weinberger 2019-03-26 19:32:46 +00:00
parent 61ab4887b6
commit 121583eb65
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,7 +84,6 @@ public class JokerPanel extends JPanel implements MouseListener{
* @param j The new joker * @param j The new joker
*/ */
private void setJoker(int index, JokerTypes j) { private void setJoker(int index, JokerTypes j) {
jokers[index] = j;
game.getCurrentPlayer().setJoker(index, j); game.getCurrentPlayer().setJoker(index, j);
} }
@ -106,7 +105,7 @@ 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); jokers[0] = JokerTypes.ADD_TROOPS_USED;
gv.updateStats(); gv.updateStats();
gv.repaint(); gv.repaint();
} }
@ -121,8 +120,9 @@ public class JokerPanel extends JPanel implements MouseListener{
return; return;
map.setIsChoosingJoker(true); map.setIsChoosingJoker(true);
game.getCurrentPlayer().setJoker(index, JokerTypes.SCARE_TROOPS_USED); game.getCurrentPlayer().setScareTroopsUsed();
gv.updateStats();
gv.repaint();
} }
} }