From ad81064fb7e84ce5ab4df6b3a708d4946022e045 Mon Sep 17 00:00:00 2001
From: Alexander <traincrazyb@live.com>
Date: Fri, 14 Aug 2015 02:23:24 -0400
Subject: [PATCH] Add back files from old deployment branch.

---
 README.md                           |  3 +++
 dependencies/config/release/dev.prc | 16 +++++++++++++++-
 otp/ai/AIBaseGlobal.py              |  9 +++++++++
 toontown/dna/DNAParser.py           |  6 +++---
 toontown/toonbase/ToontownStart.py  | 13 +++++++++++++
 5 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1b5e34b1..fdce4773 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,9 @@ The source code for Toontown Stride.
 
 * Game Development
 
+### Submodule info.
+* First, Clone and then run: git submodule init then run: git submodule update
+
 ### Info
 
 * Do not erase or revert another person's commit without first consulting them.
diff --git a/dependencies/config/release/dev.prc b/dependencies/config/release/dev.prc
index 8aa75ff8..b1db0ec3 100644
--- a/dependencies/config/release/dev.prc
+++ b/dependencies/config/release/dev.prc
@@ -2,7 +2,21 @@
 distribution dev
 
 # Art assets:
-model-path ../resources/
+vfs-mount resources/phase_3 /phase_3
+vfs-mount resources/phase_3.5 /phase_3.5
+vfs-mount resources/phase_4 /phase_4
+vfs-mount resources/phase_5 /phase_5
+vfs-mount resources/phase_5.5 /phase_5.5
+vfs-mount resources/phase_6 /phase_6
+vfs-mount resources/phase_7 /phase_7
+vfs-mount resources/phase_8 /phase_8
+vfs-mount resources/phase_9 /phase_9
+vfs-mount resources/phase_10 /phase_10
+vfs-mount resources/phase_11 /phase_11
+vfs-mount resources/phase_12 /phase_12
+vfs-mount resources/phase_13 /phase_13
+vfs-mount resources/server /server
+model-path /
 
 # Server:
 server-version tts-dev
diff --git a/otp/ai/AIBaseGlobal.py b/otp/ai/AIBaseGlobal.py
index 7a600f31..10bc58c9 100755
--- a/otp/ai/AIBaseGlobal.py
+++ b/otp/ai/AIBaseGlobal.py
@@ -21,3 +21,12 @@ def inspect(anObject):
 
 __builtins__['inspect'] = inspect
 taskMgr.finalInit()
+
+# The VirtualFileSystem, which has already initialized, doesn't see the mount
+# directives in the config(s) yet. We have to force it to load those manually:
+from panda3d.core import VirtualFileSystem, ConfigVariableList, Filename
+vfs = VirtualFileSystem.getGlobalPtr()
+mounts = ConfigVariableList('vfs-mount')
+for mount in mounts:
+    mountfile, mountpoint = (mount.split(' ', 2) + [None, None, None])[:2]
+    vfs.mount(Filename(mountfile), Filename(mountpoint), 0)
\ No newline at end of file
diff --git a/toontown/dna/DNAParser.py b/toontown/dna/DNAParser.py
index ef366db9..ea2f2aa0 100755
--- a/toontown/dna/DNAParser.py
+++ b/toontown/dna/DNAParser.py
@@ -16,20 +16,20 @@ class DNABulkLoader:
 
 def loadDNABulk(dnaStorage, file):
     dnaLoader = DNALoader()
-    fileu = '../resources/' + file
+    fileu = '/' + file
     dnaLoader.loadDNAFile(dnaStorage, fileu)
 
 def loadDNAFile(dnaStorage, file):
     print 'Reading DNA file...', file
     dnaLoader = DNALoader()
-    fileu = '../resources/' + file
+    fileu = '/' + file
     node = dnaLoader.loadDNAFile(dnaStorage, fileu)
     if node.node().getNumChildren() > 0:
         return node.node()
 
 def loadDNAFileAI(dnaStorage, file):
     dnaLoader = DNALoader()
-    fileu = '../resources/' + file
+    fileu = '/' + file
     data = dnaLoader.loadDNAFileAI(dnaStorage, fileu)
     return data
 
diff --git a/toontown/toonbase/ToontownStart.py b/toontown/toonbase/ToontownStart.py
index af820b4a..25d5bfa4 100644
--- a/toontown/toonbase/ToontownStart.py
+++ b/toontown/toonbase/ToontownStart.py
@@ -71,6 +71,15 @@ from direct.directnotify.DirectNotifyGlobal import directNotify
 notify = directNotify.newCategory('ToontownStart')
 notify.setInfo(True)
 
+# The VirtualFileSystem, which has already initialized, doesn't see the mount
+# directives in the config(s) yet. We have to force it to load those manually:
+from panda3d.core import VirtualFileSystem, ConfigVariableList, Filename
+vfs = VirtualFileSystem.getGlobalPtr()
+mounts = ConfigVariableList('vfs-mount')
+for mount in mounts:
+    mountfile, mountpoint = (mount.split(' ', 2) + [None, None, None])[:2]
+    vfs.mount(Filename(mountfile), Filename(mountpoint), 0)
+
 from otp.settings.Settings import Settings
 from otp.otpbase import OTPGlobals
 
@@ -98,6 +107,10 @@ if 'language' not in settings:
     settings['language'] = 'English'
 if 'cogInterface' not in settings:
     settings['cogInterface'] = True
+if 'speedchatPlus' not in settings:
+    settings['speedchatPlus'] = True
+if 'trueFriends' not in settings:
+    settings['trueFriends'] = True
 if 'tpTransition' not in settings:
     settings['tpTransition'] = True
 if 'fov' not in settings: