Merge pull request #4 from jtsage/combo

v1.1.0.0 merge
jtsage · Mar 19, 2022 · c4a24f3 · c4a24f3
2 parents 9884c04 + 1fae17b
commit c4a24f3
Show file tree

Hide file tree

Showing 16 changed files with 1,411 additions and 517 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -60,6 +60,8 @@
 		"g_productionInspector",
 		"source",
 		"ProductionPoint",
-		"g_sleepManager"
+		"g_sleepManager",
+		"AnimalType",
+		"g_noHudModeEnabled"
 	]
 }
diff --git a/FS22_ProductionInspector.zip b/FS22_ProductionInspector.zip
diff --git a/README.md b/README.md
@@ -6,7 +6,9 @@
   <img src="https://github.com/jtsage/FS22_ProductionInspector/raw/main/modIcon.png">
 </p>
 
-First I did the vehicle one.  Then I thought it might be nice to have productions on screen too.
+First I did the vehicle one.  Then I thought it might be nice to have productions on screen too.  Then there was an animal one, but it was too much so - BIG NEWS:
+
+ProductionInspector now includes AnimalInspector and the conceived, but never released SiloInspector
 
 ## Note about the ZIP in the repo
 
@@ -20,15 +22,23 @@ No idea.  I left the flag on for now, but I can't imagine it will work flawlessl
 
 ## Features
 
-* Display owned or all production facilities on the map and what they are doing
-* Show fill levels for the inputs
-* And the outputs
-* And which production lines are running (and what their status is)
+* Show input materials and their fill levels for production facilities
+* Show output products and their fill levels for production facilities
+* Show production lines and their status in production facilities
+* Show number of animals and space left
+* Show food levels (total and individual)
+* Show output products and their fill levels
+* Show animal health average, breeding average, and immature animal percentage
+* Show silo fill percentage, and what is in it.
+* Add an underscore to a production point, animal pen, or silo name to hide it from the HUD (_)
+* HUD elements can be shown, hidden and positioned individually.  When in the same position, they will stack.
 
 ## Default Input Bindings
 
 * `Left Ctrl` + `Left Alt` + `Num Pad 8` : Reload configuration file from disk
-* `Left Alt` + `Num Pad 8` : Toggle display on and off
+* `Left Alt` + `Num Pad 8` : Toggle productions display on and off
+* `Left Alt` + `Num Pad 7` : Toggle animal pens display on and off
+* `Left Alt` + `Num Pad 6` : Toggle silos display on and off
 
 ## Options
 
@@ -46,22 +56,37 @@ Most view options can be set in the in-game settings menu (scroll down)
 
 ### in-game configurable
 
