From bce3d492bab0763c98daf4160a8f0e8814d6132a Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Thu, 20 Jul 2017 21:49:00 +0300
Subject: [PATCH] Updated Vanilla content package & tweaked default client
 config

---
 Barotrauma/BarotraumaShared/BarotraumaShared.projitems    | 2 +-
 .../ContentPackages/{Vanilla 0.3.xml => Vanilla 0.6.xml}  | 6 +++++-
 Barotrauma/BarotraumaShared/config.xml                    | 8 ++++----
 Barotrauma/BarotraumaShared/serverconfig.xml              | 4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)
 rename Barotrauma/BarotraumaShared/Data/ContentPackages/{Vanilla 0.3.xml => Vanilla 0.6.xml} (89%)

diff --git a/Barotrauma/BarotraumaShared/BarotraumaShared.projitems b/Barotrauma/BarotraumaShared/BarotraumaShared.projitems
index 197127533..face8784d 100644
--- a/Barotrauma/BarotraumaShared/BarotraumaShared.projitems
+++ b/Barotrauma/BarotraumaShared/BarotraumaShared.projitems
@@ -721,7 +721,7 @@
     <Content Include="$(MSBuildThisFileDirectory)Content\waterbump.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Data\ContentPackages\Vanilla 0.3.xml">
+    <Content Include="$(MSBuildThisFileDirectory)Data\ContentPackages\Vanilla 0.6.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="$(MSBuildThisFileDirectory)Icon.ico" />
diff --git a/Barotrauma/BarotraumaShared/Data/ContentPackages/Vanilla 0.3.xml b/Barotrauma/BarotraumaShared/Data/ContentPackages/Vanilla 0.6.xml
similarity index 89%
rename from Barotrauma/BarotraumaShared/Data/ContentPackages/Vanilla 0.3.xml
rename to Barotrauma/BarotraumaShared/Data/ContentPackages/Vanilla 0.6.xml
index d2954ca1f..066046d1c 100644
--- a/Barotrauma/BarotraumaShared/Data/ContentPackages/Vanilla 0.3.xml	
+++ b/Barotrauma/BarotraumaShared/Data/ContentPackages/Vanilla 0.6.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<contentpackage name="Vanilla 0.3" path="Data/ContentPackages/Vanilla 0.3">
+<contentpackage name="Vanilla 0.6" path="Data/ContentPackages/Vanilla 0.6">
   <Item file="Content/Items/idcard.xml" />
   <Item file="Content/Items/itemlabel.xml" />
   <Item file="Content/Items/Artifacts/artifacts.xml" />
@@ -30,11 +30,15 @@
   <Item file="Content/Items/Weapons/explosives.xml" />
   <Item file="Content/Items/Weapons/railgun.xml" />
   <Item file="Content/Items/Weapons/weapons.xml" />
+  <Character file="Content/Characters/Carrier/carrier.xml" />
+  <Character file="Content/Characters/Charybdis/charybdis.xml" />
+  <Character file="Content/Characters/Coelanth/coelanth.xml" />
   <Character file="Content/Characters/Crawler/crawler.xml" />
   <Character file="Content/Characters/Endworm/endworm.xml" />
   <Character file="Content/Characters/Fractalguardian/fractalguardian.xml" />
   <Character file="Content/Characters/Fractalguardian2/fractalguardian2.xml" /> 
   <Character file="Content/Characters/Human/human.xml" />
+  <Character file="Content/Characters/Human/humanhusk.xml" />
   <Character file="Content/Characters/Husk/husk.xml" />
   <Character file="Content/Characters/Mantis/mantis.xml" />
   <Character file="Content/Characters/Moloch/moloch.xml" />
diff --git a/Barotrauma/BarotraumaShared/config.xml b/Barotrauma/BarotraumaShared/config.xml
index 131fbcafc..14252273a 100644
--- a/Barotrauma/BarotraumaShared/config.xml
+++ b/Barotrauma/BarotraumaShared/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<config masterserverurl="http://www.undertowgames.com/baromaster" autocheckupdates="true" musicvolume="0.0" soundvolume="0.0" verboselogging="true">
-  <graphicsmode width="1280" height="720" fullscreen="false" vsync="false" />
-  <contentpackage path="Data/ContentPackages/Vanilla 0.3.xml" />
+<config masterserverurl="http://www.undertowgames.com/baromaster" autocheckupdates="true" musicvolume="0.5" soundvolume="0.5" verboselogging="false">
+  <graphicsmode fullscreen="true" vsync="true" />
+  <contentpackage path="Data/ContentPackages/Vanilla 0.6.xml" />
   <keymapping Select="E" Use="0" Aim="1" Up="W" Down="S" Left="A" Right="D" Attack="R" Run="LeftShift" Crouch="LeftControl" Chat="Tab" CrewOrders="C" />
   <gameplay>
     <jobpreferences>
@@ -13,4 +13,4 @@
       <job name="Assistant" />
     </jobpreferences>
   </gameplay>
-</config>
\ No newline at end of file
+</config>
diff --git a/Barotrauma/BarotraumaShared/serverconfig.xml b/Barotrauma/BarotraumaShared/serverconfig.xml
index bcfac70f2..8d542f57b 100644
--- a/Barotrauma/BarotraumaShared/serverconfig.xml
+++ b/Barotrauma/BarotraumaShared/serverconfig.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config masterserverurl="http://www.undertowgames.com/baromaster" autocheckupdates="true" verboselogging="true">
-  <contentpackage path="Data/ContentPackages/Vanilla 0.3.xml" />
-</config>
\ No newline at end of file
+  <contentpackage path="Data/ContentPackages/Vanilla 0.6.xml" />
+</config>