Skip to content

Commit 6ec15b1

Browse files
emipa606emipa606
committed
Mod updated for 1.3 and passed autotests
1 parent 7d54a2d commit 6ec15b1

File tree

13 files changed

+68
-76
lines changed

13 files changed

+68
-76
lines changed

‎Assemblies/BadMeatCategory.dll renamed to ‎1.0/Assemblies/BadMeatCategory.dll

File renamed without changes.

‎1.1/Assemblies/BadMeatCategory.dll

6.5 KB
Binary file not shown.

‎1.2/Assemblies/BadMeatCategory.dll

6.5 KB
Binary file not shown.

‎1.3/Assemblies/BadMeatCategory.dll

5.5 KB
Binary file not shown.

‎About/About.xml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<li>1.0</li>
99
<li>1.1</li>
1010
<li>1.2</li>
11+
<li>1.3</li>
1112
</supportedVersions>
1213
<modDependencies />
1314
<loadAfter />
@@ -16,6 +17,8 @@
1617
Puts all meat that is defined as coming from a Humanlike race and would cause bad thoughts from eating in its own category
1718
Also moves meat from Insectoids, rotten meat from [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2466790513]Rotten Meat[/url] and Chaomeat from [url=https://steamcommunity.com/sharedfiles/filedetails/?id=1786466855]Pawnmorpher[/url]
1819

20+
Russian translation by Tkhakiro
21+
1922
Idea by: Rasutei
2023

2124
[table]

‎About/Changelog.txt

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog for BadMeatCategory
22

3+
1.0.4.0 - Mod updated for 1.3 and passed autotests
4+
5+
36
1.0.3.0 - Added russian translation, thanks Tkhakiro!
47

58

‎About/Manifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<Manifest>
33
<identifier>BadMeatCategory</identifier>
4-
<version>1.0.3.0</version>
4+
<version>1.0.4.0</version>
55
<dependencies />
66
<incompatibleWith />
77
<loadBefore />

‎About/ModSync.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ModSyncNinjaData>
33
<ID>5e19868d-711d-4873-9a25-3707e86a5faa</ID>
44
<ModName>Bad Meat Category</ModName>
5-
<Version>1.0.3.0</Version>
5+
<Version>1.0.4.0</Version>
66
<SaveBreaking>False</SaveBreaking>
77
<Host name="Github">
88
<Owner>emipa606</Owner>

‎README.md

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
Puts all meat that is defined as coming from a Humanlike race and would cause bad thoughts from eating in its own category
77
Also moves meat from Insectoids, rotten meat from https://steamcommunity.com/sharedfiles/filedetails/?id=2466790513]Rotten Meat and Chaomeat from https://steamcommunity.com/sharedfiles/filedetails/?id=1786466855]Pawnmorpher
88

9+
Russian translation by Tkhakiro
10+
911
Idea by: Rasutei
1012

1113
[table]

‎Source/BadMeatCategory.csproj.oldversioncscproj

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{3E06096B-8065-4F25-805B-71CBB5E9C42F}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>BadMeatCategory</RootNamespace>
11+
<AssemblyName>BadMeatCategory</AssemblyName>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<Deterministic>true</Deterministic>
15+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17+
<DebugSymbols>true</DebugSymbols>
18+
<DebugType>full</DebugType>
19+
<Optimize>false</Optimize>
20+
<OutputPath>..\..\Assemblies</OutputPath>
21+
<DefineConstants>DEBUG;TRACE</DefineConstants>
22+
<ErrorReport>prompt</ErrorReport>
23+
<WarningLevel>4</WarningLevel>
24+
<LangVersion>latest</LangVersion>
25+
</PropertyGroup>
26+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<DebugType>pdbonly</DebugType>
28+
<Optimize>true</Optimize>
29+
<OutputPath>..\..\Assemblies</OutputPath>
30+
<DefineConstants>TRACE</DefineConstants>
31+
<ErrorReport>prompt</ErrorReport>
32+
<WarningLevel>4</WarningLevel>
33+
<LangVersion>latest</LangVersion>
34+
</PropertyGroup>
35+
<ItemGroup>
36+
<PackageReference Include="Krafs.Rimworld.Ref">
37+
<Version>*</Version>
38+
<ExcludeAssets>runtime</ExcludeAssets>
39+
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
40+
</PackageReference>
41+
</ItemGroup>
42+
<ItemGroup>
43+
<Compile Include="BadMeatCategory.cs" />
44+
<Compile Include="Properties\AssemblyInfo.cs" />
45+
</ItemGroup>
46+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
47+
</Project>
48+

‎Source/BadMeatCategory/BadMeatCategory.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ static BadMeatCategory()
3333
var thingsToMove = new List<ThingDef>();
3434
foreach (var descendantThingDef in MeatRawCategory.DescendantThingDefs)
3535
{
36-
if (FoodUtility.IsHumanlikeMeat(descendantThingDef))
36+
if (FoodUtility.GetMeatSourceCategory(descendantThingDef) == MeatSourceCategory.Humanlike)
3737
{
3838
thingsToMove.Add(descendantThingDef);
3939
continue;

‎Source/BadMeatCategory/BadMeatCategory.csproj

+9-38
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,19 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{3E06096B-8065-4F25-805B-71CBB5E9C42F}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>BadMeatCategory</RootNamespace>
11-
<AssemblyName>BadMeatCategory</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<Deterministic>true</Deterministic>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>..\..\Assemblies</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
<LangVersion>latest</LangVersion>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>..\..\Assemblies</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
3+
<OutputPath>..\..\1.3\Assemblies</OutputPath>
4+
<TargetFramework>net472</TargetFramework>
5+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
6+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
7+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
8+
<DebugType>None</DebugType>
339
<LangVersion>latest</LangVersion>
3410
</PropertyGroup>
3511
<ItemGroup>
3612
<PackageReference Include="Krafs.Rimworld.Ref">
37-
<Version>*</Version>
13+
<Version>*</Version>
14+
<!--<Version>1.3.3052-beta</Version>-->
3815
<ExcludeAssets>runtime</ExcludeAssets>
3916
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4017
</PackageReference>
4118
</ItemGroup>
42-
<ItemGroup>
43-
<Compile Include="BadMeatCategory.cs" />
44-
<Compile Include="Properties\AssemblyInfo.cs" />
45-
</ItemGroup>
46-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
4719
</Project>
48-

‎Source/BadMeatCategory/Properties/AssemblyInfo.cs

-35
This file was deleted.

0 commit comments

Comments
 (0)