Merge branch 'main' of https://github.com/Digitalroot-Valheim/Digital…

…root.Valheim.Common.Names
Digitalroot-Valheim · Nov 23, 2022 · 0ad2464 · 0ad2464
2 parents 9f4b801 + 28a58c8
commit 0ad2464
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -2,3 +2,4 @@
 Names for Valheim Mods
 
 [![NuGet Release](https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.Common.Names/actions/workflows/nuget.release.yml/badge.svg)](https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.Common.Names/actions/workflows/nuget.release.yml)
+
diff --git a/src/Digitalroot.Valheim.Common.Names.sln.DotSettings b/src/Digitalroot.Valheim.Common.Names.sln.DotSettings
@@ -16,4 +16,5 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Skelly/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Squito/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Thornweaver/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Yagluth/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Yagluth/@EntryIndexedValue">True</s:Boolean>
+</wpf:ResourceDictionary>
diff --git a/src/Digitalroot.Valheim.Common.Names/MonsternomiconMod/EnemyNames.cs b/src/Digitalroot.Valheim.Common.Names/MonsternomiconMod/EnemyNames.cs
@@ -28,8 +28,8 @@ public static partial class EnemyNames
     public static readonly string SilverGolem = PrefabNames.SilverGolem;
     public static readonly string SmallAshNeck = PrefabNames.SmallAshNeck;
     public static readonly string SmallDarkSpider = PrefabNames.SmallDarkSpider;
-    public static readonly string SmallPolarSerpent = PrefabNames.SmallPolarSerpent;
-    public static readonly string SmallPolarLox = PrefabNames.SmallPolarLox;
+    public static readonly string PolarSerpentSmall = PrefabNames.PolarSerpentSmall;
+    public static readonly string PolarLoxSmall = PrefabNames.PolarLoxSmall;
     public static readonly string StormHatchling = PrefabNames.StormHatchling;
     public static readonly string SwollenBody = PrefabNames.SwollenBody;
     public static readonly string StormWolf = PrefabNames.StormWolf;
@@ -52,7 +52,7 @@ public static IEnumerable<string> AllNamesByBiome(Heightmap.Biome biome)
         case Heightmap.Biome.Ocean:
           yield return DrownedSoul;
           yield return StormHatchling;
-          yield return SmallPolarSerpent;
+          yield return PolarSerpentSmall;
           break;
 
         case Heightmap.Biome.Mistlands:
@@ -88,7 +88,7 @@ public static IEnumerable<string> AllNamesByBiome(Heightmap.Biome biome)
           yield return PolarFenring;
           yield return PolarLox;
           yield return SilverGolem;
-          yield return SmallPolarLox;
+          yield return PolarLoxSmall;
           break;
       }
     }

diff --git a/src/Digitalroot.Valheim.Common.Names/MonsternomiconMod/PrefabNames.cs b/src/Digitalroot.Valheim.Common.Names/MonsternomiconMod/PrefabNames.cs
@@ -36,8 +36,8 @@ public static partial class PrefabNames
     public static readonly string PolarFenring = $"{PrefixM}{nameof(PolarFenring)}";
     public static readonly string PolarLox = $"{PrefixM}{nameof(PolarLox)}";
     public static readonly string SilverGolem = $"{PrefixM}{nameof(SilverGolem)}";
-    public static readonly string SmallPolarLox = $"{PrefixM}{nameof(SmallPolarLox)}";
-    public static readonly string SmallPolarSerpent = $"{PrefixM}{nameof(SmallPolarSerpent)}";
+    public static readonly string PolarLoxSmall = $"{PrefixM}{nameof(PolarLoxSmall)}";
+    public static readonly string PolarSerpentSmall = $"{PrefixM}{nameof(PolarSerpentSmall)}";
 
     // Mistlands
     public static readonly string DarkMosquito = $"{PrefixM}{nameof(DarkMosquito)}";
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@
		Names for Valheim Mods

		[![NuGet Release](https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.Common.Names/actions/workflows/nuget.release.yml/badge.svg)](https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.Common.Names/actions/workflows/nuget.release.yml)