Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Epicguru committed Apr 14, 2024
2 parents 0c8eb14 + d640706 commit d778da4
Show file tree
Hide file tree
Showing 205 changed files with 2,594 additions and 2,366 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/BuildModCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Setup Dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x

- name: Build Mod 1.4
run: dotnet build ${{ env.SLN_PATH }} --configuration v1.4
- name: Build Mod
run: dotnet build ${{ env.SLN_PATH }} --configuration Release
8 changes: 5 additions & 3 deletions .github/workflows/GenerateReleaseZip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ jobs:
- name: Setup Dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x

- name: Build Mod 1.4
run: dotnet build ${{ env.SLN_PATH }} --configuration v1.4
- name: Build Mod
run: dotnet build ${{ env.SLN_PATH }} --configuration Release

# I don't know how well testing will work without Rimworld actually installed.
# But if you have unit tests configured to work with dotnet, you may be able
Expand All @@ -61,6 +61,7 @@ jobs:
retention-days: 7
path: |
1.4/
1.5/
About/
Animations/
Bundles/
Expand Down Expand Up @@ -105,6 +106,7 @@ jobs:
- name: Create Mod Folders
run: |
mkdir -p ${{ env.MOD_PATH }}/1.4/
mkdir -p ${{ env.MOD_PATH }}/1.5/
mkdir -p ${{ env.MOD_PATH }}/About/
mkdir -p ${{ env.MOD_PATH }}/Animations/
mkdir -p ${{ env.MOD_PATH }}/Bundles/
Expand Down
3 changes: 3 additions & 0 deletions About/About.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<author>Epicguru</author>
<supportedVersions>
<li>1.4</li>
<li>1.5</li>
</supportedVersions>
<description>Adds detailed melee combat animations, including duels, executions, and unique skills. Also (optionally) adds lassos to pull enemies into melee range.

Expand All @@ -28,5 +29,7 @@ Load as far down as possible.</description>
<li>erdelf.humanoidalienraces</li>
<li>Krkr.rule56</li>
<li>ceteam.combatextended</li>
<li>taranchuk.performanceoptimizer</li>
<li>Nals.FacialAnimation</li>
</loadAfter>
</ModMetaData>
Binary file added About/ModIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Defs/Jobs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<casualInterruptible>false</casualInterruptible>
<playerInterruptible>true</playerInterruptible>
<allowOpportunisticPrefix>false</allowOpportunisticPrefix>
<dropThingBeforeJob>false</dropThingBeforeJob>
<dropThingBeforeJob>true</dropThingBeforeJob>
<suspendable>false</suspendable>
<neverShowWeapon>true</neverShowWeapon>
<isIdle>false</isIdle>
Expand Down
13 changes: 13 additions & 0 deletions Patch_FacialAnimation/1.5/Patches/FacialAnimationPatch.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

<!-- Patches facial animation mod to use the melee attack animation during duels and executions -->
<Patch>

<!-- Note: this assumes that all animations are melee animations. This should probably be fixed -->
<Operation Class="PatchOperationAdd">
<xpath>/Defs/FacialAnimation.FaceAnimationDef[defName="AttackMelee"]/targetJobs</xpath>
<value>
<li>AM_InAnimation</li>
<li>AM_GrapplePawn</li>
</value>
</Operation>
</Patch>
12 changes: 3 additions & 9 deletions Source/AMRetextureSupport/AMRetextureSupport.csproj
Original file line number Diff line number Diff line change
@@ -1,35 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<NoStdLib>false</NoStdLib>
<LangVersion>11</LangVersion>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<RootNamespace>AM.Retexture</RootNamespace>
<Configurations>v1.4</Configurations>
<Nullable>disable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugType>none</DebugType>
</PropertyGroup>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Krafs.Publicizer" Version="2.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4063" />
</ItemGroup>

<ItemGroup>
<!-- Ungodly hack to access rimworld private properties & methods -->
<Publicize Include="Assembly-CSharp" />
</ItemGroup>

<!-- _____ 1.4 _____ -->
<ItemGroup Condition="'$(Configuration)'=='v1.4'">
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3901" />
</ItemGroup>

</Project>
13 changes: 7 additions & 6 deletions Source/AMRetextureSupport/RetextureUtility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Linq;
using UnityEngine;
using Verse;
using LudeonTK;

namespace AM.Retexture;

Expand Down Expand Up @@ -38,8 +39,8 @@ public static class RetextureUtility
},

};
private static HashSet<ModContentPack> OfficialMods;
private static ModContentPack CoreMCP;
private static HashSet<ModContentPack> officialMods;
private static ModContentPack coreMCP;

