Skip to content

Commit

Permalink
Update for 0.205.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Digitalroot committed Dec 10, 2021
1 parent a295782 commit c45799c
Show file tree
Hide file tree
Showing 8 changed files with 545 additions and 329 deletions.
128 changes: 128 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
*.sln merge=binary
*.csproj merge=binary
*.vbproj merge=binary
*.vcxproj merge=binary
*.vcproj merge=binary
*.dbproj merge=binary
*.fsproj merge=binary
*.lsproj merge=binary
*.wixproj merge=binary
*.modelproj merge=binary
*.sqlproj merge=binary
*.wwaproj merge=binary
*.user merge=binary

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
*.jpg binary
*.jpeg binary
*.png binary
*.gif binary
*.tif binary
*.tiff binary
*.ico binary
# SVG treated as an asset (binary) by default.
# *.svg text
# If you want to treat it as binary,
# use the following line instead.
*.svg binary
*.eps binary
*.webp binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
*.bibtex text diff=bibtex
*.md text
*.tex text diff=tex
*.adoc text
*.textile text
*.mustache text
*.csv text
*.tab text
*.tsv text
*.txt text
*.sql text
*.ps1 text
*.props text
*.config text
.DotSettings text
LICENSE text

# Scripts
*.bash text eol=lf
*.fish text eol=lf
*.sh text eol=lf
# These are explicitly windows files and should use crlf
*.bat text eol=crlf
*.cmd text eol=crlf

# Serialisation
*.json text
*.toml text
*.xml text
*.yaml text
*.yml text

# Archives
*.7z binary
*.gz binary
*.tar binary
*.tgz binary
*.zip binary
*.rar binary

# Unity
*.unitypackage binary
*.manifest merge=binary

# Text files where line endings should be preserved
*.patch -text

#
# Exclude files from exporting
#
.gitattributes export-ignore
.gitignore export-ignore
.gitkeep export-ignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ namespace Digitalroot.Valheim.Common.Names.Vanilla
public static partial class CraftingStationNames
{
public static readonly IEnumerable<string> AllNames = Utils.AllNames(typeof(CraftingStationNames));
public static readonly string ArtisanTable = "piece_artisanstation";
public static readonly string Cauldron = "piece_cauldron";
public static readonly string Forge = "forge";
public static readonly string Stonecutter = "piece_stonecutter";
public static readonly string Workbench = "piece_workbench";
public static readonly string ArtisanTable = PrefabNames.PieceArtisanstation;
public static readonly string Cauldron = PrefabNames.PieceCauldron;
public static readonly string Forge = PrefabNames.Forge;
public static readonly string Stonecutter = PrefabNames.PieceStonecutter;
public static readonly string Workbench = PrefabNames.PieceWorkbench;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,20 @@

namespace Digitalroot.Valheim.Common.Names.Vanilla
{
// ReSharper disable once PartialTypeWithSinglePart
public static partial class DungeonLocationNames
{
public static readonly IEnumerable<string> AllNames = Utils.AllNames(typeof(DungeonLocationNames));
public static readonly string Crypt2 = nameof(Crypt2);
public static readonly string Crypt3 = nameof(Crypt3);
public static readonly string Crypt4 = nameof(Crypt4);
public static readonly string GoblinCamp2 = nameof(GoblinCamp2);
public static readonly string SunkenCrypt4 = nameof(SunkenCrypt4);
public static readonly string Crypt2 = PrefabNames.Crypt2;
public static readonly string Crypt3 = PrefabNames.Crypt3;
public static readonly string Crypt4 = PrefabNames.Crypt4;
public static readonly string GoblinCamp1 = PrefabNames.GoblinCamp1;
public static readonly string GoblinCamp2 = PrefabNames.GoblinCamp2;
public static readonly string SunkenCrypt1 = PrefabNames.SunkenCrypt1;
public static readonly string SunkenCrypt2 = PrefabNames.SunkenCrypt2;
public static readonly string SunkenCrypt3 = PrefabNames.SunkenCrypt3;
public static readonly string SunkenCrypt4 = PrefabNames.SunkenCrypt4;
public static readonly string TrollCave = PrefabNames.TrollCave;
public static readonly string TrollCave02 = PrefabNames.TrollCave02;
}
}
7 changes: 7 additions & 0 deletions src/Digitalroot.Valheim.Common.Names/Vanilla/EnemyNames.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ namespace Digitalroot.Valheim.Common.Names.Vanilla
public static partial class EnemyNames
{
[UsedImplicitly] public static readonly IEnumerable<string> AllNames = Utils.AllNames(typeof(EnemyNames));
public static readonly string Abomination = PrefabNames.Abomination;
public static readonly string Blob = PrefabNames.Blob;
public static readonly string BlobElite = PrefabNames.BlobElite;
public static readonly string BlobTar = PrefabNames.BlobTar;
public static readonly string Boar = PrefabNames.Boar;
public static readonly string BoarPiggy = PrefabNames.BoarPiggy;
public static readonly string Crow = PrefabNames.Crow;
Expand All @@ -32,10 +34,12 @@ public static partial class EnemyNames
public static readonly string Greyling = PrefabNames.Greyling;
public static readonly string Leech = PrefabNames.Leech;
public static readonly string Lox = PrefabNames.Lox;
public static readonly string LoxCalf = PrefabNames.LoxCalf;
public static readonly string Neck = PrefabNames.Neck;
public static readonly string Seagal = PrefabNames.Seagal;
public static readonly string Serpent = PrefabNames.Serpent;
public static readonly string Skeleton = PrefabNames.Skeleton;
public static readonly string SkeletonNoArcher = PrefabNames.SkeletonNoArcher;
public static readonly string SkeletonPoison = PrefabNames.SkeletonPoison;
public static readonly string StoneGolem = PrefabNames.StoneGolem;
public static readonly string Surtling = PrefabNames.Surtling;
Expand Down Expand Up @@ -77,6 +81,7 @@ public static IEnumerable<string> AllNamesByBiome(Heightmap.Biome biome)
break;

case Heightmap.Biome.Swamp:
yield return Abomination;
yield return Blob;
yield return BlobElite;
yield return Draugr;
Expand All @@ -96,12 +101,14 @@ public static IEnumerable<string> AllNamesByBiome(Heightmap.Biome biome)
break;

case Heightmap.Biome.Plains:
yield return BlobTar;
yield return Deathsquito;
yield return Goblin;
yield return GoblinArcher;
yield return GoblinBrute;
yield return GoblinShaman;
yield return Lox;
yield return LoxCalf;
break;

case Heightmap.Biome.Ocean:
Expand Down
Loading

0 comments on commit c45799c

Please sign in to comment.