1
mirror of https://github.com/thepeacockproject/Peacock synced 2025-02-23 03:35:25 +01:00

53 Commits

Author SHA1 Message Date
Reece Dunham
12b71d6461
Fix some strict type errors (#344) 2023-11-27 12:56:32 -05:00
Reece Dunham
9d658f71c7
Fix condition that will always be true
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-11-25 13:16:42 -05:00
AnthonyFuller
79c7aa16e3 Move Southern Comfort to Noel sublocation 2023-10-26 22:09:15 +01:00
AnthonyFuller
4a2ad7f48d Fix Noel and Mamushi not showing as sub locations 2023-10-26 22:03:29 +01:00
AnthonyFuller
11a65407d4 Add Tomorrowland ID to array
(cherry picked from commit 356c2309bc98a092c8c520c37df19df9cf44e933)
2023-10-26 15:50:05 +01:00
Anthony Fuller
72826f7bde
feat(escalation): pontus (#328)
* pontus test

Signed-off-by: Reece Dunham <me@rdil.rocks>

* Remove traditions & lee hong

These are being moved out of core to reduce bundle size, translation maintainability, and just because they weren't played that much.

Signed-off-by: Reece Dunham <me@rdil.rocks>

* pontus test

Signed-off-by: Reece Dunham <me@rdil.rocks>

* Add pontus group data

Signed-off-by: Reece Dunham <me@rdil.rocks>

* Add pontus group data

Signed-off-by: Reece Dunham <me@rdil.rocks>

* Various pontus changes

* Pontus l10n

* Add season properties to pontus

* Add id to pontus in escalation codenames

* Add escalation guidelines document

* Prettier run

---------

Signed-off-by: Reece Dunham <me@rdil.rocks>
Co-authored-by: Reece Dunham <me@rdil.rocks>
2023-10-15 21:24:52 +01:00
Reece Dunham
799cf1a440
Fix linting issues
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-10-14 20:51:52 -04:00
Anthony Fuller
8189757e27
feat(menu): add escalation tile to H2/3 dashboard (#314)
* Add escalation tile to H2/3 dash

* Add the Peacock url to H3 dash

* Functioning escalation page and tile for H3

* Functioning escalation page and tile in H2

* Fix shangrila image path
2023-09-05 22:28:34 +01:00
riisikumi
d966bd862f
TS6, 3.160 update (#316)
Added TS6, bumped server versions, updated store data and unlockables
2023-08-20 15:24:40 +01:00
AnthonyFuller
ca5b1b2dad Add enhanced ContractAttack hits category
Closes #261
2023-08-04 11:28:29 +01:00
Anthony Fuller
46052c7b0e
Multi-Version Mastery and Sniper Scoring (#270)
* 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 (#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>
2023-07-24 23:47:28 +01:00
moonysolari
00ebefa009
Redo contract retrieval from official (#187)
* fix confusing comments

* new behavior to fetch contracts from official

* Reorder and organize flags with tags

* Fix contract filter being undefined

* Put mission manifest in memory instead of disk

* return undefined when not finding a contract
2023-05-09 21:30:18 -04:00
Reece Dunham
09ea869d69
Remove traditions & lee hong
These are being moved out of core to reduce bundle size, translation maintainability, and just because they weren't played that much.

Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-05-03 14:09:29 -04:00
Reece Dunham
9a000b6d70
Update deps + eslint rules
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-04-28 23:39:57 -04:00
AnthonyFuller
3103c0a718 Change from marking gamechangers as conditions to primary 2023-04-23 17:42:20 +01:00
moonysolari
d2b10e4425
Tick all unticked challenge in parent location on the mission end page (#235)
* Tick all unticked challenge in parent location

* Update default profile with actually used strings

* Add PreviouslySeenXp

* Fix evergreen xp display

* count global xp towards location mastery

* fix type

* run prettier

* Update legacy default user

---------

Co-authored-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com>
Co-authored-by: Reece Dunham <me@rdil.rocks>
2023-04-22 18:59:47 +01:00
Anthony Fuller
c2d477f02e
Add support for Elusive Target Arcade (#209)
* Add arcade support, remove use of deprecated function

* Fix retrieval of escalation group id in planning

* Add arcade contracts

* remove incorrectly acquired arcade challenges

* Fix locations for arcade levels

* Add arcade challenges

* run prettier

* fix nullibility issue in h1

* The Icon is not an elusive target

* sort eta and et contracts by location

* Reset arcade contract on fail

* show arcade challenges in career page

* fix arcade challenges filtering for destinations

* run prettier

* Don't fail arcade on exit menu with no objectives completed

* Handle secondary objectives on arcade fail

* Make a ContractSession know its Id

* fix global arcade challenges

* Add arcade contracts to the level picker

* Update Peacock require tables with ETA

* Add escalationTypes array

* Get ETA locations at startup

* remove unused arrays

---------

Co-authored-by: moonysolari <changyiding@126.com>
2023-04-21 18:48:56 +01:00
Anthony Fuller
51868f88a2
Add support for Career -> Mastery page (#225)
* Add support for Career -> Mastery page

* Add support H2016 for Career -> Mastery page

* Fix mastery not showing on H2016 destinations page

* Switch pro1 mastery to available like destinations
2023-04-18 23:35:46 +01:00
moonysolari
2c1ac0d3c9
fix revolutionary and serial killer challenges (#216) 2023-04-16 01:15:54 +01:00
AnthonyFuller
a465ee7b12 Fix gamechangers being marked incorrectly as optional
Fixes #212
2023-04-16 00:13:22 +01:00
Reece Dunham
4575924e80
Rewrite the escalation service to use group contracts (#63)
* Rewrite the escalation service to use group contracts (#28)

* Fix build and type errors

Signed-off-by: Reece Dunham <me@rdil.rocks>

* Improve Escalation Functionality with Contract Groups (#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 (#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 (#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>
2023-04-14 03:13:16 +01:00
moonysolari
7f74ac7380
Add Elusive Target challenges on H3 (#192)
* 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>
2023-04-13 18:49:31 -04:00
Reece Dunham
3421ee385b
Fix some style issues
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-04-02 00:22:26 -04:00
Lennard Fonteijn
bb63c06b31 Fixed location mastery from not always properly showing in the menus 2023-04-02 02:06:07 +02:00
moonysolari
d8334918bf
Update Elusive Target jsons to add VR bricks (#169)
* Update et jsons

* Update ET list
2023-03-29 22:30:17 -04:00
moonysolari
3c25f20174
Favorite contracts rework (#163)
* favIcon+UI fix for contract lookup

* Fix favorite status for retrieved contracts

* Support all fav functionalities binded to "P"
2023-03-26 14:30:11 -04:00
moonysolari
6d3ef2f486
Add mastery data for sniper missions (#148) 2023-03-24 09:19:01 -04:00
Lennard Fonteijn
22d6b6d1ba
Added vitest and configuration to support unit tests (#37)
* Added Vitest and configuration to support unit tests
Added Vite plugin to fix performance issue with JSON files
Added mock for configSwizzleManager to support the Vite plugin

* Added custom ESLint rule to enforce proper module paths
2023-03-20 20:19:26 -04:00
moonysolari
856859f3ca
Implement contract history and completion tracker (#98) 2023-03-20 20:12:54 -04:00
moonysolari
e6f72eb53d
Prevent disconnections caused by contract report requests (#99) 2023-03-20 12:24:21 -04:00
Lennard Fonteijn
ba9b799abe Add support for XP progression (#86)
* Fixed issue where restarting Peacock would require to first go offline again

* Added proper player progression

* Fixed most issues with the mission end screen

* Added final tweaks to scoring

* Update global challenges

* Added near-complete support for Freelancer
Added support for unlocking shortcuts
Cleaned up a bunch of magic values in relation to XP and levels

---------

Co-authored-by: moonysolari <changyiding@126.com>
2023-03-19 14:15:19 -04:00
moonysolari
4a08faeec0
Implement "Contract search", "Trending", and "Most played last week" tiles for contracts menu (#117)
* Refactor: use function for lookupContractPublicId

* Trending and Mostplayed now display stuff

* Add call to contract-preserving backend

* Actually download contract data from official

* add getRemoteService function

* implement "contract search" tile

* Change variable naming

* Run prettier

* Change naming to hitmaps

* officialSearchContract -> contractsModeRouting.ts

* Fix imports
2023-03-06 13:17:22 -05:00
moonysolari
98c192f3a5
Remove The Caged Bull from h1 (#147)
* Remove caged bull from h1

* Explicitly fastClone FCgroups
2023-02-28 20:21:58 -05:00
moonysolari
319815c3b9
Fix some bugs of The Jeffrey Consolation (#139)
* Add constantjeff brick

* Fix missing objectives
2023-02-23 09:29:15 -05:00
moonysolari
b4ca8ab690
Fix contract creation bugs (#133)
* Skip unknown mission stories

* Disable saving created contracts on the tutorial

* Update platformEntitlements.ts

Signed-off-by: Reece Dunham <me@rdil.rocks>

* Use relative import pathing

---------

Signed-off-by: Reece Dunham <me@rdil.rocks>
Co-authored-by: Reece Dunham <me@rdil.rocks>
2023-02-13 22:14:16 -05:00
moonysolari
e538854b10
Disable saving (#127) 2023-02-13 12:24:34 -05:00
AnthonyFuller
8e0711d7e9 Fix Vanilla planning screen 2023-01-29 04:37:49 +00:00
AnthonyFuller
3a0b9d4a3e Add Snug location data 2023-01-29 04:36:50 +00:00
AnthonyFuller
da81ce9919 Add CPD to GFP2 requests and add new GCs to the pool 2023-01-29 04:35:31 +00:00
Reece Dunham
163f8e0452 Significant performance improvement that I have not actually tested 2023-01-28 21:59:26 -05:00
Reece Dunham
8ec9fb1824
Update copyright years to 2023
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-01-23 13:37:33 -05:00
moonysolari
d6cae91a0f
Fix completion data generation function (#85)
Added override for HideProgression
Added hidden mastery levels for FACILITY
Fixed Mastery-tab from showing when there aren't any drops

Co-authored-by: Lennard Fonteijn <lennard@lennardf1989.com>
2023-01-21 10:53:14 +01:00
Lennard Fonteijn
85a55d4b48
Added service for mastery data (#30)
Added simplified mastery data for all locations
Added runtime generation of the full mastery data
Added initial support for profile progression
Reworked code around loading of resources to be more generic
2023-01-20 22:00:20 +01:00
moonysolari
95b71b79e7
Fix a nullibility issue in previous pr (#76) 2023-01-11 16:22:17 -05:00
moonysolari
3adb4b1f67
Fix a number of bugs on progression, entitlements, and warning logs (#75)
* Fix "Contract undefined not found!" warnings

* Implement support for /GetContractOpportunities

* Add OpportunityData to MissionManifestMetadata

* Resolved a ts-expect-error by providing types

* Fix requiem unlockables pistol

* Adjust max player level
2023-01-10 17:29:54 -05:00
Reece Dunham
7379688a91 The Christmas Calamity 2022-12-24 12:35:37 -05:00
Reece Dunham
193df194c5 Fix paginating of fake contracts 2022-12-22 14:49:04 -05:00
Reece Dunham
556d9a6970 Retire The Barbegue Befuddlement 2022-12-10 21:11:50 -05:00
Reece Dunham
6b1f37f149
Backport GameChangerReferences duplication fix from Evergreen branch
Signed-off-by: Reece Dunham <me@rdil.rocks>
2022-11-16 10:31:22 -05:00
Reece Dunham
d0ff3d5f6d
Remove duplicate escalation 2022-11-14 21:44:09 -05:00