Merge 4.1 to master - #824
Merged
Merged
Conversation
- Harden patching
…vement 2-3-4 (Taken from prestige backport)
Merges Cj's server prepatcher
…their frozen counterparts" This reverts commit df8ffa2.
Add Shadow of Tagilla only figurines to pmc loot blacklist
Ragfair fixes (blacklists, currency, default chance for barter)
* add two new types to carry the stats * removed unused method and usings * add methods to helper to work out money amount, todo other stats * add missing using * Changed The value of CounterKey to Long, this is what it is in the client * clean up get currencies method, added methods to get profile stats for use in the launcher
* Implement json enum extensions * fix return from changing prop type * Implement json based enum extensions for the client
* Add support for "and/or" cultist circle recipes. Consume non-repeatable rewards first, then if there are still repeatables after that only grant those. The cache key moves to only being the sacrificed items instead of sacrifice+reward. * Update hideout.json Cultist Circle and/or recipes to proper consumable format --------- Co-authored-by: acidphantasm <acidphantasm@nobody.com>
* Updated Cultist Circle Recipes - Ornament (Red, Silve, Violet) -> 2x Ded Moroz Figurine - Augmentin -> xTG-12 - Pumpking with sweets -> Jack-o'-Latern - Mr Kerman Cat Holo -> Mr Kerman Cat Holo, Labs access Card - Moved all crafts to better fit - 60/66 near the top, 3960 in the middle, and 39960 at the end * Removed Friend of Norvinsk reciepes to better fit live & Build 40743-8645ed3-20260716 * fixed incorrect timings. forgot a 3. * As per Drakia's Words readded Friend of Nov recipes. I would verify it actually works, I know these recipes have issues on 4.0 from my own use, and others - sometimes they just fail.
also update the line ending for the json output
- Clear up todo in AdjustWeighting - Fix up AdjustWeighting and remove the excess logging, as well as make it so that it avoids re-adjusting with 0 weight (#755)
* add helper for getting level from experience value * fix profile validation for level and exp * let profiles reach level 79 to match live * add clear mail dialogues button for a profile * Mark quests Available for Finish instead of Success --------- Co-authored-by: acidphantasm <acidphantasm@nobody.com>
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
8 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.
Title.