Comparer le texte

Trouver la différence entre deux fichiers texte

Éditeur live
Cacher identiques
Sans retour à la ligne
Vue
Niveau de précision
Coloration syntaxique

Difference

Créé Le diff n'expire jamais
68 suppressions
167 lignes
32 ajouts
130 lignes
if (cards[0].equals(one)) {
if (cards[0].equals(one)) {
if (r1 == -1) {
if (r4 == -1) {
r1 = 34;
r4 = 34;
System.out.println("lol");
} else {
} else {
r1 += 1;
r4 += 1;
}
}
looper = false;
looper = false;
} else if (cards[0].equals(two)) {
} else if (cards[0].equals(two)) {
if (r1 == -1) {
if (r4 == -1) {
r1 = 34;
r4 = 34;
} else {
} else {
r1 += 2;
r4 += 2;
}
}
System.out.println("You got an extra turn!");
System.out.println("You got an extra turn!");
extra_turn = true;
extra_turn = true;
} else if (cards[0].equals(three)) {
} else if (cards[0].equals(three)) {
r1 += 3;
r4 += 3;
} else if (cards[0].equals(four)) {
} else if (cards[0].equals(four)) {
r1 += 56;
r4 += 56;
} else if (cards[0].equals(five)) {
} else if (cards[0].equals(five)) {
r1 += 6;
r4 += 6;
} else if (cards[0].equals(seven)) {
} else if (cards[0].equals(seven)) {
if (r1 + r2 + r3 == -3 || r1 + r2 + r4 == -3 || r1 + r3 + r4 == -3 || r2 + r3 + r4 == -3) {
if (r1 + r2 + r3 == -3 || r1 + r2 + r4 == -3 || r1 + r3 + r4 == -3
r1 += 7;
|| r2 + r3 + r4 == -3) {
r4 += 7;
continue;
continue;
}
}
String split_or_not = "no";
String split_or_not = "no";
if (in_str_array(i, human_player_colors)) {
if (in_str_array(i, human_player_colors)) {
System.out.print("Would you like to split between 2 pawns?[yes]/[no]");
System.out.print("Would you like to split between 2 pawns?[yes]/[no]");
split_or_not = scan.nextLine();
split_or_not = scan.nextLine();
}
}
if (split_or_not.equals("no")) {
if (split_or_not.equals("no")) {
r1 += 7;
r4 += 7;
} else if (split_or_not.equals("yes")) {
} else if (split_or_not.equals("yes")) {
do {
do {
System.out.print("How much would you like to move " + pawn_move + "?");
System.out.print("How much would you like to move " + pawn_move + "?");
p1_move = Integer.parseInt(scan.nextLine());
p1_move = Integer.parseInt(scan.nextLine());
String pawn2_move = pawn_move(i, r1, r2, r3, r4, y1, y2, y3, y4, g1, g2,
String pawn2_move = pawn_move(i, r1, r2, r3, r4, y1, y2, y3, y4, g1, g2, g3, g4,
g3, g4, b1, b2, b3, b4, cards, one, two,
b1, b2, b3, b4, cards, one, two, in_str_array(i, human_player_colors));
in_str_array(i, human_player_colors));
;
System.out.print("How much would you like to move " + pawn2_move + "?");
System.out.print("How much would you like to move " + pawn2_move + "?");
p2_move = Integer.parseInt(scan.nextLine());
p2_move = Integer.parseInt(scan.nextLine());
if (p1_move + p2_move != 7) {
if (p1_move + p2_move != 7) {
System.out.println("Moves dont add up to 7!");
System.out.println("Moves don't add up to 7!");
continue;
continue;
} else {
} else {
if (pawn_move.equals("r1")) {
if (pawn_move.equals("r1")) {
r1 += p1_move;
r1 += p1_move;
}
}
if (pawn_move.equals("r2")) {
if (pawn_move.equals("r2")) {
r2 += p1_move;
r2 += p1_move;
}
}
if (pawn_move.equals("r3")) {
if (pawn_move.equals("r3")) {
r3 += p1_move;
r3 += p1_move;
}
}
if (pawn_move.equals("r4")) {
if (pawn_move.equals("r4")) {
r4 += p1_move;
r4 += p1_move;
}
}
if (pawn2_move.equals("r1")) {
if (pawn2_move.equals("r1")) {
r1 += p2_move;
r1 += p2_move;
}
}
if (pawn2_move.equals("r2")) {
if (pawn2_move.equals("r2")) {
r2 += p2_move;
r2 += p2_move;
}
}
if (pawn2_move.equals("r3")) {
if (pawn2_move.equals("r3")) {
r3 += p2_move;
r3 += p2_move;
}
}
if (pawn2_move.equals("r4")) {
if (pawn2_move.equals("r4")) {
r4 += p2_move;
r4 += p2_move;
}
}
}
}
} while (p1_move + p2_move != 7);
} while (p1_move + p2_move != 7);

}
}
} else if (cards[0].equals(eight)) {
} else if (cards[0].equals(eight)) {
r1 += 8;
r4 += 8;
} else if (cards[0].equals(ten)) {
} else if (cards[0].equals(ten)) {
do {
do {
fwd_bkwd = "f";
fwd_bkwd = "f";
if (in_str_array(i, human_player_colors)) {
if (in_str_array(i, human_player_colors)) {
System.out.print("Move forwards or backwards? [f]/[b]");
System.out.print("Move forwards or backwards? [f]/[b]");
fwd_bkwd = scan.nextLine();
fwd_bkwd = scan.nextLine();
}
}
} while (!(fwd_bkwd.equals("f") || fwd_bkwd.equals("b")));
} while (!(fwd_bkwd.equals("f") || fwd_bkwd.equals("b")));
if (fwd_bkwd.equals("f")) {
if (fwd_bkwd.equals("f")) {
r1 += 10;
r4 += 10;
} else {
} else {
r1 += 59;
r4 += 59;
}
}
} else if (cards[0].equals(eleven)) {
} else if (cards[0].equals(eleven)) {
String swap;
String swap;
String fwd_or_swap = "f";
String fwd_or_swap = "f";
if (in_str_array(i, human_player_colors)) {
if (in_str_array(i, human_player_colors)) {
System.out
System.out
.print("Would you like to move forward 11 or swap with an opponents pawn?[f]/[s]");
.print("Would you like to move forward 11 or swap with an opponents pawn?[f]/[s]");
fwd_or_swap = scan.nextLine();
fwd_or_swap = scan.nextLine();
}
}
if (fwd_or_swap.equals("f")) {
if (fwd_or_swap.equals("f")) {
r1 += 11;
r4 += 11;
} else if (fwd_or_swap.equals("s")) {
} else if (fwd_or_swap.equals("s")) {
boolean loop2 = false;
boolean loop2 = false;
do {
do {
System.out.print("Which pawn would you like to swap?");
System.out.print("Which pawn would you like to swap?");
swap = scan.nextLine();
swap = scan.nextLine();
if (can_swap(i, swap, r1, r2, r3, r4, g1, g2, g3, g4, y1, y2, y3, y4, b1, b2, b3,
if (can_swap(i, swap, r1, r2, r3, r4, g1, g2, g3, g4, y1, y2, y3, y4, b1, b2,
b4)) {
b3, b4)) {
System.out.println("swapped!");
System.out.println("Swapped!");
loop2 = false;
loop2 = false;
} else {
} else {
loop2 = true;
loop2 = true;
}
}
} while (loop2);
} while (loop2);
// Swapping logic
if (swap.equals("g1")) {
if (swap.equals("g1")) {
int temp = r1;
int temp = r3;
r1 = g1;
r4 = g1;
g1 = temp;
g1 = temp;
} else if (swap.equals("g2")) {
} else if (swap.equals("g2")) {
int temp = r1;
int temp = r4;
r1 = g2;
r4 = g2;
g2 = temp;
g2 = temp;
} else if (swap.equals("g3")) {
} else if (swap.equals("g3")) {
int temp = r1;
int temp = r4;
r1 = g3;
r4 = g3;
g3 = temp;
g3 = temp;
} else if (swap.equals("g4")) {
} // continue for other colors
int temp = r1;
r1 = g4;
g4 = temp;
} else if (swap.equals("y1")) {
int temp = r1;
r1 = y1;
y1 = temp;
} else if (swap.equals("y2")) {
int temp = r1;
r1 = y2;
y2 = temp;
} else if (swap.equals("y3")) {
int temp = r1;
r1 = y3;
y3 = temp;
} else if (swap.equals("y4")) {
int temp = r1;
r1 = y4;
y4 = temp;
} else if (swap.equals("b1")) {
int temp = r1;
r1 = b1;
b1 = temp;
} else if (swap.equals("b2")) {
int temp = r1;
r1 = b2;
b2 = temp;
} else if (swap.equals("b3")) {
int temp = r1;
r1 = b1;
b3 = temp;
} else if (swap.equals("b4")) {
int temp = r1;
r1 = b1;
b4 = temp;
}

}
}
} else if (cards[0].equals(twelve)) {
} else if (cards[0].equals(twelve)) {
r1 += 12;
r4 += 12;
}
}
Différences enregistrées