diff --git a/.gitignore b/.gitignore index 1c9a181..d82a7af 100644 --- a/.gitignore +++ b/.gitignore @@ -240,3 +240,6 @@ ModelManifest.xml # FAKE - F# Make .fake/ +About/cropped first edit.jpg +About/first edit.jpg +About/preview (2).png diff --git a/About/About.xml b/About/About.xml index 2142bd0..48cef9b 100644 --- a/About/About.xml +++ b/About/About.xml @@ -2,7 +2,7 @@ Food Alert Mehni - 0.18.0 + 0.19.0 https://github.com/Mehni/FoodAlert/releases/latest - v0.18.0.2\n\n Shows a persistent readout with the amount of food you currently have in storage, and an estimate of how long stocks will last. + v1.0.1\n\n Shows a persistent readout with the amount of food you currently have in storage, and an estimate of how long stocks will last. \ No newline at end of file diff --git a/About/ModSync.xml b/About/ModSync.xml deleted file mode 100644 index 3123652..0000000 --- a/About/ModSync.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - 82a0e88b-fdb0-4bd6-9c0b-ec1dab689cac - Food Alert - 0.17.0.1 - false - \ No newline at end of file diff --git a/Assemblies/0Harmony.dll b/Assemblies/0Harmony.dll index 904f049..6c0dd94 100644 Binary files a/Assemblies/0Harmony.dll and b/Assemblies/0Harmony.dll differ diff --git a/Assemblies/FoodAlert.dll b/Assemblies/FoodAlert.dll index fa5d924..85e4a1f 100644 Binary files a/Assemblies/FoodAlert.dll and b/Assemblies/FoodAlert.dll differ diff --git a/Source/FoodAlert/FoodAlert.csproj b/Source/FoodAlert/FoodAlert.csproj index 65ecaa9..270973c 100644 --- a/Source/FoodAlert/FoodAlert.csproj +++ b/Source/FoodAlert/FoodAlert.csproj @@ -25,18 +25,18 @@ none true - bin\Release\ + ..\..\Assemblies\ TRACE prompt 4 - + False - ..\..\..\..\0Harmony.dll + ..\..\..\..\..\..\..\..\..\Users\Maniak\Documents\RimWorld Mods\0Harmony.dll - ..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin_Data\Managed\Assembly-CSharp.dll + ..\..\..\..\RimWorldWin_Data\Managed\Assembly-CSharp.dll False @@ -46,7 +46,7 @@ - ..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin_Data\Managed\UnityEngine.dll + ..\..\..\..\RimWorldWin_Data\Managed\UnityEngine.dll False diff --git a/Source/FoodAlert/HarmonyPatches.cs b/Source/FoodAlert/HarmonyPatches.cs index 67b6f57..c9d4810 100644 --- a/Source/FoodAlert/HarmonyPatches.cs +++ b/Source/FoodAlert/HarmonyPatches.cs @@ -23,7 +23,7 @@ static HarmonyPatches() private static void FoodCounter_NearDatePostfix(float leftX, float width, ref float curBaseY) { { - var map = Find.VisibleMap; + var map = Find.CurrentMap; if (map == null || !map.IsPlayerHome) return; if (Find.TickManager.TicksGame < 150000) return; @@ -61,6 +61,7 @@ where pr.guest.GetsFood addendumForFlavour = "FoodAlert_Decent".Translate(); break; } + if (humansGettingFood == 0) addendumForFlavour = "\n\nShit you made me divide by zero. Disregard that."; float rightMargin = 7f; Rect zlRect = new Rect(UI.screenWidth - Alert.Width, curBaseY - 24f, Alert.Width, 24f); @@ -75,10 +76,7 @@ where pr.guest.GetsFood Text.Anchor = TextAnchor.UpperRight; Rect rect = zlRect.AtZero(); rect.xMax -= rightMargin; - if (Event.current.capsLock) - { - rect.yMin -= 50f; - } + Widgets.Label(rect, daysWorthOfHumanFood); Text.Anchor = TextAnchor.UpperLeft; GUI.EndGroup(); diff --git a/Source/FoodAlert/Properties/AssemblyInfo.cs b/Source/FoodAlert/Properties/AssemblyInfo.cs index 144da4f..8ef6013 100644 --- a/Source/FoodAlert/Properties/AssemblyInfo.cs +++ b/Source/FoodAlert/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 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("0.18.0.2")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("0.1.0.1")] +[assembly: AssemblyFileVersion("0.1.0.1")]