diff --git a/src/main/java/game/StartDarkSoulsGame.java b/src/main/java/game/StartDarkSoulsGame.java index a91d035..f22ccd8 100644 --- a/src/main/java/game/StartDarkSoulsGame.java +++ b/src/main/java/game/StartDarkSoulsGame.java @@ -230,15 +230,34 @@ public class StartDarkSoulsGame { choice3.setText(""); choice4.setText(""); } - public void fight() { // commit 31 boss fight - position = "fight"; // commit 31 boss fight + public void fight() { + position = "fight"; mainTextArea.setText("Monster HP:"+ monsterHP + " \n" - + " THE SOUl OF CINDER: Run for your life ASHEN ONE "); // commit 31 boss fight - choice1.setText("Attack"); // commit (31) west location - choice2.setText("Run for your live");// commit (31) west location - choice3.setText("");// commit (31) west location - choice4.setText("");// commit (31) west location + + " THE SOUl OF CINDER: Run for your life ASHEN ONE "); + choice1.setText("Attack"); + choice2.setText("Run for your live"); + choice3.setText(""); + choice4.setText(""); } + public void playerAttack() { + position = "playerAttack"; + int playerDamage=0; + playerDamage = new java.util.Random().nextInt(3); + + if(weapon.equals("Knife")) { + playerDamage = new java.util.Random().nextInt(3); + } + else if (weapon.equals("Gift of Tears")) { + playerDamage = new java.util.Random().nextInt(8); + } + mainTextArea.setText("monster has been attacked: "+ playerDamage +" Damage "); + monsterHP = monsterHP - playerDamage; + choice1.setText(">"); + choice2.setText(""); + choice3.setText(""); + choice4.setText(""); + + } public class TitelScreenHandler implements ActionListener{ public void actionPerformed(ActionEvent event) { @@ -295,7 +314,7 @@ public class StartDarkSoulsGame { break; case "fight": switch(yourChoice) { - case "c1": break; + case "c1": playerAttack(); break; case "c2": crossRoad(); break; } }