Merge remote-tracking branch 'upstream/DoorDevUnstable' into OverworldShuffle

2021-04-12 13:32:14 -05:00
parent ade6dfc416 960b8de237
commit 160f0732dd
62 changed files with 2829 additions and 380 deletions
--- a/resources/app/cli/args.json
+++ b/resources/app/cli/args.json
@@ -5,13 +5,13 @@
    "type": "bool"
  },
  "create_spoiler": {
-    "action": "store_true",
-    "type": "bool"
+    "action": "store_false",
+    "dest": "suppress_spoiler",
+    "type": "bool",
+    "help": "suppress"
  },
  "suppress_spoiler": {
-    "action": "store_false",
-    "dest": "create_spoiler",
-    "help": "suppress"
+    "action": "store_true"
  },
  "logic": {
    "choices": [
@@ -226,6 +226,13 @@
  "usestartinventory": {
    "type": "bool"
  },
+  "triforce_pool": {},
+  "triforce_goal": {},
+  "triforce_pool_min": {},
+  "triforce_pool_max": {},
+  "triforce_goal_min": {},
+  "triforce_goal_max": {},
+  "triforce_min_difference": {},
  "custom": {
    "type": "bool",
    "help": "suppress"