From dca40df6a83961b7473f65c3186c509f44cab750 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Thu, 14 Aug 2014 12:05:24 +0100 Subject: [PATCH] Renamed AddOption to Option --- .../{AddOptionEditor.cs => OptionEditor.cs} | 12 ++++++------ ...ionEditor.cs.meta => OptionEditor.cs.meta} | 0 .../{AddOption.cs => Option.cs} | 2 +- .../{AddOption.cs.meta => Option.cs.meta} | 0 Assets/Shuttle/ShuttleGame.unity | Bin 81732 -> 81732 bytes 5 files changed, 7 insertions(+), 7 deletions(-) rename Assets/Fungus/Editor/FungusScript/{AddOptionEditor.cs => OptionEditor.cs} (74%) rename Assets/Fungus/Editor/FungusScript/{AddOptionEditor.cs.meta => OptionEditor.cs.meta} (100%) rename Assets/Fungus/VisualScripting/{AddOption.cs => Option.cs} (97%) rename Assets/Fungus/VisualScripting/{AddOption.cs.meta => Option.cs.meta} (100%) diff --git a/Assets/Fungus/Editor/FungusScript/AddOptionEditor.cs b/Assets/Fungus/Editor/FungusScript/OptionEditor.cs similarity index 74% rename from Assets/Fungus/Editor/FungusScript/AddOptionEditor.cs rename to Assets/Fungus/Editor/FungusScript/OptionEditor.cs index b6a07df1..d9351842 100644 --- a/Assets/Fungus/Editor/FungusScript/AddOptionEditor.cs +++ b/Assets/Fungus/Editor/FungusScript/OptionEditor.cs @@ -7,23 +7,23 @@ using System.Collections.Generic; namespace Fungus.Script { - [CustomEditor (typeof(AddOption))] - public class AddOptionEditor : FungusCommandEditor + [CustomEditor (typeof(Option))] + public class OptionEditor : FungusCommandEditor { public override void DrawCommandGUI() { - AddOption t = target as AddOption; + Option t = target as Option; EditorGUI.BeginChangeCheck(); string optionText = EditorGUILayout.TextField(new GUIContent("Option Text", "Text for option button label"), t.optionText); Sequence targetSequence = SequenceEditor.SequenceField(new GUIContent("Target Sequence", "Sequence to execute when option is selected"), t.GetFungusScript(), t.targetSequence); - AddOption.ShowCondition showCondition = (AddOption.ShowCondition)EditorGUILayout.EnumPopup(new GUIContent("Show Condition", "Condition when this option should be visible."), t.showCondition); + Option.ShowCondition showCondition = (Option.ShowCondition)EditorGUILayout.EnumPopup(new GUIContent("Show Condition", "Condition when this option should be visible."), t.showCondition); BooleanVariable booleanVariable = t.booleanVariable; - if (showCondition == AddOption.ShowCondition.BooleanIsFalse || - showCondition == AddOption.ShowCondition.BooleanIsTrue) + if (showCondition == Option.ShowCondition.BooleanIsFalse || + showCondition == Option.ShowCondition.BooleanIsTrue) { booleanVariable = FungusVariableEditor.VariableField (new GUIContent ("Boolean Variable", "Boolean variable to test for condition"), t.GetFungusScript (), diff --git a/Assets/Fungus/Editor/FungusScript/AddOptionEditor.cs.meta b/Assets/Fungus/Editor/FungusScript/OptionEditor.cs.meta similarity index 100% rename from Assets/Fungus/Editor/FungusScript/AddOptionEditor.cs.meta rename to Assets/Fungus/Editor/FungusScript/OptionEditor.cs.meta diff --git a/Assets/Fungus/VisualScripting/AddOption.cs b/Assets/Fungus/VisualScripting/Option.cs similarity index 97% rename from Assets/Fungus/VisualScripting/AddOption.cs rename to Assets/Fungus/VisualScripting/Option.cs index d1d5c5bb..833f2529 100644 --- a/Assets/Fungus/VisualScripting/AddOption.cs +++ b/Assets/Fungus/VisualScripting/Option.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; namespace Fungus.Script { - public class AddOption : FungusCommand + public class Option : FungusCommand { public enum ShowCondition { diff --git a/Assets/Fungus/VisualScripting/AddOption.cs.meta b/Assets/Fungus/VisualScripting/Option.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/AddOption.cs.meta rename to Assets/Fungus/VisualScripting/Option.cs.meta diff --git a/Assets/Shuttle/ShuttleGame.unity b/Assets/Shuttle/ShuttleGame.unity index 552776acecbe70aba40771b8a2606fa17b37ee86..00e675f851950d8727cbda099f146b95567d7d76 100644 GIT binary patch delta 22 ecmX@|kLAcemWC~iYm`~?UN{tP-=NGmMH&Ep{R!3p delta 22 ccmX@|kLAcemWC~iYm`|SfMELuWyUGe0Bv#y&j0`b