nirai 1.6: we stay here pls k

build/make.py

@@ -52,7 +52,7 @@ class StridePackager(NiraiPackager, configPath=None):
         self.__manglebase = self.get_mangle_base(self.BASEDIR)
         self.add_panda3d_dirs()
         self.add_default_lib()
-        self.globalConfigPath = configPath if configPath is not None else '../deployment/public_client.prc'
+        self.globalConfigPath = configPath if configPath is not None else '../dependencies/config/release/qa.prc'
 
     def add_source_dir(self, dir):
         self.add_directory(self.BASEDIR + dir, mangler=self.__mangler)
@@ -71,7 +71,8 @@ class StridePackager(NiraiPackager, configPath=None):
 
     def generate_niraidata(self):
         print 'Generating niraidata'
-        config = self.get_file_contents(self.globalConfigPath)
+        config = self.get_file_contents('../dependencies/config/general.prc')
+        config += '\n\n' + self.get_file_contents(self.globalConfigPath)
 
         config_iv = self.generate_key(16)
         config_key = self.generate_key(16)

build/nirai/panda3d

@@ -1 +1 @@
-Subproject commit e4743737b0572feab80a08959f2b4d865ab3bc62
+Subproject commit 510b6b2b3fef1674611e4666b45db949868a8869

build/nirai/src

@@ -1 +1 @@
-Subproject commit 3d29188a91b658f61cd2c3b3b8ada23050d4f230
+Subproject commit 936977760bfac218f634533dd4d926ad7e8e2092

dependencies/config/release/qa.prc

@@ -0,0 +1,50 @@
+# Distribution:
+distribution qa
+
+# Art assets:
+model-path /
+
+# Server:
+server-version SERVER-VERSION-HERE
+min-access-level 100
+accountdb-type remote
+shard-low-pop 50
+shard-mid-pop 100
+
+# RPC:
+want-rpc-server #t
+rpc-server-endpoint http://localhost:8080/
+
+# DClass file is automatically wrapped into the niraidata.
+
+# Core features:
+want-pets #t
+want-parties #f
+want-cogdominiums #t
+want-lawbot-cogdo #f
+want-anim-props #t
+want-game-tables #t
+want-find-four #t
+want-chinese-checkers #t
+want-checkers #t
+want-house-types #f
+want-gifting #t
+want-top-toons #f
+want-emblems #f
+
+# Chat:
+want-whitelist #t
+want-sequence-list #t
+
+# Developer options:
+show-population #t
+want-instant-parties #f
+want-instant-delivery #f
+cogdo-pop-factor 1.5
+cogdo-ratio 0.5
+default-directnotify-level info
+
+# Crates:
+dont-destroy-crate #f
+get-key-reward-always #f
+get-crate-reward-always #f