Skip to content

Commit fc8d19f

Browse files
committed
🎊 - Add final commit
1 parent 9293d58 commit fc8d19f

File tree

9 files changed

+63
-83
lines changed

9 files changed

+63
-83
lines changed

data/characters/Bapt.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[Bapt, Magicien, 30.0, 500.0, 5.0, 15.0]

data/characters/Default.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[Default, ParDefault, 20.0, 700.0, 45.0, 0.0]

data/characters/LeVoleur.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[LeVoleur, Voleurs, 20.0, 700.0, 40.0, 2.0]

data/characters/Rui.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[Rui, Guerrier, 100.0, 100.0, 10.0, 10.0]

src/Characters.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,12 @@ private void charactersCreate(String defineName) {
171171
System.out.println("Quel est le niveau de la magie de votre personnage ?");
172172
System.out.print("> ");
173173

174+
createJson(name, className, attack, health, initiative, scanner.nextDouble());
175+
} else if(className == "Voleurs"){
176+
showTitle("Le%20vol");
177+
System.out.println("Quel est le niveau d'esquive de votre personnage ?");
178+
System.out.print("> ");
179+
174180
createJson(name, className, attack, health, initiative, scanner.nextDouble());
175181
} else {
176182
createJson(name, className, attack, health, initiative, 0.0);

src/Fights.java

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,53 @@ private void startFight(Player player1, Player player2) {
3030

3131
System.out.println("Le combat est terminé en " + playerTurns + " tours, " + player1.getName() + " est a " + player1.getHealth() + " et le " + player2.getName() + " est a " + player2.getHealth());
3232

33-
System.out.print("> Retour");
34-
scanner.nextLine();
33+
System.out.println("1: Voir les logs - 2: Retour");
34+
35+
System.out.print("> ");
3536
scanner.nextLine();
36-
showMenu();
37+
38+
switch (scanner.nextLine()) {
39+
case "1":
40+
System.out.println(logs);
41+
42+
System.out.println("Appuyez sur enter pour retourner au menu");
43+
44+
System.out.print("> ");
45+
scanner.nextLine();
46+
47+
showMenu();
48+
break;
49+
case "2":
50+
showMenu();
51+
break;
52+
default:
53+
break;
54+
}
3755
} else {
56+
double playerAttack;
57+
3858
if (Math.floor(playerTurns / 2) == (playerTurns / 2)) {
39-
player2.damage(player1.getAttack());
59+
playerAttack = player1.getAttack();
4060

41-
61+
player2.damage(playerAttack);
4262

4363
if(player2.getHealth() <= 0){
4464
player2.setHealth(0);
4565
}
66+
67+
logs += "[Player 1 turn] " + player2.getName() + " 🥊 " + player1.getName() + " (-" + playerAttack + ")\n";
68+
logs += "[Player 1 turn] ♥ " + player2.getName() + ": " + player2.getHealth() + "\n\n";
4669
} else {
47-
player1.damage(player2.getAttack());
70+
playerAttack = player2.getAttack();
71+
72+
player1.damage(playerAttack);
4873

4974
if(player1.getHealth() <= 0){
5075
player1.setHealth(0);
5176
}
77+
78+
logs += "[Player 2 turn] " + player1.getName() + " 🥊 " + player2.getName() + " (-" + playerAttack + ")\n";
79+
logs += "[Player 2 turn] ♥ " + player1.getName() + ": " + player1.getHealth() + "\n\n";
5280
}
5381

5482
playerTurns++;

src/Player.java

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
import java.util.Random;
2+
13
class Player {
24
private String name;
35
private String classes;
46
private double health;
57
private double attack;
68
private double initiative;
79
private double power;
10+
private boolean thiefSettings = true;
811

912
public Player(String name, String classes, double attack, double health, double initiative, double power) {
1013
this.name = name;
@@ -16,8 +19,14 @@ public Player(String name, String classes, double attack, double health, double
1619
}
1720

1821
public void damage(double damage) {
19-
if(getClassName().equals("Warrior")){
22+
if (getClassName().equals("Guerrier")) {
2023
this.health -= (damage - this.power);
24+
} else if (getClassName().equals("Voleurs")) {
25+
if ((new Random().nextInt((int) this.power) + 1) == 1) {
26+
this.health = (this.health - 0);
27+
} else {
28+
this.health -= damage;
29+
}
2130
} else {
2231
this.health -= damage;
2332
}
@@ -36,14 +45,18 @@ public void setHealth(double health) {
3645
}
3746

3847
public double getAttack() {
39-
System.out.println(getClassName());
40-
41-
if(getClassName().equals("Magicien")){
42-
System.out.println("Magicien Selected");
48+
if (getClassName().equals("Magicien")) {
4349
this.power = this.power / 2;
4450
return attack + this.power;
51+
} else if (getClassName().equals("Voleurs")) {
52+
if ((new Random().nextDouble((int) this.power) + 1) == 1 && thiefSettings) {
53+
this.thiefSettings = false;
54+
return (attack * 2);
55+
} else {
56+
this.thiefSettings = true;
57+
return attack;
58+
}
4559
} else {
46-
System.out.println("Personne normale");
4760
return attack;
4861
}
4962
}

src/Warrior.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/Wizard.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)