mirror of
https://github.com/thepeacockproject/Peacock
synced 2024-11-16 11:03:30 +01:00
Remove region markers
Signed-off-by: Reece Dunham <me@rdil.rocks>
This commit is contained in:
parent
9a000b6d70
commit
5d646aaf84
@ -92,7 +92,7 @@ module.exports = {
|
|||||||
"spaced-comment": [
|
"spaced-comment": [
|
||||||
"error",
|
"error",
|
||||||
"always",
|
"always",
|
||||||
{ markers: ["*", "@__NOINLINE__", "#region", "#endregion"] },
|
{ markers: ["*", "@__NOINLINE__"] },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
reportUnusedDisableDirectives: true,
|
reportUnusedDisableDirectives: true,
|
||||||
|
@ -1300,7 +1300,6 @@ menuDataRouter.get(
|
|||||||
|
|
||||||
const cats = []
|
const cats = []
|
||||||
|
|
||||||
// #region Main story missions
|
|
||||||
const currentIdIndex = orderedMissions.indexOf(req.query.contractId)
|
const currentIdIndex = orderedMissions.indexOf(req.query.contractId)
|
||||||
|
|
||||||
if (
|
if (
|
||||||
@ -1332,9 +1331,7 @@ menuDataRouter.get(
|
|||||||
|
|
||||||
cats.push(createMainOpportunityTile(req.query.contractId))
|
cats.push(createMainOpportunityTile(req.query.contractId))
|
||||||
}
|
}
|
||||||
// #endregion
|
|
||||||
|
|
||||||
// #region PZ missions
|
|
||||||
const pzIdIndex = orderedPZMissions.indexOf(req.query.contractId)
|
const pzIdIndex = orderedPZMissions.indexOf(req.query.contractId)
|
||||||
|
|
||||||
if (pzIdIndex !== -1 && pzIdIndex !== orderedPZMissions.length - 1) {
|
if (pzIdIndex !== -1 && pzIdIndex !== orderedPZMissions.length - 1) {
|
||||||
@ -1351,9 +1348,6 @@ menuDataRouter.get(
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
// #endregion
|
|
||||||
|
|
||||||
// #region Atlantide
|
|
||||||
|
|
||||||
if (req.query.contractId === "f1ba328f-e3dd-4ef8-bb26-0363499fdd95") {
|
if (req.query.contractId === "f1ba328f-e3dd-4ef8-bb26-0363499fdd95") {
|
||||||
const nextMissionId = "0b616e62-af0c-495b-82e3-b778e82b5912"
|
const nextMissionId = "0b616e62-af0c-495b-82e3-b778e82b5912"
|
||||||
@ -1369,9 +1363,7 @@ menuDataRouter.get(
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
// #endregion
|
|
||||||
|
|
||||||
// #region Plugin missions
|
|
||||||
const pluginData = controller.hooks.getNextCampaignMission.call(
|
const pluginData = controller.hooks.getNextCampaignMission.call(
|
||||||
req.query.contractId,
|
req.query.contractId,
|
||||||
req.gameVersion,
|
req.gameVersion,
|
||||||
@ -1396,7 +1388,6 @@ menuDataRouter.get(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// #endregion
|
|
||||||
|
|
||||||
res.json({
|
res.json({
|
||||||
template: getConfig("PlayNextTemplate", false),
|
template: getConfig("PlayNextTemplate", false),
|
||||||
|
@ -626,7 +626,6 @@ profileRouter.post(
|
|||||||
jsonMiddleware(),
|
jsonMiddleware(),
|
||||||
async (req: RequestWithJwt, res) => {
|
async (req: RequestWithJwt, res) => {
|
||||||
if (getFlag("loadoutSaving") === "PROFILES") {
|
if (getFlag("loadoutSaving") === "PROFILES") {
|
||||||
// #region Save with loadout profiles
|
|
||||||
let loadout = loadouts.getLoadoutFor(req.gameVersion)
|
let loadout = loadouts.getLoadoutFor(req.gameVersion)
|
||||||
|
|
||||||
if (!loadout) {
|
if (!loadout) {
|
||||||
@ -636,9 +635,7 @@ profileRouter.post(
|
|||||||
loadout.data[req.body.location] = req.body.loadout
|
loadout.data[req.body.location] = req.body.loadout
|
||||||
|
|
||||||
await loadouts.save()
|
await loadouts.save()
|
||||||
// #endregion
|
|
||||||
} else {
|
} else {
|
||||||
// #region Save with legacy (per-user) system
|
|
||||||
const userdata = getUserData(req.jwt.unique_name, req.gameVersion)
|
const userdata = getUserData(req.jwt.unique_name, req.gameVersion)
|
||||||
|
|
||||||
if (userdata.Extensions.defaultloadout === undefined) {
|
if (userdata.Extensions.defaultloadout === undefined) {
|
||||||
@ -649,7 +646,6 @@ profileRouter.post(
|
|||||||
req.body.loadout
|
req.body.loadout
|
||||||
|
|
||||||
writeUserData(req.jwt.unique_name, req.gameVersion)
|
writeUserData(req.jwt.unique_name, req.gameVersion)
|
||||||
// #endregion
|
|
||||||
}
|
}
|
||||||
|
|
||||||
res.status(204).end()
|
res.status(204).end()
|
||||||
|
@ -258,7 +258,6 @@ export function calculateScore(
|
|||||||
}) as ScoringHeadline,
|
}) as ScoringHeadline,
|
||||||
)
|
)
|
||||||
|
|
||||||
// #region Time
|
|
||||||
const timeHours = Math.floor(timeTotal / 3600)
|
const timeHours = Math.floor(timeTotal / 3600)
|
||||||
const timeMinutes = Math.floor((timeTotal - timeHours * 3600) / 60)
|
const timeMinutes = Math.floor((timeTotal - timeHours * 3600) / 60)
|
||||||
const timeSeconds = Math.floor(
|
const timeSeconds = Math.floor(
|
||||||
@ -313,7 +312,6 @@ export function calculateScore(
|
|||||||
scoreTotal: timebonus,
|
scoreTotal: timebonus,
|
||||||
}) as ScoringHeadline,
|
}) as ScoringHeadline,
|
||||||
)
|
)
|
||||||
// #endregion
|
|
||||||
|
|
||||||
for (const type of ["total", "subtotal"]) {
|
for (const type of ["total", "subtotal"]) {
|
||||||
scoringHeadlines.push(
|
scoringHeadlines.push(
|
||||||
@ -989,7 +987,6 @@ export async function missionEnd(
|
|||||||
await liveSplitManager.completeMission(timeTotal)
|
await liveSplitManager.completeMission(timeTotal)
|
||||||
}
|
}
|
||||||
|
|
||||||
// #region Leaderboards
|
|
||||||
if (
|
if (
|
||||||
getFlag("leaderboards") === true &&
|
getFlag("leaderboards") === true &&
|
||||||
req.gameVersion !== "scpc" &&
|
req.gameVersion !== "scpc" &&
|
||||||
@ -1061,7 +1058,6 @@ export async function missionEnd(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// #endregion
|
|
||||||
|
|
||||||
res.json({
|
res.json({
|
||||||
template:
|
template:
|
||||||
|
Loading…
Reference in New Issue
Block a user