github/Peacock
1
Fork 0
mirror of https://github.com/thepeacockproject/Peacock synced 2025-02-16 16:34:28 +01:00
Code Releases Activity

Merge branch 'v6' of https://github.com/thepeacockproject/Peacock into v6

Browse Source
This commit is contained in:
Reece Dunham 2023-01-28 21:59:32 -05:00
commit 485fa3dc45
2 changed files with 157 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
components/profileHandler.ts
View File

@ -493,11 +493,37 @@ profileRouter.post(
return res.json([])
}
let challenges: CompiledChallengeRuntimeData[] = getVersionedConfig(
"GlobalChallenges",
req.gameVersion,
true,
)
let challenges: CompiledChallengeRuntimeData[] = (
getVersionedConfig(
"GlobalChallenges",
req.gameVersion,
true,
) as CompiledChallengeRuntimeData[]
).filter((val) => {
if (!val.Challenge.InclusionData) return true
let include = false
const incData = val.Challenge.InclusionData
if (!include && incData.ContractIds) {
include = incData.ContractIds.includes(json.Metadata.Id)
}
if (!include && incData.ContractTypes) {
include = incData.ContractTypes.includes(json.Metadata.Type)
}
if (!include && incData.Locations) {
include = incData.Locations.includes(json.Metadata.Location)
}
if (!include && incData.GameModes) {
include = json.Metadata.Gamemodes.some((r) =>
incData.GameModes.includes(r),
)
}
return include
})
challenges.push(
...Object.values(

144
static/GlobalChallenges.json
View File

@ -2934,7 +2934,13 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": ["LOCATION_EDGY_FOX"],
"GameModes": null
}
}
},
{
@ -2962,7 +2968,13 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": ["LOCATION_EDGY_FOX"],
"GameModes": null
}
}
},
{
@ -2990,7 +3002,13 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": ["LOCATION_EDGY_FOX"],
"GameModes": null
}
}
},
{
@ -3018,7 +3036,13 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": ["LOCATION_ELEGANT_LLAMA"],
"GameModes": null
}
}
},
{
@ -3046,7 +3070,13 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": ["LOCATION_ELEGANT_LLAMA"],
"GameModes": null
}
}
},
{
@ -3074,7 +3104,13 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": ["LOCATION_ELEGANT_LLAMA"],
"GameModes": null
}
}
},
{
@ -3102,7 +3138,13 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": ["LOCATION_TRAPPED_WOLVERINE"],
"GameModes": null
}
}
},
{
@ -3130,7 +3172,13 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": ["LOCATION_TRAPPED_WOLVERINE"],
"GameModes": null
}
}
},
{
@ -3158,7 +3206,13 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": ["LOCATION_WET_RAT"],
"GameModes": null
}
}
},
{
@ -3186,7 +3240,13 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": ["LOCATION_WET_RAT"],
"GameModes": null
}
}
},
{
@ -3214,7 +3274,13 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": ["LOCATION_WET_RAT"],
"GameModes": null
}
}
},
{
@ -3242,7 +3308,16 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": [
"LOCATION_ANCESTRAL_BULLDOG",
"LOCATION_ANCESTRAL_SMOOTHSNAKE"
],
"GameModes": null
}
}
},
{
@ -3270,7 +3345,16 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": [
"LOCATION_ANCESTRAL_BULLDOG",
"LOCATION_ANCESTRAL_SMOOTHSNAKE"
],
"GameModes": null
}
}
},
{
@ -3298,7 +3382,13 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": ["LOCATION_GOLDEN_GECKO"],
"GameModes": null
}
}
},
{
@ -3326,7 +3416,13 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": ["LOCATION_GOLDEN_GECKO"],
"GameModes": null
}
}
},
{
@ -3354,7 +3450,13 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": ["LOCATION_GOLDEN_GECKO"],
"GameModes": null
}
}
},
{
@ -3382,7 +3484,13 @@
"Xp": 1000,
"XpModifier": {},
"PlayableSince": null,
"PlayableUntil": null
"PlayableUntil": null,
"InclusionData": {
"ContractIds": null,
"ContractTypes": null,
"Locations": ["LOCATION_GOLDEN_GECKO"],
"GameModes": null
}
}
}
]
]