Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reworking of challenge system #50

Merged
merged 10 commits into from Dec 12, 2022
Merged

Reworking of challenge system #50

merged 10 commits into from Dec 12, 2022

Conversation

RDIL
Copy link
Member

@RDIL RDIL commented Dec 2, 2022

Talked about in #45

Just opening for initial thoughts - haven't even tested it yet

Signed-off-by: Reece Dunham <me@rdil.rocks>
Signed-off-by: Reece Dunham <me@rdil.rocks>
Signed-off-by: Reece Dunham <me@rdil.rocks>
Signed-off-by: Reece Dunham <me@rdil.rocks>
Signed-off-by: Reece Dunham <me@rdil.rocks>
Signed-off-by: Reece Dunham <me@rdil.rocks>
@RDIL RDIL marked this pull request as ready for review December 10, 2022 04:09
@@ -811,51 +737,49 @@ export class ChallengeService extends ChallengeRegistry {
gameVersion: GameVersion,
userId: string,
): CompiledChallengeTreeData {
let contract
let contract: MissionManifest | null

// TODO: Properly get escalation groups for this
if (challenge.Type === "contract") {
contract = this.controller.resolveContract(
challenge.InclusionData?.ContractIds?.[0] || "",
)

// This is so we can remove unused data and make it more like official - AF
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be investigated as to see whether the format matches official, I have a strong suspicion it may not 100% match. (I remember half arsing the format as it was a mess)

EDIT: The line I selected to add this comment, was on my comment, not your change.

Copy link
Contributor

@AnthonyFuller AnthonyFuller left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Logic all LGTM, untested within the game.

@RDIL RDIL merged commit 73ff78b into v5 Dec 12, 2022
@RDIL RDIL deleted the challenges branch December 12, 2022 21:38
scrungofan pushed a commit to scrungofan/Peacock that referenced this pull request Dec 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants