d684ecc081
Merge branch 'refs/heads/master' into v7
2024-05-02 00:03:10 +01:00
de8be46083
Bump version to 7.2.2
2024-05-02 00:02:29 +01:00
0a3a5a5355
Fix missing HitsFilterType in progression transfer
2024-05-01 23:55:31 +01:00
72712219d9
Merge branch 'refs/heads/master' into v7
2024-05-01 22:12:06 +01:00
9af665bd37
Bump version to v7.2.1
2024-05-01 22:11:43 +01:00
db3259f05b
Encrypt debug profiles
2024-05-01 21:42:00 +01:00
3068aa3381
Add ItemSizes to allunlockables
...
Fixes #445
2024-05-01 21:42:00 +01:00
f9e9c3090b
feat(contracts): Add hide all bodies and do not get spotted to gamechangers
...
Signed-off-by: Reece Dunham <me@rdil.rocks>
2024-05-01 16:15:57 -04:00
7c47ec43aa
Fix progression transfer having null values
...
Also adds debug logs
2024-05-01 15:19:47 +01:00
bbaa8146a3
We no longer have versioned SniperUnlockables
2024-05-01 15:19:47 +01:00
d366d139d9
fix(cli): Evil reformatting
...
Signed-off-by: Reece Dunham <me@rdil.rocks>
2024-04-29 20:43:42 -04:00
11fc2b6a31
Merge branch 'master' of https://github.com/thepeacockproject/Peacock
2024-04-29 20:41:56 -04:00
0f59f42e6c
feat(cli): Add version option
...
Signed-off-by: Reece Dunham <me@rdil.rocks>
2024-04-29 20:41:47 -04:00
6fa3f3decb
Merge branch 'refs/heads/master' into v7
...
# Conflicts:
# .github/workflows/locale.yml
# contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA2.json
# contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA3.json
# contractdata/MIAMI/_H2_MIAMI_CHALLENGES.json
# package.json
# resources/dynamic_resources_h2.rpkg
# resources/dynamic_resources_h3.rpkg
# resources/locale.json
2024-04-29 20:07:11 +01:00
251e7e4780
Bump version to 7.2.0
2024-04-29 20:02:27 +01:00
6c57e34c35
Handle profile with no Unlockable progression
2024-04-29 19:59:53 +01:00
1d65e9c435
[skip ci] Update locale packages
2024-04-29 13:47:54 +00:00
bff0daf096
fix: adjust escalation yulania difficulty ( #439 )
2024-04-29 09:46:46 -04:00
641cf2c123
fix(contracts): Created contract kill conditions work now
2024-04-29 09:45:41 -04:00
66607dced3
chore: format
...
Signed-off-by: Reece Dunham <me@rdil.rocks>
2024-04-19 20:49:19 -04:00
beb610c340
feat: official -> peacock progression transfer ( #426 )
...
* Support multiple CPD configs
* Initial work on progression transfer - challenges
* Add transfer of profile data
* Change how ActionXp is stored
We make the UserDefault contain an empty object, saves having to add all the locations. They're only added when XP is actually gained in that sublocation, this mimics official behaviour.
* Fix player profile data
* Sync escalation and arcade progress
* Sync freelancer CPD data
* Fix linting
* Don't override previous challenge progression
* Bump default profile version
* Overriding challenge progression is inevitable
* Remove pointless cast
* Only get arcade and freelancer data in H3
* Remove debug print
* Support 2016 progression transfer
* Transfer default loadouts
* Don't clone LocationsData for getSublocations
Co-authored-by: Reece Dunham <me@rdil.rocks>
2024-04-19 20:45:44 -04:00
6db75c3772
fix(webui): Removed remnant of the cherry-pick that didn't apply cleanly
2024-04-19 12:32:40 -04:00
5208a37fe8
refactor(webui): Switch over to a proper router
...
Signed-off-by: Reece Dunham <me@rdil.rocks>
2024-04-19 12:20:52 -04:00
627d1fe465
refactor(cli): Move the CLI into its own file
...
Signed-off-by: Reece Dunham <me@rdil.rocks>
2024-04-18 09:30:52 -04:00
8108385075
tests: Fix the crc update script
2024-04-18 09:14:02 -04:00
6109fd6727
docs: Run prettier (the irony!) [skip ci]
...
Signed-off-by: Reece Dunham <me@rdil.rocks>
2024-04-17 23:39:39 -04:00
5ac8b20d8c
docs: Create a pull request template
2024-04-17 23:36:06 -04:00
de4678b5e3
feat: Add link to wiki page for port in use error
...
Signed-off-by: Reece Dunham <me@rdil.rocks>
2024-04-16 14:52:14 -04:00
29844cc22e
Bump robinraju/release-downloader from 1.9 to 1.10 in /.github/workflows ( #434 )
...
Bumps [robinraju/release-downloader](https://github.com/robinraju/release-downloader ) from 1.9 to 1.10.
- [Release notes](https://github.com/robinraju/release-downloader/releases )
- [Commits](https://github.com/robinraju/release-downloader/compare/v1.9...v1.10 )
---
updated-dependencies:
- dependency-name: robinraju/release-downloader
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-16 08:52:05 -04:00
17edffd654
Bump microsoft/setup-msbuild from 1.3 to 2 in /.github/workflows ( #433 )
...
Bumps [microsoft/setup-msbuild](https://github.com/microsoft/setup-msbuild ) from 1.3 to 2.
- [Release notes](https://github.com/microsoft/setup-msbuild/releases )
- [Changelog](https://github.com/microsoft/setup-msbuild/blob/main/building-release.md )
- [Commits](https://github.com/microsoft/setup-msbuild/compare/v1.3...v2 )
---
updated-dependencies:
- dependency-name: microsoft/setup-msbuild
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-15 17:59:20 -04:00
cb763d8bf2
Bump tar from 6.2.0 to 6.2.1 ( #429 )
...
Bumps [tar](https://github.com/isaacs/node-tar ) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/isaacs/node-tar/releases )
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md )
- [Commits](https://github.com/isaacs/node-tar/compare/v6.2.0...v6.2.1 )
---
updated-dependencies:
- dependency-name: tar
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-14 11:53:13 -04:00
97d3d1c918
feat: Node.js 20.12.1 -> 20.12.2
2024-04-14 11:51:46 -04:00
e77d83d6f2
feat(contracts): Implement contract creation kill conditions ( #414 )
2024-04-13 11:51:14 -04:00
e3912f099a
Skip adding escalations with a season value of -1 to the ContractAttack page
2024-04-10 11:53:46 +01:00
cb11a1646e
Add 2 sambuca start challenges for H2 ( #424 )
2024-04-09 22:25:29 -04:00
53b87f2b3a
Add mamushi to the escalations object
2024-04-10 01:31:45 +01:00
8e3c220b40
refactor(types): Change a bunch of types from interfaces to aliases
...
type forces you to add new attributes to the definition, instead of just being allowed to add them wherever you end up using the interface.
Signed-off-by: Reece Dunham <me@rdil.rocks>
2024-04-07 22:25:49 -04:00
587d920746
[skip ci] Update locale packages
2024-04-07 21:09:17 +00:00
7b915087a2
Update locale.json ( #422 )
...
Signed-off-by: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com>
2024-04-07 17:08:20 -04:00
ecce22943c
Add another file to the gitignore
...
Signed-off-by: Reece Dunham <me@rdil.rocks>
2024-04-07 10:23:45 -04:00
90f70b6cd5
refactor(tests): Allow loading JSON if the data is test-exclusive
...
Signed-off-by: Reece Dunham <me@rdil.rocks>
2024-04-07 10:23:10 -04:00
ed841c1536
chore: Remove useless rev ident references
...
Signed-off-by: Reece Dunham <me@rdil.rocks>
2024-04-07 10:22:44 -04:00
a42ab33dc9
Yulania: fix level 2 doesn't require eliminating rooftop target ( #421 )
...
Signed-off-by: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com>
2024-04-07 10:19:14 -04:00
9cac87db8e
Update l10n mod in a separate workflow
2024-04-06 16:12:02 +01:00
01c0c2c325
Fix l10n workflow again
2024-04-06 16:07:52 +01:00
8c7cf4f431
[skip ci] Update locale packages
...
(cherry picked from commit 399b36252a
2024-04-06 16:03:08 +01:00
856a0dee2d
Forgot ${{}}
...
(cherry picked from commit bfdb6d0de0
2024-04-06 16:03:07 +01:00
bd235aa02a
Update l10n workflow
...
(cherry picked from commit a3c580729c
2024-04-06 16:03:07 +01:00
399b36252a
[skip ci] Update locale packages
2024-04-06 15:02:12 +00:00
bfdb6d0de0
Forgot ${{}}
2024-04-06 16:00:54 +01:00
AnthonyFuller