Skip to content

Commit

Permalink
RimWorld 1.3 Ready
Browse files Browse the repository at this point in the history
  • Loading branch information
jecrell committed Jul 30, 2021
1 parent 73d3412 commit 63b5dc4
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 7 deletions.
Binary file modified 1.3/Assemblies/Vampire.dll
Binary file not shown.
21 changes: 19 additions & 2 deletions About/About.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
<li>jecrell.jecstools</li>
<li>Dubwise.DubsBadHygiene</li>
</loadAfter>
<description>1.22.0.0 (09-25-2020)
<description>1.23.0.0 (07-29-2021)

Adds vampires to RimWorld.

Heavily inspired by Vampire the Masquerade, this mod introduces a disease known as vampirism.
Expand All @@ -43,11 +44,26 @@ Avilable languages: English, Spanish (by Daru), and Russian (by kr33man)
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:
Cade Perkinson, Jay Sacane, John Pahl, Tankok1998 also known as the Shermanlover, Vahl Kilmer, Zsolt Biró, Genaeve, JD2.0, Olteanu Laurentiu, Penelope Charli Whitman, Charlie Garnham, Steven Pretswell, Sultan Saltlick, RainerWingel, Daniel Paseka, Kyben, Charles Morris, Chris Seieroe, Robin Gleeson, Lea Stannard, Teres, David Silberstein, Kiya Nicoll, Matt Harris, Paul Fenwick, Michael Whitehead, Robert Alessi, Elodie, Gothi, Audrin Navarro, Михаил Юрченко, Calum, Tim Stillson, Populous25, Don Homer, Adam Bliss, Maaxar, Christopher, TinyFloatingTurtle, John Kanady, Midgeman, Nathan Getman, Sharp Spook, LionsFate, Cristina Shaver, Mark, George Chong Chuang Ming, Oliver White, roxxploxx, Emily Shaw, Justin Andres, Robin Hager, Kevin Reagan, Austin Harbert, Marcus Regan, E_T, Alex Mederer, Alexander, Toss Antilles
Michael Cailler, Jigsawjohn , Daniel Schott, Penelope Charli Whitman, Jerome Gonschorek, Genaeve , RainerWingel , Lea Stannard, David Silberstein, 수현 남, Matt Harris, Kiya Nicoll, Paul Fenwick, Matthew Isom, Elodie , Михаил Юрченко, Charlie Garnham, Populous25 , Landon Cash, Marcus Sireanu, Maaxar , logan sheppard-organ, TinyATuin, Don Homer, Sharp Spook, roxxploxx , Dan Jones, Kaz, Justin Andres, Alex Mederer, Justin , iknowdude00, E_T , Alexander , Ken Birdwell, Michael Cailler, Jigsawjohn , Daniel Schott, Penelope Charli Whitman, Jerome Gonschorek, Genaeve , RainerWingel , Lea Stannard, David Silberstein, 수현 남, Matt Harris, Kiya Nicoll, Paul Fenwick, Matthew Isom, Elodie , Михаил Юрченко, Charlie Garnham, Populous25 , Landon Cash, Marcus Sireanu, Maaxar , logan sheppard-organ, TinyATuin, Don Homer, Sharp Spook, roxxploxx , Dan Jones, Kaz, Justin Andres, Alex Mederer, Justin , iknowdude00, E_T , Alexander , Ken Birdwell

========================
Changelog
========================
1.23.0.0 (07-29-2021)
========================
Added support for RimWorld 1.3. Renounce title and execute no longer block the Vampirism icon.

1.22.0.1 (09-27-2020)
========================
Integrated Vampire meditation fix

1.22.0.0 (09-25-2020)
========================
Rehost in new repository (Kato)
Updates repository to 1.2, updates Rimworld and Harmony dependencies and changes JecsTools dependency to instead rely on JecsTools(Unofficial) for 1.2 support.
Fixes Royal Coffins throwing error when selected
Fixes Roxal Coffins now showing gizmo buttons at the bottom

