Skip to content

Commit

Permalink
AliceCecil has adjusted the CompAnimated code to support buildings an…
Browse files Browse the repository at this point in the history
…d other objects (ThingWithComps).(via RimWorld Mod Release Tool)
  • Loading branch information
jecrell committed Oct 28, 2018
1 parent 1e0f359 commit 21bb36e
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 9 deletions.
8 changes: 6 additions & 2 deletions About/About.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<author>jecrell</author>
<url>https://discord.gg/AaVFA7V</url>
<targetVersion>1.0.2059</targetVersion>
<description>1.1.0.9 (10-19-2018)
<description>1.1.0.10 (10-28-2018)

Adds modding components to RimWorld: vehicles, spell casting, weapon slots, oversized weapons, and more!

Expand Down Expand Up @@ -58,11 +58,15 @@ Extensive hours of testing, debugging, and fixes by Xen.
Thank you to my Patrons for supporting me in my efforts. Without you, none of this would be possible.

These are the most excellent rim dwellers who support me:
Lumberjack, Shibby Says, TheJagermeister, Cory Bonifay, Kiya Nicoll, Matt Harris, Paul Fenwick, Grendalloffen, Martin K. Bonde, Bentley Alsup, Eric Idema, MasterScootie, GoSu, Josh McCabe, spook, Clifford Campbell, J, CrankyPeanut, E_T, Finwej, Jonathan, Audrin Navarro, Михаил Юрченко, John Kanady, Luis Figueroa, Midgeman, Nate Haug, Nemuri Hime, Richard Paul, SilentWeirdo, Calum, Calhoun Cattell, Keith Thoma, Tim Stillson, Dick Jones, Patrick, Nathan Getman, Populous25, Sharp Spook, Steven James, Marcus Sireanu, Mark, Emily Shaw, Drachken, Zalson, Baron Xot, Nicholas Bateman, Christopher, Justin Andres, Luis Salvatierra, TinyFloatingTurtle, George Chong Chuang Ming, John Boehr, Oliver White, roxxploxx, Robin Hager, Brachiaraidos, That Guy, Toc Anastar, Karol Rybak, Allic, Austin Harbert, Yewty, Evan Hwang, Ryan Brock, Jonathan Holzinger, MC, Alexander, Kevin Reagan, Alex Mederer, Toss Antilles, Chelsea Archambeau, Aron Glasser, Dan Winn, Fredric Sundberg, Sarah Banks, ted stevens
Maaxar, Shibby Says, TheJagermeister, Cory Bonifay, Kiya Nicoll, Matt Harris, Paul Fenwick, Grendalloffen, Martin K. Bonde, Bentley Alsup, Eric Idema, MasterScootie, GoSu, Josh McCabe, spook, Clifford Campbell, J, CrankyPeanut, E_T, Finwej, Jan Koutsky, Audrin Navarro, Михаил Юрченко, John Kanady, Luis Figueroa, Midgeman, Nate Haug, Nemuri Hime, Richard Paul, SilentWeirdo, Calum, Calhoun Cattell, Keith Thoma, Tim Stillson, Dick Jones, Patrick, Nathan Getman, Populous25, Sharp Spook, Steven James, Marcus Sireanu, Mark, Emily Shaw, Drachken, Zalson, Baron Xot, Nicholas Bateman, Christopher, Justin Andres, Luis Salvatierra, TinyFloatingTurtle, George Chong Chuang Ming, John Boehr, Oliver White, roxxploxx, Robin Hager, Brachiaraidos, That Guy, Toc Anastar, Karol Rybak, Allic, Austin Harbert, Yewty, Evan Hwang, Ryan Brock, Jonathan Holzinger, MC, Alexander, Kevin Reagan, Alex Mederer, Toss Antilles, Chelsea Archambeau, Aron Glasser, Dan Winn, Fredric Sundberg, Sarah Banks, ted stevens

========================
Changelog
========================
1.1.0.10 (10-28-2018)
========================
AliceCecil has adjusted the CompAnimated code to support buildings and other objects (ThingWithComps).

