Skip to content

Improve roll and upOrDown functions #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guitared wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Improve roll and upOrDown functions #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc12282
Improve roll logic
guitared Mar 31, 2021
5317a23
enable dynamic subversion for upOrDown function
guitared Mar 31, 2021
6abb62c
Remove semicolon
guitared Mar 31, 2021
9e74774
fix rollcounter not reset after successful roll
guitared Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions core/migrate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const upOrDown = (fromVersion, toVersion) => {
const fromNumbers = fromVersion.split(".").map(el => Number(el));
const toNumbers = toVersion.split(".").map(el => Number(el));
for (let i = 0; i < fromNumbers.length; i++) {
if (fromNumbers[i] < toNumbers[i]) {
return "up";
}
if (fromNumbers[i] > toNumbers[i]) {
return "down";
const longestLength = Math.max(fromNumbers.length, toNumbers.length);
for (let i = 0; i < longestLength; i++) {
if (!fromNumbers[i]) fromNumbers[i] = 0;
if (!toNumbers[i]) toNumbers[i] = 0;
if (fromNumbers[i] != toNumbers[i]) {
return (fromNumbers[i] < toNumbers[i]) ? "up" : "down";
}
}
return "same";
Expand Down
17 changes: 5 additions & 12 deletions core/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,18 @@ const sleep = (ms = 0) => {

const roll = (critRate, _player = null) => {
dice = Math.random() * 100;
if (!_player) {
return dice < critRate;
} else {
if(_player && _player.rollCounter >= 0) {
_player.rollCounter++;
if (_player.rollCounter == 100) {
_player.rollCounter = 0;
return true; // 100% guarantee rate
}
let rateUp = 0;
if (_player.rollCounter >= 80) {
rateUp = _player.rollCounter / 10;
rateUp = (_player.rollCounter == 100)? 100 : _player.rollCounter / 10;
}
let catchIt = dice < (critRate + rateUp);
if (catchIt) {
// reset roll counter
if (dice < critRate + rateUp) {
_player.rollCounter = 0;
return true;
}
return catchIt;
}
return dice < critRate;
}

module.exports = {
Expand Down