1
mirror of https://github.com/thepeacockproject/Peacock synced 2024-11-22 22:12:45 +01:00
Commit Graph

24 Commits

Author SHA1 Message Date
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
Riba Dániel
7c00a1dfab
Fix to extension filtering in GetProfile request (#319)
* discussed in a bit more detail here:
https://discord.com/channels/826809653181808651/1089161116527108157/1148372825615388917

* prettier
2023-09-05 18:53:31 +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
Reece Dunham
580caeab3b
[perf] Inventory rework (part 1) (#291)
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-06-14 11:36:07 -04:00
moonysolari
2a7f41b1c0
Save challenge states (#271) 2023-05-07 07:46:00 +01:00
Reece Dunham
5d646aaf84
Remove region markers
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-04-28 23:49:06 -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
moonysolari
6f2c5ab3fd
Fix ET challenges not ticked on the mission end page (#254)
* Fix et challenges not getting ticked

* refactor: remove redundant code and add a function

* fix elusive SA bugs
2023-04-27 07:12:55 +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
Lennard Fonteijn
4551059a53 Added logic to generate require table for plugins
Fixed issue where non-development builds would try to load TypeScript-based plugins
Fixed issue of non-exported interface FakePlayer
2023-04-17 00:24:13 +02: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
Lennard Fonteijn
b8a68820d9
Added fallback for loadSession in case someone might have disconnected. (#191) 2023-04-06 21:46:28 +01:00
moonysolari
5fff1c89ae
Fix challenges for H2 and H2016 (#152)
* Add location templates for older game versions

* Fix challenge data extraction script for h1

* Add challenge location templates

* unfinished game version support

* Fix challenge data extraction script for H2

* Conform function calls to new signature

* Add a game version for all maps

* Improve comments

* Try to add difficulty support

* fix type error

* fix GetActiveChallengesAndProgression difficulty

* Add difficulty for GetChallengeTreeFor

* Fix up difficulty in other places

* Add challenges data jsons for all three games

* Add H2 global TC challenges

* Fix H1 challenge typeheader

* Fix Type fields in SavedChallenge

* Fix imports

* Delete backup file

* Reduce hard-coding of difficulty number

* Support versioned global challenges

* remove H2GlobalChallenges

* Add missing global Challenges

* Make versions a global variable

* run prettier

* Use Drop Ids instead of unlockables

---------

Co-authored-by: Reece Dunham <me@rdil.rocks>
2023-04-05 20:02:25 +01:00
Lennard Fonteijn
4031779a91 Added distinction between Mastery XP and Action XP
Added extended Profile Profile to main menu
Added support for Payout objectives on the score screen
Added flag for unlocking all shortcuts
Added flag for unlocking all Freelancer masteries
Added flag to allow Peacock to be restarted when the game is running and connected
Fixed issue where playstyle wasn't show properly
2023-03-19 14:15:19 -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
5f5ce0abe0
Add global "The Classics" challenges (#146)
* bar and difficulty UI fixes

* nullability fix

* Improve deptree logic

* Refactor: inclusionDataCheck

* Added global The Classics challenges

* Refactoring: tryToCompleteChallenge

---------

Co-authored-by: Reece Dunham <me@rdil.rocks>
2023-03-06 12:13:13 -05:00
moonysolari
323419c497
Fix mission end screens for challenges (#88)
* Fix mission end screens for challenges

Signed-off-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com>
Co-authored-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com>
2023-01-28 23:29:53 -05:00
AnthonyFuller
275cb417b2 Respect inclusion data for GlobalChallenges 2023-01-29 02:44:54 +00: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
d78d5bf3ea
Fix all broken challenges in #22 (#82)
* Using state machine parser 5.2.0

* Correctly store and load challenge contexts

* Update THIRDPARTYNOTICES
2023-01-16 13:30:06 -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
moonysolari
e548325955
New saving/loading behaviors to fix bugs related to saving (#73)
Signed-off-by: moonysolari <118079569+moonysolari@users.noreply.github.com>
2023-01-09 14:49:04 -05:00
Reece Dunham
73ff78b7c2
Reworking of challenge system (#50) 2022-12-12 16:38:55 -05:00
Reece Dunham
6245e91624 Initial commit
Co-authored-by: Tino Roivanen <tino.roivanen98@gmail.com>
Co-authored-by: Govert de Gans <grappigegovert@hotmail.com>
Co-authored-by: Gray Olson <gray@grayolson.com>
Co-authored-by: Alexandre Sanchez <alex73630@gmail.com>
Co-authored-by: Anthony Fuller <24512050+anthonyfuller@users.noreply.github.com>
Co-authored-by: atampy25 <24306974+atampy25@users.noreply.github.com>
Co-authored-by: David <davidstulemeijer@gmail.com>
Co-authored-by: c0derMo <c0dermo@users.noreply.github.com>
Co-authored-by: Jeevat Singh <jeevatt.singh@gmail.com>
Signed-off-by: Reece Dunham <me@rdil.rocks>
2022-10-19 21:33:45 -04:00