1.1.0.9 (10-19-2018)
========================
Added a try and catch to the ProjectileExtension Harmony patch for CanHitCellFromCellIgnoringRange. This should allow for proper ability casting again.
Expand Down
4 changes: 4 additions & 0 deletions About/Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
1.1.0.10 (10-28-2018)
========================
AliceCecil has adjusted the CompAnimated code to support buildings and other objects (ThingWithComps).

1.1.0.9 (10-19-2018)
========================
Added a try and catch to the ProjectileExtension Harmony patch for CanHitCellFromCellIgnoringRange. This should allow for proper ability casting again.
Expand Down
2 changes: 1 addition & 1 deletion About/Manifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest>
<identifier>JecsTools</identifier>
<version>1.1.0.9</version>
<version>1.1.0.10</version>
<dependencies />
<incompatibleWith />
<loadBefore>
Expand Down
2 changes: 1 addition & 1 deletion About/Version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0.9
1.1.0.10
Binary file modified Assemblies/CompAnimated.dll
Binary file not shown.
Binary file modified Source/.vs/JecsTools/v15/.suo
Binary file not shown.
Binary file modified Source/.vs/JecsTools/v15/Server/sqlite3/storage.ide-shm
Binary file not shown.
Binary file modified Source/.vs/JecsTools/v15/Server/sqlite3/storage.ide-wal
Binary file not shown.
24 changes: 19 additions & 5 deletions Source/AllModdingComponents/CompAnimated/CompAnimated.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Linq;
using System;
using System.Linq;
using UnityEngine;
using Verse;
using Verse.Sound;
Expand Down Expand Up @@ -56,7 +57,14 @@ public Graphic CurGraphic
}
}

public static Graphic ResolveCurGraphic(ThingWithComps pThingWithComps, CompProperties_Animated pProps, ref Graphic result,
[Obsolete("ResolveCurGraphic for pawns is deprecated, please use ResolveCurGraphic for ThingWithComps instead.")]
public static Graphic ResolveCurGraphic(Pawn pawn, CompProperties_Animated pProps, ref Graphic result,
ref int pCurIndex, ref int pTicksToCycle, ref bool pDirty, bool useBaseGraphic = true)
{
return ResolveCurGraphic(pawn as ThingWithComps, pProps, ref result, ref pCurIndex, ref pTicksToCycle, ref pDirty, useBaseGraphic);
}

public static Graphic ResolveCurGraphic(ThingWithComps pThingWithComps, CompProperties_Animated pProps, ref Graphic result,
ref int pCurIndex, ref int pTicksToCycle, ref bool pDirty, bool useBaseGraphic = true)
{
if (pProps.secondsBetweenFrames <= 0.0f)
Expand All @@ -78,7 +86,7 @@ public static Graphic ResolveCurGraphic(ThingWithComps pThingWithComps, CompProp
{
if (!pProps.stillFrames.NullOrEmpty())
{
Log.Message("ticked still");
//Log.Message("ticked still");
pCurIndex = (pCurIndex + 1) % pProps.stillFrames.Count();
result = ResolveCycledGraphic(pThingWithComps, pProps, pCurIndex);
pDirty = false;
Expand All @@ -99,8 +107,14 @@ private Graphic DefaultGraphic()
{
return ResolveCurGraphic(parent, Props, ref curGraphic, ref curIndex, ref ticksToCycle, ref dirty);
}

public static Graphic ResolveCycledGraphic(ThingWithComps pAnimatee, CompProperties_Animated pProps, int pCurIndex)

[Obsolete("ResolveCycledGraphic for pawns is deprecated, please use ResolveCycledGraphic for ThingWithComps instead.")]
public static Graphic ResolveCycledGraphic(Pawn pAnimatee, CompProperties_Animated pProps, int pCurIndex)
{
return ResolveCycledGraphic(pAnimatee as ThingWithComps, pProps, pCurIndex);
}

public static Graphic ResolveCycledGraphic(ThingWithComps pAnimatee, CompProperties_Animated pProps, int pCurIndex)
{
Graphic result = null;
bool haveMovingFrames = !pProps.movingFrames.NullOrEmpty();
Expand Down

0 comments on commit 21bb36e

Please sign in to comment.