Merge branch 'main' into docs/rcondocs/rcon

3 files changed, 26 insertions, 33 deletions

diff --git a/docs/using-northstar/advanced.md b/docs/using-northstar/advanced.md
index 4710e9a..d904fcd 100644
--- a/docs/using-northstar/advanced.md
+++ b/docs/using-northstar/advanced.md
@@ -6,10 +6,10 @@ This is a section detailing the more advanced parts of using Northstar, with som
 
 ## Mod profiles <a href="#profiles" id="profiles"></a>
 
-Profiles are a way to launch a version of Northstar with specific mods enabled, differing per profile. These profiles are separated by folders that you create yourself, and add your own mods to. This is especially useful if you want to [play vanilla using Northstar](advanced.md#vanilla-on-northstar).\
+Profiles are a way to launch a version of Northstar with specific mods enabled, differing per profile. These profiles are separated by folders that you create yourself, and add your own mods to.\
 Currently, the only mod managers supporting profiles are [VTOL](https://github.com/BigSpice/VTOL) and [r2modman](https://thunderstore.io/package/ebkr/r2modman/).
 
-### Regular Profile
+### Creating a profile
 
 The first thing you want to do while creating a new profile is to have a Northstar release version downloaded and ready to be used. You will only need the `R2Northstar` folder from this second version, as the rest of the `NorthstarRelease.vX.Y.Z.zip` doesn't matter to creating additional profiles.
 
@@ -19,15 +19,7 @@ In order to create the `.bat` to launch this profile, you'll need to first creat
 
 You can set up profiles in an even more advanced way by setting up a way to use Steam to launch multiple different profiles from their newer launch menu that appears when you can launch a game in more ways than one. This is also covered [here](../installing-northstar/basic-setup.md#adding-alternate-launch-option-for-steam), and can be set up for profiles by simply adding the `-profile=PROFILE FOLDER NAME HERE` to the arguments of the new option for NorthstarLauncher, as seen below
 
-![SteamEdit using Northstar Profiles](../images/steamedit-profiles.png)
-
-### Vanilla Profile
-
-A simple "vanilla" profile can be created using a `.bat` file, without needing to fully make an additional mods folder. You can do this simply by creating a `.txt` file inside of your Titanfall2 directory (you can name it whatever you want), and putting in `NorthstarLauncher.exe -norestrictservercommands -profile=R2Vanilla`.
-After doing this, you'll want to rename it to `yourFileName.bat`.
-This tells the NorthstarLauncher to not restrict server commands, a feature which is needed to allow the server to tell the client which server to join (but is disabled on Northstar for security reasons), and tells it to use the `R2Vanilla` profile, which, as it doesn't normally exist, will launch Northstar with no core mods enabled, allowing you to easily play on Vanilla using most of Northstar's security fixes.
-
-Double clicking the `.bat` or right clicking on it and hitting `open` will launch the vanilla profile.
+![SteamEdit using Northstar profiles](../images/steamedit-profiles.png)
 
 ## Setting levels using console commands <a href="#set-level" id="set-level"></a>
 
@@ -42,24 +34,3 @@ With everything unlocked, there is no need to set your level to a higher level,
 `script GetPlayerArray()[0].SetPersistentVar("xp", INSERT_XP_COUNT)` this command sets the xp count of the player (meaning, the amount of kills required per level in order to level up). You want to replace `INSERT_XP_COUNT` with the number you want. Setting this number lower than 472 is recommended, as to not encounter issues.
 
 If you experience strange issues after using these, you probably set something too high, and should follow the [resetting levels wiki section](../installing-northstar/troubleshooting.md#i-used-a-command-to-set-my-playergun-xp-level-and-i-set-it-too-high-so-now-my-game-crashes-when-trying-to-join-multiplayer).
-
-## Playing Vanilla via NorthstarLauncher <a href="#vanilla-on-northstar" id="vanilla-on-northstar"></a>
-
-It is recommended that you [set up a vanilla profile](advanced.md#profiles) instead of disabling all of your mods and using `-norestrictservercommands` as a launch option, however if you wish to only play vanilla using this method and would rather not set up a profile, you can do the following.
-
-The reason behind doing this is that Northstar has several security fixes that Vanilla does not have, however these are not *necessary*. The odds you get hacked playing vanilla are close to zero, and there are no reports of people being genuinely hacked by playing Vanilla.\
-This method assumes you're launching Northstar via Titanfall 2 on EA or Steam using launch options.
-
-1. Go to the main menu of Northstar 
-2. Click `"Mods"` on the bottom of the menu
-3. Disable **ALL** of your mods
-4. Close Northstar
-5. Add `-norestrictservercommands` and `-northstar` as a [launch option](../installing-northstar/troubleshooting.md#launch-opts)
-6. Launch Titanfall 2 and you should be able to play on vanilla servers using Northstar's security fixes
-
-**TO PLAY ON NORTHSTAR AGAIN**
-
-1. Go to your [Titanfall2 directory](../installing-northstar/troubleshooting.md#game-location)
-2. Open your `R2Northstar` folder
-3. Delete `enabledmods.json`
-4. Launch Northstar
diff --git a/docs/using-northstar/launch-arguments.md b/docs/using-northstar/launch-arguments.md
index 9205890..6e1ee2e 100644
--- a/docs/using-northstar/launch-arguments.md
+++ b/docs/using-northstar/launch-arguments.md
@@ -5,8 +5,9 @@ Here's a list of new command line arguments that Northstar introduces, they shou
 | Argument           | Description                                                                                        | Value                            |
 | ------------------ | -------------------------------------------------------------------------------------------------- | -------------------------------- |
 | `-disablelogs`     | Disable logging and creation of log files                                                          |                                  |
-| `-vanilla`         | Disables Northstar loading                                                                         |                                  |
+| `-nonorthstardll`  | Disables Northstar loading                                                                         |                                  |
 | `-northstar`       | Enables Northstar loading                                                                          |                                  |
+| `-vanilla`         | Enables vanilla compatibility                                                                      |                                  |
 | `-dedicated`       | Starts a dedicated server without video output                                                     |                                  |
 | `-waitfordebugger` | Waits for debugger to connect before launching game                                                |                                  |
 | `-language`        | Forces loading of client localisation                                                              | language string ex: `portuguese` |
diff --git a/docs/using-northstar/vanilla.md b/docs/using-northstar/vanilla.md
new file mode 100644
index 0000000..62fd98e
--- /dev/null
+++ b/docs/using-northstar/vanilla.md
@@ -0,0 +1,21 @@
+# Playing vanilla Titanfall 2 via Northstar
+
+While Northstar comes pre-packaged with mods to support community servers and custom content, some users may not want all of this.
+Northstar can also be used to load mods on vanilla more easily and with more stability than vpk modding, and can sometimes help when the game doesn't want to launch at all.
+
+## Launching vanilla Titanfall 2 via Northstar (no mods) <a href="#vanilla-without-mods" id="vanilla-without-mods"></a>
+
+This method of launching Titanfall 2 is generally done when some part of Steam/EA launching Titanfall 2 doesn't work properly.
+You can do this by going to your [Titanfall2 directory](../installing-northstar/troubleshooting.md#game-location), creating a `Vanilla.bat` file, right clicking the `Vanilla.bat` file, hitting `Edit`, then entering `NorthstarLauncher.exe -nonorthstardll`.
+
+Once you do this, double click the `Vanilla.bat` file to load vanilla Titanfall 2 via Northstar without mods.
+
+## Launching vanilla Titanfall 2 via Northstar (with mods) <a href="#vanilla-with-mods" id="vanilla-with-mods"></a>
+
+While Northstar is seeing [more progress towards vanilla compatibility](https://github.com/R2Northstar/NorthstarLauncher/pull/601), it's still decently far out.
+A community made modification is available in the form of [VanillaPlus](https://northstar.thunderstore.io/package/NanohmProtogen/VanillaPlus/) to load mods on vanilla.
+It should be noted that, again, this is a community made modification and is not "officially" Northstar.
+
+To use it, read the mod's description on Thunderstore to install it, as it has a special install process compared to other mods.
+If you have any issues, check the [VanillaPlus FAQ](https://github.com/Zayveeo5e/NP.VanillaPlus/blob/main/FAQ.md) to see if you can find your issue there.
+If you can't find your issue on the FAQ, open an issue on the mod's GitHub repo.