Skip to content

Commit 58f87b9

Browse files
ARajan1084actions-user
ARajan1084
authored and
actions-user
committed
Bot: Prettified Java code!
1 parent 92d9f10 commit 58f87b9

File tree

10 files changed

+169
-47
lines changed

10 files changed

+169
-47
lines changed

‎src/com/codefortomorrow/advanced/chapter13/practice/RecurMergeSort.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.codefortomorrow.advanced.chapter13.practice;
22

33
public class RecurMergeSort {
4-
public static void recurMergeSort(Comparable[] array, int start, int end) {
54

6-
}
5+
public static void recurMergeSort(Comparable[] array, int start, int end) {}
76
}

‎src/com/codefortomorrow/advanced/chapter13/solutions/RecurMergeSort.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.codefortomorrow.advanced.chapter13.solutions;
22

33
public class RecurMergeSort {
4+
45
public static void recurMergeSort(Comparable[] array, int start, int end) {
56
if (start >= end) {
67
return;

‎src/com/codefortomorrow/intermediate/chapter12/practice/pokemon/Battle.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,24 @@ public class Battle {
88
private Pokemon pokemonTwo;
99
private int turn;
1010

11-
public Battle (Pokemon pokemonOne, Pokemon pokemonTwo) {
11+
public Battle(Pokemon pokemonOne, Pokemon pokemonTwo) {
1212
this.pokemonOne = pokemonOne;
1313
this.pokemonTwo = pokemonTwo;
1414
turn = 1;
1515
}
1616

1717
public void runBattle() {
18-
while(true) {
18+
while (true) {
1919
if (turn == 1) {
2020
executeTurn(pokemonOne, pokemonTwo);
2121
} else {
2222
executeTurn(pokemonTwo, pokemonOne);
2323
}
2424
System.out.println(pokemonOne);
2525
System.out.println(pokemonTwo);
26-
if (pokemonOne.getCurrentHP() <= 0 || pokemonTwo.getCurrentHP() <= 0) {
26+
if (
27+
pokemonOne.getCurrentHP() <= 0 || pokemonTwo.getCurrentHP() <= 0
28+
) {
2729
break;
2830
}
2931
}
@@ -34,11 +36,11 @@ public void executeTurn(Pokemon pokemon, Pokemon other) {
3436

3537
Move[] pokemonMoves = pokemon.getMoveList();
3638
for (int i = 1; i <= pokemonMoves.length; i++) {
37-
System.out.println(i + ": " + pokemonMoves[i-1].getName());
39+
System.out.println(i + ": " + pokemonMoves[i - 1].getName());
3840
}
3941
System.out.print("Move #: ");
4042
int move = sc.nextInt();
41-
pokemon.attack(other, move-1);
43+
pokemon.attack(other, move - 1);
4244
System.out.println();
4345

4446
if (turn == 1) {
@@ -47,4 +49,4 @@ public void executeTurn(Pokemon pokemon, Pokemon other) {
4749
turn = 1;
4850
}
4951
}
50-
}
52+
}

‎src/com/codefortomorrow/intermediate/chapter12/practice/pokemon/Main.java‎

Lines changed: 49 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,61 @@
11
package com.codefortomorrow.intermediate.chapter12.practice.pokemon;
22

33
public class Main {
4-
public static void main(String[]args) {
4+
5+
public static void main(String[] args) {
56
Move a1 = new Move("Water Gun", false, false, false, false, false, 15);
67
Move a2 = new Move("Tackle", false, false, false, false, false, 10);
78
Move a3 = new Move("Bubble", false, false, false, false, false, 16);
8-
Move a4 = new Move("Water Splash", false, false, false, false, false, 6);
9-
Move[] moveListA = {a1, a2, a3, a4};
10-
Pokemon a = new Pokemon(moveListA, 40, 0, "Squirtle", "Water", "Squirtle", 1);
9+
Move a4 = new Move(
10+
"Water Splash",
11+
false,
12+
false,
13+
false,
14+
false,
15+
false,
16+
6
17+
);
18+
Move[] moveListA = { a1, a2, a3, a4 };
19+
Pokemon a = new Pokemon(
20+
moveListA,
21+
40,
22+
0,
23+
"Squirtle",
24+
"Water",
25+
"Squirtle",
26+
1
27+
);
1128

12-
Move b1 = new Move("Thunder Shock", false, false, false, false, false, 25);
29+
Move b1 = new Move(
30+
"Thunder Shock",
31+
false,
32+
false,
33+
false,
34+
false,
35+
false,
36+
25
37+
);
1338
Move b2 = new Move("Slam", false, false, false, false, false, 16);
14-
Move b3 = new Move("Quick Attack", false, false, false, false, false, 10);
39+
Move b3 = new Move(
40+
"Quick Attack",
41+
false,
42+
false,
43+
false,
44+
false,
45+
false,
46+
10
47+
);
1548
Move b4 = new Move("Thunder", false, false, false, false, false, 6);
16-
Move[] moveListB = {b1, b2, b3, b4};
17-
Pokemon b = new Pokemon(moveListB, 30, 0, "Pikachu", "Electric", "Pikachu", 1);
49+
Move[] moveListB = { b1, b2, b3, b4 };
50+
Pokemon b = new Pokemon(
51+
moveListB,
52+
30,
53+
0,
54+
"Pikachu",
55+
"Electric",
56+
"Pikachu",
57+
1
58+
);
1859
Battle battle = new Battle(a, b);
1960
battle.runBattle();
2061
}

‎src/com/codefortomorrow/intermediate/chapter12/practice/pokemon/Move.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,15 @@ public class Move {
2222
* @param freezing whether the move freezes
2323
* @param baseDamage base damage of the move
2424
*/
25-
public Move(String name, boolean poisoning, boolean sleeping, boolean paralyzing, boolean burning, boolean freezing, int baseDamage) {
25+
public Move(
26+
String name,
27+
boolean poisoning,
28+
boolean sleeping,
29+
boolean paralyzing,
30+
boolean burning,
31+
boolean freezing,
32+
int baseDamage
33+
) {
2634
this.name = name;
2735
this.poisoning = poisoning;
2836
this.sleeping = sleeping;

‎src/com/codefortomorrow/intermediate/chapter12/practice/pokemon/Pokemon.java‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,28 @@ public class Pokemon {
2626
* @param species the species of the Pokemon
2727
* @param type type of the Pokemon
2828
*/
29-
public Pokemon(String species, String type) {
30-
31-
}
29+
public Pokemon(String species, String type) {}
3230

3331
/**
3432
* Complete this constructor. See the above constructor for default values.
3533
* @param species the species of the Pokemon
3634
* @param type of the Pokemon
3735
* @param name the name/nickname of the Pokemon
3836
*/
39-
public Pokemon(String species, String type, String name) {
40-
41-
}
37+
public Pokemon(String species, String type, String name) {}
4238

4339
/**
4440
* Complete this constructor. See the first constructor for default values.
4541
*/
46-
public Pokemon(Move[] moveList, int maxHP, int XP, String species, String type, String name, int level) {
47-
48-
}
42+
public Pokemon(
43+
Move[] moveList,
44+
int maxHP,
45+
int XP,
46+
String species,
47+
String type,
48+
String name,
49+
int level
50+
) {}
4951

5052
/**
5153
* Places given move in the moveList at the given index. If a move was previously present, it
@@ -65,7 +67,13 @@ public Move learnMove(int index, Move move) {
6567
*/
6668
public void attack(Pokemon enemy, int moveIndex) {
6769
// Type your code here
68-
System.out.println(name + " used " + moveList[moveIndex].getName() + " on " + enemy.getName());
70+
System.out.println(
71+
name +
72+
" used " +
73+
moveList[moveIndex].getName() +
74+
" on " +
75+
enemy.getName()
76+
);
6977
System.out.println(enemy.getName() + " took " + " damage."); // TODO: Fix
7078
}
7179

@@ -81,9 +89,7 @@ public boolean takeDamage(int damage) {
8189
* Adds given HP to current HP
8290
* @param hp given hp to heal
8391
*/
84-
public void heal(int hp) {
85-
86-
}
92+
public void heal(int hp) {}
8793

8894
public String getName() {
8995
return ""; //TODO: Fix

‎src/com/codefortomorrow/intermediate/chapter12/solutions/pokemon/Battle.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,24 @@ public class Battle {
88
private Pokemon pokemonTwo;
99
private int turn;
1010

11-
public Battle (Pokemon pokemonOne, Pokemon pokemonTwo) {
11+
public Battle(Pokemon pokemonOne, Pokemon pokemonTwo) {
1212
this.pokemonOne = pokemonOne;
1313
this.pokemonTwo = pokemonTwo;
1414
turn = 1;
1515
}
1616

1717
public void runBattle() {
18-
while(true) {
18+
while (true) {
1919
if (turn == 1) {
2020
executeTurn(pokemonOne, pokemonTwo);
2121
} else {
2222
executeTurn(pokemonTwo, pokemonOne);
2323
}
2424
System.out.println(pokemonOne);
2525
System.out.println(pokemonTwo);
26-
if (pokemonOne.getCurrentHP() <= 0 || pokemonTwo.getCurrentHP() <= 0) {
26+
if (
27+
pokemonOne.getCurrentHP() <= 0 || pokemonTwo.getCurrentHP() <= 0
28+
) {
2729
break;
2830
}
2931
}
@@ -34,11 +36,11 @@ public void executeTurn(Pokemon pokemon, Pokemon other) {
3436

3537
Move[] pokemonMoves = pokemon.getMoveList();
3638
for (int i = 1; i <= pokemonMoves.length; i++) {
37-
System.out.println(i + ": " + pokemonMoves[i-1].getName());
39+
System.out.println(i + ": " + pokemonMoves[i - 1].getName());
3840
}
3941
System.out.print("Move #: ");
4042
int move = sc.nextInt();
41-
pokemon.attack(other, move-1);
43+
pokemon.attack(other, move - 1);
4244
System.out.println();
4345

4446
if (turn == 1) {
@@ -47,4 +49,4 @@ public void executeTurn(Pokemon pokemon, Pokemon other) {
4749
turn = 1;
4850
}
4951
}
50-
}
52+
}

‎src/com/codefortomorrow/intermediate/chapter12/solutions/pokemon/Main.java‎

Lines changed: 49 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,61 @@
11
package com.codefortomorrow.intermediate.chapter12.solutions.pokemon;
22

33
public class Main {
4-
public static void main(String[]args) {
4+
5+
public static void main(String[] args) {
56
Move a1 = new Move("Water Gun", false, false, false, false, false, 15);
67
Move a2 = new Move("Tackle", false, false, false, false, false, 10);
78
Move a3 = new Move("Bubble", false, false, false, false, false, 16);
8-
Move a4 = new Move("Water Splash", false, false, false, false, false, 6);
9-
Move[] moveListA = {a1, a2, a3, a4};
10-
Pokemon a = new Pokemon(moveListA, 40, 0, "Squirtle", "Water", "Squirtle", 1);
9+
Move a4 = new Move(
10+
"Water Splash",
11+
false,
12+
false,
13+
false,
14+
false,
15+
false,
16+
6
17+
);
18+
Move[] moveListA = { a1, a2, a3, a4 };
19+
Pokemon a = new Pokemon(
20+
moveListA,
21+
40,
22+
0,
23+
"Squirtle",
24+
"Water",
25+
"Squirtle",
26+
1
27+
);
1128

12-
Move b1 = new Move("Thunder Shock", false, false, false, false, false, 25);
29+
Move b1 = new Move(
30+
"Thunder Shock",
31+
false,
32+
false,
33+
false,
34+
false,
35+
false,
36+
25
37+
);
1338
Move b2 = new Move("Slam", false, false, false, false, false, 16);
14-
Move b3 = new Move("Quick Attack", false, false, false, false, false, 10);
39+
Move b3 = new Move(
40+
"Quick Attack",
41+
false,
42+
false,
43+
false,
44+
false,
45+
false,
46+
10
47+
);
1548
Move b4 = new Move("Thunder", false, false, false, false, false, 6);
16-
Move[] moveListB = {b1, b2, b3, b4};
17-
Pokemon b = new Pokemon(moveListB, 30, 0, "Pikachu", "Electric", "Pikachu", 1);
49+
Move[] moveListB = { b1, b2, b3, b4 };
50+
Pokemon b = new Pokemon(
51+
moveListB,
52+
30,
53+
0,
54+
"Pikachu",
55+
"Electric",
56+
"Pikachu",
57+
1
58+
);
1859
Battle battle = new Battle(a, b);
1960
battle.runBattle();
2061
}

‎src/com/codefortomorrow/intermediate/chapter12/solutions/pokemon/Move.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,15 @@ public class Move {
2222
* @param freezing whether the move freezes
2323
* @param baseDamage base damage of the move
2424
*/
25-
public Move(String name, boolean poisoning, boolean sleeping, boolean paralyzing, boolean burning, boolean freezing, int baseDamage) {
25+
public Move(
26+
String name,
27+
boolean poisoning,
28+
boolean sleeping,
29+
boolean paralyzing,
30+
boolean burning,
31+
boolean freezing,
32+
int baseDamage
33+
) {
2634
this.name = name;
2735
this.poisoning = poisoning;
2836
this.sleeping = sleeping;

‎src/com/codefortomorrow/intermediate/chapter12/solutions/pokemon/Pokemon.java‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,15 @@ public Pokemon(String species, String type, String name) {
4646
/**
4747
* Complete this constructor. See the first constructor for default values.
4848
*/
49-
public Pokemon(Move[] moveList, int maxHP, int XP, String species, String type, String name, int level) {
49+
public Pokemon(
50+
Move[] moveList,
51+
int maxHP,
52+
int XP,
53+
String species,
54+
String type,
55+
String name,
56+
int level
57+
) {
5058
this.moveList = moveList;
5159
this.maxHP = maxHP;
5260
this.XP = XP;
@@ -78,7 +86,13 @@ public Move learnMove(int index, Move move) {
7886
public void attack(Pokemon enemy, int moveIndex) {
7987
int damage = moveList[moveIndex].calculateDamage(level);
8088
enemy.takeDamage(damage);
81-
System.out.println(name + " used " + moveList[moveIndex].getName() + " on " + enemy.getName());
89+
System.out.println(
90+
name +
91+
" used " +
92+
moveList[moveIndex].getName() +
93+
" on " +
94+
enemy.getName()
95+
);
8296
System.out.println(enemy.getName() + " took " + damage + " damage.");
8397
}
8498

0 commit comments

Comments
 (0)