Skip to content

Commit

Permalink
Update version
Browse files Browse the repository at this point in the history
  • Loading branch information
Falconne committed Mar 26, 2019
1 parent d641558 commit e26d981
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static void Postfix(ref RecipeWorkerCounter __instance, ref int __result,
if (extendedBillData?.CountAway ?? false)
__result += CountAway(billMap, __instance, bill, productThingDef);
}

private static int CountAway(Map billMap, RecipeWorkerCounter counter, Bill_Production bill, ThingDef productThingDef)
{
int count = 0;
Expand Down Expand Up @@ -99,7 +99,7 @@ public static int CountAdditionalProducts(RecipeWorkerCounter counter, Bill_Prod
{
ThingFilter filter = extendedBillData.ProductAdditionalFilter;
bool countAway = extendedBillData.CountAway;

Map map = bill.Map;
ThingDef defaultProductDef = counter.recipe.products[0].thingDef;
int count = 0;
Expand Down Expand Up @@ -132,11 +132,15 @@ public static int CountAdditionalProducts(RecipeWorkerCounter counter, Bill_Prod
}
}
}
if(!bill.includeEquipped) //Still count Carried Things

if (!bill.includeEquipped)
{
//Still count Carried Things
foreach (Pawn pawn in map.mapPawns.FreeColonistsSpawned)
{
count += CountPawnThings(pawn, counter, bill, def, true);
}
}
}
else
{
Expand All @@ -149,6 +153,7 @@ public static int CountAdditionalProducts(RecipeWorkerCounter counter, Bill_Prod
}
}
}

if (bill.includeEquipped)
{
foreach (Pawn pawn in map.mapPawns.FreeColonistsSpawned)
Expand Down
4 changes: 2 additions & 2 deletions src/ImprovedWorkbenches/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.5.0")]
[assembly: AssemblyFileVersion("1.0.5.0")]
[assembly: AssemblyVersion("1.0.6.0")]
[assembly: AssemblyFileVersion("1.0.6.0")]



0 comments on commit e26d981

Please sign in to comment.