/// <summary>
/// Gets the mod that is providing the active texture for this weapon def.
Expand Down Expand Up @@ -114,14 +115,14 @@ public static ActiveTextureReport GetTextureReport(ThingDef weapon, int pass = 0
var resource = Resources.Load<Texture2D>($"Textures/{texPath}");
if (resource != null)
{
OfficialMods ??= LoadedModManager.RunningModsListForReading.Where(m => m.IsOfficialMod).ToHashSet();
CoreMCP ??= OfficialMods.First(m => m.PackageId == ModContentPack.CoreModPackageId);
officialMods ??= LoadedModManager.RunningModsListForReading.Where(m => m.IsOfficialMod).ToHashSet();
coreMCP ??= officialMods.First(m => m.PackageId == ModContentPack.CoreModPackageId);

// If the weapon comes from a dlc, then that dlc is the texture provider.
// Otherwise, just set the provider as one of the official mods (core or dlc).
ModContentPack mod = weapon.modContentPack;
if (!OfficialMods.Contains(mod))
mod = CoreMCP;
if (!officialMods.Contains(mod))
mod = coreMCP;

if (!hasFirst)
{
Expand Down
39 changes: 19 additions & 20 deletions Source/AlienRacesPatch/AlienRacesPatch.csproj
Original file line number Diff line number Diff line change
@@ -1,43 +1,42 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net48</TargetFramework>
<PropertyGroup>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<NoStdLib>false</NoStdLib>
<LangVersion>preview</LangVersion>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Configurations>v1.4</Configurations>
<AssemblyName>AM.AlienRacesPatch</AssemblyName>
<RootNamespace>AM.AlienRacesPatch</RootNamespace>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\ThingGenerator\AnimationMod.csproj">
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4063" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\AnimationMod\AnimationMod.csproj">
<CopyLocal>False</CopyLocal>
<Private>False</Private>
<ExcludeAssets>all</ExcludeAssets>
</ProjectReference>
</ItemGroup>

<!-- _____ 1.4 _____ -->
<ItemGroup Condition="'$(Configuration)'=='v1.4'">
<Reference Include="AlienRace">
<HintPath>refs/1.4/AlienRace14.dll</HintPath>
<CopyLocal>False</CopyLocal>
<Private>False</Private>
</Reference>
<PackageReference Include="Krafs.Rimworld.Ref">
<Version>1.4.3901</Version>
</PackageReference>
<ItemGroup>
<Reference Include="AlienRace">
<HintPath>refs\AlienRace.dll</HintPath>
<CopyLocal>False</CopyLocal>
<Private>False</Private>
<ExcludeAssets>runtime</ExcludeAssets>
</Reference>
</ItemGroup>

<PropertyGroup Condition="'$(Configuration)'=='v1.4'">
<DebugType>none</DebugType>
<OutputPath>..\..\Patch_AlienRaces\1.4\Assemblies\</OutputPath>
<Optimize>true</Optimize>
<DefineConstants>TRACE;V14</DefineConstants>
</PropertyGroup>
<PropertyGroup>
<DebugType>none</DebugType>
<OutputPath>..\..\Patch_AlienRaces\$(RimworldVersion)\Assemblies\</OutputPath>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>

</Project>
File renamed without changes.
86 changes: 59 additions & 27 deletions Source/AnimationMod.sln
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31717.71
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationMod", "ThingGenerator\AnimationMod.csproj", "{0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationMod", "AnimationMod\AnimationMod.csproj", "{0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LightsaberPatch", "LightsaberPatch\LightsaberPatch.csproj", "{D9B99467-57BB-4DE7-8147-F5D47554D1CB}"
EndProject
Expand All @@ -28,37 +28,68 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reporting", "Reporting", "{
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Patches", "Patches", "{7C1CE274-810E-467E-B8EF-4AB2A83E17F9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TacticowlPatch", "TacticowlPatch\TacticowlPatch.csproj", "{DEC2223C-6DD4-48EF-9438-8F4E97B6C542}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TacticowlPatch", "TacticowlPatch\TacticowlPatch.csproj", "{DEC2223C-6DD4-48EF-9438-8F4E97B6C542}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FacialAnimationPatch", "FacialAnimationPatch\FacialAnimationPatch.csproj", "{B5AC984E-8B51-426B-9F54-CC85006449F1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
v1.4|Any CPU = v1.4|Any CPU
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}.v1.4|Any CPU.ActiveCfg = v1.4|Any CPU
{0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}.v1.4|Any CPU.Build.0 = v1.4|Any CPU
{D9B99467-57BB-4DE7-8147-F5D47554D1CB}.v1.4|Any CPU.ActiveCfg = v1.4|Any CPU
{D9B99467-57BB-4DE7-8147-F5D47554D1CB}.v1.4|Any CPU.Build.0 = v1.4|Any CPU
{15189C13-7D5D-4F8D-AE17-1CA9F4A744EB}.v1.4|Any CPU.ActiveCfg = v1.4|Any CPU
{15189C13-7D5D-4F8D-AE17-1CA9F4A744EB}.v1.4|Any CPU.Build.0 = v1.4|Any CPU
{603ACB32-6730-4BAF-8E0A-A0E3399D634F}.v1.4|Any CPU.ActiveCfg = Release|Any CPU
{603ACB32-6730-4BAF-8E0A-A0E3399D634F}.v1.4|Any CPU.Build.0 = Release|Any CPU
{3802FB86-C860-4F98-A6F6-5E9AA47AF564}.v1.4|Any CPU.ActiveCfg = v1.4|Any CPU
{3802FB86-C860-4F98-A6F6-5E9AA47AF564}.v1.4|Any CPU.Build.0 = v1.4|Any CPU
{67701E3B-9094-4CA2-9DD8-42EBAFCB9F4A}.v1.4|Any CPU.ActiveCfg = Debug|Any CPU
{67701E3B-9094-4CA2-9DD8-42EBAFCB9F4A}.v1.4|Any CPU.Build.0 = Debug|Any CPU
{0B91E675-3505-4587-94BB-6FEFC5ADB24D}.v1.4|Any CPU.ActiveCfg = v1.4|Any CPU
{0B91E675-3505-4587-94BB-6FEFC5ADB24D}.v1.4|Any CPU.Build.0 = v1.4|Any CPU
{BBB0D084-8A32-458E-8A7F-48E7D90F0489}.v1.4|Any CPU.ActiveCfg = v1.4|Any CPU
{BBB0D084-8A32-458E-8A7F-48E7D90F0489}.v1.4|Any CPU.Build.0 = v1.4|Any CPU
{DB0FEE4E-5DF7-4DD3-B876-7FC20D310C8E}.v1.4|Any CPU.ActiveCfg = Debug|Any CPU
{DB0FEE4E-5DF7-4DD3-B876-7FC20D310C8E}.v1.4|Any CPU.Build.0 = Debug|Any CPU
{06C481CC-E8D0-46D6-B02B-127DD9E3A1AA}.v1.4|Any CPU.ActiveCfg = Debug|Any CPU
{06C481CC-E8D0-46D6-B02B-127DD9E3A1AA}.v1.4|Any CPU.Build.0 = Debug|Any CPU
{7B881968-1527-40FC-9FB3-85A5A01BEE88}.v1.4|Any CPU.ActiveCfg = v1.4|Any CPU
{7B881968-1527-40FC-9FB3-85A5A01BEE88}.v1.4|Any CPU.Build.0 = v1.4|Any CPU
{DEC2223C-6DD4-48EF-9438-8F4E97B6C542}.v1.4|Any CPU.ActiveCfg = v1.4|Any CPU
{DEC2223C-6DD4-48EF-9438-8F4E97B6C542}.v1.4|Any CPU.Build.0 = v1.4|Any CPU
{0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}.Release|Any CPU.Build.0 = Release|Any CPU
{D9B99467-57BB-4DE7-8147-F5D47554D1CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D9B99467-57BB-4DE7-8147-F5D47554D1CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D9B99467-57BB-4DE7-8147-F5D47554D1CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D9B99467-57BB-4DE7-8147-F5D47554D1CB}.Release|Any CPU.Build.0 = Release|Any CPU
{15189C13-7D5D-4F8D-AE17-1CA9F4A744EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{15189C13-7D5D-4F8D-AE17-1CA9F4A744EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{15189C13-7D5D-4F8D-AE17-1CA9F4A744EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{15189C13-7D5D-4F8D-AE17-1CA9F4A744EB}.Release|Any CPU.Build.0 = Release|Any CPU
{603ACB32-6730-4BAF-8E0A-A0E3399D634F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{603ACB32-6730-4BAF-8E0A-A0E3399D634F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{603ACB32-6730-4BAF-8E0A-A0E3399D634F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{603ACB32-6730-4BAF-8E0A-A0E3399D634F}.Release|Any CPU.Build.0 = Release|Any CPU
{3802FB86-C860-4F98-A6F6-5E9AA47AF564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3802FB86-C860-4F98-A6F6-5E9AA47AF564}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3802FB86-C860-4F98-A6F6-5E9AA47AF564}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3802FB86-C860-4F98-A6F6-5E9AA47AF564}.Release|Any CPU.Build.0 = Release|Any CPU
{67701E3B-9094-4CA2-9DD8-42EBAFCB9F4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{67701E3B-9094-4CA2-9DD8-42EBAFCB9F4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{67701E3B-9094-4CA2-9DD8-42EBAFCB9F4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{67701E3B-9094-4CA2-9DD8-42EBAFCB9F4A}.Release|Any CPU.Build.0 = Release|Any CPU
{0B91E675-3505-4587-94BB-6FEFC5ADB24D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B91E675-3505-4587-94BB-6FEFC5ADB24D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B91E675-3505-4587-94BB-6FEFC5ADB24D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0B91E675-3505-4587-94BB-6FEFC5ADB24D}.Release|Any CPU.Build.0 = Release|Any CPU
{BBB0D084-8A32-458E-8A7F-48E7D90F0489}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BBB0D084-8A32-458E-8A7F-48E7D90F0489}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BBB0D084-8A32-458E-8A7F-48E7D90F0489}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BBB0D084-8A32-458E-8A7F-48E7D90F0489}.Release|Any CPU.Build.0 = Release|Any CPU
{DB0FEE4E-5DF7-4DD3-B876-7FC20D310C8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DB0FEE4E-5DF7-4DD3-B876-7FC20D310C8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DB0FEE4E-5DF7-4DD3-B876-7FC20D310C8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DB0FEE4E-5DF7-4DD3-B876-7FC20D310C8E}.Release|Any CPU.Build.0 = Release|Any CPU
{06C481CC-E8D0-46D6-B02B-127DD9E3A1AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{06C481CC-E8D0-46D6-B02B-127DD9E3A1AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{06C481CC-E8D0-46D6-B02B-127DD9E3A1AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{06C481CC-E8D0-46D6-B02B-127DD9E3A1AA}.Release|Any CPU.Build.0 = Release|Any CPU
{7B881968-1527-40FC-9FB3-85A5A01BEE88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7B881968-1527-40FC-9FB3-85A5A01BEE88}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7B881968-1527-40FC-9FB3-85A5A01BEE88}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7B881968-1527-40FC-9FB3-85A5A01BEE88}.Release|Any CPU.Build.0 = Release|Any CPU
{DEC2223C-6DD4-48EF-9438-8F4E97B6C542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DEC2223C-6DD4-48EF-9438-8F4E97B6C542}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DEC2223C-6DD4-48EF-9438-8F4E97B6C542}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DEC2223C-6DD4-48EF-9438-8F4E97B6C542}.Release|Any CPU.Build.0 = Release|Any CPU
{B5AC984E-8B51-426B-9F54-CC85006449F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B5AC984E-8B51-426B-9F54-CC85006449F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B5AC984E-8B51-426B-9F54-CC85006449F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B5AC984E-8B51-426B-9F54-CC85006449F1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -73,6 +104,7 @@ Global
{06C481CC-E8D0-46D6-B02B-127DD9E3A1AA} = {3549402C-9759-4ABC-938C-FC4F801C156F}
{7B881968-1527-40FC-9FB3-85A5A01BEE88} = {7C1CE274-810E-467E-B8EF-4AB2A83E17F9}
{DEC2223C-6DD4-48EF-9438-8F4E97B6C542} = {7C1CE274-810E-467E-B8EF-4AB2A83E17F9}
{B5AC984E-8B51-426B-9F54-CC85006449F1} = {7C1CE274-810E-467E-B8EF-4AB2A83E17F9}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {1478B48A-1088-4408-9427-E3B4EADB515C}
Expand Down
1 change: 1 addition & 0 deletions Source/AnimationMod.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=Lerp/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Lightsaber/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=minecraft/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=parms/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=pathfinding/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=pathing/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Renderers/@EntryIndexedValue">True</s:Boolean>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Linq;
using UnityEngine;
using Verse;
using LudeonTK;

namespace AM.AMSettings;

Expand Down Expand Up @@ -425,11 +426,8 @@ float DrawAnim(AnimDef def)
{
checkbox.x += 110;
checkbox.width = 200;
#if V13
def.SData.Probability = Widgets.HorizontalSlider(checkbox, def.SData.Probability, 0f, 10f, label: $"Relative Probability: {def.SData.Probability * 100f:F0}%");
#else
def.SData.Probability = Widgets.HorizontalSlider_NewTemp(checkbox, def.SData.Probability, 0f, 10f, label: $"Relative Probability: {def.SData.Probability * 100f:F0}%", roundTo: 0.05f);
#endif

def.SData.Probability = Widgets.HorizontalSlider(checkbox, def.SData.Probability, 0f, 10f, label: $"Relative Probability: {def.SData.Probability * 100f:F0}%", roundTo: 0.05f);
}

return rect.height;
Expand Down
Loading

0 comments on commit d778da4

Please sign in to comment.