-* __isEnabledVisible__ - Show / Hide the HUD
-* __isEnabledShowInputs__ - Show Input levels
-* __isEnabledOnlyOwned__ - Show only owned production points
-* __isEnabledShowInactivePoint__ - Show inactive production points
-* __isEnabledShowInactiveProd__ - Show inactive production lines
-* __isEnabledShowInputs__ - Show inputs
-* __isEnabledShowOutputs__ - Show outputs
-* __isEnabledShowEmptyOutput__ - Show outputs when empty
-* __isEnabledShowOutPercent__ - Show output level percentages
-* __isEnabledShowOutFillLevel__ - Show output level fill (liters)
-* __isEnabledShowInPercent__ -  Show input level percentages
-* __isEnabledShowInFillLevel__ - Show input level fill (liters)
-* __isEnabledShowEmptyInput__ -  Show empty inputs
-* __isEnabledShortEmptyOutput__ -  Shorten display of empty outputs
-* __isEnabledShowOutputMode__ -  Show output destination marker
-* __isEnabledMaxProductions__ - Limit to this number of productions in the HUD (0 = unlimited)
+
+* __isEnabledProdVisible__ - Productions HUD visibility
+* __isEnabledAnimVisible__ - Animals HUD visibility
+* __isEnabledSiloVisible__ - Silo HUD visiblity
+* __isEnabledForceProdJustify__ - Force justification, productions (1 - no, 2 - left, 3 - right )
+* __isEnabledForceAnimJustify__ - Force justification, animals (1 - no, 2 - left, 3 - right )
+* __isEnabledForceSiloJustify__ - Force justification, silos (1 - no, 2 - left, 3 - right )
+* __isEnabledProdOnlyOwned__ - Only owned productions visible
+* __isEnabledProdInactivePoint__ - Inactive productions visible
+* __isEnabledProdInactiveProd__ - Inactive products visible
+* __isEnabledProdOutPercent__ - Production output percentages
+* __isEnabledProdOutFillLevel__ - Production output raw fill levels
+* __isEnabledProdInPercent__ - Production input percentages
+* __isEnabledProdInFillLevel__ - Production input raw fill levels
+* __isEnabledProdInputs__ - Production input visibility
+* __isEnabledProdOutputs__ - Production output visibility
+* __isEnabledProdEmptyOutput__ - Productions show empty outputs
+* __isEnabledProdEmptyInput__ - Productions show empty inputs
+* __isEnabledProdShortEmptyOut__ - Productions show empty inputs as "--" instead of 0 (0%)
+* __isEnabledProdOutputMode__ - Productions show output mode
+* __isEnabledProdMax__ - Maximum number of productions to show
+* __isEnabledAnimCount__ - Animal counts
+* __isEnabledAnimFood__ - Animal food percentage
+* __isEnabledAnimFoodTypes__ - Animal food types
+* __isEnabledAnimProductivity__ - Animal productivity
+* __isEnabledAnimReproduction__ - Animal reproduction percentage
+* __isEnabledAnimPuberty__ - Animals below breeding age percentage
+* __isEnabledAnimHealth__ - Animal average health
+* __isEnabledAnimOutputs__ - Animal output products
+* __isEnabledAnimMax__ - Maximum number of animal pens to show
+* __isEnabledSiloMax__ - Maximum number of silos to show
 
 ### colors
 
@@ -72,6 +97,10 @@ Fill type levels are color coded from empty (green) to full (red) unless it is a
 * __colorProdName__ - Color for production line name
 * __colorFillType__ - Color for fill type names
 * __colorCaption__ - Color for captions (Input: Output: Productions:)
+* __colorEmpty__ - Color for empty entries (no input or output or product lines)
+* __colorEmptyInput__ - Color for empty inputs
+* __ColorAniHome__ - Color for animal pen and silo names
+* __ColorAniData__ - Color for animal pen and silo data points
 * __colorSep__ - Color for seperator
 * __colorEmpty__ - Color for empty input / output / production lines
 * __colorStatusInactive__ - Color for production line status when inactive
@@ -90,6 +119,8 @@ Fill type levels are color coded from empty (green) to full (red) unless it is a
 * __setStringTextStoring__ - text string for output mode storing, default "↓"
 * __setStringTextDistribute__ - text string for output mode distributing, default "→"
 * __setTotalMaxProductions__ - maximum number of productions available in the settings menu, default 40.
+* __setTotalMaxAnimals__ - maximum number of animal pens available in the settings menu, default 20
+* __setTotalMaxSilos__ - maximum number of silos available in the settings menu, default 10
 
 ### dev, debug and extras
 

diff --git a/itchIcon.png b/itchIcon.png
diff --git a/itchIcon.psd b/itchIcon.psd
diff --git a/modHubIcon.png b/modHubIcon.png
diff --git a/modHubIcon.psd b/modHubIcon.psd
diff --git a/modHub_screenshots/pi_sshot_1.png b/modHub_screenshots/pi_sshot_1.png
diff --git a/modHub_screenshots/pi_sshot_2.png b/modHub_screenshots/pi_sshot_2.png
diff --git a/modHub_screenshots/pi_sshot_3.png b/modHub_screenshots/pi_sshot_3.png
diff --git a/readme_sample.png b/readme_sample.png