From 301609de56504696469f54660a0f097483782954 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Fri, 27 Feb 2015 10:33:01 +0000 Subject: [PATCH] Tidied up Portrait scripts folder, renamed Stage command to ControlStage #84 --- Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs | 2 -- Assets/Fungus/Portrait/Editor/StageEditor.cs | 4 ++-- Assets/Fungus/Portrait/Scripts/Commands.meta | 5 +++++ .../Portrait/Scripts/{Stage.cs => Commands/ControlStage.cs} | 4 ++-- .../Scripts/{Stage.cs.meta => Commands/ControlStage.cs.meta} | 0 Assets/Fungus/Portrait/Scripts/{ => Commands}/Portrait.cs | 0 .../Fungus/Portrait/Scripts/{ => Commands}/Portrait.cs.meta | 0 7 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 Assets/Fungus/Portrait/Scripts/Commands.meta rename Assets/Fungus/Portrait/Scripts/{Stage.cs => Commands/ControlStage.cs} (98%) rename Assets/Fungus/Portrait/Scripts/{Stage.cs.meta => Commands/ControlStage.cs.meta} (100%) rename Assets/Fungus/Portrait/Scripts/{ => Commands}/Portrait.cs (100%) rename Assets/Fungus/Portrait/Scripts/{ => Commands}/Portrait.cs.meta (100%) diff --git a/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs b/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs index ef348be0..2e0480b9 100644 --- a/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs +++ b/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs @@ -26,7 +26,6 @@ namespace Fungus protected virtual void OnEnable() { descriptionProp = serializedObject.FindProperty("description"); - defaultPortraitStageProp = serializedObject.FindProperty("defaultPortraitStage"); colorCommandsProp = serializedObject.FindProperty("colorCommands"); hideComponentsProp = serializedObject.FindProperty("hideComponents"); runSlowDurationProp = serializedObject.FindProperty("runSlowDuration"); @@ -42,7 +41,6 @@ namespace Fungus fungusScript.UpdateHideFlags(); EditorGUILayout.PropertyField(descriptionProp); - EditorGUILayout.PropertyField(defaultPortraitStageProp); EditorGUILayout.PropertyField(colorCommandsProp); EditorGUILayout.PropertyField(hideComponentsProp); EditorGUILayout.PropertyField(runSlowDurationProp); diff --git a/Assets/Fungus/Portrait/Editor/StageEditor.cs b/Assets/Fungus/Portrait/Editor/StageEditor.cs index 48a0bd22..858c2c5c 100644 --- a/Assets/Fungus/Portrait/Editor/StageEditor.cs +++ b/Assets/Fungus/Portrait/Editor/StageEditor.cs @@ -12,7 +12,7 @@ using Rotorz.ReorderableList; namespace Fungus { - [CustomEditor (typeof(Stage))] + [CustomEditor (typeof(ControlStage))] public class StageEditor : CommandEditor { protected SerializedProperty displayProp; @@ -36,7 +36,7 @@ namespace Fungus { serializedObject.Update(); - Stage t = target as Stage; + ControlStage t = target as ControlStage; // Format Enum names string[] displayLabels = StringFormatter.FormatEnumNames(t.display,""); diff --git a/Assets/Fungus/Portrait/Scripts/Commands.meta b/Assets/Fungus/Portrait/Scripts/Commands.meta new file mode 100644 index 00000000..f93c8d3b --- /dev/null +++ b/Assets/Fungus/Portrait/Scripts/Commands.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: d788ef66df2204e64bb317a89edbd1a7 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/Portrait/Scripts/Stage.cs b/Assets/Fungus/Portrait/Scripts/Commands/ControlStage.cs similarity index 98% rename from Assets/Fungus/Portrait/Scripts/Stage.cs rename to Assets/Fungus/Portrait/Scripts/Commands/ControlStage.cs index 5e4e61c8..8446b8da 100644 --- a/Assets/Fungus/Portrait/Scripts/Stage.cs +++ b/Assets/Fungus/Portrait/Scripts/Commands/ControlStage.cs @@ -19,9 +19,9 @@ namespace Fungus } [CommandInfo("Portrait", - "Stage", + "Control Stage", "Controls the stage on which character portraits are displayed.")] - public class Stage : Command + public class ControlStage : Command { [Tooltip("Display type")] public StageDisplayType display; diff --git a/Assets/Fungus/Portrait/Scripts/Stage.cs.meta b/Assets/Fungus/Portrait/Scripts/Commands/ControlStage.cs.meta similarity index 100% rename from Assets/Fungus/Portrait/Scripts/Stage.cs.meta rename to Assets/Fungus/Portrait/Scripts/Commands/ControlStage.cs.meta diff --git a/Assets/Fungus/Portrait/Scripts/Portrait.cs b/Assets/Fungus/Portrait/Scripts/Commands/Portrait.cs similarity index 100% rename from Assets/Fungus/Portrait/Scripts/Portrait.cs rename to Assets/Fungus/Portrait/Scripts/Commands/Portrait.cs diff --git a/Assets/Fungus/Portrait/Scripts/Portrait.cs.meta b/Assets/Fungus/Portrait/Scripts/Commands/Portrait.cs.meta similarity index 100% rename from Assets/Fungus/Portrait/Scripts/Portrait.cs.meta rename to Assets/Fungus/Portrait/Scripts/Commands/Portrait.cs.meta