Merge branch 'master' into dev

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,45 @@
+name: Bug Report
+description: File a bug report
+labels: ["bug"]
+body:
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What Happened?
+      description: Please describe what happened
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: What was supposed to happen?
+      description: If applicable, describe what should have happened instead.
+    validations:
+      required: false
+  - type: dropdown
+    id: platform
+    attributes:
+      label: Platform
+      description: Please provide which platform you were playing on when you encountered this bug.
+      options:
+        - Steam
+        - Epic Games
+        - Xbox Game Pass
+    validations:
+      required: true
+  - type: textarea
+    id: mods
+    attributes:
+      label: Mods
+      description: Please define which mods you had enabled when the problem occurred.
+      render: Markdown
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Logs
+      description: If you can, try to locate the point in the logs where the error occurred and paste the message displayed here.
+      render: Shell
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,14 @@
+name: Feature Request
+description: Request a feature you'd like to see in a later release
+labels: ["enhancement"]
+body:
+  - type: textarea
+    id: feature
+    attributes:
+      label: Feature
+      description: Describe the feature you'd like to see in New Horizons.
+  - type: textarea
+    id: context
+    attributes:
+      label: Context
+      description: Provide any additional context such as screenshots or diagrams here.

.github/workflows/docs_build.yml

@@ -32,6 +32,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       
+      - uses: szenius/set-timezone@v1.0
+        with:
+          timezoneLinux: "America/New York"
+      
       - run: mkdir ./.venv
       
       - run: cp -r docs/** .
@@ -66,7 +70,7 @@ jobs:
       - name: Build Site
         uses: VaultVulp/action-pipenv@v2.0.1
         with:
-          command: run python -m menagerie generate
+          command: run menagerie generate
           
       - name: Upload Artifact
         uses: actions/upload-artifact@v2

NewHorizons/schema.json

@@ -7,6 +7,7 @@
   "$defs": {
     "vector3": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "x": {
           "type": "number",
@@ -24,6 +25,7 @@
     },
     "vector2": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "x": {
           "type": "number",
@@ -37,6 +39,7 @@
     },
     "wholeVector2": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "x": {
           "type": "integer",
@@ -55,6 +58,7 @@
     },
     "color": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "R": {
           "$ref": "#/$defs/colorPart"
@@ -81,6 +85,7 @@
       "type": "array",
       "items": {
         "type": "object",
+        "additionalProperties": false,
         "properties": {
           "time": {
             "type": "integer",
@@ -95,6 +100,7 @@
     },
     "procGen": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "scale": {
           "type": "number",
@@ -114,7 +120,12 @@
   "required": [
     "name"
   ],
+  "additionalProperties": false,
   "properties": {
+    "$schema": {
+      "type": "string",
+      "description": "The schema used to validate your config."
+    },
     "name": {
       "type": "string",
       "description": "Unique name of your planet"
@@ -136,6 +147,7 @@
     },
     "Base": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "hasMapMarker": {
           "type": "boolean",
@@ -214,6 +226,7 @@
     },
     "Atmosphere": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "size": {
           "type": "number",
@@ -287,6 +300,7 @@
     },
     "Orbit": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "semiMajorAxis": {
           "type": "integer",
@@ -367,6 +381,7 @@
     },
     "Ring": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "innerRadius": {
           "type": "number",
@@ -405,6 +420,7 @@
     },
     "HeightMap": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "heightMap": {
           "type": "string",
@@ -431,6 +447,7 @@
     },
     "AsteroidBelt": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "innerRadius": {
           "type": "number",
@@ -462,6 +479,7 @@
     },
     "Star": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "size": {
           "type": "number",
@@ -500,6 +518,7 @@
     },
     "FocalPoint": {
       "type": "object",
+      "additionalProperties": false,
       "description": "Use this to create the focal point that two objects can orbit in a binary system",
       "properties": {
         "primary": {
@@ -514,11 +533,13 @@
     },
     "Props": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "scatter": {
           "type": "array",
           "items": {
             "type": "object",
+            "additionalProperties": false,
             "properties": {
               "count": {
                 "type": "integer"
@@ -550,6 +571,7 @@
           "type": "array",
           "items": {
             "type": "object",
+            "additionalProperties": false,
             "properties": {
               "path": {
                 "type": "string",
@@ -574,11 +596,14 @@
                 "type": "boolean",
                 "description": "Do we override rotation and try to automatically align this object to stand upright on the body's surface?",
                 "default": false
+              },
+              "removeChildren": {
+                "type": "array",
+                "description": "A list of children to remove from this detail",
+                "items": {
+                  "type": "string"
+                }
               }
-            },
-            "scale": {
-              "type": "number",
-              "default": 1
             }
           }
         },
@@ -586,6 +611,7 @@
           "type": "array",
           "items": {
             "type": "object",
+            "additionalProperties": false,
             "properties": {
               "position": {
                 "$ref": "#/$defs/vector3",
@@ -616,6 +642,7 @@
           "description": "A set of volumes that reveal ship log fact",
           "items": {
             "type": "object",
+            "additionalProperties": false,
             "properties": {
               "revealOn": {
                 "type": "string",
@@ -659,6 +686,7 @@
           "description": "A set of locations for ship log entries",
           "items": {
             "type": "object",
+            "additionalProperties": false,
             "properties": {
               "id": {
                 "type": "string",
@@ -681,6 +709,7 @@
           "description": "A set of geysers",
           "items": {
             "type": "object",
+            "additionalProperties": false,
             "properties": {
               "position": {
                 "$ref": "#/$defs/vector3",
@@ -693,6 +722,7 @@
     },
     "Spawn": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "playerSpawnPoint": {
           "$ref": "#/$defs/vector3",
@@ -710,11 +740,13 @@
     },
     "Signal": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "signals": {
           "type": "array",
           "items": {
             "type": "object",
+            "additionalProperties": false,
             "properties": {
               "position": {
                 "$ref": "#/$defs/vector3"
@@ -771,6 +803,7 @@
     },
     "Singularity": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "size": {
           "type": "number",
@@ -800,6 +833,7 @@
     },
     "Water": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "size": {
           "type": "number",
@@ -815,6 +849,7 @@
     },
     "Lava": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "size": {
           "type": "number",
@@ -830,6 +865,7 @@
     },
     "Sand": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "size": {
           "type": "number",
@@ -845,6 +881,7 @@
     },
     "Funnel": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "target": {
           "type": "string",
@@ -870,6 +907,7 @@
     },
     "ShipLog": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "xmlFile": {
           "type": "string",
@@ -891,6 +929,7 @@
           "description": "A set of positions to use instead of automatic layout in rumor mode.",
           "items": {
             "type": "object",
+            "additionalProperties": false,
             "properties": {
               "id": {
                 "type": "string",
@@ -904,6 +943,7 @@
         },
         "MapMode": {
           "type": "object",
+          "additionalProperties": false,
           "properties": {
             "revealedSprite": {
               "type": "string",
@@ -946,6 +986,7 @@
               "description": "Place non-selectable object in map mode (like sand funnels).",
               "items": {
                 "type": "object",
+                "additionalProperties": false,
                 "properties": {
                   "revealedSprite": {
                     "type": "string",
@@ -982,6 +1023,7 @@
           "description": "A set of colors to apply to curiosities.",
           "items": {
             "type": "object",
+            "additionalProperties": false,
             "properties": {
               "id": {
                 "type": "string",

README.md

@@ -11,10 +11,6 @@
 
 *Do you want to create planets using New Horizons?* Then check out our [website](https://nh.outerwildsmods.com/) for all our documentation!
 
-A custom world creation tool for Outer Wilds.
-
-You can view the addons creators have made (or upload one yourself) [here](https://outerwildsmods.com/custom-worlds)!
-
 If you want to see examples of what NH can do check out the [examples add-on](https://github.com/xen-42/ow-new-horizons-examples) or [real solar system add-on](https://github.com/xen-42/outer-wilds-real-solar-system).
 
 Check the ship's log for how to use your warp drive to travel between star systems!

docs/Pipfile.lock

@@ -204,11 +204,11 @@
         },
         "menagerie-docs": {
             "hashes": [
-                "sha256:86474264ca3f3aa289bf22e4f2b0287ba29c946bd54e34a1f6c77d549c3c23ad",
+                "sha256:fb68b5cfd7046fd619179a190fc49a0e6c0d33a53456e95df08c045448800bda",
-                "sha256:adee872cde3616c2bab6b8e4ad15f3aac95dbc9340ff02377a21d257ec5fa108"
+                "sha256:fd17cd85da13196dfceaa6d6a65097aea28a2cdecf5dc69e6e92f273b15fd759"
             ],
             "index": "pypi",
-            "version": "==0.0.5"
+            "version": "==0.1.1"
         },
         "mypy-extensions": {
             "hashes": [
@@ -279,11 +279,11 @@
         },
         "pygments": {
             "hashes": [
-                "sha256:44238f1b60a76d78fc8ca0528ee429702aae011c265fe6a8dd8b63049ae41c65",
+                "sha256:5eb116118f9612ff1ee89ac96437bb6b49e8f04d8a13b514ba26f620208e26eb",
-                "sha256:4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a"
+                "sha256:dc9c10fb40944260f6ed4c688ece0cd2048414940f1cea51b8b226318411c519"
             ],
-            "markers": "python_version >= '3.5'",
+            "markers": "python_version >= '3.6'",
-            "version": "==2.11.2"
+            "version": "==2.12.0"
         },
         "pyparsing": {
             "hashes": [
@@ -434,11 +434,11 @@
         },
         "typing-extensions": {
             "hashes": [
-                "sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42",
+                "sha256:6657594ee297170d19f67d55c05852a874e7eb634f4f753dbd667855e07c1708",
-                "sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2"
+                "sha256:f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376"
             ],
-            "markers": "python_version >= '3.6'",
+            "markers": "python_version >= '3.7'",
-            "version": "==4.1.1"
+            "version": "==4.2.0"
         },
         "typing-inspect": {
             "hashes": [

docs/Setup.md

@@ -34,7 +34,7 @@ Production build automatically copies over schemas.
 ## Generating
 Run `generate` with pipenv
 ```shell
-pipenv run python -m menagerie generate
+pipenv run menagerie generate
 ```
 
 ## Opening

docs/config.json

@@ -1,11 +1,11 @@
 {
-  "$schema": "https://raw.githubusercontent.com/Bwc9876/menagerie/master/menagerie/config_schema.json",
+  "$schema": "https://raw.githubusercontent.com/Bwc9876/menagerie/master/menagerie/schemas/config_schema.json",
   "cache_enabled": false,
   "base_url": "https://nh.outerwildsmods.com/",
   "themes": {
     "bootstrap": "https://bootswatch.com/5/darkly/bootstrap.min.css",
     "highlight_js": "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.4.0/styles/github-dark-dimmed.min.css",
-    "navbar_color": "dark"
+    "theme": "dark"
   },
   "styles": {
     "base": "styles/base.css",

docs/content/pages/secret.md

@@ -0,0 +1,9 @@
+Title: Hidden Page
+Description: Hehe funny secret
+Hide_In_Nav: True
+
+# Hello!!
+
+Uh idk what to put here thought it would be funny haha
+
+![Cow](https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fmedia1.tenor.com%2Fimages%2F964831e7eccb34007e82c065a50679ef%2Ftenor.gif%3Fitemid%3D18924714&f=1&nofb=1)

docs/content/static/styles/base.css

@@ -1,5 +1,6 @@
 pre > code {
     background-color: #1a1a1a !important;
+    border-radius: .25rem !important;
 }
 
 ::-webkit-scrollbar {