uzihead/encounter-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fxed an issue with random encounters, added a repeatable property, add event for abandoning encounters

Browse Source
This commit is contained in:
Sebastian Bularca
2026-05-22 13:53:00 +02:00
parent d14c5cdc2d
commit 0902836a61
6 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/EncounterContext.cs
View File

@@ -2,6 +2,10 @@ namespace Jovian.EncounterSystem {
/// <summary>Per-resolution scratch object passed to every event handler. Extend with fields as handlers need them.</summary>
public class EncounterContext {
public IEncounter CurrentEncounter { get; }
public EncounterRegistry Registry { get; set; }
/// <summary>Set to <c>true</c> to halt processing of remaining events.</summary>
public bool ShouldStopEvents { get; set; }
public EncounterContext(IEncounter currentEncounter) {
CurrentEncounter = currentEncounter;

12
Runtime/EncounterRegistry.cs
View File

@@ -11,7 +11,9 @@ namespace Jovian.EncounterSystem {
private readonly Dictionary<string, IEncounter> encounters = new();
public Dictionary<string, IEncounter> GetEncounters() => encounters;
public Dictionary<string, IEncounter> GetEncounters() {
return encounters;
}
public void RegisterEncounter(IEncounter encounter) {
var id = encounter?.EncounterDefinition?.internalId;
@@ -38,19 +40,19 @@ namespace Jovian.EncounterSystem {
return;
}
for(int c = 0; c < encounterCollections.Length; c++) {
for(var c = 0; c < encounterCollections.Length; c++) {
var collection = encounterCollections[c];
if(collection?.encounterTables == null) {
continue;
}
for(int t = 0; t < collection.encounterTables.Length; t++) {
for(var t = 0; t < collection.encounterTables.Length; t++) {
var table = collection.encounterTables[t];
if(table?.encounters == null) {
continue;
}
for(int i = 0; i < table.encounters.Count; i++) {
for(var i = 0; i < table.encounters.Count; i++) {
RegisterEncounter(table.encounters[i]);
}
}
@@ -86,7 +88,7 @@ namespace Jovian.EncounterSystem {
IEncounter selected = null;
var seen = 0;
for(var i = 0; i < encounters.Count; i++) {
for(var i = 0; i < table.encounters.Count; i++) {
var encounter = table.encounters[i];
if(encounter == null || encounter.GetType() != encounterKind.GetType()) {
continue;

25
Runtime/EncounterResolver.cs
View File

@@ -2,13 +2,12 @@ using System;
using System.Collections.Generic;
namespace Jovian.EncounterSystem {
/// <summary>Dispatches <see cref="IEncounterEvent"/> instances to per-type handlers. Unknown types are skipped.</summary>
/// <summary>Dispatches <see cref="IEncounterEvent"/> instances to per-type handlers.
/// Handlers return <c>true</c> to stop processing remaining events.</summary>
public class EncounterResolver {
private readonly Dictionary<Type, Action<IEncounterEvent, EncounterContext>> handlers = new();
private readonly Dictionary<Type, Func<IEncounterEvent, EncounterContext, bool>> handlers = new();
public void Register<T>(Action<T, EncounterContext> handler) where T : IEncounterEvent {
// Wrap the typed delegate so the dictionary can hold handlers for any event type uniformly.
// Cast is safe because the wrapper is only invoked via lookup under typeof(T).
public void Register<T>(Func<T, EncounterContext, bool> handler) where T : IEncounterEvent {
handlers[typeof(T)] = (evt, ctx) => handler((T)evt, ctx);
}
@@ -17,22 +16,26 @@ namespace Jovian.EncounterSystem {
}
/// <summary>Indexed iteration over <paramref name="events"/> — avoids the boxed enumerator
/// that an <c>IEnumerable&lt;T&gt;</c> parameter would force. <see cref="EncounterDialogOption.events"/>
/// is a <c>List</c>, which implements <c>IReadOnlyList</c>, so call sites just pass it directly.</summary>
/// that an <c>IEnumerable&lt;T&gt;</c> parameter would force. Stops when a handler
/// returns <c>true</c> or <see cref="EncounterContext.ShouldStopEvents"/> is set.</summary>
public void Resolve(IReadOnlyList<IEncounterEvent> events, EncounterContext context) {
if(events == null) {
return;
}
var count = events.Count;
for(int i = 0; i < count; i++) {
for(var i = 0; i < count; i++) {
var evt = events[i];
if(evt == null) {
if(evt == null || context.ShouldStopEvents) {
continue;
}
if(handlers.TryGetValue(evt.GetType(), out var handler)) {
handler(evt, context);
if(!handlers.TryGetValue(evt.GetType(), out var handler)) {
continue;
}
if(handler(evt, context)) {
context.ShouldStopEvents = true;
}
}
}

1
Runtime/IEncounter.cs
View File

@@ -49,5 +49,6 @@ namespace Jovian.EncounterSystem {
[Serializable]
public class EncounterProperties {
public int difficulty;
public bool isRepeatable = true;
}
}

4
Runtime/IEncounterEvent.cs
View File

@@ -24,4 +24,8 @@ namespace Jovian.EncounterSystem {
public class GiveRewardEvent : IEncounterEvent {
public Reward reward;
}
[Serializable]
public class AbandonEncounterEvent : IEncounterEvent {
}
}

14
Runtime/QuestProgress.cs
View File

@@ -14,6 +14,7 @@ namespace Jovian.EncounterSystem {
public event Action<IEncounter> QuestStarted;
public event Action<IEncounter, IEncounter> QuestAdvanced;
public event Action<IEncounter> QuestCompleted;
public event Action<IEncounter> QuestAbandoned;
public IReadOnlyCollection<string> ResolvedIds => resolvedIds;
@@ -76,6 +77,19 @@ namespace Jovian.EncounterSystem {
}
}
public void OnEncounterAbandoned(IEncounter encounter) {
if(encounter?.EncounterDefinition.Kind is not QuestKind questKind) {
return;
}
var id = encounter.EncounterDefinition?.internalId;
if(string.IsNullOrEmpty(id) || !resolvedIds.Remove(id)) {
return;
}
QuestAbandoned?.Invoke(encounter);
}
public void LoadResolvedIds(IEnumerable<string> ids) {
resolvedIds.Clear();
if(ids == null) {