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

255 Commits

Author SHA1 Message Date
AnthonyFuller
2a82bf0c2b Fix sniper repository ID
Fixes #215
2023-04-16 00:45:08 +01:00
AnthonyFuller
b3ba386111 Restore Blood group contract 2023-04-16 00:35:54 +01:00
AnthonyFuller
d7c51bc641 Disable saving on escalations (again)
Fixes #214
2023-04-16 00:33:27 +01:00
AnthonyFuller
8129ccd20b Revert "Disable saving on escalations"
This reverts commit a9573c2802.
2023-04-16 00:22:17 +01:00
AnthonyFuller
a9573c2802 Disable saving on escalations
Fixes #214
2023-04-16 00:19:34 +01:00
AnthonyFuller
a465ee7b12 Fix gamechangers being marked incorrectly as optional
Fixes #212
2023-04-16 00:13:22 +01:00
AnthonyFuller
7e78a76817 Fix ET challenge ordering (with deduplication) 2023-04-15 23:49:22 +01:00
AnthonyFuller
1377abfddb Fix Miami ET challenge image path 2023-04-15 23:25:12 +01:00
AnthonyFuller
39eb9878f3 Fix image path of Sazerac (sezarac) challenge images 2023-04-15 22:50:50 +01:00
AnthonyFuller
dfebbb1a70 Fix H2 featured challenge tile image 2023-04-15 21:48:38 +01:00
AnthonyFuller
db7cf2e2e2 Make the freelancer tile use planning page when starting 2023-04-15 01:52:35 +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
AnthonyFuller
1d8cb6d128 Bump version to v6.1.1 2023-04-12 01:28:23 +01:00
moonysolari
46777981dd
fix nullablility issue affecting eg wardrobe (#206) 2023-04-11 19:59:39 -04:00
AnthonyFuller
e07e551bb6 Add go to destination button on Freelancer tile 2023-04-11 20:59:56 +01:00
Reece Dunham
ee8b54132e
Bump version to v6.1.0
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-04-11 13:35:59 -04:00
moonysolari
efd6ede347
Support configurable default starting suits lock/unlock (#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
2023-04-11 12:10:24 -04:00
Lennard Fonteijn
74a387445d Added support for statistics under the Player Profile menu 2023-04-11 10:55:43 +02:00
moonysolari
4499173e29
Update AreaDiscovered challenges during evergreen missions (#196)
* ignore AreaDiscovered for evergreen

* Revert "ignore AreaDiscovered for evergreen"

This reverts commit 78beddec95.

* Track area discovery in evergreen

* remove persistentBools

* fix global challenges' location

* run prettier

* fix REVEALED
2023-04-10 04:50:58 +01:00
Anthony Fuller
e53095a0f7
Bump SMP version to v5.5.2 (#199) 2023-04-09 18:48:19 -04:00
Reece Dunham
6998d2b3fb Fix the type checking 2023-04-08 22:48:27 -04:00
Reece Dunham
2016394041 Add a CI task to run the tests 2023-04-08 22:46:51 -04:00
Reece Dunham
934fe294ec Skip inclusion of helper cmd files in lite version 2023-04-08 22:42:51 -04:00
Reece Dunham
27942b17d4 TypeScript v5 2023-04-08 22:29:40 -04:00
Reece Dunham
1dfd710a93 Update deps, don't do prettier through eslint 2023-04-08 22:25:29 -04:00
Reece Dunham
189755f52d Gitignore thirdpartynotices 2023-04-08 22:06:27 -04:00
Reece Dunham
673bfec718
Improve how export debug info stores data (#185)
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-04-06 23:07:54 -04:00
AnthonyFuller
f68bf02808 Bump SMP version to v5.5.1 2023-04-07 04:04:29 +01:00
moonysolari
3ded3490e1
Fix contract lookup for H2 (#179)
* Fix contract lookup for H2

* dedupe jsons
2023-04-06 22:03:59 -04:00
AnthonyFuller
0e2135e1eb Bump SMP version to v5.5.0 2023-04-07 02:10:58 +01:00
Lennard Fonteijn
303b0596d2
Fixed an issue where refresh_token was not properly served (#190) 2023-04-06 21:47:08 +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
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
AnthonyFuller
235072b38c Make the Freelancer tile take in-game 2023-04-05 17:24:08 +01:00
moonysolari
79dc9b8fa0
Support "Discover [Location]" challenges (#180) 2023-04-04 09:15:35 -04:00
moonysolari
dcf68d064d
Add VR bricks to side missions (#178)
* Update snow festival json

* Update holiday hoarders json

* Add vr for special assignments

* Add VR for PZ missions

* Add VR bricks for extra missions

* run prettier

* Update contractdata/HOKKAIDO/HOKKAIDOSNOWFESTIVAL.json

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

---------

Signed-off-by: moonysolari <118079569+moonysolari@users.noreply.github.com>
Co-authored-by: Reece Dunham <me@rdil.rocks>
2023-04-03 14:55:16 -04:00
Reece Dunham
ed5e0428d8
Additionally target v7 PRs
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-04-02 01:07:45 -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
ba3e8e1f96
Node 18.15.0
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-04-02 00:35:02 -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