From 3a160295e74f9b19892876fa52ac5d3605497c32 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Thu, 28 Aug 2014 13:19:57 +0100 Subject: [PATCH] Separate Say and Choose commands --- Assets/Fungus/Dialog/Commands/AddOption.cs | 4 +- Assets/Fungus/Dialog/Commands/Choose.cs | 115 ++++++++++++++++++ .../{SetDialog.cs.meta => Choose.cs.meta} | 2 +- Assets/Fungus/Dialog/Commands/Say.cs | 87 ++++--------- Assets/Fungus/Dialog/Commands/SetDialog.cs | 36 ------ Assets/Fungus/Dialog/Editor/ChooseEditor.cs | 46 +++++++ ...logEditor.cs.meta => ChooseEditor.cs.meta} | 2 +- Assets/Fungus/Dialog/Editor/SayEditor.cs | 48 ++------ .../Fungus/Dialog/Editor/SetDialogEditor.cs | 31 ----- Assets/Fungus/Dialog/Scripts/Dialog.cs | 2 +- Assets/Shuttle/ShuttleGame.unity | Bin 104100 -> 106324 bytes 11 files changed, 198 insertions(+), 175 deletions(-) create mode 100644 Assets/Fungus/Dialog/Commands/Choose.cs rename Assets/Fungus/Dialog/Commands/{SetDialog.cs.meta => Choose.cs.meta} (78%) delete mode 100644 Assets/Fungus/Dialog/Commands/SetDialog.cs create mode 100644 Assets/Fungus/Dialog/Editor/ChooseEditor.cs rename Assets/Fungus/Dialog/Editor/{SetDialogEditor.cs.meta => ChooseEditor.cs.meta} (78%) delete mode 100644 Assets/Fungus/Dialog/Editor/SetDialogEditor.cs diff --git a/Assets/Fungus/Dialog/Commands/AddOption.cs b/Assets/Fungus/Dialog/Commands/AddOption.cs index df0350a8..0cf0d168 100644 --- a/Assets/Fungus/Dialog/Commands/AddOption.cs +++ b/Assets/Fungus/Dialog/Commands/AddOption.cs @@ -15,10 +15,10 @@ namespace Fungus.Script public override void OnEnter() { - Say.SayOption option = new Say.SayOption(); + Choose.Option option = new Choose.Option(); option.optionText = optionText; option.targetSequence = targetSequence; - Say.options.Add(option); + Choose.options.Add(option); Continue(); } diff --git a/Assets/Fungus/Dialog/Commands/Choose.cs b/Assets/Fungus/Dialog/Commands/Choose.cs new file mode 100644 index 00000000..38aecb1a --- /dev/null +++ b/Assets/Fungus/Dialog/Commands/Choose.cs @@ -0,0 +1,115 @@ +using UnityEngine; +using System; +using System.Collections; +using System.Collections.Generic; + +namespace Fungus.Script +{ + [CommandCategory("Dialog")] + [HelpText("Presents a list of options for the player to choose from, with an optional timeout. Add options using preceding AddOption commands.")] + public class Choose : FungusCommand + { + public Dialog dialog; + static public Dialog activeDialog; + + public class Option + { + public string optionText; + public Sequence targetSequence; + } + + static public List