Fixes after merge + updated assembly vesion

Jarno458 · Dec 19, 2021 · ba95cca · ba95cca
1 parent 79f90e8
commit ba95cca
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 28 deletions.
diff --git a/TsRandomizer/Extensions/GameSaveExtensions.cs b/TsRandomizer/Extensions/GameSaveExtensions.cs
@@ -42,30 +42,20 @@ internal static FillingMethod GetFillingMethod(this GameSave gameSave)
 			return fillingMethod;
 		}
 
-		internal static void SetFillingMethod(this GameSave gameSave, FillingMethod fillingMethod)
-		{
+		internal static void SetFillingMethod(this GameSave gameSave, FillingMethod fillingMethod) => 
 			gameSave.DataKeyStrings[FillMethodSaveFileKey] = fillingMethod.ToString();
-		}
 
-		internal static bool HasMeleeOrb(this GameSave gameSave, EInventoryOrbType orbType)
-		{
-			return gameSave.DataKeyBools.ContainsKey(MeleeOrbPrefixKey + (int) orbType);
-		}
+		internal static bool HasMeleeOrb(this GameSave gameSave, EInventoryOrbType orbType) => 
+			gameSave.DataKeyBools.ContainsKey(MeleeOrbPrefixKey + (int) orbType);
 
-		internal static bool HasFamiliar(this GameSave gameSave, EInventoryFamiliarType familiar)
-		{
-			return gameSave.DataKeyBools.ContainsKey(FamiliarPrefixKey + (int)familiar);
-		}
+		internal static bool HasFamiliar(this GameSave gameSave, EInventoryFamiliarType familiar) => 
+			gameSave.DataKeyBools.ContainsKey(FamiliarPrefixKey + (int)familiar);
 
-		internal static bool HasRelic(this GameSave gameSave, EInventoryRelicType relic)
-		{
-			return gameSave.Inventory.RelicInventory.Inventory.ContainsKey((int)relic);
-		}
+		internal static bool HasRelic(this GameSave gameSave, EInventoryRelicType relic) => 
+			gameSave.Inventory.RelicInventory.Inventory.ContainsKey((int)relic);
 
-		internal static bool HasOrb(this GameSave gameSave, EInventoryOrbType orbType)
-		{
-			return gameSave.Inventory.OrbInventory.Inventory.ContainsKey((int) orbType);
-		}
+		internal static bool HasOrb(this GameSave gameSave, EInventoryOrbType orbType) => 
+			gameSave.Inventory.OrbInventory.Inventory.ContainsKey((int) orbType);
 
 		internal static bool HasRing(this GameSave gameSave, EInventoryOrbType orbType)
 		{
@@ -155,8 +145,7 @@ static void AddOrb(this GameSave gameSave, EInventoryOrbType orbType, EOrbSlot o
 			}
 		}
 
-		static void AddEquipment(this GameSave gameSave, EInventoryEquipmentType enquipment)
-		{
+		static void AddEquipment(this GameSave gameSave, EInventoryEquipmentType enquipment) =>
 			gameSave.Inventory.EquipmentInventory.AddItem((int) enquipment);
 
 		static void AddUseItem(this GameSave gameSave, EInventoryUseItemType useItem) => 
@@ -235,11 +224,9 @@ internal static void AddConcussion(this GameSave gameSave)
 				gameSave.DataKeyInts[ConcussionCountFileKey] = 1;
         }
 
-		internal static int GetConcussionCount(this GameSave gameSave)
-        {
-			return gameSave.DataKeyInts.ContainsKey(ConcussionCountFileKey)
+		internal static int GetConcussionCount(this GameSave gameSave) =>
+			gameSave.DataKeyInts.ContainsKey(ConcussionCountFileKey)
 				? gameSave.DataKeyInts[ConcussionCountFileKey]
 				: 0;
-        }
 	}
 }
diff --git a/TsRandomizer/Properties/AssemblyInfo.cs b/TsRandomizer/Properties/AssemblyInfo.cs
@@ -7,13 +7,13 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("TsRandomizer")]
-[assembly: AssemblyCopyright("Copyright © 2021")]
+[assembly: AssemblyCopyright("Copyright © 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("694e46c5-fd46-4cc8-8b71-d381e154ccf7")]
-[assembly: AssemblyVersion("0.1.2.1")]
-[assembly: AssemblyFileVersion("0.1.2.1")]
+[assembly: AssemblyVersion("0.1.3.0")]
+[assembly: AssemblyFileVersion("0.1.3.0")]
 
 [assembly: InternalsVisibleTo("TsRandomizer.Tests")]
 [assembly: InternalsVisibleTo("TsRandomizerSeedGeneratah")]