1
mirror of https://github.com/thepeacockproject/Peacock synced 2024-11-29 09:15:11 +01:00
Commit Graph

197 Commits

Author SHA1 Message Date
AnthonyFuller
deae351ea0 Fix JSDoc for filterUnlockedContent 2023-07-25 00:03:25 +01:00
AnthonyFuller
4d6e4c1085 Add sniper unlockables to H2/3 maps 2023-07-25 00:02:54 +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
Jorys Paulin
c3ba4244b5
hotfix: fix call to getUnlockableById in planning (#299)
* hotfix: fix call to getUnlockableById in planning

* hotfix: reformatted using prettier
2023-07-15 16:06:16 +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
Anthony Fuller
c3b765c9c2
Add SMF contract support (#293) (#294)
* Amogus sus

* Deez

Co-authored-by: atampy25 <24306974+atampy25@users.noreply.github.com>
2023-06-14 11:59:48 +01:00
AnthonyFuller
53a04f6f6f Retrieve C47 suit image from the servers 2023-05-11 15:09:27 +01:00
AnthonyFuller
0702975c3e Bump H3 server version to 8.12.0 2023-05-11 11:59:22 +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
moonysolari
f6e44b4a71
Fix disconnection when dying in arcade (#272) 2023-05-08 17:03:28 +01:00
moonysolari
2a7f41b1c0
Save challenge states (#271) 2023-05-07 07:46:00 +01:00
moonysolari
49995b13ca
Fix a number of timer-related broken challenges (#268)
* Fix a number of broken challenges

* run prettier
2023-05-06 04:44:23 +01: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
AnthonyFuller
c609b9db3d Fix arcade reset 2023-05-01 19:35:21 +01:00
moonysolari
d4df25d6d3
Sniper locations have no escalations (#259) 2023-04-30 09:20:55 +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
Reece Dunham
beb594d6d8
Fix the tests in the dumbest possible way
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-04-28 22:37:46 -04:00
Reece Dunham
f49cecf985
Drop hook "getMissionEnd"
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-04-28 21:07:49 -04:00
Reece Dunham
89bb83b8ad
Fixed type definition errors
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-04-28 20:15:53 -04:00
AnthonyFuller
3270faf9cd Add support for elusivesAreShown to arcade 2023-04-27 16:19:24 +01: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
AnthonyFuller
996115e55c Add Solstice suit image to diff 2023-04-25 07:14:17 +01:00
AnthonyFuller
fd42ec08f5 Download image pack using a releases 2023-04-25 07:13:37 +01:00
AnthonyFuller
d7077b858e Add plugins folder to debug profile 2023-04-25 05:42:18 +01:00
AnthonyFuller
fdffcc3f67 Update generated require table 2023-04-25 05:42:18 +01:00
AnthonyFuller
6bcd96e22c Fix removing completed marker when using level picker 2023-04-23 17:42:20 +01:00
AnthonyFuller
3103c0a718 Change from marking gamechangers as conditions to primary 2023-04-23 17:42:20 +01:00
AnthonyFuller
bdc4ee0ac3 Fix exporting of debug profile
Fixes #222
2023-04-23 07:29:00 +01:00
AnthonyFuller
5804c31c03 Prettier run 2023-04-23 02:50:44 +01:00
moonysolari
9fe9f11a6a
Disables loadout locks when mastery is disabled (#248) 2023-04-23 02:37:45 +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
moonysolari
75a4b259e4
Fixed a nullability issue (#243) 2023-04-22 10:13:26 +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
AnthonyFuller
6ecf5b0efb Add overrideIndex for plugins adding PlayNext data 2023-04-21 13:17:21 +01:00
moonysolari
a52c1aaa01
Fix mamushi having elusives challenges (#229) 2023-04-19 07:25:56 +01:00
AnthonyFuller
0edf996c2b Change how plugins register escalations 2023-04-19 00:42:32 +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
4270c3ab6a
Update image pack metadata (#226)
* Update image pack metadata

* Update gitignore with overrides
2023-04-17 23:49:00 +01:00
Lennard Fonteijn
606b84b0cc Added dynamic external package detection for plugin compilation 2023-04-17 00:24:13 +02: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
moonysolari
de98595db1
Fix snowdrop having graduation's challenges (#217)
* fix snowdrop having graduation's challenges

* add exception for snowdrop

* Revert "fix snowdrop having graduation's challenges"

This reverts commit 6c53961157.

* also fix for h2

---------

Co-authored-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com>
2023-04-16 06:22:06 +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
AnthonyFuller
7f86bddf21 Stop escalation challenges from showing in Snug 2023-04-14 23:54:31 +01:00
moonysolari
14faf6ed25
Add global escalation challenges (#210)
* 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>
2023-04-14 23:41:43 +01:00
AnthonyFuller
feb9db0452 Fix snowdrop showing up on all locations in H2016 2023-04-14 07:01:53 +01:00
AnthonyFuller
f954ed3ee6 Group elusives by season 2023-04-14 04:15:58 +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