Skip to content

Commit 09ec4a7

Browse files
committed
remove unrelated changes
1 parent e9465c7 commit 09ec4a7

6 files changed

Lines changed: 54 additions & 54 deletions

File tree

.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ If you have not completed one of the steps below, you can create the pull reques
1616
When you have completed the checklist, press the "Ready for review" button.
1717
-->
1818

19-
- [ ] I have run Prettier to reformat any changed files
20-
- [ ] I have verified my changes work
19+
- [ ] I have run Prettier to reformat any changed files
20+
- [ ] I have verified my changes work

components/candle/progressionService.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ export class ProgressionService {
170170

171171
const parentLocationId = subLocation
172172
? subLocation.Properties?.ParentLocation
173-
: location ?? contract.Metadata.Location
173+
: (location ?? contract.Metadata.Location)
174174

175175
if (!parentLocationId) {
176176
return
@@ -187,8 +187,8 @@ export class ProgressionService {
187187
userProfile,
188188
parentLocationId,
189189
contractSession.gameVersion === "h1"
190-
? contract.Metadata.Difficulty ?? "normal"
191-
: sniperUnlockable ?? undefined,
190+
? (contract.Metadata.Difficulty ?? "normal")
191+
: (sniperUnlockable ?? undefined),
192192
)
193193

194194
const maxLevel = masteryData?.MaxLevel || DEFAULT_MASTERY_MAXLEVEL

docs/CODE_OF_CONDUCT.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@ diverse, inclusive, and healthy community.
1717
Examples of behavior that contributes to a positive environment for our
1818
community include:
1919

20-
- Demonstrating empathy and kindness toward other people
21-
- Being respectful of differing opinions, viewpoints, and experiences
22-
- Giving and gracefully accepting constructive feedback
23-
- Accepting responsibility and apologizing to those affected by our mistakes,
24-
and learning from the experience
25-
- Focusing on what is best not just for us as individuals, but for the
26-
overall community
20+
- Demonstrating empathy and kindness toward other people
21+
- Being respectful of differing opinions, viewpoints, and experiences
22+
- Giving and gracefully accepting constructive feedback
23+
- Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
- Focusing on what is best not just for us as individuals, but for the
26+
overall community
2727

2828
Examples of unacceptable behavior include:
2929

30-
- The use of sexualized language or imagery, and sexual attention or
31-
advances of any kind
32-
- Trolling, insulting or derogatory comments, and personal or political attacks
33-
- Public or private harassment
34-
- Publishing others' private information, such as a physical or email
35-
address, without their explicit permission
36-
- Other conduct which could reasonably be considered inappropriate in a
37-
professional setting
30+
- The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
- Trolling, insulting or derogatory comments, and personal or political attacks
33+
- Public or private harassment
34+
- Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
- Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
3838

3939
## Enforcement Responsibilities
4040

docs/ESCALATION_GUIDELINES.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ and Peacock escalations.
66

77
The guidelines:
88

9-
- Use localised strings for anything that isn't automatically localised by the game.
10-
- Try not to "re-localise" strings that are already in the game and available to us e.g. "No Disguise Change"
11-
- Try to "group" objectives together i.e. eliminations and retrieval objectives should be grouped separately (e.g. Target, Target, Target, Retrieval, Retrieval).
12-
- **Always** try to use `GroupObjectiveDisplayOrder` and keep objectives in the same order between levels (unless they've changed and need to be marked as new).
13-
- Use `IsNew` on any new objectives.
14-
- New objectives should be placed **before** old objectives in their groups.
15-
- The first level **should not** have any objectives marked as new.
16-
- Gamechangers **should always be placed to the right of main objectives**.
17-
- Try to have kill objectives first, before any other objectives.
18-
- Try to not put long strings for `BriefingName` this is so they show nicely in the tall tiles with scrolling/being truncated.
19-
- Don't use `LongBriefingText` unless it's absolutely required. It can be left out and it'll default to `BriefingText`.
20-
- Peacock escalations should be added **first** in locations **and in `EscalationCodenames.json`**.
21-
- If no conditions are included for a target, use the game to localise it (`UI_CONTRACT_GENERAL_OBJ_KILL`).
22-
- If conditions are included, include them in the HUD string and **LOCALISE IT**!
23-
- For `(Long)BriefingText`, try to use proper grammar (i.e. ending with a full stop).
9+
- Use localised strings for anything that isn't automatically localised by the game.
10+
- Try not to "re-localise" strings that are already in the game and available to us e.g. "No Disguise Change"
11+
- Try to "group" objectives together i.e. eliminations and retrieval objectives should be grouped separately (e.g. Target, Target, Target, Retrieval, Retrieval).
12+
- **Always** try to use `GroupObjectiveDisplayOrder` and keep objectives in the same order between levels (unless they've changed and need to be marked as new).
13+
- Use `IsNew` on any new objectives.
14+
- New objectives should be placed **before** old objectives in their groups.
15+
- The first level **should not** have any objectives marked as new.
16+
- Gamechangers **should always be placed to the right of main objectives**.
17+
- Try to have kill objectives first, before any other objectives.
18+
- Try to not put long strings for `BriefingName` this is so they show nicely in the tall tiles with scrolling/being truncated.
19+
- Don't use `LongBriefingText` unless it's absolutely required. It can be left out and it'll default to `BriefingText`.
20+
- Peacock escalations should be added **first** in locations **and in `EscalationCodenames.json`**.
21+
- If no conditions are included for a target, use the game to localise it (`UI_CONTRACT_GENERAL_OBJ_KILL`).
22+
- If conditions are included, include them in the HUD string and **LOCALISE IT**!
23+
- For `(Long)BriefingText`, try to use proper grammar (i.e. ending with a full stop).

docs/USER_PROFILES.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ If you are unsure, ask.
1616

1717
Version 1 introduced the profile versioning system. The changes are:
1818

19-
- Removed unused keys (non location parents) in `u.Extensions.progression.Locations`.
20-
- Upper-cased keys in `u.Extensions.progression.Locations` to fit with the rest of Peacock.
21-
- Added subpackages to certain locations in `u.Extensions.progression.Locations`:
22-
- Legacy profiles now have `normal` and `pro1`.
23-
- Sniper locations now have their unlockables contained inside the location.
24-
- Unused properties were removed from locations in `u.Extensions.progression.Locations`.
25-
- `u.Extensions.progression.Unlockables` has been removed.
19+
- Removed unused keys (non location parents) in `u.Extensions.progression.Locations`.
20+
- Upper-cased keys in `u.Extensions.progression.Locations` to fit with the rest of Peacock.
21+
- Added subpackages to certain locations in `u.Extensions.progression.Locations`:
22+
- Legacy profiles now have `normal` and `pro1`.
23+
- Sniper locations now have their unlockables contained inside the location.
24+
- Unused properties were removed from locations in `u.Extensions.progression.Locations`.
25+
- `u.Extensions.progression.Unlockables` has been removed.
2626

2727
## Version 2
2828

2929
Version 2 introduced support for syncing official progress to Peacock. The changes are:
3030

31-
- `u.Extensions.LastOfficialSync` has been added which records a date and time of the last official sync.
32-
- `u.Extensions.progression.PlayerProfileXp.Sublocations` has been changed to an object.
31+
- `u.Extensions.LastOfficialSync` has been added which records a date and time of the last official sync.
32+
- `u.Extensions.progression.PlayerProfileXp.Sublocations` has been changed to an object.

packaging/README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
This folder contains some tools related to the build/packaging/deployment
44
infrastructure of the project.
55

6-
- `build.mjs` - The esbuild configuration for the server in production.
7-
- `buildTasks.mjs` - Pre-bundling of specific files.
8-
- `devLoader.mjs` - Starts the server in the development environment.
9-
- `esbuild-plugin-license.mjs` - esbuild plugin that automatically updates the
10-
THIRDPARTYNOTICES.txt file.
11-
- `extractChallengeData.mjs` - a little CLI tool for downloading challenges from
12-
the IOI servers.
13-
- `HOW_TO_USE.html` - legacy help file.
14-
- `json5ToJson.mjs` - Converts a JSON5 file to a JSON file with the same name (
15-
but the JSON extension).
6+
- `build.mjs` - The esbuild configuration for the server in production.
7+
- `buildTasks.mjs` - Pre-bundling of specific files.
8+
- `devLoader.mjs` - Starts the server in the development environment.
9+
- `esbuild-plugin-license.mjs` - esbuild plugin that automatically updates the
10+
THIRDPARTYNOTICES.txt file.
11+
- `extractChallengeData.mjs` - a little CLI tool for downloading challenges from
12+
the IOI servers.
13+
- `HOW_TO_USE.html` - legacy help file.
14+
- `json5ToJson.mjs` - Converts a JSON5 file to a JSON file with the same name (
15+
but the JSON extension).

0 commit comments

Comments
 (0)