Skip to content
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.

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

[TESTED]Added Auto Contract button next to ask for easier & changed emoji for easier button #5573

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
31e7f0f
Change the Emoji on ask for easier contract
I-am-TURBO Jan 12, 2024
92ac31c
Added Auto Contract button next to easier
I-am-TURBO Jan 12, 2024
54ea07f
Uploaded the actual file for this PR
I-am-TURBO Jan 12, 2024
a82ec52
This time it is actually the commit
I-am-TURBO Jan 12, 2024
efda7a0
fixed errors
I-am-TURBO Jan 12, 2024
53d8a28
fixed more errors
I-am-TURBO Jan 12, 2024
aebd79a
fixed more errors
I-am-TURBO Jan 12, 2024
368a02e
more error fixing
I-am-TURBO Jan 12, 2024
13014e8
more errors
I-am-TURBO Jan 12, 2024
9179c19
more errors
I-am-TURBO Jan 12, 2024
7613fe5
ContractButton fixes
nwjgit Jan 12, 2024
6b8c688
Merge branch 'master' into Farming-Button
I-am-TURBO Jan 15, 2024
07a161c
Merge branch 'master' into Farming-Button
I-am-TURBO Jan 18, 2024
dd94ec8
Merge branch 'master' into Farming-Button
I-am-TURBO Jan 21, 2024
1d35dcd
Merge branch 'master' into Farming-Button
I-am-TURBO Jan 23, 2024
5034b72
Merge branch 'oldschoolgg:master' into Farming-Button
I-am-TURBO Jan 29, 2024
36358a2
Merge branch 'master' into Farming-Button
I-am-TURBO Jan 30, 2024
6087cb0
Merge branch 'master' into Farming-Button
I-am-TURBO Feb 2, 2024
2584bbe
Merge branch 'oldschoolgg:master' into Farming-Button
I-am-TURBO Feb 3, 2024
e3c46d6
Merge branch 'oldschoolgg:master' into Farming-Button
I-am-TURBO Feb 5, 2024
ff99124
Merge branch 'oldschoolgg:master' into Farming-Button
I-am-TURBO Feb 7, 2024
ac06ca5
Merge branch 'master' into Farming-Button
I-am-TURBO Feb 10, 2024
ed14c84
Merge branch 'oldschoolgg:master' into Farming-Button
I-am-TURBO Feb 12, 2024
dc1b0c9
Merge branch 'oldschoolgg:master' into Farming-Button
I-am-TURBO Feb 19, 2024
0b8be8f
Merge branch 'master' into Farming-Button
I-am-TURBO Feb 19, 2024
24a2324
Merge branch 'oldschoolgg:master' into Farming-Button
I-am-TURBO Feb 29, 2024
da746fc
Merge branch 'oldschoolgg:master' into Farming-Button
I-am-TURBO Mar 12, 2024
346c4e4
Merge branch 'oldschoolgg:master' into Farming-Button
I-am-TURBO Mar 17, 2024
349bfae
Merge branch 'oldschoolgg:master' into Farming-Button
I-am-TURBO Mar 19, 2024
da836b2
Merge branch 'oldschoolgg:master' into Farming-Button
I-am-TURBO Mar 26, 2024
fc3d595
Merge branch 'oldschoolgg:master' into Farming-Button
I-am-TURBO Apr 3, 2024
b16d041
Merge branch 'oldschoolgg:master' into Farming-Button
I-am-TURBO Apr 27, 2024
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
2 changes: 1 addition & 1 deletion src/lib/util/smallUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

export function formatDuration(ms: number, short = false) {
if (ms < 0) ms = -ms;
const time = {

Check warning on line 60 in src/lib/util/smallUtils.ts

View workflow job for this annotation

GitHub Actions / ESLint

'time' is already declared in the upper scope on line 7 column 63
day: Math.floor(ms / 86_400_000),
hour: Math.floor(ms / 3_600_000) % 24,
minute: Math.floor(ms / 60_000) % 60,
Expand Down Expand Up @@ -152,7 +152,7 @@
.setCustomId('FARMING_CONTRACT_EASIER')
.setLabel('Ask for easier Contract')
.setStyle(ButtonStyle.Secondary)
.setEmoji('977410792754413668');
.setEmoji('🎲');
}

export function makeAutoFarmButton() {
Expand Down Expand Up @@ -236,7 +236,7 @@
highestDeathChance?: number;
steepness?: number;
}): number {
if (!currentKC) currentKC = 1;

Check warning on line 239 in src/lib/util/smallUtils.ts

View workflow job for this annotation

GitHub Actions / ESLint

Unexpected number value in conditional. An explicit zero/NaN check is required
currentKC = Math.max(1, currentKC);
let baseDeathChance = Math.min(highestDeathChance, (100 * hardness) / steepness);
const maxScalingKC = 5 + (75 * hardness) / steepness;
Expand Down