From a69bcc307a2908f541a8d32e9f9b1215226189b9 Mon Sep 17 00:00:00 2001
From: Eric Froemling <ericfroemling@gmail.com>
Date: Mon, 7 Oct 2019 05:40:07 -0700
Subject: [PATCH] syncing latest public private stuff

---
 .idea/dictionaries/ericf.xml   | 4 ++++
 Makefile                       | 5 +++--
 assets/src/data/scripts/_ba.py | 6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml
index 1b566dc1..e945822f 100644
--- a/.idea/dictionaries/ericf.xml
+++ b/.idea/dictionaries/ericf.xml
@@ -1,6 +1,10 @@
 <component name="ProjectDictionaryState">
   <dictionary name="ericf">
     <words>
+      <w>onln</w>
+      <w>nprocessors</w>
+      <w>getconf</w>
+      <w>cpus</w>
       <w>aaaa</w>
       <w>aaab</w>
       <w>aaac</w>
diff --git a/Makefile b/Makefile
index c08dc8f7..97e83650 100644
--- a/Makefile
+++ b/Makefile
@@ -273,8 +273,9 @@ preflightfull2:
 #                                                                              #
 ################################################################################
 
-# This should give the cpu count on linux and mac; can expand this if need be.
-CPUS = $(shell getconf _NPROCESSORS_ONLN || echo 4)
+# This should give the cpu count on linux and mac; may need to expand this
+# if using this on other platforms.
+CPUS = $(shell getconf _NPROCESSORS_ONLN || echo 8)
 ROOT_DIR = ${abspath ${CURDIR}}
 VERSION = $(shell tools/version_utils version)
 BUILD_NUMBER = $(shell tools/version_utils build)
diff --git a/assets/src/data/scripts/_ba.py b/assets/src/data/scripts/_ba.py
index 376bf80f..be0c275d 100644
--- a/assets/src/data/scripts/_ba.py
+++ b/assets/src/data/scripts/_ba.py
@@ -4,6 +4,12 @@ The real _bs is a compiled extension module and only available
 in the live game. This dummy module allows Pylint/Mypy/etc. to
 function reasonably well outside of the game.
 
+Make sure this file is never included in an actual game distro!
+
+Ideally this should be a stub (.pyi) file, but we'd need
+to make sure that it still works with all our tools
+(mypy, pylint, pycharm).
+
 NOTE: This file was autogenerated by gendummymodule; do not edit by hand.
 """