Skip to content

Commit

Permalink
Merge pull request #57 from edbmods/alpha-15-version-update
Browse files Browse the repository at this point in the history
Updated version numbers for Alpha 15
  • Loading branch information
edbmods authored Aug 29, 2016
2 parents 23d3a39 + 5dec135 commit f91391e
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion EdBPrepareCarefully.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace>EdB.PrepareCarefully</RootNamespace>
<AssemblyName>EdBPrepareCarefully</AssemblyName>
<ReleaseVersion>0.15.0.1</ReleaseVersion>
<ReleaseVersion>0.15.1.1</ReleaseVersion>
<UseMSBuildEngine>False</UseMSBuildEngine>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<ApplicationManifest>ScenPart_PlayerPawnsArriveMethodCarefully.manifest</ApplicationManifest>
Expand Down
2 changes: 1 addition & 1 deletion EdBPrepareCarefully.sln
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,6 @@ Global
$29.IncludeStaticEntities = True
$0.VersionControlPolicy = $31
$31.inheritsSet = Mono
version = 0.15.0.1
version = 0.15.1.1
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("0.15.0.1")]
[assembly: AssemblyVersion("0.15.1.1")]

// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
Expand Down
4 changes: 2 additions & 2 deletions Resources/About/About.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<name>EdB Prepare Carefully</name>
<author>EdB</author>
<url></url>
<targetVersion>0.15.1272</targetVersion>
<targetVersion>0.15.1279</targetVersion>
<description>Customize your colonists, choose your gear and prepare carefully for your crash landing!

If you get a set of starting colonists that you like, save them as a preset so that you can start your game the same way next time.

[Version 0.15.0.1]
[Version 0.15.1.1]
</description>
</ModMetaData>
3 changes: 2 additions & 1 deletion Resources/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
_____________________________________________________________________________

Version 0.15.0.1
Version 0.15.1.1
_____________________________________________________________________________

- Added support for Alpha 15.
- Re-labeled the "Implants" tab to "Medical" on the Equipment page.

_____________________________________________________________________________

Expand Down
2 changes: 1 addition & 1 deletion Source/CostCalculator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ public double GetBaseThingCost(ThingDef def, ThingDef stuffDef)
return def.BaseMarketValue;
}
else {
// TODO: Alpha 15
// TODO: Alpha 16
// Should look at ThingMaker.MakeThing() to decide which validations we need to do
// before calling that method to avoid null pointer exceptions. Should re-evaluate
// for each new alpha and then update the todo comment with the next alpha version.
Expand Down
8 changes: 5 additions & 3 deletions Source/CustomPawn.cs
Original file line number Diff line number Diff line change
Expand Up @@ -965,19 +965,21 @@ protected void ResetGender()
});
}
}

ResetHead();
ResetBodyType();
}

protected void ResetBodyType()
{
graphics[PawnLayers.BodyType] = GraphicGetter_NakedHumanlike.GetNakedBodyGraphic(pawn.story.BodyType, ShaderDatabase.Cutout, pawn.story.SkinColor);
BodyType bodyType = pawn.story.BodyType;
Graphic bodyTypeGraphic = GraphicGetter_NakedHumanlike.GetNakedBodyGraphic(bodyType, ShaderDatabase.Cutout,
pawn.story.SkinColor);
graphics[PawnLayers.BodyType] = bodyTypeGraphic;
foreach (ThingDef def in selectedApparel) {
if (def != null) {
int layer = PawnLayers.ToPawnLayerIndex(def.apparel);
if (layer != -1) {
graphics[layer] = GraphicsCache.Instance.GetApparel(def, pawn.story.BodyType);
graphics[layer] = GraphicsCache.Instance.GetApparel(def, bodyType);
}
}
}
Expand Down

0 comments on commit f91391e

Please sign in to comment.