mirror of
				https://gitgud.io/c0ffeeeeeeee/rimworld-animations.git
				synced 2024-08-15 00:43:45 +00:00 
			
		
		
		
	Patch
This commit is contained in:
		
							parent
							
								
									aeceb77100
								
							
						
					
					
						commit
						8a7b542d17
					
				
					 11 changed files with 20 additions and 11 deletions
				
			
		| 
						 | 
				
			
			@ -21,6 +21,6 @@ namespace Rimworld_Animations {
 | 
			
		|||
        public BodyTypeOffset bodyTypeOffset = new BodyTypeOffset();
 | 
			
		||||
        public Vector3 offset = new Vector2(0, 0);
 | 
			
		||||
		public List<string> requiredGender;
 | 
			
		||||
 | 
			
		||||
        public List<string> tags = new List<string>();
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,9 +10,10 @@ namespace Rimworld_Animations {
 | 
			
		|||
        public string stageName;
 | 
			
		||||
        public int stageIndex;
 | 
			
		||||
        public int playTimeTicks = 0;
 | 
			
		||||
        public int playTimeTicksQuick = -1;
 | 
			
		||||
        public bool isLooping;
 | 
			
		||||
        public List<BaseAnimationClip> animationClips;
 | 
			
		||||
 | 
			
		||||
        public List<string> tags = new List<string>();
 | 
			
		||||
 | 
			
		||||
        public void initialize() {
 | 
			
		||||
            foreach (BaseAnimationClip clip in animationClips) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,6 +15,6 @@ namespace Rimworld_Animations {
 | 
			
		|||
        public abstract void buildSimpleCurves();
 | 
			
		||||
        public string soundDef = null; //for playing sounds
 | 
			
		||||
        public int actor;
 | 
			
		||||
 | 
			
		||||
        public List<string> tags = new List<string>();
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,5 +10,6 @@ namespace Rimworld_Animations {
 | 
			
		|||
        public int tickDuration = 1;
 | 
			
		||||
        public float? atTick;
 | 
			
		||||
        public string soundEffect;
 | 
			
		||||
        public List<string> tags = new List<string>();
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -52,6 +52,7 @@ namespace Rimworld_Animations {
 | 
			
		|||
        public List<Pawn> actorsInCurrentAnimation;
 | 
			
		||||
 | 
			
		||||
        public bool controlGenitalAngle = false;
 | 
			
		||||
        public bool fastAnimForQuickie = false;
 | 
			
		||||
 | 
			
		||||
        private AnimationDef anim;
 | 
			
		||||
        private AnimationStage stage {
 | 
			
		||||
| 
						 | 
				
			
			@ -155,7 +156,9 @@ namespace Rimworld_Animations {
 | 
			
		|||
            this.actor = actor;
 | 
			
		||||
            this.anim = anim;
 | 
			
		||||
            this.mirror = mirror;
 | 
			
		||||
            if(fastAnimForQuickie)
 | 
			
		||||
            this.fastAnimForQuickie = fastAnimForQuickie;
 | 
			
		||||
 | 
			
		||||
            if (fastAnimForQuickie && anim.animationStages.Any(x => x.playTimeTicksQuick >= 0) == false)
 | 
			
		||||
            {
 | 
			
		||||
                curStage = 1;
 | 
			
		||||
                animTicks = anim.animationStages[0].playTimeTicks;
 | 
			
		||||
| 
						 | 
				
			
			@ -259,7 +262,7 @@ namespace Rimworld_Animations {
 | 
			
		|||
 | 
			
		||||
            stageTicks++;
 | 
			
		||||
 | 
			
		||||
            if(stageTicks >= stage.playTimeTicks) {
 | 
			
		||||
            if(stageTicks >= stage.playTimeTicks || (fastAnimForQuickie && stage.playTimeTicksQuick >= 0 && stageTicks >= stage.playTimeTicksQuick)) {
 | 
			
		||||
 | 
			
		||||
                curStage++;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
 using System;
 | 
			
		||||
using System;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
using System.Text;
 | 
			
		||||
| 
						 | 
				
			
			@ -11,7 +11,6 @@ namespace Rimworld_Animations {
 | 
			
		|||
    {
 | 
			
		||||
        public CompProperties_BodyAnimator()
 | 
			
		||||
        {
 | 
			
		||||
 | 
			
		||||
            base.compClass = typeof(CompBodyAnimator);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,6 +15,7 @@ namespace Rimworld_Animations {
 | 
			
		|||
        public bool sounds = false;
 | 
			
		||||
        public List<rjw.xxx.rjwSextype> sexTypes = null;
 | 
			
		||||
        public List<String> interactionDefTypes = null;
 | 
			
		||||
        public List<string> tags = new List<string>();
 | 
			
		||||
 | 
			
		||||
        public override void PostLoad() {
 | 
			
		||||
            base.PostLoad();
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -27,7 +27,6 @@ namespace Rimworld_Animations
 | 
			
		|||
			{
 | 
			
		||||
				if (i.OperandIs(AccessTools.Method(typeof(PawnUtility), "IsInvisible")))
 | 
			
		||||
				{
 | 
			
		||||
 | 
			
		||||
					yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(PawnRenderer_RenderPawnAt_Patch), "ClearCache"));
 | 
			
		||||
				}
 | 
			
		||||
				else
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -46,11 +46,11 @@
 | 
			
		|||
      <Private>False</Private>
 | 
			
		||||
    </Reference>
 | 
			
		||||
    <Reference Include="RJW">
 | 
			
		||||
      <HintPath>..\..\rjw\1.3\Assemblies\RJW.dll</HintPath>
 | 
			
		||||
      <HintPath>..\..\rjw-master\1.3\Assemblies\RJW.dll</HintPath>
 | 
			
		||||
      <Private>False</Private>
 | 
			
		||||
    </Reference>
 | 
			
		||||
    <Reference Include="RJW-ToysAndMasturbation">
 | 
			
		||||
      <HintPath>..\..\rjw-toys-and-masturbation\Assemblies\RJW-ToysAndMasturbation.dll</HintPath>
 | 
			
		||||
      <HintPath>..\..\rjw-toys-and-masturbation-master\Assemblies\RJW-ToysAndMasturbation.dll</HintPath>
 | 
			
		||||
      <Private>False</Private>
 | 
			
		||||
    </Reference>
 | 
			
		||||
    <Reference Include="System" />
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -44,7 +44,11 @@
 | 
			
		|||
      <Private>False</Private>
 | 
			
		||||
    </Reference>
 | 
			
		||||
    <Reference Include="RJW">
 | 
			
		||||
      <HintPath>..\rjw\1.3\Assemblies\RJW.dll</HintPath>
 | 
			
		||||
      <HintPath>..\rjw-master\1.3\Assemblies\RJW.dll</HintPath>
 | 
			
		||||
      <Private>False</Private>
 | 
			
		||||
    </Reference>
 | 
			
		||||
    <Reference Include="RJW-ToysAndMasturbation">
 | 
			
		||||
      <HintPath>..\rjw-toys-and-masturbation-master\Assemblies\RJW-ToysAndMasturbation.dll</HintPath>
 | 
			
		||||
      <Private>False</Private>
 | 
			
		||||
    </Reference>
 | 
			
		||||
    <Reference Include="System" />
 | 
			
		||||
| 
						 | 
				
			
			@ -65,6 +69,7 @@
 | 
			
		|||
    </Reference>
 | 
			
		||||
  </ItemGroup>
 | 
			
		||||
  <ItemGroup>
 | 
			
		||||
    <Compile Include="1.3\Source\Extensions\PawnWoundDrawerExtension.cs" />
 | 
			
		||||
    <Compile Include="1.3\Source\Patches\RimworldPatches\HarmonyPatch_Thing.cs" />
 | 
			
		||||
    <Compile Include="1.3\Source\Utilities\PatchOperationAddOrReplace.cs" />
 | 
			
		||||
    <Compile Include="Properties\AssemblyInfo.cs" />
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue