1
mirror of https://github.com/thepeacockproject/Peacock synced 2025-03-08 01:49:18 +01:00

25 Commits

Author SHA1 Message Date
AnthonyFuller
f3edd06381 feat: add electric trilogy challenge
(cherry picked from commit ca0f82b2bdeed185c3aee30b013686fc414ef144)
2024-09-12 13:27:05 +01:00
suanjiansalt
61372d277a
fix: longbush allow penicillin kettlebell (#496) 2024-07-18 12:19:13 -04:00
AnthonyFuller
f6e882f9ca Switch challenges to GameVersions array 2024-04-03 19:40:30 +01:00
AnthonyFuller
9180505f7b Add OrderIndex properties to in-built challenge groups 2024-03-31 23:53:00 +01:00
moonysolari
f040ff5e65
New non-pack challenges (#363)
* Add non-pack challenges

* Add new sniper challenge
2024-01-17 03:02:37 +00:00
suanjiansalt
97161e8be5
Fix peacock escalations' incomplete displayed killing tips (#358) 2024-01-10 12:29:11 -05:00
Jorys Paulin
f8c8985543
Add descriptions to Peacock escalations (#320)
* feat: add descriptions to Peacock escalations

* fix: un-translate as per requested

* fix: change everything as requested by Anthony

* feat: update German translations

* fix: update German translations

---------

Co-authored-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com>
2023-09-22 17:32:51 +01:00
Govert de Gans
a0a2773fb1
Update (parts of) some contracts to match newest IOI version (#295)
* Add SMF contract support (#293)

* Amogus sus

* Deez

* Update (parts of) some contracts to match newest IOI version

---------

Co-authored-by: atampy25 <24306974+atampy25@users.noreply.github.com>
Co-authored-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com>
2023-08-05 05:45:28 +01:00
AnthonyFuller
65383c0a28 Prettier run 2023-08-04 11:33:58 +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
Jorys Paulin
65dca71414
Feature/escalations (#306)
* fix: wrong target name in DEZ escalation level 3

* fix: wrong HUD in Sleazeball escalation level 1

* feat: objective icons for Jeffrey escalation
2023-07-22 10:18:05 -04:00
AnthonyFuller
da8d427cca Refactor Peacock escalations 2023-04-23 17:42:20 +01:00
AnthonyFuller
afe842530d Update Peacock escalations to use localised strings 2023-04-21 18:09:08 +01:00
moonysolari
cb29c4c045
Add extra escalation feat challenges (#230) 2023-04-20 05:10:56 +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 a9573c2802c01cddb65ca980d44cdd196fc2b97c.
2023-04-16 00:22:17 +01:00
AnthonyFuller
a9573c2802 Disable saving on escalations
Fixes #214
2023-04-16 00:19:34 +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
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
307ab08d89 Fixed all challenges JSON-files to contain the expected data format 2023-04-01 23:26:02 +02: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
1cb640992f
Update season 1 challenges and add challenges for the rest of the locations (#77)
* Update season 1 challenges

* Add ICA Facility challenges

* Add season 2 challenges

* Add season 2 dlc challenges

* Add season 3 challenges

* Add sniper challenges
2023-01-13 22:04:58 -05:00
Kaki
79771533cb
Add h2 escalations (#14) 2022-11-13 10:30:44 +00: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