feat: conquest progression & rewards #1791

Merged

Sainan merged 10 commits from conquest-progress into main 2025-04-23 11:35:57 -07:00

Conversation 0 Commits 10 Files Changed 7 +243 -19

Sainan commented 2025-04-22 12:33:27 -07:00

Owner

Copy Link

Closes #1570

Closes #1570

Sainan added 1 commit 2025-04-22 12:33:28 -07:00

feat: conquest progression aaa985e1ae

Sainan added 1 commit 2025-04-22 15:23:30 -07:00

feat: conquest research points (#1796) ... 5da66a1b3b

Reviewed-on: #1796
Co-authored-by: Jānis <janisslsm@noreply.localhost>
Co-committed-by: Jānis <janisslsm@noreply.localhost>

Sainan changed title from feat: conquest progression to feat: conquest progression & research points 2025-04-22 15:23:46 -07:00

Sainan added 1 commit 2025-04-22 15:26:52 -07:00

reset 'high score' at week rollover f609850c0c

Sainan added 1 commit 2025-04-22 18:28:10 -07:00

move this logic before MissionRewards are discharged ad2e13c1a8

Sainan added 1 commit 2025-04-22 18:36:56 -07:00

remove needless lambda ed21f45491

Sainan added 1 commit 2025-04-22 18:38:34 -07:00

lab conquest rewards bff08c4767

Sainan added 1 commit 2025-04-22 18:49:28 -07:00

fix 37 points reward 837d481633

Sainan added 2 commits 2025-04-22 18:52:01 -07:00

don't even try for rewards if score is not a new PB 38112dcdf4

add hex conquest rewards 72bf0fb4a4

Sainan force-pushed conquest-progress from 72bf0fb4a4 to cbfbb1e903 2025-04-22 18:52:12 -07:00 Compare

Sainan changed title from feat: conquest progression & research points to feat: conquest progression & rewards 2025-04-22 18:52:23 -07:00

Sainan added 1 commit 2025-04-22 21:23:54 -07:00

this should not have been removed c58a9e5229

Sainan merged commit 15aaa28a4f into main 2025-04-23 11:35:57 -07:00

Sainan deleted branch conquest-progress 2025-04-23 11:35:57 -07:00

Sainan referenced this issue from a commit 2025-04-23 11:35:58 -07:00

feat: conquest progression & rewards (#1791)

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

bug

An existing implemention is incorrect

dependencies

Pull requests that update a dependency file

documentation

Improvements or additions to documentation

enhancement

New feature or request specific to the emulator

help wanted

Extra attention is needed

improvement

missing data

part of more major rehaul

Can't be worked on right now without merge conflicts later

pr'd for

Soon™

question

Further information is requested

unimplemented

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: OpenWF/SpaceNinjaServer#1791

No description provided.