(#484) Exploration objectives #531

immortius · 2025-12-13T11:29:07Z

Closes #484
Closes #461
Closes #536

Overview

Introduces three new objectives centered around exploration - closing anomalies, entering rooms and activating objective blocks. Additionally adds a chance for exit portals to spawn in the rift.

Testing Instructions

The objective block objective is now the default for new rift keys
The kill objective is now added via "death" essence
The explore objective is added via "light" essence
The anomaly objective is added via "energy" essence
Alternatively all objectives can be added via the wotr riftKey objective command.

Framework Changes

New objective type: GoalBasedObjective. This uses the same goals as the quest system. To facilitate this goal updates are now broadcast using the GoalEvent.Update event, so they can be subscribed to by both quests and objectives (or other systems in the future). By reusing the goal system it means whenever a new goal type is implemented it can be used by both - with this update for example it is also possible to add quests to close anomalies, visit rooms and activate objective blocks.
RiftMapData is a new level attachment for tracking which rooms in the rift have been discovered or visited. This is currently used to drive the explore room objective by tracking when a new room is entered for the first time. It should also prove useful in the future for the rift map display. The RiftMapEvent.RoomFirstVisitedEvent is broadcast from here.
Objectives can now provide a list of JigsawListProcessors to add to the rift configuration.
Bridged Rift Parameters to Loot Parameters. There is now a loot context parameter for RiftParameterData, and a rift_parameter number provider to get the value from a rift parameter. Additionally added number providers for obtaining rift room and rift structure counts, and math operator providers for combining different loot parameters (currently multiply, sum, ceil, max, and min). This all enables the use of rift information in goals as part of GoalBasedObjectives.
RiftFaster: Replaced the string identifier for generatables with a RiftGenerableId record. This is to make it easier to do logic around the identifiers - particularly logic that shouldn't care about the namespace of the generatable (for other mods adding extra pois and such).
RiftFaster: added methods for gathering counts of generatables. Noting that ImplementsLegend has suggested future rework to capture this information during generation.

Smaller Changes

An event is now broadcast when an anomaly is closed - AnomalyEvent.Closed
New block: ObjectiveBlock, which changes state when first activated and sends off a GoalEvent.Update for the ActivateObjectiveGoal.
New goal types: ActivateObjective, CloseAnomaly and VisitRoom.
The wotr rift roomInfo command is now wotr rift room info, and a wotr rift room anomalyCount command has been added.
Mob type is now optional in the KillMobGoal.
The NoObjective now renders a simple message when active. The exploration objectives will fall back to this when no targets are available (if there are no anomalies to close/no objective blocks to activate).
The old KillObjective type has been removed, with the kill objective now using the GoalBasedObjective type. This means that it displays the specific number of kills required instead of showing a bar.
Improved goal checkbox icon
ReplaceSingleJigsaw JigsawListProcessor for having a chance to replace a single jigsaw pool in a generatable.
FastWeightedList.codecWithSingleAlternative method for providing a codec for a FastWeightedList with support for a single value being provided instead.
Added a method to RiftSpaceCorridor to obtain the location of the connected space.
Added ConnectedRoomIterator for iterating rooms connected to a room, outwards to a desired depth.

Bug Fixes

Crash in RiftConfig#withCustomData when attempting to override an existing entry.
Fix forest trial_spawner configuration having an empty entity, causing log spam.

Refactors

Moved goals into their own package core.goal, out from core.quest.
Further refactoring around goals, such as introducing GoalState and GoalTracker interfaces and simplifying UI element linkage to goals from different contexts.
LootContext is now used instead of LootParams for generating goals and rewards. LootParams were frequently being used to generate a LootContext anyway.
Renamed RiftDifficultyEvents and RiftEvents to RiftDifficultyEventHandler and RiftEventHandler. I would suggest that a XEventHandler naming pattern for the classes subscribing to events is clearer than the XEvents pattern, as it separates them better from the XEvent naming for classes providing event types.

Implementation Notes

The generics around AnomalyTask and AnomalyState are difficult to work with. I've worked around it but noting that these need some refactoring.
It would be nice to split out Objective information from RiftData as its own attachment in the future.

ImplementsLegend · 2025-12-16T21:07:23Z

...in/java/com/wanderersoftherift/wotr/world/level/levelgen/layout/LayeredFiniteRiftLayout.java

+    public RiftSpace getSpaceAt(Vec3i pos) {
+        return getSpaceAt(pos.getX(), pos.getY(), pos.getZ());
+    }


The RiftLayout interface has exact same method.

No it doesn't. It has getChunkSpace, which is more of a getOrCreateSpaceAt.

I didn't notice that the name is different. But this new overload still seems to be unused.

Right, it ended up unused.

ImplementsLegend · 2025-12-16T21:21:20Z

src/main/java/com/wanderersoftherift/wotr/world/level/levelgen/template/RiftGeneratableId.java

Different types of RiftGeneratable should probably have their own identifier type since each is identified with different information. Builtins usually only need ResourceLocation, but payload templates need ResourceLocation and palette index.

I think having multiple types adds complexity for no value, particularly because it makes it harder to work with the identifier. Also not clear there is a use case for future variations. I'll at least make index an OptionalInt and change the string representation to not have an index for the built in cases.

src/main/java/com/wanderersoftherift/wotr/world/level/ConnectedRoomIterator.java

ImplementsLegend · 2025-12-17T14:29:26Z

src/main/java/com/wanderersoftherift/wotr/core/goal/GoalEventHandler.java

+
+    @SubscribeEvent
+    public static void onDiedInRift(RiftEvent.PlayerDied event) {
+        // TODO: Rather than sending an event, have a registry of GoalTracking providers? Pros, cons


Not sure how much improvement would that change get, but the current state is kinda weird.

I'll leave it alone for now then. Would be easier to change after #536

Nevermind, I did a rework. GoalTrackers are now looked up using (registerable) lookup functions, and then they can provide a stream of GoalStates of specific types that can be worked with directly rather than passing around update functions.

src/main/java/com/wanderersoftherift/wotr/core/goal/GoalTracker.java

ImplementsLegend · 2025-12-17T15:20:52Z

src/main/java/com/wanderersoftherift/wotr/loot/provider/number/MultiplyNumberProvider.java

+
+import java.util.List;
+
+public record MultiplyNumberProvider(List<NumberProvider> values) implements NumberProvider {


I'm starting to think that maybe we should make a registry for some common math functions and whenever there is datapacking involving math we just make one "math" type that has function property. Or give it expression string to parse.

We could change the rift parameters to lean more on the NumberProvider system. Ignoring the name, LootContext is a pretty flexible mechanism for providing context to number generation.

mal0ki · 2025-12-20T02:15:32Z

I've played with these changes, and they do work as intended. And we did catch a few bugs with it, but that should all be working alright now.
So this is an approval for me (without code review)

refactor: merged rift package into core.rift refactor: moved goals into their own package

feat: replace kill objective with goal based version

…atterns of jigsaw with a room distance of entrance refactor: cleanup and comments

…erProvider

feat: room rift count number provider feat: additional math operator number providers feat: RiftMapData for tracking rooms discovered/visited refactor: use ICancellableEvent for GoalEvent.Update

refactor: replaced use of LootParams with LootContext for goal and reward generation refactor: removed kill objective

refactor: moved goal widgets from quest to goal package

feat: objective block structures feat: goal based objectives now fall back on the no objective their goals lack targets feat: exit portals spawn throughout the rift at low probability

fix: corrected room rift counting

feat: recipe update for new objectives

refactor: reduced duplicate code refactor: improved some naming

refactor: Simplfied hasNext in ConnectedRoomIterator refactor: Improved RiftGeneratableId

refactor: Moved objective data into its own level attachment refactor: Reworked goal update handling refactor: various cleanup to goal handling

fix: Check right level for objective when leaving rift

… and added some error handling

immortius force-pushed the dividesByZero/#484-exploration-objectives branch from f229af1 to eb2f283 Compare December 13, 2025 21:42

immortius marked this pull request as ready for review December 15, 2025 09:08

ImplementsLegend reviewed Dec 17, 2025

View reviewed changes

immortius marked this pull request as draft December 18, 2025 02:28

immortius marked this pull request as ready for review December 18, 2025 04:52

mal0ki added a commit that referenced this pull request Dec 23, 2025

Enabled Energy essence as it's used in #531

8bc09b6

immortius added 23 commits December 24, 2025 08:42

feat: initial pass at GoalBasedObjective

e54a980

refactor: merged rift package into core.rift refactor: moved goals into their own package

feat: bridge rift parameters to loot parameters

375a8b3

feat: replace kill objective with goal based version

feat: close anomaly goal

5579376

refactor: goal tracking handling

5f78262

feat: cull disconnected rooms

db7eab0

feat: RiftJigsawCountNumberProvider for obtaining counts of certain p…

def028c

…atterns of jigsaw with a room distance of entrance refactor: cleanup and comments

feat: change RiftJigsawCountNumberProvider roomDistance to use a Numb…

92158fb

…erProvider

fix: jigsaw count visited room tracking

d416b77

feat: explore rift room objective

d38525d

feat: room rift count number provider feat: additional math operator number providers feat: RiftMapData for tracking rooms discovered/visited refactor: use ICancellableEvent for GoalEvent.Update

feat: improved goal incomplete/complete icon

7d81987

refactor: replaced use of LootParams with LootContext for goal and reward generation refactor: removed kill objective

feat: infrastructure for objective blocks

5ce8355

refactor: moved goal widgets from quest to goal package

feat: goal based objectives can include jigsaw list processors

916dfc7

feat: objective block structures feat: goal based objectives now fall back on the no objective their goals lack targets feat: exit portals spawn throughout the rift at low probability

feat: tweaked objective counts

3d00f56

fix: corrected room rift counting

feat: activation sound for objective block

c93caa6

feat: recipe update for new objectives

feat: allow for generatable path prefix checks ignoring namespace

e246a75

refactor: improved some naming

df90d71

doco: Javadoc and comments

869acf2

feat: add ConnectedRoomIterator

6179885

refactor: reduced duplicate code refactor: improved some naming

refactor: Function -> ToIntFunction for goal progress

4c2e36d

refactor: Simplfied hasNext in ConnectedRoomIterator refactor: Improved RiftGeneratableId

feat: Registration event for goal tracker lookup methods

20c8063

refactor: Moved objective data into its own level attachment refactor: Reworked goal update handling refactor: various cleanup to goal handling

refactor: removed unused method

8d79be6

fix: No Objective should always succeed

8d241c7

fix: Check right level for objective when leaving rift

refactor: use event level rather than player level (still same level)

c752a73

fix: removed invalid rift parameter from anomaly objective definition…

b5a0cbe

… and added some error handling

immortius force-pushed the dividesByZero/#484-exploration-objectives branch from 29509a9 to b5a0cbe Compare December 23, 2025 21:46

immortius added 2 commits December 24, 2025 08:50

fix: Objective block definition using new method

44c8c15

fix: add energy essence texture

ee3bc0f


		import java.util.List;

		public record MultiplyNumberProvider(List<NumberProvider> values) implements NumberProvider {

(#484) Exploration objectives #531

Are you sure you want to change the base?

(#484) Exploration objectives #531

Uh oh!

Conversation

immortius commented Dec 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Overview

Testing Instructions

Framework Changes

Smaller Changes

Bug Fixes

Refactors

Implementation Notes

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mal0ki commented Dec 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

immortius commented Dec 13, 2025 •

edited

Loading