Skip to content

Commit c8d5cb7

Browse files
committed
✨ - Update class
1 parent 9b93821 commit c8d5cb7

File tree

2 files changed

+16
-110
lines changed

2 files changed

+16
-110
lines changed

src/Warrior.java

Lines changed: 7 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -2,82 +2,34 @@ class Warrior {
22
private String name;
33
private double health;
44
private double attack;
5-
private double shield;
65
private double initiative;
6+
private double shield;
77

88
public Warrior(String name, double attack, double health, double initiative, double shield) {
99
this.name = name;
1010
this.attack = attack;
1111
this.health = health;
12-
this.shield = shield;
1312
this.initiative = initiative;
13+
this.shield = shield;
1414
}
1515

16-
public void damage_receive(int nbDamage){
17-
this.setHealth(this.getHealth() - (nbDamage - getShield()));
18-
}
19-
20-
@Override
21-
public String toString() {
22-
return "Warrior{" +
23-
"name='" + name + '\'' +
24-
", health=" + health +
25-
", attack=" + attack +
26-
", shield=" + shield +
27-
'}';
28-
}
29-
30-
public String toString(int toStringV2) {
31-
return "Warrior{" +
32-
"name='" + name + '\'' +
33-
", health=" + health +
34-
", attack=" + attack +
35-
", shield=" + shield +
36-
'}';
16+
public void damage(double damage) {
17+
this.health -= (damage - this.shield);
3718
}
3819

3920
public String getName() {
4021
return name;
4122
}
4223

43-
public void damage(double damage){
44-
this.health -= damage;
45-
}
46-
47-
public void setName(String name){
48-
this.name = name;
49-
}
50-
51-
public double getHealth(){
24+
public double getHealth() {
5225
return health;
5326
}
5427

55-
public void setHealth (double health){
56-
this.health = health;
57-
}
58-
59-
public double getAttack () {
28+
public double getAttack() {
6029
return attack;
6130
}
6231

63-
public void setAttack (double attack) {
64-
this.attack = attack;
65-
}
66-
67-
public double getShield() {
68-
return shield;
69-
}
70-
71-
public void setShield(double shield) {
72-
this.shield = shield;
73-
}
74-
7532
public double getInitiative() {
7633
return initiative;
7734
}
78-
public void setInitiative(double initiative) {
79-
this.initiative = initiative;
80-
}
81-
82-
83-
}
35+
}

src/Wizard.java

Lines changed: 9 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,36 @@
11
class Wizard {
2-
32
private String name;
43
private double health;
54
private double attack;
6-
private double magic;
7-
private double attack_magic;
85
private double initiative;
6+
private double magic;
97

10-
public Wizard(String name, double attack, double health, double initiative, double magic, double attack_magic) {
8+
public Wizard(String name, double attack, double health, double initiative, double magic) {
119
this.name = name;
1210
this.attack = attack;
1311
this.health = health;
14-
this.magic = magic ;
15-
this.attack_magic = attack_magic;
1612
this.initiative = initiative;
13+
this.magic = magic * 2;
1714
}
1815

19-
public double getAttack_magic() {
20-
return attack_magic;
21-
}
22-
23-
public void setAttack_magic(double attack_magic) {
24-
this.attack_magic = attack_magic;
16+
public void damage(double damage) {
17+
this.health -= damage;
2518
}
2619

2720
public String getName() {
2821
return name;
2922
}
3023

31-
public void damage(double damage){
32-
this.health -= damage;
33-
}
34-
35-
public void setName(String name){
36-
this.name =name;
37-
}
38-
39-
public double getHealth(){
24+
public double getHealth() {
4025
return health;
4126
}
4227

43-
public void setHealth (double health){
44-
this.health = health;
45-
}
46-
47-
public double getAttack () {
48-
return attack;
49-
}
50-
51-
public void setAttack (double attack) {
52-
this.attack = attack;
53-
}
54-
55-
public double getMagic() {
56-
return magic;
57-
}
58-
59-
public void setMagic(double magic) {
60-
this.magic = magic;
61-
}
62-
63-
public void decreaseMagic() {
64-
magic = magic / 2;
65-
}
66-
67-
public void AttackMagic(){
68-
attack_magic = magic + attack;
28+
public double getAttack() {
29+
this.magic = this.magic / 2;
30+
return attack + this.magic;
6931
}
7032

7133
public double getInitiative() {
7234
return initiative;
7335
}
74-
75-
76-
public void setInitiative(double initiative) {
77-
this.initiative = initiative;
78-
}
79-
8036
}
81-
82-

0 commit comments

Comments
 (0)