owner/Bowling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add 0 roll handling aswell

Browse Source
This commit is contained in:
Rasmus Rasmussen 2025-03-27 13:54:02 +01:00
parent aa81717fd9
commit 76284c3951
3 changed files with 60 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rolls4.txt
View File

@ -1 +1 @@
0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 10, 10, 10, 5, 5 5, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 10, 10, 10, 5, 5

1
rolls5.txt Normal file
View File

@ -0,0 +1 @@
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 10, 10

62
src/PrintFrames.cpp
View File

@ -32,6 +32,20 @@ string PrintFrames::parseValue(vector<Frame> frames) {
ss << "X, " << frames[i].Roll[2] << " "; ss << "X, " << frames[i].Roll[2] << " ";
} }
else if (frames[i].Roll[1] == 10 && frames[i].Roll[2] == 0) {
ss << frames[i].Roll[1] << ", - ";
}
else if (frames[i].Roll[1] == 0 && frames[i].Roll[2] == 10) {
ss << "-, " << frames[i].Roll[2] << " ";
}
else if (frames[i].Roll[1] != 10 && frames[i].Roll[2] == 0) {
ss << frames[i].Roll[1] << ", - ";
}
else if (frames[i].Roll[1] == 0 && frames[i].Roll[2] != 10) {
ss << "-, " << frames[i].Roll[2] << " ";
}
continue; continue;
} }
@ -44,8 +58,17 @@ string PrintFrames::parseValue(vector<Frame> frames) {
ss << frames[i + 1].Roll[1] << ", X"; ss << frames[i + 1].Roll[1] << ", X";
} else { } else {
if (frames[i + 1].Roll[0] + frames[i + 1].Roll[1] == 10) { if (frames[i + 1].Roll[0] + frames[i + 1].Roll[1] == 10) {
ss << "X, " << frames[i + 1].Roll[0] << " ,/"; ss << "X, " << frames[i + 1].Roll[0] << ", /";
} else { }
else if (frames[i + 1].Roll[0] == 0 && frames[i + 1].Roll[1] != 0) {
ss << "X, " << "-, " << frames[i + 1].Roll[1];
}
else if (frames[i + 1].Roll[0] != 0 && frames[i + 1].Roll[1] == 0) {
ss << "X, " << frames[i + 1].Roll[0] << ", -";
}
else {
ss << "X, "; ss << "X, ";
} }
} }
@ -62,7 +85,25 @@ string PrintFrames::parseValue(vector<Frame> frames) {
// Spare // Spare
if (frames[i].Roll[0] + frames[i].Roll[1] == 10) { if (frames[i].Roll[0] + frames[i].Roll[1] == 10) {
if (frames[i].Roll.size() == 3) { if (frames[i].Roll.size() == 3) {
ss << frames[i].Roll[0] << ", / "; if (frames[i].Roll[0] == 0 && frames[i].Roll[1] != 10 && frames[i].Roll[2] != 10) {
if (frames[i].Roll[2] == 0) {
ss << "-, /, -";
} else {
ss << "-, " << frames[i].Roll[1] << frames[i].Roll[2];
}
}
else if (frames[i].Roll[0] == 0 && frames[i].Roll[1] == 10 && frames[i].Roll[2] != 10) {
if (frames[i].Roll[2] == 0) {
ss << "-, /, -";
} else {
ss << "-, /, " << frames[i].Roll[2];
}
}
else if (frames[i].Roll[0] == 0 && frames[i].Roll[1] == 10 && frames[i].Roll[2] == 10) {
ss << "-, /, X";
} else {
ss << frames[i].Roll[0] << ", / ";
}
continue; continue;
} }
@ -74,7 +115,20 @@ string PrintFrames::parseValue(vector<Frame> frames) {
if (i == 9) { if (i == 9) {
ss << frames[i].Roll[0] << ", " << frames[i].Roll[1] << " "; ss << frames[i].Roll[0] << ", " << frames[i].Roll[1] << " ";
} else { } else {
ss << frames[i].Roll[0] << ", " << frames[i].Roll[1]; if (frames[i].Roll[0] == 0 && frames[i].Roll[1] == 0) {
ss << "-, -";
}
else if (frames[i].Roll[0] == 0 && frames[i].Roll[1] != 0) {
ss << "-, " << frames[i].Roll[1];
}
else if (frames[i].Roll[0] != 0 && frames[i].Roll[1] == 0) {
ss << frames[i].Roll[0] << ", -";
}
else {
ss << frames[i].Roll[0] << ", " << frames[i].Roll[1];
}
} }
} }