From 9c4a9ffa472fdf53cb7287913c84e93ed69511cc Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Wed, 15 Apr 2015 13:23:28 +0100 Subject: [PATCH] Reorganised scripting commands under scripting, flow and variables categories --- Assets/Fungus/Flowchart/Scripts/Commands/Break.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/Call.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/DeleteSaveKey.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/Else.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/ElseIf.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/End.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/If.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/Jump.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/Label.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/LoadScene.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/LoadVariable.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/RandomFloat.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/RandomInteger.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/Reset.cs | 4 ++-- Assets/Fungus/Flowchart/Scripts/Commands/SaveVariable.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/SendMessage.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/SetSaveProfile.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/SetVariable.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/Stop.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/Wait.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/While.cs | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/Break.cs b/Assets/Fungus/Flowchart/Scripts/Commands/Break.cs index 678ad02b..28dfb035 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/Break.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/Break.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Flow", "Break", "Force a loop to terminate immediately.")] [AddComponentMenu("")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/Call.cs b/Assets/Fungus/Flowchart/Scripts/Commands/Call.cs index 1e39f000..6075ffb3 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/Call.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/Call.cs @@ -7,7 +7,7 @@ using System; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Flow", "Call", "Execute another block in the same Flowchart.")] [AddComponentMenu("")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/DeleteSaveKey.cs b/Assets/Fungus/Flowchart/Scripts/Commands/DeleteSaveKey.cs index 14a5d40b..5d6baea1 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/DeleteSaveKey.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/DeleteSaveKey.cs @@ -4,7 +4,7 @@ using System.Collections; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Variables", "Delete Save Key", "Deletes a saved value from permanent storage.")] [AddComponentMenu("")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/Else.cs b/Assets/Fungus/Flowchart/Scripts/Commands/Else.cs index 8147030d..7fee9af5 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/Else.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/Else.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Flow", "Else", "Marks the start of a command block to be executed when the preceding If statement is False.")] [AddComponentMenu("")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/ElseIf.cs b/Assets/Fungus/Flowchart/Scripts/Commands/ElseIf.cs index c5a97fea..1c5205d7 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/ElseIf.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/ElseIf.cs @@ -6,7 +6,7 @@ using System; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Flow", "Else If", "Marks the start of a command block to be executed when the preceding If statement is False and the test expression is true.")] [AddComponentMenu("")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/End.cs b/Assets/Fungus/Flowchart/Scripts/Commands/End.cs index 45f9395d..93f3ec9e 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/End.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/End.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Flow", "End", "Marks the end of a conditional block.")] [AddComponentMenu("")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/If.cs b/Assets/Fungus/Flowchart/Scripts/Commands/If.cs index 3ee24b7e..b77df9c2 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/If.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/If.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Flow", "If", "If the test expression is true, execute the following command block.")] [AddComponentMenu("")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/Jump.cs b/Assets/Fungus/Flowchart/Scripts/Commands/Jump.cs index 07822beb..c2489821 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/Jump.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/Jump.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Flow", "Jump", "Move execution to a specific Label command")] [AddComponentMenu("")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/Label.cs b/Assets/Fungus/Flowchart/Scripts/Commands/Label.cs index 6e6ad0fe..5455f3de 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/Label.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/Label.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Flow", "Label", "Marks a position in the command list for execution to jump to.")] [AddComponentMenu("")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/LoadScene.cs b/Assets/Fungus/Flowchart/Scripts/Commands/LoadScene.cs index 3cb816f4..8fe57f47 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/LoadScene.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/LoadScene.cs @@ -4,7 +4,7 @@ using System.Collections; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Flow", "Load Scene", "Loads a new Unity scene and displays an optional loading image. This is useful " + "for splitting a large game across multiple scene files to reduce peak memory " + diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/LoadVariable.cs b/Assets/Fungus/Flowchart/Scripts/Commands/LoadVariable.cs index e3cf54ff..1465e1f8 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/LoadVariable.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/LoadVariable.cs @@ -4,7 +4,7 @@ using System.Collections; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Variables", "Load Variable", "Loads a saved value and stores it in a Boolean, Integer, Float or String variable. If the key is not found then the variable is not modified.")] [AddComponentMenu("")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/RandomFloat.cs b/Assets/Fungus/Flowchart/Scripts/Commands/RandomFloat.cs index a8b5a524..e3bbff11 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/RandomFloat.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/RandomFloat.cs @@ -3,7 +3,7 @@ using System.Collections; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Variables", "Random Float", "Sets an float variable to a random value in the defined range.")] [AddComponentMenu("")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/RandomInteger.cs b/Assets/Fungus/Flowchart/Scripts/Commands/RandomInteger.cs index 69d6b437..324967dd 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/RandomInteger.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/RandomInteger.cs @@ -3,7 +3,7 @@ using System.Collections; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Variables", "Random Integer", "Sets an integer variable to a random value in the defined range.")] [AddComponentMenu("")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/Reset.cs b/Assets/Fungus/Flowchart/Scripts/Commands/Reset.cs index cf1fd22b..b5c2744a 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/Reset.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/Reset.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Variables", "Reset", - "Resets the state of all commands and local and global variables in the Flowchart.")] + "Resets the state of all commands and variables in the Flowchart.")] [AddComponentMenu("")] public class Reset : Command { diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/SaveVariable.cs b/Assets/Fungus/Flowchart/Scripts/Commands/SaveVariable.cs index 87e7fb68..0533a531 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/SaveVariable.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/SaveVariable.cs @@ -4,7 +4,7 @@ using System.Collections; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Variables", "Save Variable", "Save an Boolean, Integer, Float or String variable to persistent storage using a string key. " + "The value can be loaded again later using the Load Variable command. You can also " + diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/SendMessage.cs b/Assets/Fungus/Flowchart/Scripts/Commands/SendMessage.cs index fccabbc7..30632f41 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/SendMessage.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/SendMessage.cs @@ -3,7 +3,7 @@ using System.Collections; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Flow", "Send Message", "Sends a message to either the owner Flowchart or all Flowcharts in the scene. Blocks can listen for this message to start execution.")] [AddComponentMenu("")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/SetSaveProfile.cs b/Assets/Fungus/Flowchart/Scripts/Commands/SetSaveProfile.cs index 7135b7eb..bccf761d 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/SetSaveProfile.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/SetSaveProfile.cs @@ -4,7 +4,7 @@ using System.Collections; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Variables", "Set Save Profile", "Sets the active profile that the Save Variable and Load Variable commands will use. This is useful to crete multiple player save games. Once set, the profile applies across all Flowcharts and will also persist across scene loads.")] [AddComponentMenu("")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/SetVariable.cs b/Assets/Fungus/Flowchart/Scripts/Commands/SetVariable.cs index 9a6235ba..882819b6 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/SetVariable.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/SetVariable.cs @@ -3,7 +3,7 @@ using System.Collections; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Variables", "Set Variable", "Sets a Boolean, Integer, Float or String variable to a new value using a simple arithmetic operation. The value can be a constant or reference another variable of the same type.")] [AddComponentMenu("")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/Stop.cs b/Assets/Fungus/Flowchart/Scripts/Commands/Stop.cs index d3cccec4..2dd1a837 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/Stop.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/Stop.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Flow", "Stop", "Stop executing the current Flowchart.")] [AddComponentMenu("")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/Wait.cs b/Assets/Fungus/Flowchart/Scripts/Commands/Wait.cs index 6301ac0b..35989a7b 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/Wait.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/Wait.cs @@ -4,7 +4,7 @@ using System.Collections; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Flow", "Wait", "Waits for period of time before executing the next command in the block.")] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/While.cs b/Assets/Fungus/Flowchart/Scripts/Commands/While.cs index bd9eb11f..325f9684 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/While.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/While.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; namespace Fungus { - [CommandInfo("Scripting", + [CommandInfo("Flow", "While", "Continuously loop through a block of commands while the condition is true. Use the Break command to force the loop to terminate immediately.")] [AddComponentMenu("")]