Skip to content

Commit 7fe4780

Browse files
author
“Tezz03”
committed
fix: to upload
1 parent 604f2c9 commit 7fe4780

File tree

2 files changed

+139
-135
lines changed
  • lesson_16/objects/objects_app/src

2 files changed

+139
-135
lines changed

‎lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/playerleveling/Player.java‎

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,38 @@
11
package com.codedifferently.lesson16.playerleveling;
22

3-
43
public class Player {
5-
private String name;
6-
private Type type;
7-
private int level;
8-
private double currentExperience;
9-
private int expPerFight;
10-
private boolean isAlive;
11-
12-
public enum Type {
13-
HUMAN,
14-
ELF,
15-
ORC,
16-
DRAGONIOD
17-
}
4+
private String name;
5+
private Type type;
6+
private int level;
7+
private double currentExperience;
8+
private int expPerFight;
9+
private boolean isAlive;
10+
11+
public enum Type {
12+
HUMAN,
13+
ELF,
14+
ORC,
15+
DRAGONIOD
16+
}
1817

19-
public Player ( String name, Type type, int level, double currentExperience, int expPerFight, boolean isAlive) {
20-
this.name = name;
21-
this.type = type;
22-
this.level = level;
23-
this.currentExperience = currentExperience;
24-
this.expPerFight = expPerFight;
25-
this.isAlive = isAlive;
26-
}
18+
public Player(
19+
String name,
20+
Type type,
21+
int level,
22+
double currentExperience,
23+
int expPerFight,
24+
boolean isAlive) {
25+
this.name = name;
26+
this.type = type;
27+
this.level = level;
28+
this.currentExperience = currentExperience;
29+
this.expPerFight = expPerFight;
30+
this.isAlive = isAlive;
31+
}
2732

28-
// Getters and Setters
33+
// Getters and Setters
2934

30-
public String getName() {
35+
public String getName() {
3136
return name;
3237
}
3338

@@ -42,55 +47,53 @@ public Type getType() {
4247
public void setType(Type characterType) {
4348
this.type = characterType;
4449
}
50+
4551
public int getLevel() {
46-
return level;
47-
}
52+
return level;
53+
}
4854

4955
public void setLevel(int level) {
5056
this.level = level;
51-
}
57+
}
5258

5359
public double getCurrentExperience() {
5460
return currentExperience;
5561
}
5662

57-
public void setCurrentExperiience (double currentExperience) {
63+
public void setCurrentExperiience(double currentExperience) {
5864
this.currentExperience = currentExperience;
5965
}
6066

6167
public int getExpPerFight() {
68+
if (expPerFight <= 0) {
69+
throw new IllegalStateException("Experience per fight must be greater than 0.");
70+
}
6271
return expPerFight;
6372
}
6473

65-
public void setExpPerFight ( int expPerFight) {
74+
public void setExpPerFight(int expPerFight) {
6675
this.expPerFight = expPerFight;
67-
6876
}
6977

7078
public boolean getIsAlive() {
7179
return isAlive;
7280
}
7381

74-
7582
public void gainExperience(int fights) {
76-
for (int i = 0; i < fights; i++) {
77-
currentExperience += expPerFight;
83+
for (int i = 0; i < fights; i++) {
84+
currentExperience += expPerFight;
7885

79-
double requiredExp = 100 * Math.pow(2, level - 1); // Level 1: 100 XP, Level 2: 200 XP, etc.
86+
double requiredExp = 100 * Math.pow(2, level - 1); // Level 1: 100 XP, Level 2: 200 XP, etc.
8087

81-
while (currentExperience >= requiredExp) {
82-
currentExperience -= requiredExp; // carry over any extra XP
83-
level++;
84-
System.out.println(name + " leveled up to level " + level + "!");
85-
requiredExp = 100 * Math.pow(2, level - 1); // Update the required XP for the new level
86-
}
88+
while (currentExperience >= requiredExp) {
89+
currentExperience -= requiredExp; // carry over any extra XP
90+
level++;
91+
System.out.println(name + " leveled up to level " + level + "!");
92+
requiredExp = 100 * Math.pow(2, level - 1); // Update the required XP for the new level
8793
}
88-
// used ai for lines between 85 and 97
94+
}
95+
// used ai for lines between 85 and 97
8996
}
9097
}
9198

92-
93-
94-
95-
96-
//int level = 1; int experience = 0; for(int i = 1; i <= 100; i++) {
99+
// int level = 1; int experience = 0; for(int i = 1; i <= 100; i++) {

‎lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/playertest/PlayerTest.java‎

Lines changed: 90 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,107 @@
11
package com.codedifferently.lesson16.playertest;
2-
import java.util.ArrayList;
32

43
import static org.junit.jupiter.api.Assertions.assertEquals;
54
import static org.junit.jupiter.api.Assertions.assertTrue;
6-
import org.junit.jupiter.api.Test;
75

86
import com.codedifferently.lesson16.playerleveling.Player;
97
import com.codedifferently.lesson16.playerleveling.Player.Type;
8+
import java.util.ArrayList;
9+
import org.junit.jupiter.api.Test;
10+
11+
public class PlayerTest {
12+
13+
@Test
14+
public void getName() {
15+
var expectedName = "JinWhoo";
16+
17+
Player player1 = new Player("JinWhoo", null, 0, 0, 0, true);
18+
19+
var actual = player1.getName();
20+
21+
assertEquals(expectedName, actual);
22+
}
23+
24+
@Test
25+
public void setName() {
26+
var expectedName = "Montez";
27+
28+
Player player = new Player("JinWhoo", null, 0, 0, 0, true);
29+
30+
player.setName(expectedName);
31+
32+
assertEquals(expectedName, player.getName());
33+
}
34+
35+
@Test
36+
public void getType() {
37+
Player player1 = new Player(null, Player.Type.DRAGONIOD, 0, 0, 0, true);
38+
Type expected = Type.DRAGONIOD;
39+
assertEquals(expected, player1.getType());
40+
}
41+
42+
@Test
43+
public void setType() {
44+
Player player = new Player(null, Player.Type.HUMAN, 0, 0, 0, true);
45+
player.setType(Player.Type.ELF);
46+
assertEquals(Player.Type.ELF, player.getType());
47+
}
48+
49+
@Test
50+
public void getLevel() {
51+
Player player = new Player(null, null, 5, 0, 0, true);
52+
assertEquals(5, player.getLevel());
53+
}
54+
55+
@Test
56+
public void setLevel() {
57+
Player player = new Player(null, null, 1, 0, 0, true);
58+
player.setLevel(10);
59+
assertEquals(10, player.getLevel());
60+
}
61+
62+
@Test
63+
public void getCurrentExperience() {
64+
Player player = new Player(null, null, 0, 150.5, 0, true);
65+
assertEquals(150.5, player.getCurrentExperience());
66+
}
67+
68+
@Test
69+
public void setCurrentExperience() {
70+
Player player = new Player(null, null, 0, 0, 0, true);
71+
player.setCurrentExperiience(200.75);
72+
assertEquals(200.75, player.getCurrentExperience());
73+
}
74+
75+
@Test
76+
public void getExpPerFight() {
77+
Player player = new Player(null, null, 0, 0, 50, true);
78+
assertEquals(50, player.getExpPerFight());
79+
}
80+
81+
@Test
82+
public void setExpPerFight() {
83+
Player player = new Player(null, null, 0, 0, 0, true);
84+
player.setExpPerFight(100);
85+
assertEquals(100, player.getExpPerFight());
86+
}
87+
88+
@Test
89+
public void getIsAlive() {
90+
Player player = new Player(null, null, 0, 0, 0, true);
91+
assertTrue(player.getIsAlive());
92+
}
1093

11-
public class PlayerTest {
12-
13-
@Test
14-
public void getName() {
15-
var expectedName = "JinWhoo";
16-
17-
Player player1 = new Player("JinWhoo", null, 0, 0, 0, true);
18-
19-
var actual = player1.getName();
20-
21-
assertEquals(expectedName, actual);
22-
}
23-
24-
@Test
25-
public void setName() {
26-
var expectedName = "Montez";
27-
28-
Player player = new Player("JinWhoo", null, 0, 0, 0, true);
29-
30-
player.setName(expectedName);
31-
32-
assertEquals(expectedName, player.getName());
33-
}
34-
35-
@Test
36-
public void getType() {
37-
Player player1 = new Player(null, Player.Type.DRAGONIOD, 0, 0, 0, true);
38-
Type expected = Type.DRAGONIOD;
39-
assertEquals(expected, player1.getType());
40-
}
41-
42-
@Test
43-
public void setType() {
44-
Player player = new Player(null, Player.Type.HUMAN, 0, 0, 0, true);
45-
player.setType(Player.Type.ELF);
46-
assertEquals(Player.Type.ELF, player.getType());
47-
}
48-
49-
@Test
50-
public void getLevel() {
51-
Player player = new Player(null, null, 5, 0, 0, true);
52-
assertEquals(5, player.getLevel());
53-
}
54-
55-
@Test
56-
public void setLevel() {
57-
Player player = new Player(null, null, 1, 0, 0, true);
58-
player.setLevel(10);
59-
assertEquals(10, player.getLevel());
60-
}
61-
62-
@Test
63-
public void getCurrentExperience() {
64-
Player player = new Player(null, null, 0, 150.5, 0, true);
65-
assertEquals(150.5, player.getCurrentExperience());
66-
}
67-
68-
@Test
69-
public void setCurrentExperience() {
70-
Player player = new Player(null, null, 0, 0, 0, true);
71-
player.setCurrentExperiience(200.75);
72-
assertEquals(200.75, player.getCurrentExperience());
73-
}
74-
75-
@Test
76-
public void getExpPerFight() {
77-
Player player = new Player(null, null, 0, 0, 50, true);
78-
assertEquals(50, player.getExpPerFight());
79-
}
80-
81-
@Test
82-
public void setExpPerFight() {
83-
Player player = new Player(null, null, 0, 0, 0, true);
84-
player.setExpPerFight(100);
85-
assertEquals(100, player.getExpPerFight());
86-
}
87-
88-
@Test
89-
public void getIsAlive() {
90-
Player player = new Player(null, null, 0, 0, 0, true);
91-
assertTrue(player.getIsAlive());
92-
}
93-
94-
@Test
95-
public void testLevelUpOnce() {
94+
@Test
95+
public void testLevelUpOnce() {
9696
ArrayList<String> abilities = new ArrayList<>();
9797
Player player1 = new Player("Jordan", Player.Type.HUMAN, 1, 0, 100, true);
9898

9999
player1.gainExperience(1); // 1 fight = 100 XP
100100

101101
assertEquals(2, player1.getLevel()); // Should now be level 2
102102
assertEquals(0, player1.getCurrentExperience()); // XP resets after exact level up
103-
}
104103
}
104+
}
105105

106-
// String name, Type type, int level, double currentExperience, int expPerFight, ArrayList<String> unlockedAbilities, boolean isAlive
106+
// String name, Type type, int level, double currentExperience, int expPerFight, ArrayList<String>
107+
// unlockedAbilities, boolean isAlive

0 commit comments

Comments
 (0)