diff --git a/Assets/Fungus/Audio/Scripts/Commands/ControlAudio.cs b/Assets/Fungus/Audio/Scripts/Commands/ControlAudio.cs index 50cc6dd1..8d8d5114 100644 --- a/Assets/Fungus/Audio/Scripts/Commands/ControlAudio.cs +++ b/Assets/Fungus/Audio/Scripts/Commands/ControlAudio.cs @@ -16,6 +16,7 @@ namespace Fungus StopLoop, ChangeVolume } + [Tooltip("What to do to audio")] public controlType control; @@ -33,6 +34,7 @@ namespace Fungus [Tooltip("Time to fade between current volume level and target volume level.")] public float fadeDuration; + [Tooltip("Wait until this command has finished before executing the next command.")] public bool waitUntilFinished = false; public override void OnEnter() diff --git a/Assets/Fungus/Flowchart/Scripts/Block.cs b/Assets/Fungus/Flowchart/Scripts/Block.cs index 87134cd9..431bfeb0 100644 --- a/Assets/Fungus/Flowchart/Scripts/Block.cs +++ b/Assets/Fungus/Flowchart/Scripts/Block.cs @@ -34,12 +34,14 @@ namespace Fungus public int itemId = -1; // Invalid flowchart item id [FormerlySerializedAs("sequenceName")] + [Tooltip("The name of the block node as displayed in the Flowchart window")] public string blockName = "New Block"; [TextArea(2, 5)] [Tooltip("Description text to display under the block node")] public string description = ""; + [Tooltip("An optional Event Handler which can execute the block when an event occurs")] public EventHandler eventHandler; [HideInInspector] diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/If.cs b/Assets/Fungus/Flowchart/Scripts/Commands/If.cs index b77df9c2..f610a37b 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/If.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/If.cs @@ -11,7 +11,6 @@ namespace Fungus [AddComponentMenu("")] public class If : Condition { - [Tooltip("Variable to use in expression")] [VariableProperty(typeof(BooleanVariable), typeof(IntegerVariable), diff --git a/Assets/Fungus/Narrative/Scripts/Commands/Menu.cs b/Assets/Fungus/Narrative/Scripts/Commands/Menu.cs index b1490b47..3d09be0e 100644 --- a/Assets/Fungus/Narrative/Scripts/Commands/Menu.cs +++ b/Assets/Fungus/Narrative/Scripts/Commands/Menu.cs @@ -9,20 +9,24 @@ namespace Fungus { [CommandInfo("Narrative", "Menu", - "Displays a multiple choice menu")] + "Displays a button in a multiple choice menu")] [AddComponentMenu("")] public class Menu : Command { + [Tooltip("Text to display on the menu button")] public string text = "Option Text"; [Tooltip("Notes about the option text for other authors, localization, etc.")] public string description = ""; [FormerlySerializedAs("targetSequence")] + [Tooltip("Block to execute when this option is selected")] public Block targetBlock; + [Tooltip("Hide this option if the target block has been executed previously")] public bool hideIfVisited; + [Tooltip("A custom Menu Dialog to use to display this menu. All subsequent Menu commands will use this dialog.")] public MenuDialog setMenuDialog; protected static bool eventSystemPresent; diff --git a/Assets/Fungus/Narrative/Scripts/Commands/Say.cs b/Assets/Fungus/Narrative/Scripts/Commands/Say.cs index 0a75aced..4a0077fe 100644 --- a/Assets/Fungus/Narrative/Scripts/Commands/Say.cs +++ b/Assets/Fungus/Narrative/Scripts/Commands/Say.cs @@ -11,6 +11,7 @@ namespace Fungus [AddComponentMenu("")] public class Say : Command { + // Removed this tooltip as users's reported it obscures the text box [TextArea(5,10)] public string storyText = ""; diff --git a/Assets/Fungus/Sprite/Scripts/Draggable2D.cs b/Assets/Fungus/Sprite/Scripts/Draggable2D.cs index b0d6813a..c3b58f2d 100644 --- a/Assets/Fungus/Sprite/Scripts/Draggable2D.cs +++ b/Assets/Fungus/Sprite/Scripts/Draggable2D.cs @@ -22,7 +22,7 @@ namespace Fungus [Tooltip("Time object takes to return to its starting position")] public float returnDuration = 1f; - Vector3 startingPosition; + protected Vector3 startingPosition; protected virtual void OnMouseDown() {