forked from thepeacockproject/Peacock
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Wuzmart patch 1 #1
Open
Wuzmart
wants to merge
268
commits into
v7
Choose a base branch
from
Wuzmart-patch-1
base: v7
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
Conversation
This file contains 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 semi-working featured contracts challenges * Pass contract IDs to $pushunique (need SMP update) * Add readme for challenges * Use drop ids * fix fc challenges json * Added h2 featuren contracts challenges * Update smp to 5.4.0
* Fix contract lookup for H2 * dedupe jsons
Signed-off-by: Reece Dunham <me@rdil.rocks>
…kproject#196) * ignore AreaDiscovered for evergreen * Revert "ignore AreaDiscovered for evergreen" This reverts commit 78bedde. * Track area discovery in evergreen * remove persistentBools * fix global challenges' location * run prettier * fix REVEALED
…oject#202) * refactor: use object for suit lookup * improve sublocation default suits * change getDefaultSuitFor function signature * use TOKEN_OUTFIT_WET_SUIT to simplify logic * Correctly hide/give default starting suits
Signed-off-by: Reece Dunham <me@rdil.rocks>
* Only change elusive contract types at getforplay * Update the angel of death json * Add ET challenges for all locations * Correctly get elusives challenges in contracts * Add CHALLENGES_ELUSIVE_TARGET_MIAMI * Add global elusives challenges * Remove " - Year 2" texts * Correct strings in the Brothers challenges * Latest ET challenge extraction script * Add flag to toggle elusives saving * make elusive target challenges game version aware * remove extra BLOODYMARY challenges * Fix The Blackmailer strings * Remove duplicate global challenges definitions * Filter out elusive challenges for location page * update info on et tab on career-challenges page * Allow elusives to be restarted in H2/3, add flag for H2016 --------- Co-authored-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com>
…ect#63) * Rewrite the escalation service to use group contracts (thepeacockproject#28) * Fix build and type errors Signed-off-by: Reece Dunham <me@rdil.rocks> * Improve Escalation Functionality with Contract Groups (thepeacockproject#160) * Fix Sinbad escalation and add group definition * Add group contracts and fix InGroup IDs where needed * Run prettier * Add missing group definitions * Fixed id issues with sinbad * Fix missionsInLocation.ts * Added groupdefinitions (thepeacockproject#198) Added localization and missing groupdefinitions for Peacock custom escalations * Fix incorrect escalation contract ids * Remove missing escalations * Add Ataro group definition * Add 7DS entrances * Restore no2016 functionality, add xmas to no2016 list * Add missing deluxe escalation entrance * Fix linting * Added h3 escalations (thepeacockproject#204) * Added h3 escalations Added all remaining escalations from h3 maps * Prettier yeehaw --------- Co-authored-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com> * Fix escalation completion * Fix smilax level 1 * Fix escalation challenges not completing * Get groups when resolving contracts * track escalation challenge completion * fix mission end page for escalation challenges * Update GameChangerProperties * Update EvergreenGameChangerProperties * Add new GameChangerProperties * Fix aborting on invalid escalation group * remove dupe yellow rabbit suit * Fixed DGS having no challenges on career page * run prettier * Update Proloff Level 2 * Update escalation hub tile to work with group contracts * Move escalations and elusives to subfolders * Add 7DS campaign * Fix escalation level picker * Fix escalations being incorrectly marked as completed * Remove completed status when editing escalation level progress * Add new H3 escalations to level picker * Add Season tag to elusives for future use * Add Season tag to typedefs * Respect Season tag when sending elusives * Add Legacy Escalations * Remove milfoil for now, add escalations to missions * Move xmas escalation * Fix Snowdrop not showing in 2016 * Add missing entitlements to escalations * Fix play next level in 2016, remove use of deprecated function * Move remaining Peacock escalations * Swap out featured Peacock escalation --------- Signed-off-by: Reece Dunham <me@rdil.rocks> Co-authored-by: moonysolari <118079569+moonysolari@users.noreply.github.com> Co-authored-by: Kaki <66200818+Kakiking@users.noreply.github.com> Co-authored-by: moonysolari <changyiding@126.com> Co-authored-by: riisikumi <54016129+riisikumi@users.noreply.github.com> Co-authored-by: AnthonyFuller <24512050+AnthonyFuller@users.noreply.github.com>
* Added escalation challenges * add legacy and custom escalations to list * add h2 escalation challenges * Run prettier * Added H1 Escalation challenges --------- Co-authored-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com>
* fix: wrong target name in DEZ escalation level 3 * fix: wrong HUD in Sleazeball escalation level 1 * feat: objective icons for Jeffrey escalation
…on par with the official ioi names (thepeacockproject#307) Co-authored-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com>
* Add multi-version mastery files * Add pro1 unlocks to legacy allunlockables * Add 47's suit to scpc all unlockables * Add and remove various configs * Remove some useless promises * Fix scpc hub * Fix issue with user profile saving * Fix scpc issues for hub * Add singleplayer/multiplayer sniper * A great many things - Add multi-version mastery - Improve sniper mastery support - Improve general H2016 support * Fix some warnings * Fix pro1 mastery on destination screens * Remove entP from createInventory, lock/unlock pro1 accordingly * Remove JSDoc entP parameter from createInventory * Remove difficultyunlocks from safehouse pages * Add versioned user profiles * Prettier run * Remove false point from user profiles docs * Add comment about profile versioning to types * Fix default profile links * Remove remaining lowercase * Fix sniper showing XP as XP * Add game versions to the unlockable map * Update getMasteryForUnlockable call in planning * Fix missing locations when updating profiles * Update versions to v7 * Fix ICA Facility destination mastery * Fix sniper challenge unlockables showing in inventory * Sniper Scoring (thepeacockproject#273) * Initial sniper scoring * Fix linting errors * Update require table * Calculate and display final sniper score on end screen * Bump SMP version to v5.7.0 * Update since version for scoring * Fix create inventory call for sniper scoring * Support sniper unlockables in the inventory * Update versions to v7 * Reflect changes to createInventory in scoreHandler * Get unlockable name in completion data * It was not okay. * Thanks webstorm * Add support for /profiles/page/GetMasteryCompletionDataForUnlockable * Support sniper play next * Remove sniper gamemodes template from overrides * Remove debug prints from scoring event handler * Fix challenge multiplier * Exclude sniper unlockables from stashpoint * Start fixing up the missionEnd response for sniper * Update misleading comment * Use existing global challenge to check for SA on sniper contracts * Re-add removed global challenges * Proper support for the mission end screen on sniper contracts * Remove redundant label --------- Signed-off-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com> Co-authored-by: Govert de Gans <grappigegovert@hotmail.com> * Add co-op sniper scoring defs * Update MasteryUnlockable template * Bump SMP version to v5.9.3 * Re-add deepmerge * Fix SMP checksum * Fix linting errors caused by merge * Fix score handler imports * Move load flags * Remove unnecessary game version arg * Whoopsies Co-authored-by: Reece Dunham <me@rdil.rocks> Signed-off-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com> --------- Signed-off-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com> Co-authored-by: Govert de Gans <grappigegovert@hotmail.com> Co-authored-by: Reece Dunham <me@rdil.rocks>
Signed-off-by: Reece Dunham <me@rdil.rocks>
Signed-off-by: Reece Dunham <me@rdil.rocks>
Signed-off-by: Reece Dunham <me@rdil.rocks>
Co-authored-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com>
Minor adjustments to 'Peacock' and 'Escalations' in Chinese. Thanks for help. Signed-off-by: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com>
…ockproject#295) * Add SMF contract support (thepeacockproject#293) * Amogus sus * Deez * Update (parts of) some contracts to match newest IOI version --------- Co-authored-by: atampy25 <24306974+atampy25@users.noreply.github.com> Co-authored-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com>
Signed-off-by: Pgeorge <38467521+Wuzmart@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Updated Russian locale