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: Profit per corpse loot #1734

Merged
merged 6 commits into from
May 8, 2024
Merged

Feature: Profit per corpse loot #1734

merged 6 commits into from
May 8, 2024

Conversation

hannibal002
Copy link
Owner

@hannibal002 hannibal002 commented May 7, 2024 •
edited
Loading

What

added profit per corpse loot in chat

Images

image
image
image
image

Test

/shtestmessage -clipboard -lines -s

§a§l▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬
  §r§b§l§r§6§lUMBER §r§b§lCORPSE LOOT! 
  §r§a§lREWARDS
    §r§5+1,000 HOTM Experience
    §r§9☘ Fine Peridot Gemstone §r§8x2
    §r§9☠ Fine Onyx Gemstone §r§8x2
    §r§bGlacite Powder §r§8x17,031
§a§l▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬

Changelog New Features

  • Profit Per Corpse. - hannibal2
    • Displays profit/loss in chat after looting a corpse in the Mineshaft.
    • Includes a breakdown of information on hover.

@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label May 7, 2024
@hannibal002 hannibal002 added this to the Version 0.25 milestone May 7, 2024
@hannibal002 hannibal002 requested a review from CalMWolfs May 7, 2024 20:40
@github-actions GitHub Actions
Copy link

github-actions bot commented May 7, 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 May 7, 2024
@hannibal002
Merge branch 'beta' into added-profit-per-corpse
a7f9b9b 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label May 7, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented May 7, 2024

Conflicts have been resolved! 🎉

CalMWolfs
CalMWolfs requested changes May 8, 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.

i think adding this word in would make it look better, but apart from that the code looks good

src/main/java/at/hannibal2/skyhanni/features/mining/mineshaft/MineshaftCorpseProfitPer.kt Outdated Show resolved Hide resolved
@hannibal002 @CalMWolfs
Update src/main/java/at/hannibal2/skyhanni/features/mining/mineshaft/…
686c139 
…MineshaftCorpseProfitPer.kt

Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
@hannibal002 hannibal002 requested a review from CalMWolfs May 8, 2024 11:03
CalMWolfs
CalMWolfs approved these changes May 8, 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.

code looks good, havent tested

@hannibal002 hannibal002 merged commit 2d98444 into beta May 8, 2024
7 checks passed
@hannibal002 hannibal002 deleted the added-profit-per-corpse branch May 8, 2024 19:13
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label May 8, 2024
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

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

Successfully merging this pull request may close these issues.
2 participants
@hannibal002 @CalMWolfs