Diff
checker
文本
文本
图像
文档
Excel
文件夹
Legal
Enterprise
桌面版
定价
登录
下载 Diffchecker 桌面版
比较文本
查找两个文本文件之间的差异
工具
历史
实时编辑器
折叠未更改行
关闭换行
视图
拆分
统一
比对精度
智能
单词
字符
语法高亮
选择语法
忽略
文本转换
转到第一个差异
编辑输入
Diffchecker Desktop
运行Diffchecker最安全的方式。获取Diffchecker桌面应用:您的差异永远不会离开您的电脑!
获取桌面版
Difference
创建于
2年前
差异永不过期
清除
导出
分享
解释
68 删除
行
总计
删除
字符
总计
删除
要继续使用此功能,请升级到
Diff
checker
Pro
查看价格
167 行
全部复制
32 添加
行
总计
添加
字符
总计
添加
要继续使用此功能,请升级到
Diff
checker
Pro
查看价格
130 行
全部复制
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 don
t 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("
s
wapped!");
System.out.println("
S
wapped!");
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;
}
}
已保存差异
原始文本
打开文件
if (cards[0].equals(one)) { if (r1 == -1) { r1 = 34; } else { r1 += 1; } looper = false; } else if (cards[0].equals(two)) { if (r1 == -1) { r1 = 34; } else { r1 += 2; } System.out.println("You got an extra turn!"); extra_turn = true; } else if (cards[0].equals(three)) { r1 += 3; } else if (cards[0].equals(four)) { r1 += 56; } else if (cards[0].equals(five)) { r1 += 6; } else if (cards[0].equals(seven)) { if (r1 + r2 + r3 == -3 || r1 + r2 + r4 == -3 || r1 + r3 + r4 == -3 || r2 + r3 + r4 == -3) { r1 += 7; continue; } String split_or_not = "no"; if (in_str_array(i, human_player_colors)) { System.out.print("Would you like to split between 2 pawns?[yes]/[no]"); split_or_not = scan.nextLine(); } if (split_or_not.equals("no")) { r1 += 7; } else if (split_or_not.equals("yes")) { do { System.out.print("How much would you like to move " + pawn_move + "?"); p1_move = Integer.parseInt(scan.nextLine()); String pawn2_move = pawn_move(i, r1, r2, r3, r4, y1, y2, y3, y4, g1, g2, g3, g4, b1, b2, b3, b4, cards, one, two, in_str_array(i, human_player_colors)); ; System.out.print("How much would you like to move " + pawn2_move + "?"); p2_move = Integer.parseInt(scan.nextLine()); if (p1_move + p2_move != 7) { System.out.println("Moves dont add up to 7!"); continue; } else { if (pawn_move.equals("r1")) { r1 += p1_move; } if (pawn_move.equals("r2")) { r2 += p1_move; } if (pawn_move.equals("r3")) { r3 += p1_move; } if (pawn_move.equals("r4")) { r4 += p1_move; } if (pawn2_move.equals("r1")) { r1 += p2_move; } if (pawn2_move.equals("r2")) { r2 += p2_move; } if (pawn2_move.equals("r3")) { r3 += p2_move; } if (pawn2_move.equals("r4")) { r4 += p2_move; } } } while (p1_move + p2_move != 7); } } else if (cards[0].equals(eight)) { r1 += 8; } else if (cards[0].equals(ten)) { do { fwd_bkwd = "f"; if (in_str_array(i, human_player_colors)) { System.out.print("Move forwards or backwards? [f]/[b]"); fwd_bkwd = scan.nextLine(); } } while (!(fwd_bkwd.equals("f") || fwd_bkwd.equals("b"))); if (fwd_bkwd.equals("f")) { r1 += 10; } else { r1 += 59; } } else if (cards[0].equals(eleven)) { String swap; String fwd_or_swap = "f"; if (in_str_array(i, human_player_colors)) { System.out .print("Would you like to move forward 11 or swap with an opponents pawn?[f]/[s]"); fwd_or_swap = scan.nextLine(); } if (fwd_or_swap.equals("f")) { r1 += 11; } else if (fwd_or_swap.equals("s")) { boolean loop2 = false; do { System.out.print("Which pawn would you like to swap?"); swap = scan.nextLine(); if (can_swap(i, swap, r1, r2, r3, r4, g1, g2, g3, g4, y1, y2, y3, y4, b1, b2, b3, b4)) { System.out.println("swapped!"); loop2 = false; } else { loop2 = true; } } while (loop2); if (swap.equals("g1")) { int temp = r1; r1 = g1; g1 = temp; } else if (swap.equals("g2")) { int temp = r1; r1 = g2; g2 = temp; } else if (swap.equals("g3")) { int temp = r1; r1 = g3; g3 = temp; } else if (swap.equals("g4")) { 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)) { r1 += 12; }
更改后文本
打开文件
if (cards[0].equals(one)) { if (r4 == -1) { r4 = 34; System.out.println("lol"); } else { r4 += 1; } looper = false; } else if (cards[0].equals(two)) { if (r4 == -1) { r4 = 34; } else { r4 += 2; } System.out.println("You got an extra turn!"); extra_turn = true; } else if (cards[0].equals(three)) { r4 += 3; } else if (cards[0].equals(four)) { r4 += 56; } else if (cards[0].equals(five)) { r4 += 6; } else if (cards[0].equals(seven)) { if (r1 + r2 + r3 == -3 || r1 + r2 + r4 == -3 || r1 + r3 + r4 == -3 || r2 + r3 + r4 == -3) { r4 += 7; continue; } String split_or_not = "no"; if (in_str_array(i, human_player_colors)) { System.out.print("Would you like to split between 2 pawns?[yes]/[no]"); split_or_not = scan.nextLine(); } if (split_or_not.equals("no")) { r4 += 7; } else if (split_or_not.equals("yes")) { do { System.out.print("How much would you like to move " + pawn_move + "?"); p1_move = Integer.parseInt(scan.nextLine()); String pawn2_move = pawn_move(i, r1, r2, r3, r4, y1, y2, y3, y4, g1, g2, g3, g4, b1, b2, b3, b4, cards, one, two, in_str_array(i, human_player_colors)); System.out.print("How much would you like to move " + pawn2_move + "?"); p2_move = Integer.parseInt(scan.nextLine()); if (p1_move + p2_move != 7) { System.out.println("Moves don't add up to 7!"); continue; } else { if (pawn_move.equals("r1")) { r1 += p1_move; } if (pawn_move.equals("r2")) { r2 += p1_move; } if (pawn_move.equals("r3")) { r3 += p1_move; } if (pawn_move.equals("r4")) { r4 += p1_move; } if (pawn2_move.equals("r1")) { r1 += p2_move; } if (pawn2_move.equals("r2")) { r2 += p2_move; } if (pawn2_move.equals("r3")) { r3 += p2_move; } if (pawn2_move.equals("r4")) { r4 += p2_move; } } } while (p1_move + p2_move != 7); } } else if (cards[0].equals(eight)) { r4 += 8; } else if (cards[0].equals(ten)) { do { fwd_bkwd = "f"; if (in_str_array(i, human_player_colors)) { System.out.print("Move forwards or backwards? [f]/[b]"); fwd_bkwd = scan.nextLine(); } } while (!(fwd_bkwd.equals("f") || fwd_bkwd.equals("b"))); if (fwd_bkwd.equals("f")) { r4 += 10; } else { r4 += 59; } } else if (cards[0].equals(eleven)) { String swap; String fwd_or_swap = "f"; if (in_str_array(i, human_player_colors)) { System.out .print("Would you like to move forward 11 or swap with an opponents pawn?[f]/[s]"); fwd_or_swap = scan.nextLine(); } if (fwd_or_swap.equals("f")) { r4 += 11; } else if (fwd_or_swap.equals("s")) { boolean loop2 = false; do { System.out.print("Which pawn would you like to swap?"); swap = scan.nextLine(); if (can_swap(i, swap, r1, r2, r3, r4, g1, g2, g3, g4, y1, y2, y3, y4, b1, b2, b3, b4)) { System.out.println("Swapped!"); loop2 = false; } else { loop2 = true; } } while (loop2); // Swapping logic if (swap.equals("g1")) { int temp = r3; r4 = g1; g1 = temp; } else if (swap.equals("g2")) { int temp = r4; r4 = g2; g2 = temp; } else if (swap.equals("g3")) { int temp = r4; r4 = g3; g3 = temp; } // continue for other colors } } else if (cards[0].equals(twelve)) { r4 += 12; }
查找差异