Merge branch 'main' into dev

This commit is contained in:
Ben C 2022-06-26 17:57:45 -04:00
commit 543f5cbe3b
No known key found for this signature in database
GPG Key ID: 7F8F04504B670474
3 changed files with 9 additions and 8 deletions

View File

@ -262,21 +262,25 @@ namespace NewHorizons.External.Modules
/// <summary> /// <summary>
/// Maximum time between meteor launches. /// Maximum time between meteor launches.
/// </summary> /// </summary>
[DefaultValue(20f)]
public float maxInterval = 20f; public float maxInterval = 20f;
/// <summary> /// <summary>
/// Maximum random speed at which meteors are launched. /// Maximum random speed at which meteors are launched.
/// </summary> /// </summary>
[DefaultValue(150f)]
public float maxLaunchSpeed = 150f; public float maxLaunchSpeed = 150f;
/// <summary> /// <summary>
/// Minimum time between meteor launches. /// Minimum time between meteor launches.
/// </summary> /// </summary>
[DefaultValue(5f)]
public float minInterval = 5f; public float minInterval = 5f;
/// <summary> /// <summary>
/// Minimum random speed at which meteors are launched. /// Minimum random speed at which meteors are launched.
/// </summary> /// </summary>
[DefaultValue(50f)]
public float minLaunchSpeed = 50f; public float minLaunchSpeed = 50f;
/// <summary> /// <summary>

View File

@ -22,11 +22,9 @@ pipenv install --dev
## Environment Variables ## Environment Variables
- URL_PREFIX: Path to put before all links and static files, see below for recommended values - URL_PREFIX: Path to put before all links and static files, see below for recommended values
- Production: "/" - Production and Local Builds: "/"
- Local Build: "" (set as empty string)
- PyCharm Development Server: "/outer-wilds-new-horizons/docs/out/" - PyCharm Development Server: "/outer-wilds-new-horizons/docs/out/"
## Copy Schemas ## Copy Schemas
Create a folder called `schemas` in the `docs/content/pages/` folder and copy all schemas to generate into it, make sure not to add this folder to git. Create a folder called `schemas` in the `docs/content/pages/` folder and copy all schemas to generate into it, make sure not to add this folder to git.
Production build automatically copies over schemas. Production build automatically copies over schemas.
@ -39,5 +37,5 @@ pipenv run menagerie generate
## Opening ## Opening
- Production: Go to the site - Production: Go to the site
- Local: Open `out/index.html` - Local: Go into `docs/out` in a new terminal window and run `py -m http.server 8080` and then connect to http://localhost:8080/
- PyCharm Development Server: Right click `out/index.html` -> Open In -> Browser -> Default - PyCharm Development Server: Right click `out/index.html` -> Open In -> Browser -> Default

View File

@ -159,13 +159,11 @@ You can load your XML file to your planet by doing adding the following to your
## Entry Layout ## Entry Layout
By default, entries in rumor mode are laid out by rows, where each row is one planet. This will not make for a perfect By default, entries in rumor mode are laid out by rows, where each row is one planet. This will not make for a perfect
layout, so you can use the `entryPositions` property to change them layout, so you can use the `entryPositions` property in your star system config to change them
For example, if I want to change an entry with the ID of `EXAMPLE_ENTRY` and another with the ID of `EXAMPLE_ENTRY_2`: For example, if I want to change an entry with the ID of `EXAMPLE_ENTRY` and another with the ID of `EXAMPLE_ENTRY_2`:
```json ```json
{ {
"ShipLog": {
"xmlFile": "planets/example.xml",
"entryPositions": [ "entryPositions": [
{ {
"id": "EXAMPLE_ENTRY", "id": "EXAMPLE_ENTRY",
@ -182,10 +180,11 @@ For example, if I want to change an entry with the ID of `EXAMPLE_ENTRY` and ano
} }
} }
] ]
}
} }
``` ```
To help with this, download the unity explorer mod and manually position entries, then simply use the dev tools to dump all the entries to a json string you can copy and paste into your config.
![autoDetectiveMode]({{ "images/ship_log/auto_rumor_mode.webp"|static }}) ![autoDetectiveMode]({{ "images/ship_log/auto_rumor_mode.webp"|static }})
*A set of entries laid out with auto mode* *A set of entries laid out with auto mode*