semantic changes

Packages/com.jovian.encounter-system/Runtime/DialogLineLibrary.cs

@@ -22,7 +22,7 @@ namespace Jovian.EncounterSystem {
             }
 
             EnsureCache();
-            return cache.TryGetValue(id, out var text) ? text : null;
+            return cache.GetValueOrDefault(id);
         }
 
         public void InvalidateCache() {

Packages/com.jovian.encounter-system/Runtime/DialogLineRef.cs

@@ -9,13 +9,11 @@ namespace Jovian.EncounterSystem {
         [TextArea(2, 6)] public string inlineText;
 
         public string Resolve(DialogLineLibrary library) {
-            if(library != null && !string.IsNullOrEmpty(id)) {
-                var text = library.Resolve(id);
-                if(!string.IsNullOrEmpty(text)) {
-                    return text;
-                }
+            if(!library || string.IsNullOrEmpty(id)) {
+                return inlineText;
             }
-            return inlineText;
+            var text = library.Resolve(id);
+            return !string.IsNullOrEmpty(text) ? text : inlineText;
         }
     }
 }

Packages/com.jovian.encounter-system/Runtime/EncounterDialogOptionSet.cs

@@ -23,7 +23,7 @@ namespace Jovian.EncounterSystem {
         }
 
         private void RenameToMatchId() {
-            if(this == null || string.IsNullOrEmpty(id)) {
+            if(!this || string.IsNullOrEmpty(id)) {
                 return;
             }
 

Packages/com.jovian.encounter-system/Runtime/EncounterTable.cs

@@ -18,7 +18,7 @@ namespace Jovian.EncounterSystem {
             }
 
             EnsureCache();
-            return idCache.TryGetValue(internalId, out var encounter) ? encounter : null;
+            return idCache.GetValueOrDefault(internalId);
         }
 
         /// <summary>Force the id lookup cache to rebuild on next use.</summary>
@@ -43,7 +43,7 @@ namespace Jovian.EncounterSystem {
 
             IEncounter selected = null;
             var seen = 0;
-            for(int i = 0; i < encounters.Count; i++) {
+            for(var i = 0; i < encounters.Count; i++) {
                 var encounter = encounters[i];
                 if(encounter == null || encounter.GetType() != type) {
                     continue;
@@ -68,7 +68,7 @@ namespace Jovian.EncounterSystem {
 
             IEncounter selected = null;
             var seen = 0;
-            for(int i = 0; i < encounters.Count; i++) {
+            for(var i = 0; i < encounters.Count; i++) {
                 var encounter = encounters[i];
                 if(encounter == null || !filter(encounter)) {
                     continue;
@@ -91,7 +91,7 @@ namespace Jovian.EncounterSystem {
                 return;
             }
 
-            for(int i = 0; i < encounters.Count; i++) {
+            for(var i = 0; i < encounters.Count; i++) {
                 var encounter = encounters[i];
                 var internalId = encounter?.EncounterDefinition?.internalId;
                 if(!string.IsNullOrEmpty(internalId)) {

Packages/com.jovian.encounter-system/Runtime/IEncounterKind.cs

@@ -7,46 +7,7 @@ namespace Jovian.EncounterSystem {
     }
 
     [Serializable]
-    public class CombatKind : IEncounterKind {
-        public string enemyGroupId;
-        public string rewardTableId;
-    }
-
-    [Serializable]
-    public class QuestKind : IEncounterKind {
+    public partial class QuestKind : IEncounterKind {
         public EncounterLink nextEncounter;
-        public string questTitle;
-    }
-
-    [Serializable]
-    public class SocialKind : IEncounterKind {
-        public string npcId;
-        public string factionId;
-        public int reputationDelta;
-    }
-
-    [Serializable]
-    public class PuzzleKind : IEncounterKind {
-        public string puzzleId;
-        public int difficultyClass;
-    }
-
-    [Serializable]
-    public class ExplorationKind : IEncounterKind {
-        public int perceptionDC;
-    }
-
-    [Serializable]
-    public class TutorialKind : IEncounterKind {
-        public string tutorialId;
-    }
-
-    [Serializable]
-    public class HazardKind : IEncounterKind {
-        public int damageAmount;
-    }
-
-    [Serializable]
-    public class OtherKind : IEncounterKind {
     }
 }

Packages/com.jovian.encounter-system/Runtime/IRewardKind.cs

@@ -4,30 +4,4 @@ namespace Jovian.EncounterSystem {
     /// <summary>Polymorphic payload on a <see cref="Reward"/>. Add a new kind by implementing this interface.</summary>
     public interface IRewardKind {
     }
-
-    [Serializable]
-    public class CurrencyRewardKind : IRewardKind {
-        public string currencyId;
-        public int amount;
-    }
-
-    [Serializable]
-    public class ItemRewardKind : IRewardKind {
-        public string itemId;
-        public int quantity;
-    }
-
-    [Serializable]
-    public class ExperienceRewardKind : IRewardKind {
-        public int amount;
-    }
-
-    [Serializable]
-    public class UnlockableRewardKind : IRewardKind {
-        public string unlockableId;
-    }
-
-    [Serializable]
-    public class OtherRewardKind : IRewardKind {
-    }
 }