feat: Shopsanity - #206
Merged
Merged
feat: Shopsanity#206
Conversation
- Changes settings to include Shopsanity and Scrubsanity and edits descriptions - Adjusts Item Pool to split Scrub Purchases from Shops, Also implements item pool logic for Shopsanity and Scrubsanity - Adjusts Item Locations for proper override values for shops
Fixes a few issues with compiling
* Add choice markers, CreateShopMessage - Use ># in Tingle and other shops - Create both halves of shop text from first ID - Write price to field_4 and to text * Tweak CreateShopMessage - Make part-timer variants of shop messages (En & Fr only so far) - Make out of stock variant of blue potion message automatically - Draft per-language same-line separators - Center ice trap message
- Implements new shops.cpp files for calculating prices and setting fake names for ice trap items - Fake names are dummied out for now pending creation - Adds new Shopsanity and Shopsanity price settings
- Changes settings to include Shopsanity and Scrubsanity and edits descriptions - Adjusts Item Pool to split Scrub Purchases from Shops, Also implements item pool logic for Shopsanity and Scrubsanity - Adjusts Item Locations for proper override values for shops
Fixes a few issues with compiling
* Add choice markers, CreateShopMessage - Use ># in Tingle and other shops - Create both halves of shop text from first ID - Write price to field_4 and to text * Tweak CreateShopMessage - Make part-timer variants of shop messages (En & Fr only so far) - Make out of stock variant of blue potion message automatically - Draft per-language same-line separators - Center ice trap message
- Implements new shops.cpp files for calculating prices and setting fake names for ice trap items - Fake names are dummied out for now pending creation - Adds new Shopsanity and Shopsanity price settings
…into Shopsanity
- Reworked CreateShopMessages and Created CreateShopMessage() function to handle creating the text itself - Adjust Vanilla item placement for Shops to not use the BUY items - update Z3DR
…into Shopsanity
- Actually call the Shop Messages function so they're created
- First attempt at ordering shop items correctly - Update Z3DR
ya know
Adjust Trading Post location values so items appear in the shop as they show in the spoiler log
Adjust Message values for Trading Post items to match what they actually are
fix TP Item Slot 2
Reduce redundancy
- Move contents of CreateShopMessage to for loop - Try to simplify said loop a bit
nit: Update Z3DR.
nit: Remove unused prices as they're set in message. nit: Fix potion shop ordering.
- Implements NonShopItems functionality borrowed from OOT3DR
fix wrong type used
- Implement shopsanity prices - Adjust shop assignment logic so assigns every item a price - Adjust Bomb Shop Goron to not be a shop ~ Leaving vanilla for now
remove static items not needed anymore
- Adds initial test for scrub text - Adds price onto curiosity shop bomb bag
fix: Update shop item placement to avoid crashes.
- Adds Chateau Romani Refill Item + hints - Adjusts Magic Bean itemtype - Adds Milk Bar Milk and Chateau purchase locations to Shopsanity - Moves Scrubsanity setting from Major Items category to Side Quest category - Minor adjustments to item pool generation (Adds vanilla placements for progressive bomb bags to clock town & milk/chateau to Milk Bar ) - Cleans up more commented out code
- Use "variables" for Tingle shop prices - Fix up milk bar dialogue - Fill up more scrub messages
still pretty sloppy
- Update some hint text - Update German - Add Pendant and Stray Fairies to Ice Trap disguises - Fix(?) Magic Bean Ice Trap disguise - Fix Chateau Romani Refill in TrickNameTable - Update ItemTable Item Types
…into Shopsanity
- Adds missing IngameSettings to pre - set options in the Ingame Menu - Adds Descriptions for settings - Update Z3DR Back to dev (Since Shopsanity Branch is now merged)
Fixes name of pirate cutscene skip description
Shorten option setting so it doesnt overflow
lowercase t because of consistency
change group for IST glitch chest
Update Z3DR. Change gitmodules to point to dev.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
No description provided.