From 84dde981537f5a7d9b34c47baab0f5ffee0b2740 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Wed, 22 Oct 2014 14:47:33 +0100 Subject: [PATCH] AddOption command can now set a variable on selection --- Assets/Fungus/Dialog/Commands/AddOption.cs | 4 +- Assets/Fungus/Dialog/Commands/Choose.cs | 6 + .../Fungus/Dialog/Editor/AddOptionEditor.cs | 7 +- .../FungusScript/Commands/SetVariable.cs | 140 +++++++++--------- 4 files changed, 86 insertions(+), 71 deletions(-) diff --git a/Assets/Fungus/Dialog/Commands/AddOption.cs b/Assets/Fungus/Dialog/Commands/AddOption.cs index c2aaafdd..6a0fde2d 100644 --- a/Assets/Fungus/Dialog/Commands/AddOption.cs +++ b/Assets/Fungus/Dialog/Commands/AddOption.cs @@ -8,7 +8,7 @@ namespace Fungus [CommandInfo("Dialog", "Add Option", "Adds an option for the player to select, displayed by the next Say command.")] - public class AddOption : Command + public class AddOption : SetVariable { public string optionText; public Sequence targetSequence; @@ -26,6 +26,8 @@ namespace Fungus Choose.Option option = new Choose.Option(); option.optionText = optionText; option.targetSequence = targetSequence; + option.action = () => DoSetOperation(); + Choose.options.Add(option); Continue(); diff --git a/Assets/Fungus/Dialog/Commands/Choose.cs b/Assets/Fungus/Dialog/Commands/Choose.cs index 938919c5..d482a16a 100644 --- a/Assets/Fungus/Dialog/Commands/Choose.cs +++ b/Assets/Fungus/Dialog/Commands/Choose.cs @@ -14,6 +14,7 @@ namespace Fungus { public string optionText; public Sequence targetSequence; + public Action action; } static public List