forked from AtmaTek/WorldsCollide
-
Notifications
You must be signed in to change notification settings - Fork 13
feature: filter low value items #58
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
Open
gwnoseworthy
wants to merge
8
commits into
ff6wc:main
Choose a base branch
from
gwnoseworthy:feat-trash-filters
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
6851b40
feature: Add filtering of low value items from shops and chests. flag…
gwnoseworthy 5d5bd0b
chore: Add gold and iron armor to trash
gwnoseworthy b974b52
fix: when removing trash if item has no sell value asign chest empty.
gwnoseworthy 1fb7edd
feat: split trash filtering on shops and chests via -nts and -ntc
gwnoseworthy 9287fa0
fix: place filter trash args to relevant parsers
gwnoseworthy 5554c26
fix: add new flags to options
gwnoseworthy a2aeb80
feature: trash item price is based on vendor sell price flag
gwnoseworthy 2e6e1ea
fix: Trash list update from feedback
gwnoseworthy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| from data.chest import Chest | ||
| import data.chests_asm as chests_asm | ||
| from data.item import Item | ||
| from data.structures import DataArrays | ||
| import random | ||
|
|
||
|
|
@@ -105,6 +106,27 @@ def shuffle_random(self): | |
| elif chest.type == Chest.ITEM: | ||
| chest.contents = self.items.get_random() | ||
|
|
||
| if self.args.no_trash_chests: | ||
| if self.args.shop_sell_fraction4: | ||
| sell_factor = 1/4 | ||
| elif self.args.shop_sell_fraction8: | ||
| sell_factor = 1 / 8 | ||
| elif self.args.shop_sell_fraction0: | ||
| sell_factor = 0 | ||
| else: | ||
| sell_factor = 1/2 | ||
| for chest in possible_chests: | ||
| if not chest.type == Chest.ITEM: | ||
| continue | ||
| item = Item(chest.contents, self.rom) | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please change to |
||
| if item.is_trash: | ||
| item_chest_value = int(min((item.price * sell_factor)//100, Chest.MAX_GOLD_VALUE)) | ||
| if not item.sell_gold_value: | ||
| chest.type = Chest.EMPTY | ||
| chest.type = Chest.GOLD | ||
| chest.contents = item_chest_value | ||
|
|
||
|
|
||
| def random_tiered(self): | ||
| def get_item(tiers, tier_s_distribution): | ||
| from data.chest_item_tiers import weights | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change only affects
-ccsr #(where number is non-zero). I recommend making it apply for all other chest options as well by moving it into its own method called by mod.