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.

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

Jump to bottom

Feature: Total Powder Cost in Perk Lore #1460

Merged
merged 94 commits into from
Jun 13, 2024
Merged

Feature: Total Powder Cost in Perk Lore #1460

merged 94 commits into from
Jun 13, 2024

Conversation

j10a1n15
Copy link
Contributor

@j10a1n15 j10a1n15 commented Apr 15, 2024 •
edited by hannibal002
Loading

Dependencies

What

This Pull Request adds the option to show the "powder spend/total needed" per HotM Perk.

Images

image

Changelog New Features

  • Added HotM Perks Powder features. - j10a1n15
    • Added total powder cost to HotM perks.
    • Added powder cost for 10 levels.

Changelog Technical Details

  • Added getPerkByName(name) and calculateTotalCost(level) to HotmAPI. - j10a1n15

Thunderblade73 and others added 27 commits December 29, 2023 14:33
@Thunderblade73
input some data
40af948
@Thunderblade73
working
b4991e4
@Thunderblade73
added full storage support, copy tree, powder and tokens
ed8846a
@Thunderblade73
test
2ed9de7
@Thunderblade73
improved the rewardFun
03b008d
@Thunderblade73
rename of file
94f7801
@Thunderblade73
Merge branch 'beta' into hotm-API
11a7b19 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
#	src/main/java/at/hannibal2/skyhanni/config/Storage.java
#	src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
@Thunderblade73
made feature separate
f63774c
@Thunderblade73
fix
8950236
@Thunderblade73
fix
bcbdab0
@Thunderblade73
Revert "test"
243a4c2 
This reverts commit 2ed9de7.
@Thunderblade73
max level hide
ed0f783
@Thunderblade73
fixed missing new line
f5136a8
@Thunderblade73
updated format
c4e431b
@Thunderblade73
.
d954a74
@Thunderblade73
Merge branch 'beta' into hotm-API
35158f2 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/Storage.java
@Thunderblade73
Merge branch 'beta' into hotm-API
8d45844 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@Thunderblade73
Merge branch 'beta' into hotm-API
8b70d6c 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@Thunderblade73
Merge branch 'beta' into hotm-API
6c46d32
@Thunderblade73
Merge branch 'beta' into hotm-API
b003bc9 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@Thunderblade73
Mining V3
2089acd
@Thunderblade73
Merge branch 'beta' into hotm-API
ab77fa2
@Thunderblade73
Merge branch 'beta' into hotm-API
9f8bf3f 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@Thunderblade73
fix
f4f8467
@Thunderblade73 @j10a1n15
fixed typos
e13e575 
Co-authored-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@j10a1n15
init
280816b
@j10a1n15
small improvement
6d7de74
@hannibal002 hannibal002 added this to the Version 0.26 milestone Apr 16, 2024
CalMWolfs
CalMWolfs requested changes Jun 1, 2024
View reviewed changes
Copy link
Collaborator

@CalMWolfs CalMWolfs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just this one thing, feature works fine and seems cool

src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt Outdated Show resolved Hide resolved
@CalMWolfs CalMWolfs added the Soon This Pull Request will be merged within the next couple of betas label Jun 1, 2024
@j10a1n15 j10a1n15 requested a review from CalMWolfs June 1, 2024 09:47
@j10a1n15
remove
aace276 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@j10a1n15
Merge branch 'hannibal002:beta' into total-powder-needed
349f199
@j10a1n15
auto load
27be988 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 8, 2024

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 8, 2024
@CalMWolfs
Merge branch 'refs/heads/beta' into fork/j10a1n15/total-powder-needed
102361d 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 8, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 8, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 9, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 9, 2024

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 9, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 9, 2024

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 merged commit 045c397 into hannibal002:beta Jun 13, 2024
3 of 4 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Jun 13, 2024
@j10a1n15 j10a1n15 deleted the total-powder-needed branch June 13, 2024 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CalMWolfs CalMWolfs CalMWolfs approved these changes

@Thunderblade73 Thunderblade73 Awaiting requested review from Thunderblade73

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Version 0.26
Development

Successfully merging this pull request may close these issues.
5 participants
@j10a1n15 @Thunderblade73 @CalMWolfs @hannibal002 @martimavocado