1.21.0.0 (03-15-2020)
========================
Adds Blood Wine, Royalty support, and a very exhaustive list of fixes.
Expand All @@ -71,5 +87,6 @@ Fixes issues with war form, zulo form, mist form, etc
1.19.0.3 (10-03-2018)
========================
Vampires now properly display their transformations.\nVampires no longer suffer from heart attacks.\nVampires should no longer be affected by drug policy errors.

</description>
</ModMetaData>
4 changes: 4 additions & 0 deletions About/Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
1.23.0.0 (07-29-2021)
========================
Added support for RimWorld 1.3. Renounce title and execute no longer block the Vampirism icon.

1.22.0.1 (09-27-2020)
========================
Integrated Vampire meditation fix
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>RimOfMadness-Vampires</identifier>
<version>1.22.0.1</version>
<version>1.23.0.0</version>
<dependencies>
<li>jecrell.jecstools</li>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion About/Version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.21.0.0
1.23.0.0
9 changes: 7 additions & 2 deletions Source/Vampires/HarmonyPatches/HarmonyPatches_Graphics.cs
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,19 @@ public static bool RenderVampire(PawnRenderer __instance, Vector3 rootLoc, float
.y);
}
else scaleVector = new Vector3(0, 0, 0);
GenDraw.DrawMeshNowOrLater(mesh, loc + scaleVector, quat, damagedMat, flags.HasFlag(PawnRenderFlags.Portrait));
GenDraw.DrawMeshNowOrLater(mesh, loc + scaleVector, quat, damagedMat, flags.FlagSet(PawnRenderFlags.DrawNow));
//HasFlag(PawnRenderFlags.Portrait));

//GenDraw.DrawMeshNowOrLater(mesh, Matrix4x4.TRS(loc + scaleVector, quat, Vector3.one), damagedMat, flags.FlagSet(PawnRenderFlags.DrawNow));

loc.y += 0.0046875f;
}
if (bodyDrawType == RotDrawMode.Fresh)
{
Vector3 drawLoc = rootLoc;
drawLoc.y += 0.01875f;
Traverse.Create(__instance).Field("woundOverlays").GetValue<PawnWoundDrawer>().RenderOverBody(drawLoc, mesh, quat, flags.HasFlag(PawnRenderFlags.Portrait), BodyTypeDef.WoundLayer.Body, bodyFacing);
Traverse.Create(__instance).Field("woundOverlays").GetValue<PawnWoundDrawer>().RenderOverBody(drawLoc, mesh, quat, flags.FlagSet(PawnRenderFlags.DrawNow), BodyTypeDef.WoundLayer.Body, bodyFacing);
//Traverse.Create(__instance).Field("woundOverlays").GetValue<PawnWoundDrawer>().RenderOverBody(drawLoc, mesh, quat, flags.HasFlag(PawnRenderFlags.Portrait), BodyTypeDef.WoundLayer.Body, bodyFacing);
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion Source/Vampires/HarmonyPatches/HarmonyPatches_UI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ public static void Vamp_DrawCharacterCard(Rect rect, Pawn pawn, Action randomize
bool flag = randomizeCallback != null;
if (!flag && pawn.IsColonist && !pawn.health.Dead)
{
Rect rect7 = new Rect(CharacterCardUtility.BasePawnCardSize.x - 140f, 14f, 30f, 30f);
bool guilty = pawn.guilt.IsGuilty;
bool royalty = pawn.royalty.AllTitlesForReading.Count > 0;
int distance = (guilty) ? 174 : 140;
distance += (royalty) ? 34 : 0;
Rect rect7 = new Rect(CharacterCardUtility.BasePawnCardSize.x - distance, 14f, 30f, 30f);
TooltipHandler.TipRegion(rect7,
new TipSignal(
(pawn.IsGhoul()) ? "ROMV_GhoulSheet".Translate() : "ROMV_VampireSheet".Translate()));
Expand Down

0 comments on commit 63b5dc4

Please sign in to comment.