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

139 Commits

Author SHA1 Message Date
Lennard Fonteijn
b8a68820d9
Added fallback for loadSession in case someone might have disconnected. (#191) 2023-04-06 21:46:28 +01:00
moonysolari
21b3663c50
Added featured contracts challenges (#186)
* 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
2023-04-06 17:05:36 +01:00
Lennard Fonteijn
02f1fbbc00
Added additional logging for debugging purposes (#183) 2023-04-06 00:21:12 +01:00
moonysolari
1e6e9a8c11
fix: type mismatches due to version-awareness (#184) 2023-04-05 21:43:10 +01:00
J0k3r-1
ce0f64cf30
feat: initial support for mastery progression (#161)
* feat: Initial support for mastery progression

* chore: Fix typo

* feat: Award users challenge drops immediately after completion. Also builds the inventory on startup with those drops

* feat: Award mastery unlockables to user as soon as they are available

* feat: Added flag to toggle mastery progression

* fix: Address linting issues

* feat: Handle loadout lock for Miami and Hokkaido

* fix: Looking for LimitedSlots on parent location, to include all contracts on the location

* Update components/flags.ts

Co-authored-by: Reece Dunham <me@rdil.rocks>
Signed-off-by: J0k3r-1 <128742169+J0k3r-1@users.noreply.github.com>

* refactor: Look at location LimitedLoadout to prevent unecessary unlockable lookups

* refactor: Add a different Map for mapping Level and Location to an unlockable id

* fix: Prevent evergreen gear unlockables to be awarded to the user inventory w/t proper mastery level

Evergreen level unlockables for gear are treated the same as packages, and include the actual unlockable item within their properties, so similar logic to packages was needed to address those correctly

* refactor: Use gameVersion from contractSession on grantLocationMasteryXp

* fix: Fix typo

* feat: Add progression service to handle XP and Drop award (#1)

* refactor: Cleanup unused imports

* refactor: Added some improvments over feedback

* fix: Fix wrong evergreen check flag condition

* feat: Added challenge drops to missionEnd screen + minor fixes

* refactor: Removed writeUserData from challengeService

The progressionService already stores the data, so theres no need to call it again here

* fix: Prevent evergreenmastery unlock types from being awarded to the inventory

* chore: Amend the explanation for getLocationMasteryDrops on evergreen type unlock

* Update components/menus/planning.ts

Co-authored-by: moonysolari <118079569+moonysolari@users.noreply.github.com>
Signed-off-by: J0k3r-1 <128742169+J0k3r-1@users.noreply.github.com>

* refactor: Award evergreenmastery but filter on inventory grant, like createInventory

* refactor: Refactor challenge drop usage as they have been refactored from Unlockable[] to string[]

* fix: Add mastery requirement for locked loadouts on Miami and Hokkaido + Add interface for sourcechallenge

* chore: Remove console.log

* fix: fixed H1 hokkaido not starting

---------

Signed-off-by: J0k3r-1 <128742169+J0k3r-1@users.noreply.github.com>
Co-authored-by: Reece Dunham <me@rdil.rocks>
Co-authored-by: moonysolari <118079569+moonysolari@users.noreply.github.com>
2023-04-05 20:19: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
moonysolari
79dc9b8fa0
Support "Discover [Location]" challenges (#180) 2023-04-04 09:15:35 -04:00
Reece Dunham
da1d1e4818
Slight unification to 2016 stashpoint logic
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-04-02 00:59:47 -04:00
Reece Dunham
a1961521fd
Add assertion that game version is provided in campaigns
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-04-02 00:25:32 -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
Reece Dunham
8fcd4db87d
Add assertions to prevent type confusion
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-04-02 00:10:14 -04:00
Lennard Fonteijn
bb63c06b31 Fixed location mastery from not always properly showing in the menus 2023-04-02 02:06:07 +02:00
Lennard Fonteijn
307ab08d89 Fixed all challenges JSON-files to contain the expected data format 2023-04-01 23:26:02 +02:00
Lennard Fonteijn
87b2743ce3 Fixed drops from not showing on their respective challenges in the menu 2023-04-01 23:26:02 +02:00
Lennard Fonteijn
10ce9c14e8
Fixed default log levels for "run-dev" (#175) 2023-03-31 20:17:53 -04: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
fd3ca51f85
Store inclusion data for global challenges (#167) 2023-03-29 17:38:48 -04:00
moonysolari
3906b1e348
Remove recon gear and update inventory items list (#168)
* fix some ownerships

* Remove recon gear

* Updated legacy unlockables
2023-03-29 16:02:15 -04:00
moonysolari
f961c08846
Fix SA for freelancer (#164) 2023-03-26 17:20:55 -04:00
Reece Dunham
732632f212
Update the image pack
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-03-26 17:10:27 -04:00
Lennard Fonteijn
f732942e39
Add support for logging to console and files (#159)
* Add support for logging to console and files

* Added support for internal and custom log categories
Added support for disabling log categories
Added support for setting desired log levels for both console and file
2023-03-26 14:59:57 -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
AnthonyFuller
992c77af0d Set EG Level to 100 for default CPD 2023-03-26 14:02:39 +01: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
7a47bb418a
remove confusing log output (#157) 2023-03-20 19:54:59 -04:00
moonysolari
e6f72eb53d
Prevent disconnections caused by contract report requests (#99) 2023-03-20 12:24:21 -04:00
Lennard Fonteijn
168aee05fe Fixed issue where LevelInfo was not properly set for normal contracts 2023-03-19 15:23:32 -04:00
Lennard Fonteijn
84fbce175b Fixed Challenge XP from being capped on the Player Profile menu
Fixed Freelancer to not have payout when the mission failed
Fixed score screen from crashing when the current location has no mastery drops
2023-03-19 14:15:19 -04:00
Lennard Fonteijn
0eef121ac8 Added support for Sniper locations on the score screen
Fixed issue with Mastery not leveling beyond level 1
Fixed issue where the score screen wouldn't show for locations without Mastery
2023-03-19 14:15:19 -04: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
e8d7821c31
Fix nullability issue in inclusion data check (#154)
* Fix nullability issue in incData check

* Fix comments
2023-03-17 22:06:51 -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
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
e5417e10d9
Add recommended mission stories (#138) 2023-03-06 12:12:52 -05:00
moonysolari
db4fa8d7b7
Removes disguises from suits in h1 and h2 (#149) 2023-03-06 12:12:28 -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
9e15fcd4a2
Optimization: grouping challenges by parent locations (#143)
* Organize the challenges using parent locations

* Fix Career challenges page

* Simplify filtering

* remove unused ChallengeFilterType

* Add comments, address nullibility issues

* Nullibility fix
2023-02-24 11:39:55 -05:00
moonysolari
9c4c71d9a6
Fixed the "Continue Story" tile for the Patient Zero and A Silver Tongue mission end page (#137)
* Added PlayNext tiles for PZ and A Silver Tongue

* Add Patient Zero mission
2023-02-23 18:16:38 -05:00
moonysolari
7c3427858d
New checkForUpdates behavior for testing versions (#141)
* New behavior for testing versions
2023-02-23 18:14:33 -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
Reece Dunham
c2e57b6276
Merge branch 'v6' of https://github.com/thepeacockproject/Peacock into v6 2023-02-14 14:03:03 -05:00
Reece Dunham
b2cf8903b1
Tiny microoptimization in destination generation
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-02-14 14:02:57 -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
moonysolari
a297973693
Get the latest entitlements for user upon authentication (#128)
* Get entitlements on connection

* Fall back to old data upon failure

* Added checks on error type

* Update components/platformEntitlements.ts

Co-authored-by: Reece Dunham <me@rdil.rocks>
Signed-off-by: moonysolari <118079569+moonysolari@users.noreply.github.com>

* Update platformEntitlements.ts

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

---------

Signed-off-by: moonysolari <118079569+moonysolari@users.noreply.github.com>
Signed-off-by: Reece Dunham <me@rdil.rocks>
Co-authored-by: Reece Dunham <me@rdil.rocks>
2023-02-12 00:02:38 -05:00
Cookie303728
a2df1d615d
adds a plugins folder when non is detected (#129) 2023-02-09 19:39:38 +01:00
moonysolari
9b64aa32c6
Remove duplicated items in the user's inventory (#112)
* ancestral fountain pen

* tactical wet suit

* colorado rabies suit

* move to brokenItems

* Changed to retain the other wetsuit
2023-02-05 15:21:01 -05:00