From f450a60f6630ff823c46b8ed151ec85f4ed5f7af Mon Sep 17 00:00:00 2001
From: FishyClockwork <fcwgit@hotmail.com>
Date: Sat, 29 Oct 2016 15:54:45 +0200
Subject: [PATCH] Undone changes to usdf.txt, updated usdf_zdoom.txt

Undone changes to usdf.txt, updated usdf_zdoom.txt
---
 specs/usdf.txt       | 20 --------------------
 specs/usdf_zdoom.txt | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/specs/usdf.txt b/specs/usdf.txt
index 2c65f25d06..093c9e7d74 100644
--- a/specs/usdf.txt
+++ b/specs/usdf.txt
@@ -122,26 +122,6 @@ conversation // Starts a dialog.
                 amount = <integer>; // Minimum amount of the item needed.
             }
 
-            // The amount of an item needed for this option to become available.
-            // You can have as many as needed. All require blocks must be satisfied
-            // to show this option.
-            require
-            {
-                item   = <integer>; // Item that is required to show this option.
-                amount = <integer>; // Minimum amount of the item needed.
-            }
-
-            // The undesired amount of an item. This option will become available
-            // if you have less than the specified amount. You can have as many
-            // as needed. All exclude blocks must be satisfied to show this option.
-            // Note: if both require and exclude are defined then all require
-            // and all exclude blocks must be satisfied to show this option.
-            exclude
-            {
-                item   = <integer>; // Item that is unwanted to show this option.
-                amount = <integer>; // Unwanted minimum amount of the item.
-            }
-
             displaycost     = <bool>;    // Whether the cost should be
                                          // displayed with the option.
                                          // If no cost is specified this should
diff --git a/specs/usdf_zdoom.txt b/specs/usdf_zdoom.txt
index 8a324c0882..588ae6cda1 100644
--- a/specs/usdf_zdoom.txt
+++ b/specs/usdf_zdoom.txt
@@ -50,14 +50,24 @@ conversation
                 item   = <string>;
             }
 
+            // The amount of an item needed for this option to become available.
+            // You can have as many as needed. All require blocks must be satisfied
+            // to show this option.
             require
             {
-                item   = <string>;
+                item   = <string>;  // Item that is required to show this option.
+                amount = <integer>; // Minimum amount of the item needed.
             }
 
+            // The undesired amount of an item. This option will become available
+            // if you have less than the specified amount. You can have as many
+            // as needed. All exclude blocks must be satisfied to show this option.
+            // Note: if both require and exclude are defined then all require
+            // and all exclude blocks must be satisfied to show this option.
             exclude
             {
-                item   = <string>;
+                item   = <string>;  // Item that is unwanted to show this option.
+                amount = <integer>; // Unwanted minimum amount of the item.
             }
 
             giveitem        = <string>;