From 4fc5d527c6951584dad900cbf14194193c9e53f4 Mon Sep 17 00:00:00 2001 From: FishyClockwork Date: Sun, 30 Oct 2016 20:30:32 +0100 Subject: [PATCH] Moved 'goodbye' from usdf.txt to usdf_zdoom.txt I have undone all my changes to usdf.txt. It should look like how it did before commit 0df6ba6 --- specs/usdf.txt | 18 ++++++++---------- specs/usdf_zdoom.txt | 3 +++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/specs/usdf.txt b/specs/usdf.txt index 093c9e7d7..4d1d01c1b 100644 --- a/specs/usdf.txt +++ b/specs/usdf.txt @@ -87,16 +87,14 @@ conversation // Starts a dialog. page // Starts a new page. Pages are automatically numbered starting at 1. { - name = ; // Name that goes in the upper left hand corner - panel = ; // Name of lump to render as the background. - voice = ; // Narration sound lump. - dialog = ; // Dialog of the page. - goodbye = ; // Custom goodbye message. If omitted then the - // generic goodbyes will be displayed instead. - drop = ; // mobj for the object to drop if the actor is - // killed. - link = ; // Page to jump to if all ifitem conditions are - // satisified. + name = ; // Name that goes in the upper left hand corner + panel = ; // Name of lump to render as the background. + voice = ; // Narration sound lump. + dialog = ; // Dialog of the page. + drop = ; // mobj for the object to drop if the actor is + // killed. + link = ; // Page to jump to if all ifitem conditions are + // satisified. // jumps to the specified page if the player has the specified amount // or more of item in their inventory. This can be repeated as many diff --git a/specs/usdf_zdoom.txt b/specs/usdf_zdoom.txt index 2b2e6f6da..f800b5ae7 100644 --- a/specs/usdf_zdoom.txt +++ b/specs/usdf_zdoom.txt @@ -89,6 +89,9 @@ conversation // Starts a dialog. page { + goodbye = ; // Custom goodbye message. If omitted then the + // generic goodbyes will be displayed instead. + choice { // The amount of an item needed for this option to become available.