diff --git a/Assets/Fungus/Scripts/Commands/Break.cs b/Assets/Fungus/Scripts/Commands/Break.cs index 433d4bee..7e586f68 100644 --- a/Assets/Fungus/Scripts/Commands/Break.cs +++ b/Assets/Fungus/Scripts/Commands/Break.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Force a loop to terminate immediately. diff --git a/Assets/Fungus/Scripts/Commands/Call.cs b/Assets/Fungus/Scripts/Commands/Call.cs index 0464e5ec..8797af63 100644 --- a/Assets/Fungus/Scripts/Commands/Call.cs +++ b/Assets/Fungus/Scripts/Commands/Call.cs @@ -6,7 +6,7 @@ using UnityEngine.Serialization; using System.Collections.Generic; using System; -namespace Fungus +namespace Fungus.Commands { /// /// Execute another block in the same Flowchart as the command, or in a different Flowchart. diff --git a/Assets/Fungus/Scripts/Commands/CallMethod.cs b/Assets/Fungus/Scripts/Commands/CallMethod.cs index 4a0f096a..0088c79d 100644 --- a/Assets/Fungus/Scripts/Commands/CallMethod.cs +++ b/Assets/Fungus/Scripts/Commands/CallMethod.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Calls a named method on a GameObject using the GameObject.SendMessage() system. diff --git a/Assets/Fungus/Scripts/Commands/ClearMenu.cs b/Assets/Fungus/Scripts/Commands/ClearMenu.cs index 23f379f6..c2f9a8e3 100644 --- a/Assets/Fungus/Scripts/Commands/ClearMenu.cs +++ b/Assets/Fungus/Scripts/Commands/ClearMenu.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Clears the options from a menu dialogue. diff --git a/Assets/Fungus/Scripts/Commands/Comment.cs b/Assets/Fungus/Scripts/Commands/Comment.cs index 75cdd439..a217c074 100644 --- a/Assets/Fungus/Scripts/Commands/Comment.cs +++ b/Assets/Fungus/Scripts/Commands/Comment.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Use comments to record design notes and reminders about your game. diff --git a/Assets/Fungus/Scripts/Commands/Condition.cs b/Assets/Fungus/Scripts/Commands/Condition.cs index d785b610..d1e10336 100644 --- a/Assets/Fungus/Scripts/Commands/Condition.cs +++ b/Assets/Fungus/Scripts/Commands/Condition.cs @@ -3,18 +3,8 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { - public enum CompareOperator - { - Equals, // == - NotEquals, // != - LessThan, // < - GreaterThan, // > - LessThanOrEquals, // <= - GreaterThanOrEquals // >= - } - [AddComponentMenu("")] public abstract class Condition : Command { diff --git a/Assets/Fungus/Scripts/Commands/ControlAudio.cs b/Assets/Fungus/Scripts/Commands/ControlAudio.cs index ed9acd91..8dd076d3 100644 --- a/Assets/Fungus/Scripts/Commands/ControlAudio.cs +++ b/Assets/Fungus/Scripts/Commands/ControlAudio.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Plays, loops, or stops an audiosource. Any AudioSources with the same tag as the target Audio Source will automatically be stoped. diff --git a/Assets/Fungus/Scripts/Commands/ControlStage.cs b/Assets/Fungus/Scripts/Commands/ControlStage.cs index d0c43dbd..33be9830 100644 --- a/Assets/Fungus/Scripts/Commands/ControlStage.cs +++ b/Assets/Fungus/Scripts/Commands/ControlStage.cs @@ -2,13 +2,9 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using UnityEngine.UI; -using UnityEngine.Events; -using System; -using System.Collections; -using System.Collections.Generic; +using Fungus.Utils; -namespace Fungus +namespace Fungus.Commands { public enum StageDisplayType { diff --git a/Assets/Fungus/Scripts/Commands/ControlWithDisplay.cs b/Assets/Fungus/Scripts/Commands/ControlWithDisplay.cs index cb993733..36a8f2d7 100644 --- a/Assets/Fungus/Scripts/Commands/ControlWithDisplay.cs +++ b/Assets/Fungus/Scripts/Commands/ControlWithDisplay.cs @@ -4,7 +4,7 @@ using System; using UnityEngine; -namespace Fungus +namespace Fungus.Commands { public class ControlWithDisplay : Command { diff --git a/Assets/Fungus/Scripts/Commands/Conversation.cs b/Assets/Fungus/Scripts/Commands/Conversation.cs index f826af87..e0ff9cd9 100644 --- a/Assets/Fungus/Scripts/Commands/Conversation.cs +++ b/Assets/Fungus/Scripts/Commands/Conversation.cs @@ -3,8 +3,10 @@ using UnityEngine; using System.Collections; +using Fungus.Variables; +using Fungus.Utils; -namespace Fungus +namespace Fungus.Commands { /// /// Do multiple say and portrait commands in a single block of text. Format is: [character] [portrait] [stage position] [: Story text]. diff --git a/Assets/Fungus/Scripts/Commands/DebugLog.cs b/Assets/Fungus/Scripts/Commands/DebugLog.cs index 5d8ca659..f34b597d 100644 --- a/Assets/Fungus/Scripts/Commands/DebugLog.cs +++ b/Assets/Fungus/Scripts/Commands/DebugLog.cs @@ -2,8 +2,9 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Writes a log message to the debug console. diff --git a/Assets/Fungus/Scripts/Commands/DeleteSaveKey.cs b/Assets/Fungus/Scripts/Commands/DeleteSaveKey.cs index 7b75eca4..aae4b8db 100644 --- a/Assets/Fungus/Scripts/Commands/DeleteSaveKey.cs +++ b/Assets/Fungus/Scripts/Commands/DeleteSaveKey.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Deletes a saved value from permanent storage. diff --git a/Assets/Fungus/Scripts/Commands/Destroy.cs b/Assets/Fungus/Scripts/Commands/Destroy.cs index 9a50d81b..2333ebfc 100644 --- a/Assets/Fungus/Scripts/Commands/Destroy.cs +++ b/Assets/Fungus/Scripts/Commands/Destroy.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Destroys a specified game object in the scene. diff --git a/Assets/Fungus/Scripts/Commands/Else.cs b/Assets/Fungus/Scripts/Commands/Else.cs index 35604e53..6b39c927 100644 --- a/Assets/Fungus/Scripts/Commands/Else.cs +++ b/Assets/Fungus/Scripts/Commands/Else.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Marks the start of a command block to be executed when the preceding If statement is False. diff --git a/Assets/Fungus/Scripts/Commands/ElseIf.cs b/Assets/Fungus/Scripts/Commands/ElseIf.cs index 2f01c480..1e1a118f 100644 --- a/Assets/Fungus/Scripts/Commands/ElseIf.cs +++ b/Assets/Fungus/Scripts/Commands/ElseIf.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Marks the start of a command block to be executed when the preceding If statement is False and the test expression is true. diff --git a/Assets/Fungus/Scripts/Commands/End.cs b/Assets/Fungus/Scripts/Commands/End.cs index 890f20ed..8af8d487 100644 --- a/Assets/Fungus/Scripts/Commands/End.cs +++ b/Assets/Fungus/Scripts/Commands/End.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Marks the end of a conditional block. diff --git a/Assets/Fungus/Scripts/Commands/ExecuteLua.cs b/Assets/Fungus/Scripts/Commands/ExecuteLua.cs index 359bf425..3f346ec1 100644 --- a/Assets/Fungus/Scripts/Commands/ExecuteLua.cs +++ b/Assets/Fungus/Scripts/Commands/ExecuteLua.cs @@ -2,10 +2,11 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus; using MoonSharp.Interpreter; +using Fungus; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Executes a Lua code chunk using a Lua Environment. diff --git a/Assets/Fungus/Scripts/Commands/FadeScreen.cs b/Assets/Fungus/Scripts/Commands/FadeScreen.cs index a0316755..877d6dbe 100644 --- a/Assets/Fungus/Scripts/Commands/FadeScreen.cs +++ b/Assets/Fungus/Scripts/Commands/FadeScreen.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Draws a fullscreen texture over the scene to give a fade effect. Setting Target Alpha to 1 will obscure the screen, alpha 0 will reveal the screen. diff --git a/Assets/Fungus/Scripts/Commands/FadeSprite.cs b/Assets/Fungus/Scripts/Commands/FadeSprite.cs index fcae03ab..f3f8a1d3 100644 --- a/Assets/Fungus/Scripts/Commands/FadeSprite.cs +++ b/Assets/Fungus/Scripts/Commands/FadeSprite.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Fades a sprite to a target color over a period of time. diff --git a/Assets/Fungus/Scripts/Commands/FadeToView.cs b/Assets/Fungus/Scripts/Commands/FadeToView.cs index 6273d0f2..d653df4f 100644 --- a/Assets/Fungus/Scripts/Commands/FadeToView.cs +++ b/Assets/Fungus/Scripts/Commands/FadeToView.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Fades the camera out and in again at a position specified by a View object. diff --git a/Assets/Fungus/Scripts/Commands/FadeUI.cs b/Assets/Fungus/Scripts/Commands/FadeUI.cs index 604292d1..aff71a0f 100644 --- a/Assets/Fungus/Scripts/Commands/FadeUI.cs +++ b/Assets/Fungus/Scripts/Commands/FadeUI.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.UI; using Fungus; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Fades a UI object. diff --git a/Assets/Fungus/Scripts/Commands/Fullscreen.cs b/Assets/Fungus/Scripts/Commands/Fullscreen.cs index fd299faf..0b7f6979 100644 --- a/Assets/Fungus/Scripts/Commands/Fullscreen.cs +++ b/Assets/Fungus/Scripts/Commands/Fullscreen.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Sets the application to fullscreen, windowed or toggles the current state. diff --git a/Assets/Fungus/Scripts/Commands/GetText.cs b/Assets/Fungus/Scripts/Commands/GetText.cs index a074aeee..b9d535dc 100644 --- a/Assets/Fungus/Scripts/Commands/GetText.cs +++ b/Assets/Fungus/Scripts/Commands/GetText.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.UI; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Gets the text property from a UI Text object and stores it in a string variable. diff --git a/Assets/Fungus/Scripts/Commands/If.cs b/Assets/Fungus/Scripts/Commands/If.cs index 52b98ce0..0456934d 100644 --- a/Assets/Fungus/Scripts/Commands/If.cs +++ b/Assets/Fungus/Scripts/Commands/If.cs @@ -2,8 +2,9 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// If the test expression is true, execute the following command block. diff --git a/Assets/Fungus/Scripts/Commands/InvokeEvent.cs b/Assets/Fungus/Scripts/Commands/InvokeEvent.cs index 43d1c2aa..f9a115ad 100644 --- a/Assets/Fungus/Scripts/Commands/InvokeEvent.cs +++ b/Assets/Fungus/Scripts/Commands/InvokeEvent.cs @@ -4,8 +4,9 @@ using UnityEngine; using System; using UnityEngine.Events; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Calls a list of component methods via the Unity Event System (as used in the Unity UI) diff --git a/Assets/Fungus/Scripts/Commands/InvokeMethod.cs b/Assets/Fungus/Scripts/Commands/InvokeMethod.cs index 81ad628a..82226680 100644 --- a/Assets/Fungus/Scripts/Commands/InvokeMethod.cs +++ b/Assets/Fungus/Scripts/Commands/InvokeMethod.cs @@ -8,8 +8,9 @@ using System.Collections.Generic; using System; using UnityEngine.Events; using MarkerMetro.Unity.WinLegacy.Reflection; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Invokes a method of a component via reflection. Supports passing multiple parameters and storing returned values in a Fungus variable. diff --git a/Assets/Fungus/Scripts/Commands/Jump.cs b/Assets/Fungus/Scripts/Commands/Jump.cs index 65b193e6..4c63477c 100644 --- a/Assets/Fungus/Scripts/Commands/Jump.cs +++ b/Assets/Fungus/Scripts/Commands/Jump.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Move execution to a specific Label command in the same block. diff --git a/Assets/Fungus/Scripts/Commands/Label.cs b/Assets/Fungus/Scripts/Commands/Label.cs index b4aaa1b2..da76c909 100644 --- a/Assets/Fungus/Scripts/Commands/Label.cs +++ b/Assets/Fungus/Scripts/Commands/Label.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Marks a position in the command list for execution to jump to. diff --git a/Assets/Fungus/Scripts/Commands/LoadScene.cs b/Assets/Fungus/Scripts/Commands/LoadScene.cs index 2d5ef658..5d41d36d 100644 --- a/Assets/Fungus/Scripts/Commands/LoadScene.cs +++ b/Assets/Fungus/Scripts/Commands/LoadScene.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Loads a new Unity scene and displays an optional loading image. This is useful diff --git a/Assets/Fungus/Scripts/Commands/LoadVariable.cs b/Assets/Fungus/Scripts/Commands/LoadVariable.cs index d5f277ed..16718cd2 100644 --- a/Assets/Fungus/Scripts/Commands/LoadVariable.cs +++ b/Assets/Fungus/Scripts/Commands/LoadVariable.cs @@ -2,8 +2,9 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// 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. diff --git a/Assets/Fungus/Scripts/Commands/LookFrom.cs b/Assets/Fungus/Scripts/Commands/LookFrom.cs index 3a875079..52d8f1e3 100644 --- a/Assets/Fungus/Scripts/Commands/LookFrom.cs +++ b/Assets/Fungus/Scripts/Commands/LookFrom.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Instantly rotates a GameObject to look at the supplied Vector3 then returns it to it's starting rotation over time. diff --git a/Assets/Fungus/Scripts/Commands/LookTo.cs b/Assets/Fungus/Scripts/Commands/LookTo.cs index 50f93afc..3f0b0058 100644 --- a/Assets/Fungus/Scripts/Commands/LookTo.cs +++ b/Assets/Fungus/Scripts/Commands/LookTo.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Rotates a GameObject to look at a supplied Transform or Vector3 over time. diff --git a/Assets/Fungus/Scripts/Commands/Menu.cs b/Assets/Fungus/Scripts/Commands/Menu.cs index 845a62a5..377faaa4 100644 --- a/Assets/Fungus/Scripts/Commands/Menu.cs +++ b/Assets/Fungus/Scripts/Commands/Menu.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections.Generic; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Displays a button in a multiple choice menu. diff --git a/Assets/Fungus/Scripts/Commands/MenuTimer.cs b/Assets/Fungus/Scripts/Commands/MenuTimer.cs index 4e17ed81..bdca678f 100644 --- a/Assets/Fungus/Scripts/Commands/MenuTimer.cs +++ b/Assets/Fungus/Scripts/Commands/MenuTimer.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections.Generic; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Displays a timer bar and executes a target block if the player fails to select a menu option in time. diff --git a/Assets/Fungus/Scripts/Commands/MoveAdd.cs b/Assets/Fungus/Scripts/Commands/MoveAdd.cs index 0a9f82c2..afbb729e 100644 --- a/Assets/Fungus/Scripts/Commands/MoveAdd.cs +++ b/Assets/Fungus/Scripts/Commands/MoveAdd.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Moves a game object by a specified offset over time. diff --git a/Assets/Fungus/Scripts/Commands/MoveFrom.cs b/Assets/Fungus/Scripts/Commands/MoveFrom.cs index 047e5e4c..2bb75a90 100644 --- a/Assets/Fungus/Scripts/Commands/MoveFrom.cs +++ b/Assets/Fungus/Scripts/Commands/MoveFrom.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Moves a game object from a specified position back to its starting position over time. The position can be defined by a transform in another object (using To Transform) or by setting an absolute position (using To Position, if To Transform is set to None). diff --git a/Assets/Fungus/Scripts/Commands/MoveTo.cs b/Assets/Fungus/Scripts/Commands/MoveTo.cs index dceb0bbf..94214f4d 100644 --- a/Assets/Fungus/Scripts/Commands/MoveTo.cs +++ b/Assets/Fungus/Scripts/Commands/MoveTo.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Moves a game object to a specified position over time. The position can be defined by a transform in another object (using To Transform) or by setting an absolute position (using To Position, if To Transform is set to None). diff --git a/Assets/Fungus/Scripts/Commands/MoveToView.cs b/Assets/Fungus/Scripts/Commands/MoveToView.cs index 7649f62b..18f2a5c7 100644 --- a/Assets/Fungus/Scripts/Commands/MoveToView.cs +++ b/Assets/Fungus/Scripts/Commands/MoveToView.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Moves the camera to a location specified by a View object. diff --git a/Assets/Fungus/Scripts/Commands/OpenURL.cs b/Assets/Fungus/Scripts/Commands/OpenURL.cs index 5054b81b..5f982170 100644 --- a/Assets/Fungus/Scripts/Commands/OpenURL.cs +++ b/Assets/Fungus/Scripts/Commands/OpenURL.cs @@ -3,8 +3,9 @@ using UnityEngine; using Fungus; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Opens the specified URL in the browser. diff --git a/Assets/Fungus/Scripts/Commands/PlayAnimState.cs b/Assets/Fungus/Scripts/Commands/PlayAnimState.cs index f6f31d24..c4e79a26 100644 --- a/Assets/Fungus/Scripts/Commands/PlayAnimState.cs +++ b/Assets/Fungus/Scripts/Commands/PlayAnimState.cs @@ -2,8 +2,9 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Plays a state of an animator according to the state name. diff --git a/Assets/Fungus/Scripts/Commands/PlayMusic.cs b/Assets/Fungus/Scripts/Commands/PlayMusic.cs index 8a00509b..e3fc5760 100644 --- a/Assets/Fungus/Scripts/Commands/PlayMusic.cs +++ b/Assets/Fungus/Scripts/Commands/PlayMusic.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Plays looping game music. If any game music is already playing, it is stopped. Game music will continue playing across scene loads. diff --git a/Assets/Fungus/Scripts/Commands/PlaySound.cs b/Assets/Fungus/Scripts/Commands/PlaySound.cs index ddc23318..2fa09327 100644 --- a/Assets/Fungus/Scripts/Commands/PlaySound.cs +++ b/Assets/Fungus/Scripts/Commands/PlaySound.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Plays a once-off sound effect. Multiple sound effects can be played at the same time. diff --git a/Assets/Fungus/Scripts/Commands/PlayUsfxrSound.cs b/Assets/Fungus/Scripts/Commands/PlayUsfxrSound.cs index b6802fb8..87ab88ca 100644 --- a/Assets/Fungus/Scripts/Commands/PlayUsfxrSound.cs +++ b/Assets/Fungus/Scripts/Commands/PlayUsfxrSound.cs @@ -4,8 +4,9 @@ using System; using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Plays a usfxr synth sound. Use the usfxr editor [Tools > Fungus > Utilities > Generate usfxr Sound Effects] to create the SettingsString. Set a ParentTransform if using positional sound. See https://github.com/zeh/usfxr for more information about usfxr. diff --git a/Assets/Fungus/Scripts/Commands/Portrait.cs b/Assets/Fungus/Scripts/Commands/Portrait.cs index 4e119220..4e6bcf4e 100644 --- a/Assets/Fungus/Scripts/Commands/Portrait.cs +++ b/Assets/Fungus/Scripts/Commands/Portrait.cs @@ -2,8 +2,9 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; +using Fungus.Utils; -namespace Fungus +namespace Fungus.Commands { /// /// Controls a character portrait. diff --git a/Assets/Fungus/Scripts/Commands/PunchPosition.cs b/Assets/Fungus/Scripts/Commands/PunchPosition.cs index 812f8a4a..54641709 100644 --- a/Assets/Fungus/Scripts/Commands/PunchPosition.cs +++ b/Assets/Fungus/Scripts/Commands/PunchPosition.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Applies a jolt of force to a GameObject's position and wobbles it back to its initial position. diff --git a/Assets/Fungus/Scripts/Commands/PunchRotation.cs b/Assets/Fungus/Scripts/Commands/PunchRotation.cs index 2eadace1..2b2ea475 100644 --- a/Assets/Fungus/Scripts/Commands/PunchRotation.cs +++ b/Assets/Fungus/Scripts/Commands/PunchRotation.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Applies a jolt of force to a GameObject's rotation and wobbles it back to its initial rotation. diff --git a/Assets/Fungus/Scripts/Commands/PunchScale.cs b/Assets/Fungus/Scripts/Commands/PunchScale.cs index b68ff791..1507f54e 100644 --- a/Assets/Fungus/Scripts/Commands/PunchScale.cs +++ b/Assets/Fungus/Scripts/Commands/PunchScale.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Applies a jolt of force to a GameObject's scale and wobbles it back to its initial scale. diff --git a/Assets/Fungus/Scripts/Commands/Quit.cs b/Assets/Fungus/Scripts/Commands/Quit.cs index c183172f..041843ed 100644 --- a/Assets/Fungus/Scripts/Commands/Quit.cs +++ b/Assets/Fungus/Scripts/Commands/Quit.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Quits the application. Does not work in Editor or Webplayer builds. Shouldn't generally be used on iOS. diff --git a/Assets/Fungus/Scripts/Commands/RandomFloat.cs b/Assets/Fungus/Scripts/Commands/RandomFloat.cs index ee5da463..0aead1be 100644 --- a/Assets/Fungus/Scripts/Commands/RandomFloat.cs +++ b/Assets/Fungus/Scripts/Commands/RandomFloat.cs @@ -2,8 +2,9 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Sets an float variable to a random value in the defined range. diff --git a/Assets/Fungus/Scripts/Commands/RandomInteger.cs b/Assets/Fungus/Scripts/Commands/RandomInteger.cs index e2ceddbc..1515541c 100644 --- a/Assets/Fungus/Scripts/Commands/RandomInteger.cs +++ b/Assets/Fungus/Scripts/Commands/RandomInteger.cs @@ -2,8 +2,9 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Sets an integer variable to a random value in the defined range. diff --git a/Assets/Fungus/Scripts/Commands/ReadTextFile.cs b/Assets/Fungus/Scripts/Commands/ReadTextFile.cs index 79d8815d..10397bcd 100644 --- a/Assets/Fungus/Scripts/Commands/ReadTextFile.cs +++ b/Assets/Fungus/Scripts/Commands/ReadTextFile.cs @@ -3,8 +3,9 @@ using UnityEngine; using Fungus; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Reads in a text file and stores the contents in a string variable. diff --git a/Assets/Fungus/Scripts/Commands/Reset.cs b/Assets/Fungus/Scripts/Commands/Reset.cs index fd7ed387..e6e6d728 100644 --- a/Assets/Fungus/Scripts/Commands/Reset.cs +++ b/Assets/Fungus/Scripts/Commands/Reset.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Resets the state of all commands and variables in the Flowchart. diff --git a/Assets/Fungus/Scripts/Commands/ResetAnimTrigger.cs b/Assets/Fungus/Scripts/Commands/ResetAnimTrigger.cs index f33c37ea..3ecab22b 100644 --- a/Assets/Fungus/Scripts/Commands/ResetAnimTrigger.cs +++ b/Assets/Fungus/Scripts/Commands/ResetAnimTrigger.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Resets a trigger parameter on an Animator component. diff --git a/Assets/Fungus/Scripts/Commands/RotateAdd.cs b/Assets/Fungus/Scripts/Commands/RotateAdd.cs index ddbca940..a0a3ec43 100644 --- a/Assets/Fungus/Scripts/Commands/RotateAdd.cs +++ b/Assets/Fungus/Scripts/Commands/RotateAdd.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Rotates a game object by the specified angles over time. diff --git a/Assets/Fungus/Scripts/Commands/RotateFrom.cs b/Assets/Fungus/Scripts/Commands/RotateFrom.cs index 95737ea1..8ec7db27 100644 --- a/Assets/Fungus/Scripts/Commands/RotateFrom.cs +++ b/Assets/Fungus/Scripts/Commands/RotateFrom.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Rotates a game object from the specified angles back to its starting orientation over time. diff --git a/Assets/Fungus/Scripts/Commands/RotateTo.cs b/Assets/Fungus/Scripts/Commands/RotateTo.cs index b6c964b2..e5dfadcc 100644 --- a/Assets/Fungus/Scripts/Commands/RotateTo.cs +++ b/Assets/Fungus/Scripts/Commands/RotateTo.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Rotates a game object to the specified angles over time. diff --git a/Assets/Fungus/Scripts/Commands/SaveVariable.cs b/Assets/Fungus/Scripts/Commands/SaveVariable.cs index f7da07f2..bdca4c3a 100644 --- a/Assets/Fungus/Scripts/Commands/SaveVariable.cs +++ b/Assets/Fungus/Scripts/Commands/SaveVariable.cs @@ -2,8 +2,9 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Save an Boolean, Integer, Float or String variable to persistent storage using a string key. diff --git a/Assets/Fungus/Scripts/Commands/Say.cs b/Assets/Fungus/Scripts/Commands/Say.cs index def5cfec..2e660900 100644 --- a/Assets/Fungus/Scripts/Commands/Say.cs +++ b/Assets/Fungus/Scripts/Commands/Say.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Writes text in a dialog box. diff --git a/Assets/Fungus/Scripts/Commands/ScaleAdd.cs b/Assets/Fungus/Scripts/Commands/ScaleAdd.cs index d149a188..1083d457 100644 --- a/Assets/Fungus/Scripts/Commands/ScaleAdd.cs +++ b/Assets/Fungus/Scripts/Commands/ScaleAdd.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Changes a game object's scale by a specified offset over time. diff --git a/Assets/Fungus/Scripts/Commands/ScaleFrom.cs b/Assets/Fungus/Scripts/Commands/ScaleFrom.cs index 863bbc93..483ed2d0 100644 --- a/Assets/Fungus/Scripts/Commands/ScaleFrom.cs +++ b/Assets/Fungus/Scripts/Commands/ScaleFrom.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Changes a game object's scale to the specified value and back to its original scale over time. diff --git a/Assets/Fungus/Scripts/Commands/ScaleTo.cs b/Assets/Fungus/Scripts/Commands/ScaleTo.cs index df663fe1..6a34268e 100644 --- a/Assets/Fungus/Scripts/Commands/ScaleTo.cs +++ b/Assets/Fungus/Scripts/Commands/ScaleTo.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Changes a game object's scale to a specified value over time. diff --git a/Assets/Fungus/Scripts/Commands/SendMessage.cs b/Assets/Fungus/Scripts/Commands/SendMessage.cs index ec5ca954..f87b4340 100644 --- a/Assets/Fungus/Scripts/Commands/SendMessage.cs +++ b/Assets/Fungus/Scripts/Commands/SendMessage.cs @@ -3,8 +3,10 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; +using Fungus.EventHandlers; -namespace Fungus +namespace Fungus.Commands { /// /// Sends a message to either the owner Flowchart or all Flowcharts in the scene. Blocks can listen for this message using a Message Received event handler. diff --git a/Assets/Fungus/Scripts/Commands/SetActive.cs b/Assets/Fungus/Scripts/Commands/SetActive.cs index 23e509e5..27feb641 100644 --- a/Assets/Fungus/Scripts/Commands/SetActive.cs +++ b/Assets/Fungus/Scripts/Commands/SetActive.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Sets a game object in the scene to be active / inactive. diff --git a/Assets/Fungus/Scripts/Commands/SetAnimBool.cs b/Assets/Fungus/Scripts/Commands/SetAnimBool.cs index 51f98e42..8e4fb946 100644 --- a/Assets/Fungus/Scripts/Commands/SetAnimBool.cs +++ b/Assets/Fungus/Scripts/Commands/SetAnimBool.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Sets a boolean parameter on an Animator component to control a Unity animation" diff --git a/Assets/Fungus/Scripts/Commands/SetAnimFloat.cs b/Assets/Fungus/Scripts/Commands/SetAnimFloat.cs index 9def4753..13c1add6 100644 --- a/Assets/Fungus/Scripts/Commands/SetAnimFloat.cs +++ b/Assets/Fungus/Scripts/Commands/SetAnimFloat.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Sets a float parameter on an Animator component to control a Unity animation. diff --git a/Assets/Fungus/Scripts/Commands/SetAnimInteger.cs b/Assets/Fungus/Scripts/Commands/SetAnimInteger.cs index 322928ce..21e4cde9 100644 --- a/Assets/Fungus/Scripts/Commands/SetAnimInteger.cs +++ b/Assets/Fungus/Scripts/Commands/SetAnimInteger.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Sets an integer parameter on an Animator component to control a Unity animation. diff --git a/Assets/Fungus/Scripts/Commands/SetAnimTrigger.cs b/Assets/Fungus/Scripts/Commands/SetAnimTrigger.cs index 80120ec6..262ab3d7 100644 --- a/Assets/Fungus/Scripts/Commands/SetAnimTrigger.cs +++ b/Assets/Fungus/Scripts/Commands/SetAnimTrigger.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Sets a trigger parameter on an Animator component to control a Unity animation. diff --git a/Assets/Fungus/Scripts/Commands/SetAudioPitch.cs b/Assets/Fungus/Scripts/Commands/SetAudioPitch.cs index 6cff8015..584ca98e 100644 --- a/Assets/Fungus/Scripts/Commands/SetAudioPitch.cs +++ b/Assets/Fungus/Scripts/Commands/SetAudioPitch.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Sets the global pitch level for audio played with Play Music and Play Sound commands. diff --git a/Assets/Fungus/Scripts/Commands/SetAudioVolume.cs b/Assets/Fungus/Scripts/Commands/SetAudioVolume.cs index c646488f..0cc33d48 100644 --- a/Assets/Fungus/Scripts/Commands/SetAudioVolume.cs +++ b/Assets/Fungus/Scripts/Commands/SetAudioVolume.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Sets the global volume level for audio played with Play Music and Play Sound commands. diff --git a/Assets/Fungus/Scripts/Commands/SetClickable2D.cs b/Assets/Fungus/Scripts/Commands/SetClickable2D.cs index db4068f8..9866ce52 100644 --- a/Assets/Fungus/Scripts/Commands/SetClickable2D.cs +++ b/Assets/Fungus/Scripts/Commands/SetClickable2D.cs @@ -2,8 +2,9 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Sets a Clickable2D component to be clickable / non-clickable. diff --git a/Assets/Fungus/Scripts/Commands/SetCollider.cs b/Assets/Fungus/Scripts/Commands/SetCollider.cs index b6bfcb94..5d5eaaf3 100644 --- a/Assets/Fungus/Scripts/Commands/SetCollider.cs +++ b/Assets/Fungus/Scripts/Commands/SetCollider.cs @@ -3,8 +3,9 @@ using UnityEngine; using System.Collections.Generic; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Sets all collider (2d or 3d) components on the target objects to be active / inactive. diff --git a/Assets/Fungus/Scripts/Commands/SetDraggable2D.cs b/Assets/Fungus/Scripts/Commands/SetDraggable2D.cs index 6006f333..544e51f4 100644 --- a/Assets/Fungus/Scripts/Commands/SetDraggable2D.cs +++ b/Assets/Fungus/Scripts/Commands/SetDraggable2D.cs @@ -2,8 +2,9 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Sets a Draggable2D component to be draggable / non-draggable. diff --git a/Assets/Fungus/Scripts/Commands/SetInteractable.cs b/Assets/Fungus/Scripts/Commands/SetInteractable.cs index 5357c2ab..1767a27e 100644 --- a/Assets/Fungus/Scripts/Commands/SetInteractable.cs +++ b/Assets/Fungus/Scripts/Commands/SetInteractable.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.UI; using System.Collections.Generic; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Set the interactable state of selectable objects. diff --git a/Assets/Fungus/Scripts/Commands/SetLanguage.cs b/Assets/Fungus/Scripts/Commands/SetLanguage.cs index a3c42f29..49195695 100644 --- a/Assets/Fungus/Scripts/Commands/SetLanguage.cs +++ b/Assets/Fungus/Scripts/Commands/SetLanguage.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Set the active language for the scene. A Localization object with a localization file must be present in the scene. diff --git a/Assets/Fungus/Scripts/Commands/SetLayerOrder.cs b/Assets/Fungus/Scripts/Commands/SetLayerOrder.cs index 2712d1a5..65023378 100644 --- a/Assets/Fungus/Scripts/Commands/SetLayerOrder.cs +++ b/Assets/Fungus/Scripts/Commands/SetLayerOrder.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Sets the Renderer sorting layer of every child of a game object. Applies to all Renderers (including mesh, skinned mesh, and sprite). diff --git a/Assets/Fungus/Scripts/Commands/SetMenuDialog.cs b/Assets/Fungus/Scripts/Commands/SetMenuDialog.cs index 884dccf0..152191f1 100644 --- a/Assets/Fungus/Scripts/Commands/SetMenuDialog.cs +++ b/Assets/Fungus/Scripts/Commands/SetMenuDialog.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Sets a custom menu dialog to use when displaying multiple choice menus. diff --git a/Assets/Fungus/Scripts/Commands/SetMouseCursor.cs b/Assets/Fungus/Scripts/Commands/SetMouseCursor.cs index 27361f1a..e847fa06 100644 --- a/Assets/Fungus/Scripts/Commands/SetMouseCursor.cs +++ b/Assets/Fungus/Scripts/Commands/SetMouseCursor.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Sets the mouse cursor sprite. diff --git a/Assets/Fungus/Scripts/Commands/SetSaveProfile.cs b/Assets/Fungus/Scripts/Commands/SetSaveProfile.cs index 374a0a31..bcf56096 100644 --- a/Assets/Fungus/Scripts/Commands/SetSaveProfile.cs +++ b/Assets/Fungus/Scripts/Commands/SetSaveProfile.cs @@ -5,7 +5,7 @@ using UnityEngine; using System; using System.Collections; -namespace Fungus +namespace Fungus.Commands { /// /// 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. diff --git a/Assets/Fungus/Scripts/Commands/SetSayDialog.cs b/Assets/Fungus/Scripts/Commands/SetSayDialog.cs index e507e7be..cb088169 100644 --- a/Assets/Fungus/Scripts/Commands/SetSayDialog.cs +++ b/Assets/Fungus/Scripts/Commands/SetSayDialog.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Sets a custom say dialog to use when displaying story text. diff --git a/Assets/Fungus/Scripts/Commands/SetSliderValue.cs b/Assets/Fungus/Scripts/Commands/SetSliderValue.cs index 52da60b5..56577404 100644 --- a/Assets/Fungus/Scripts/Commands/SetSliderValue.cs +++ b/Assets/Fungus/Scripts/Commands/SetSliderValue.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.UI; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Sets the value property of a slider object. diff --git a/Assets/Fungus/Scripts/Commands/SetSpriteOrder.cs b/Assets/Fungus/Scripts/Commands/SetSpriteOrder.cs index 06f615f1..20a928dc 100644 --- a/Assets/Fungus/Scripts/Commands/SetSpriteOrder.cs +++ b/Assets/Fungus/Scripts/Commands/SetSpriteOrder.cs @@ -3,8 +3,9 @@ using UnityEngine; using System.Collections.Generic; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Controls the render order of sprites by setting the Order In Layer property of a list of sprites. diff --git a/Assets/Fungus/Scripts/Commands/SetText.cs b/Assets/Fungus/Scripts/Commands/SetText.cs index 34893fab..0dbc3140 100644 --- a/Assets/Fungus/Scripts/Commands/SetText.cs +++ b/Assets/Fungus/Scripts/Commands/SetText.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.UI; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Sets the text property on a UI Text object and/or an Input Field object. diff --git a/Assets/Fungus/Scripts/Commands/SetVariable.cs b/Assets/Fungus/Scripts/Commands/SetVariable.cs index 9c4dcd93..02122b80 100644 --- a/Assets/Fungus/Scripts/Commands/SetVariable.cs +++ b/Assets/Fungus/Scripts/Commands/SetVariable.cs @@ -2,8 +2,9 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// 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. diff --git a/Assets/Fungus/Scripts/Commands/ShakeCamera.cs b/Assets/Fungus/Scripts/Commands/ShakeCamera.cs index f45b44be..f5163178 100644 --- a/Assets/Fungus/Scripts/Commands/ShakeCamera.cs +++ b/Assets/Fungus/Scripts/Commands/ShakeCamera.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus +namespace Fungus.Commands { /// /// Applies a camera shake effect to the main camera. diff --git a/Assets/Fungus/Scripts/Commands/ShakePosition.cs b/Assets/Fungus/Scripts/Commands/ShakePosition.cs index 0f1558b5..6c359430 100644 --- a/Assets/Fungus/Scripts/Commands/ShakePosition.cs +++ b/Assets/Fungus/Scripts/Commands/ShakePosition.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Randomly shakes a GameObject's position by a diminishing amount over time. diff --git a/Assets/Fungus/Scripts/Commands/ShakeRotation.cs b/Assets/Fungus/Scripts/Commands/ShakeRotation.cs index d3f96cdc..152ee22f 100644 --- a/Assets/Fungus/Scripts/Commands/ShakeRotation.cs +++ b/Assets/Fungus/Scripts/Commands/ShakeRotation.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Randomly shakes a GameObject's rotation by a diminishing amount over time. diff --git a/Assets/Fungus/Scripts/Commands/ShakeScale.cs b/Assets/Fungus/Scripts/Commands/ShakeScale.cs index c662a5d8..a92ea72a 100644 --- a/Assets/Fungus/Scripts/Commands/ShakeScale.cs +++ b/Assets/Fungus/Scripts/Commands/ShakeScale.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Randomly shakes a GameObject's rotation by a diminishing amount over time. diff --git a/Assets/Fungus/Scripts/Commands/ShowSprite.cs b/Assets/Fungus/Scripts/Commands/ShowSprite.cs index abec738e..cf854b6c 100644 --- a/Assets/Fungus/Scripts/Commands/ShowSprite.cs +++ b/Assets/Fungus/Scripts/Commands/ShowSprite.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Makes a sprite visible / invisible by setting the color alpha. diff --git a/Assets/Fungus/Scripts/Commands/SpawnObject.cs b/Assets/Fungus/Scripts/Commands/SpawnObject.cs index fc487cb1..18211b7f 100644 --- a/Assets/Fungus/Scripts/Commands/SpawnObject.cs +++ b/Assets/Fungus/Scripts/Commands/SpawnObject.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Spawns a new object based on a reference to a scene or prefab game object. diff --git a/Assets/Fungus/Scripts/Commands/StartSwipe.cs b/Assets/Fungus/Scripts/Commands/StartSwipe.cs index 57a76291..f7d311b7 100644 --- a/Assets/Fungus/Scripts/Commands/StartSwipe.cs +++ b/Assets/Fungus/Scripts/Commands/StartSwipe.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Activates swipe panning mode where the player can pan the camera within the area between viewA & viewB. diff --git a/Assets/Fungus/Scripts/Commands/Stop.cs b/Assets/Fungus/Scripts/Commands/Stop.cs index 4a2669ac..0be1acdc 100644 --- a/Assets/Fungus/Scripts/Commands/Stop.cs +++ b/Assets/Fungus/Scripts/Commands/Stop.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Stop executing the Block that contains this command. diff --git a/Assets/Fungus/Scripts/Commands/StopBlock.cs b/Assets/Fungus/Scripts/Commands/StopBlock.cs index 8d40e98e..c04dee4f 100644 --- a/Assets/Fungus/Scripts/Commands/StopBlock.cs +++ b/Assets/Fungus/Scripts/Commands/StopBlock.cs @@ -2,8 +2,9 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Stops executing the named Block. diff --git a/Assets/Fungus/Scripts/Commands/StopFlowchart.cs b/Assets/Fungus/Scripts/Commands/StopFlowchart.cs index 41c012cc..31ad961f 100644 --- a/Assets/Fungus/Scripts/Commands/StopFlowchart.cs +++ b/Assets/Fungus/Scripts/Commands/StopFlowchart.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections.Generic; -namespace Fungus +namespace Fungus.Commands { /// /// Stops execution of all Blocks in a Flowchart. diff --git a/Assets/Fungus/Scripts/Commands/StopMusic.cs b/Assets/Fungus/Scripts/Commands/StopMusic.cs index 7e5bbd88..11d120c4 100644 --- a/Assets/Fungus/Scripts/Commands/StopMusic.cs +++ b/Assets/Fungus/Scripts/Commands/StopMusic.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Stops the currently playing game music. diff --git a/Assets/Fungus/Scripts/Commands/StopSwipe.cs b/Assets/Fungus/Scripts/Commands/StopSwipe.cs index bf685ce6..bc6b5f94 100644 --- a/Assets/Fungus/Scripts/Commands/StopSwipe.cs +++ b/Assets/Fungus/Scripts/Commands/StopSwipe.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Deactivates swipe panning mode. diff --git a/Assets/Fungus/Scripts/Commands/StopTween.cs b/Assets/Fungus/Scripts/Commands/StopTween.cs index aaf260e7..4e289038 100644 --- a/Assets/Fungus/Scripts/Commands/StopTween.cs +++ b/Assets/Fungus/Scripts/Commands/StopTween.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Stops an active iTween by name. diff --git a/Assets/Fungus/Scripts/Commands/StopTweens.cs b/Assets/Fungus/Scripts/Commands/StopTweens.cs index 7f8d6ff3..bd6f0cd8 100644 --- a/Assets/Fungus/Scripts/Commands/StopTweens.cs +++ b/Assets/Fungus/Scripts/Commands/StopTweens.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Stop all active iTweens in the current scene. diff --git a/Assets/Fungus/Scripts/Commands/TweenUI.cs b/Assets/Fungus/Scripts/Commands/TweenUI.cs index 4cba1bf7..24c5395e 100644 --- a/Assets/Fungus/Scripts/Commands/TweenUI.cs +++ b/Assets/Fungus/Scripts/Commands/TweenUI.cs @@ -4,8 +4,9 @@ using UnityEngine; using System.Collections.Generic; using Fungus; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Abstract base class for TweenUI commands. diff --git a/Assets/Fungus/Scripts/Commands/Wait.cs b/Assets/Fungus/Scripts/Commands/Wait.cs index 4925749f..f8b45d18 100644 --- a/Assets/Fungus/Scripts/Commands/Wait.cs +++ b/Assets/Fungus/Scripts/Commands/Wait.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Waits for period of time before executing the next command in the block. diff --git a/Assets/Fungus/Scripts/Commands/While.cs b/Assets/Fungus/Scripts/Commands/While.cs index 3720933b..a7aeed42 100644 --- a/Assets/Fungus/Scripts/Commands/While.cs +++ b/Assets/Fungus/Scripts/Commands/While.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Commands { /// /// Continuously loop through a block of commands while the condition is true. Use the Break command to force the loop to terminate immediately. diff --git a/Assets/Fungus/Scripts/Commands/Write.cs b/Assets/Fungus/Scripts/Commands/Write.cs index c92fa412..2a04f9e1 100644 --- a/Assets/Fungus/Scripts/Commands/Write.cs +++ b/Assets/Fungus/Scripts/Commands/Write.cs @@ -2,8 +2,9 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { /// /// Writes content to a UI Text or Text Mesh object. diff --git a/Assets/Fungus/Scripts/Commands/iTweenCommand.cs b/Assets/Fungus/Scripts/Commands/iTweenCommand.cs index 393337c1..8d5b6136 100644 --- a/Assets/Fungus/Scripts/Commands/iTweenCommand.cs +++ b/Assets/Fungus/Scripts/Commands/iTweenCommand.cs @@ -3,8 +3,9 @@ using UnityEngine; using UnityEngine.Serialization; +using Fungus.Variables; -namespace Fungus +namespace Fungus.Commands { public enum iTweenAxis diff --git a/Assets/Fungus/Scripts/Components/Block.cs b/Assets/Fungus/Scripts/Components/Block.cs index 2cb2835a..cdf79a33 100644 --- a/Assets/Fungus/Scripts/Components/Block.cs +++ b/Assets/Fungus/Scripts/Components/Block.cs @@ -6,6 +6,8 @@ using UnityEngine.Serialization; using System; using System.Collections; using System.Collections.Generic; +using Fungus.Commands; +using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Components/Character.cs b/Assets/Fungus/Scripts/Components/Character.cs index 8c3634ee..2f7c6f94 100644 --- a/Assets/Fungus/Scripts/Components/Character.cs +++ b/Assets/Fungus/Scripts/Components/Character.cs @@ -5,6 +5,7 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections.Generic; using System; +using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Components/Clickable2D.cs b/Assets/Fungus/Scripts/Components/Clickable2D.cs index 0cdca596..f557f950 100644 --- a/Assets/Fungus/Scripts/Components/Clickable2D.cs +++ b/Assets/Fungus/Scripts/Components/Clickable2D.cs @@ -3,6 +3,8 @@ using UnityEngine; using UnityEngine.EventSystems; +using Fungus.EventHandlers; +using Fungus.Commands; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Components/Draggable2D.cs b/Assets/Fungus/Scripts/Components/Draggable2D.cs index 10c9ab61..641c1f10 100644 --- a/Assets/Fungus/Scripts/Components/Draggable2D.cs +++ b/Assets/Fungus/Scripts/Components/Draggable2D.cs @@ -4,7 +4,8 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.Serialization; - +using Fungus.EventHandlers; +using Fungus.Commands; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Components/Flowchart.cs b/Assets/Fungus/Scripts/Components/Flowchart.cs index 083b334b..6b410499 100644 --- a/Assets/Fungus/Scripts/Components/Flowchart.cs +++ b/Assets/Fungus/Scripts/Components/Flowchart.cs @@ -9,6 +9,10 @@ using System.Text; using System.Linq; using System.Collections.Generic; using System.Text.RegularExpressions; +using Fungus.Commands; +using Fungus.EventHandlers; +using Fungus.Utils; +using Fungus.Variables; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Components/Localization.cs b/Assets/Fungus/Scripts/Components/Localization.cs index 5b776e43..5cd3216a 100644 --- a/Assets/Fungus/Scripts/Components/Localization.cs +++ b/Assets/Fungus/Scripts/Components/Localization.cs @@ -9,6 +9,7 @@ using System.Collections.Generic; using System.Text.RegularExpressions; using System.Text; using Ideafixxxer.CsvParser; +using Fungus.Commands; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Components/PortraitController.cs b/Assets/Fungus/Scripts/Components/PortraitController.cs index c68c0a08..3e300bb1 100644 --- a/Assets/Fungus/Scripts/Components/PortraitController.cs +++ b/Assets/Fungus/Scripts/Components/PortraitController.cs @@ -6,6 +6,7 @@ using UnityEngine.UI; using System; using System.Collections; using MoonSharp.Interpreter; +using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Components/Writer.cs b/Assets/Fungus/Scripts/Components/Writer.cs index e4a0df9f..d21506cf 100644 --- a/Assets/Fungus/Scripts/Components/Writer.cs +++ b/Assets/Fungus/Scripts/Components/Writer.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using System; using System.Reflection; using System.Text; +using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/CallEditor.cs b/Assets/Fungus/Scripts/Editor/CallEditor.cs index 96e4500b..7d291e8d 100644 --- a/Assets/Fungus/Scripts/Editor/CallEditor.cs +++ b/Assets/Fungus/Scripts/Editor/CallEditor.cs @@ -3,6 +3,7 @@ using UnityEditor; using UnityEngine; +using Fungus.Commands; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/CommandListAdaptor.cs b/Assets/Fungus/Scripts/Editor/CommandListAdaptor.cs index b3a0f33a..48e716b4 100644 --- a/Assets/Fungus/Scripts/Editor/CommandListAdaptor.cs +++ b/Assets/Fungus/Scripts/Editor/CommandListAdaptor.cs @@ -9,6 +9,8 @@ using UnityEngine; using UnityEditor; using System; using Rotorz.ReorderableList; +using Fungus.Commands; +using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/ControlAudioEditor.cs b/Assets/Fungus/Scripts/Editor/ControlAudioEditor.cs index 9dea4a17..55786d17 100644 --- a/Assets/Fungus/Scripts/Editor/ControlAudioEditor.cs +++ b/Assets/Fungus/Scripts/Editor/ControlAudioEditor.cs @@ -3,6 +3,7 @@ using UnityEditor; using UnityEngine; +using Fungus.Commands; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/FlowchartMenuItems.cs b/Assets/Fungus/Scripts/Editor/FlowchartMenuItems.cs index b71d8413..cfe36e2f 100644 --- a/Assets/Fungus/Scripts/Editor/FlowchartMenuItems.cs +++ b/Assets/Fungus/Scripts/Editor/FlowchartMenuItems.cs @@ -3,6 +3,7 @@ using UnityEngine; using UnityEditor; +using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/FlowchartWindow.cs b/Assets/Fungus/Scripts/Editor/FlowchartWindow.cs index 13e88e1d..eb43d2c8 100644 --- a/Assets/Fungus/Scripts/Editor/FlowchartWindow.cs +++ b/Assets/Fungus/Scripts/Editor/FlowchartWindow.cs @@ -7,6 +7,7 @@ using UnityEditorInternal; using System; using System.Linq; using System.Collections.Generic; +using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/IfEditor.cs b/Assets/Fungus/Scripts/Editor/IfEditor.cs index 856e154d..e5516280 100644 --- a/Assets/Fungus/Scripts/Editor/IfEditor.cs +++ b/Assets/Fungus/Scripts/Editor/IfEditor.cs @@ -4,6 +4,8 @@ using UnityEditor; using UnityEngine; using System.Collections.Generic; +using Fungus.Commands; +using Fungus.Variables; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/InvokeEventEditor.cs b/Assets/Fungus/Scripts/Editor/InvokeEventEditor.cs index 619306aa..1596f529 100644 --- a/Assets/Fungus/Scripts/Editor/InvokeEventEditor.cs +++ b/Assets/Fungus/Scripts/Editor/InvokeEventEditor.cs @@ -2,6 +2,7 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEditor; +using Fungus.Commands; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/InvokeMethodEditor.cs b/Assets/Fungus/Scripts/Editor/InvokeMethodEditor.cs index ed45edd2..003a86e6 100644 --- a/Assets/Fungus/Scripts/Editor/InvokeMethodEditor.cs +++ b/Assets/Fungus/Scripts/Editor/InvokeMethodEditor.cs @@ -8,6 +8,8 @@ using System.Linq; using System.Reflection; using System; using System.Collections.Generic; +using Fungus.Commands; +using Fungus.Variables; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/LabelEditor.cs b/Assets/Fungus/Scripts/Editor/LabelEditor.cs index f330f4fb..620b2441 100644 --- a/Assets/Fungus/Scripts/Editor/LabelEditor.cs +++ b/Assets/Fungus/Scripts/Editor/LabelEditor.cs @@ -4,6 +4,7 @@ using UnityEditor; using UnityEngine; using System.Collections.Generic; +using Fungus.Commands; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/MenuEditor.cs b/Assets/Fungus/Scripts/Editor/MenuEditor.cs index 53b3eff7..13ccb13d 100644 --- a/Assets/Fungus/Scripts/Editor/MenuEditor.cs +++ b/Assets/Fungus/Scripts/Editor/MenuEditor.cs @@ -3,10 +3,11 @@ using UnityEditor; using UnityEngine; +using Fungus.Commands; namespace Fungus { - [CustomEditor (typeof(Fungus.Menu))] + [CustomEditor (typeof(Fungus.Commands.Menu))] public class MenuEditor : CommandEditor { protected SerializedProperty textProp; diff --git a/Assets/Fungus/Scripts/Editor/MenuTimerEditor.cs b/Assets/Fungus/Scripts/Editor/MenuTimerEditor.cs index 6766418d..17580f6a 100644 --- a/Assets/Fungus/Scripts/Editor/MenuTimerEditor.cs +++ b/Assets/Fungus/Scripts/Editor/MenuTimerEditor.cs @@ -3,6 +3,7 @@ using UnityEditor; using UnityEngine; +using Fungus.Commands; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/PortraitEditor.cs b/Assets/Fungus/Scripts/Editor/PortraitEditor.cs index ba0df85b..a6d4fa68 100644 --- a/Assets/Fungus/Scripts/Editor/PortraitEditor.cs +++ b/Assets/Fungus/Scripts/Editor/PortraitEditor.cs @@ -3,6 +3,8 @@ using UnityEditor; using UnityEngine; +using Fungus.Commands; +using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/SayEditor.cs b/Assets/Fungus/Scripts/Editor/SayEditor.cs index 4855cac5..8f5cf8de 100644 --- a/Assets/Fungus/Scripts/Editor/SayEditor.cs +++ b/Assets/Fungus/Scripts/Editor/SayEditor.cs @@ -4,6 +4,8 @@ using UnityEditor; using UnityEngine; using System.Collections.Generic; +using Fungus.Commands; +using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/SetColliderEditor.cs b/Assets/Fungus/Scripts/Editor/SetColliderEditor.cs index 2e271285..2518fb07 100644 --- a/Assets/Fungus/Scripts/Editor/SetColliderEditor.cs +++ b/Assets/Fungus/Scripts/Editor/SetColliderEditor.cs @@ -4,6 +4,7 @@ using UnityEditor; using UnityEngine; using Rotorz.ReorderableList; +using Fungus.Commands; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/SetVariableEditor.cs b/Assets/Fungus/Scripts/Editor/SetVariableEditor.cs index 2efba94b..abdeb62b 100644 --- a/Assets/Fungus/Scripts/Editor/SetVariableEditor.cs +++ b/Assets/Fungus/Scripts/Editor/SetVariableEditor.cs @@ -4,6 +4,8 @@ using UnityEditor; using UnityEngine; using System.Collections.Generic; +using Fungus.Commands; +using Fungus.Variables; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/StageEditor.cs b/Assets/Fungus/Scripts/Editor/StageEditor.cs index fed194ac..3c662b02 100644 --- a/Assets/Fungus/Scripts/Editor/StageEditor.cs +++ b/Assets/Fungus/Scripts/Editor/StageEditor.cs @@ -3,6 +3,8 @@ using UnityEditor; using UnityEngine; +using Fungus.Commands; +using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/VariableEditor.cs b/Assets/Fungus/Scripts/Editor/VariableEditor.cs index 7a30aac8..308eb072 100644 --- a/Assets/Fungus/Scripts/Editor/VariableEditor.cs +++ b/Assets/Fungus/Scripts/Editor/VariableEditor.cs @@ -6,6 +6,7 @@ using UnityEngine; using System; using System.Collections.Generic; using System.Linq; +using Fungus.Variables; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/ViewEditor.cs b/Assets/Fungus/Scripts/Editor/ViewEditor.cs index f1e7d724..425a7df2 100644 --- a/Assets/Fungus/Scripts/Editor/ViewEditor.cs +++ b/Assets/Fungus/Scripts/Editor/ViewEditor.cs @@ -3,6 +3,7 @@ using UnityEditor; using UnityEngine; +using Fungus.Commands; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/WriteEditor.cs b/Assets/Fungus/Scripts/Editor/WriteEditor.cs index 4d4abf36..9246d672 100644 --- a/Assets/Fungus/Scripts/Editor/WriteEditor.cs +++ b/Assets/Fungus/Scripts/Editor/WriteEditor.cs @@ -3,6 +3,8 @@ using UnityEditor; using UnityEngine; +using Fungus.Commands; +using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/EventHandlers/ButtonClicked.cs b/Assets/Fungus/Scripts/EventHandlers/ButtonClicked.cs index b0ab6971..10e99310 100644 --- a/Assets/Fungus/Scripts/EventHandlers/ButtonClicked.cs +++ b/Assets/Fungus/Scripts/EventHandlers/ButtonClicked.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.UI; -namespace Fungus +namespace Fungus.EventHandlers { /// /// The block will execute when the user clicks on the target UI button object. diff --git a/Assets/Fungus/Scripts/EventHandlers/DragCancelled.cs b/Assets/Fungus/Scripts/EventHandlers/DragCancelled.cs index 375eb39c..f10be139 100644 --- a/Assets/Fungus/Scripts/EventHandlers/DragCancelled.cs +++ b/Assets/Fungus/Scripts/EventHandlers/DragCancelled.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.EventHandlers { /// /// The block will execute when the player drags an object and releases it without dropping it on a target object. diff --git a/Assets/Fungus/Scripts/EventHandlers/DragCompleted.cs b/Assets/Fungus/Scripts/EventHandlers/DragCompleted.cs index c0bd6a29..9da02347 100644 --- a/Assets/Fungus/Scripts/EventHandlers/DragCompleted.cs +++ b/Assets/Fungus/Scripts/EventHandlers/DragCompleted.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.EventHandlers { /// /// The block will execute when the player drags an object and successfully drops it on a target object. diff --git a/Assets/Fungus/Scripts/EventHandlers/DragEntered.cs b/Assets/Fungus/Scripts/EventHandlers/DragEntered.cs index 1362e5a1..9f293e06 100644 --- a/Assets/Fungus/Scripts/EventHandlers/DragEntered.cs +++ b/Assets/Fungus/Scripts/EventHandlers/DragEntered.cs @@ -6,7 +6,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Fungus +namespace Fungus.EventHandlers { /// /// The block will execute when the player is dragging an object which starts touching the target object. diff --git a/Assets/Fungus/Scripts/EventHandlers/DragExited.cs b/Assets/Fungus/Scripts/EventHandlers/DragExited.cs index 84a5436b..e5f9cee7 100644 --- a/Assets/Fungus/Scripts/EventHandlers/DragExited.cs +++ b/Assets/Fungus/Scripts/EventHandlers/DragExited.cs @@ -6,7 +6,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Fungus +namespace Fungus.EventHandlers { /// /// The block will execute when the player is dragging an object which stops touching the target object. diff --git a/Assets/Fungus/Scripts/EventHandlers/DragStarted.cs b/Assets/Fungus/Scripts/EventHandlers/DragStarted.cs index 9c34fa12..0fc7b53b 100644 --- a/Assets/Fungus/Scripts/EventHandlers/DragStarted.cs +++ b/Assets/Fungus/Scripts/EventHandlers/DragStarted.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.EventHandlers { /// /// The block will execute when the player starts dragging an object. diff --git a/Assets/Fungus/Scripts/EventHandlers/EndEdit.cs b/Assets/Fungus/Scripts/EventHandlers/EndEdit.cs index 4d46b681..bb9fefee 100644 --- a/Assets/Fungus/Scripts/EventHandlers/EndEdit.cs +++ b/Assets/Fungus/Scripts/EventHandlers/EndEdit.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.UI; -namespace Fungus +namespace Fungus.EventHandlers { /// /// The block will execute when the user finishes editing the text in the input field. diff --git a/Assets/Fungus/Scripts/EventHandlers/FlowchartEnabled.cs b/Assets/Fungus/Scripts/EventHandlers/FlowchartEnabled.cs index 50c78d43..ae098ec7 100644 --- a/Assets/Fungus/Scripts/EventHandlers/FlowchartEnabled.cs +++ b/Assets/Fungus/Scripts/EventHandlers/FlowchartEnabled.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.EventHandlers { /// /// The block will execute when the Flowchart game object is enabled. diff --git a/Assets/Fungus/Scripts/EventHandlers/GameStarted.cs b/Assets/Fungus/Scripts/EventHandlers/GameStarted.cs index 39891c41..96534451 100644 --- a/Assets/Fungus/Scripts/EventHandlers/GameStarted.cs +++ b/Assets/Fungus/Scripts/EventHandlers/GameStarted.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.EventHandlers { /// /// The block will execute when the game starts playing. diff --git a/Assets/Fungus/Scripts/EventHandlers/KeyPressed.cs b/Assets/Fungus/Scripts/EventHandlers/KeyPressed.cs index 69c6c1f4..034e6658 100644 --- a/Assets/Fungus/Scripts/EventHandlers/KeyPressed.cs +++ b/Assets/Fungus/Scripts/EventHandlers/KeyPressed.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.EventHandlers { /// /// The block will execute when a key press event occurs. diff --git a/Assets/Fungus/Scripts/EventHandlers/MessageReceived.cs b/Assets/Fungus/Scripts/EventHandlers/MessageReceived.cs index 3da23d25..64eaafab 100644 --- a/Assets/Fungus/Scripts/EventHandlers/MessageReceived.cs +++ b/Assets/Fungus/Scripts/EventHandlers/MessageReceived.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.EventHandlers { /// /// The block will execute when the specified message is received from a Send Message command. diff --git a/Assets/Fungus/Scripts/EventHandlers/ObjectClicked.cs b/Assets/Fungus/Scripts/EventHandlers/ObjectClicked.cs index 9ea0c57f..12481311 100644 --- a/Assets/Fungus/Scripts/EventHandlers/ObjectClicked.cs +++ b/Assets/Fungus/Scripts/EventHandlers/ObjectClicked.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.EventHandlers { /// /// The block will execute when the user clicks or taps on the clickable object. diff --git a/Assets/Fungus/Scripts/Interfaces/ICharacter.cs b/Assets/Fungus/Scripts/Interfaces/ICharacter.cs index fda47b83..4312ac0c 100644 --- a/Assets/Fungus/Scripts/Interfaces/ICharacter.cs +++ b/Assets/Fungus/Scripts/Interfaces/ICharacter.cs @@ -3,6 +3,7 @@ using UnityEngine; using System.Collections.Generic; +using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Interfaces/IFlowchart.cs b/Assets/Fungus/Scripts/Interfaces/IFlowchart.cs index 5116cd34..981141cf 100644 --- a/Assets/Fungus/Scripts/Interfaces/IFlowchart.cs +++ b/Assets/Fungus/Scripts/Interfaces/IFlowchart.cs @@ -3,6 +3,7 @@ using UnityEngine; using System.Collections.Generic; +using Fungus.Commands; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Interfaces/IPortraitController.cs b/Assets/Fungus/Scripts/Interfaces/IPortraitController.cs index 512fab1c..8fe36e14 100644 --- a/Assets/Fungus/Scripts/Interfaces/IPortraitController.cs +++ b/Assets/Fungus/Scripts/Interfaces/IPortraitController.cs @@ -2,6 +2,7 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using MoonSharp.Interpreter; +using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Interfaces/ITextTagParser.cs b/Assets/Fungus/Scripts/Interfaces/ITextTagParser.cs index 8337b300..2c7be361 100644 --- a/Assets/Fungus/Scripts/Interfaces/ITextTagParser.cs +++ b/Assets/Fungus/Scripts/Interfaces/ITextTagParser.cs @@ -2,6 +2,7 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using System.Collections.Generic; +using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Interfaces/IVariable.cs b/Assets/Fungus/Scripts/Interfaces/IVariable.cs index 86dec752..172bca3c 100644 --- a/Assets/Fungus/Scripts/Interfaces/IVariable.cs +++ b/Assets/Fungus/Scripts/Interfaces/IVariable.cs @@ -3,6 +3,16 @@ namespace Fungus { + public enum CompareOperator + { + Equals, // == + NotEquals, // != + LessThan, // < + GreaterThan, // > + LessThanOrEquals, // <= + GreaterThanOrEquals // >= + } + /// /// Scope types for Variables. /// diff --git a/Assets/Fungus/Scripts/Utils/ConversationManager.cs b/Assets/Fungus/Scripts/Utils/ConversationManager.cs index d5fb1477..46d390b0 100644 --- a/Assets/Fungus/Scripts/Utils/ConversationManager.cs +++ b/Assets/Fungus/Scripts/Utils/ConversationManager.cs @@ -7,7 +7,7 @@ using System.Text.RegularExpressions; using UnityEngine; using System.Text; -namespace Fungus +namespace Fungus.Utils { public class ConversationManager : IConversationManager { diff --git a/Assets/Fungus/Scripts/Utils/FungusConstants.cs b/Assets/Fungus/Scripts/Utils/FungusConstants.cs index e4bd43b6..0a98f3e5 100644 --- a/Assets/Fungus/Scripts/Utils/FungusConstants.cs +++ b/Assets/Fungus/Scripts/Utils/FungusConstants.cs @@ -1,7 +1,7 @@ // This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus). // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) -namespace Fungus +namespace Fungus.Utils { /// /// Global constants used in various parts of Fungus. diff --git a/Assets/Fungus/Scripts/Utils/PortraitUtils.cs b/Assets/Fungus/Scripts/Utils/PortraitUtils.cs index 54d5f1b8..8c7b3995 100644 --- a/Assets/Fungus/Scripts/Utils/PortraitUtils.cs +++ b/Assets/Fungus/Scripts/Utils/PortraitUtils.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEngine.UI; using MoonSharp.Interpreter; -namespace Fungus +namespace Fungus.Utils { /// /// Contains all options to run a portrait command. diff --git a/Assets/Fungus/Scripts/Utils/StringFormatter.cs b/Assets/Fungus/Scripts/Utils/StringFormatter.cs index f932001c..94d34e3d 100644 --- a/Assets/Fungus/Scripts/Utils/StringFormatter.cs +++ b/Assets/Fungus/Scripts/Utils/StringFormatter.cs @@ -4,7 +4,7 @@ using System.Text; using System; -namespace Fungus +namespace Fungus.Utils { /// /// Misc string formatting functions. diff --git a/Assets/Fungus/Scripts/Utils/TextTagParser.cs b/Assets/Fungus/Scripts/Utils/TextTagParser.cs index fae0687d..208df57a 100644 --- a/Assets/Fungus/Scripts/Utils/TextTagParser.cs +++ b/Assets/Fungus/Scripts/Utils/TextTagParser.cs @@ -5,7 +5,7 @@ using UnityEngine; using System.Collections.Generic; using System.Text.RegularExpressions; -namespace Fungus +namespace Fungus.Utils { /// /// Parses a string for special Fungus text tags. diff --git a/Assets/Fungus/Scripts/Utils/TextTagToken.cs b/Assets/Fungus/Scripts/Utils/TextTagToken.cs index 06f93144..fb139eb4 100644 --- a/Assets/Fungus/Scripts/Utils/TextTagToken.cs +++ b/Assets/Fungus/Scripts/Utils/TextTagToken.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Fungus +namespace Fungus.Utils { public class TextTagToken { diff --git a/Assets/Fungus/Scripts/VariableTypes/AnimatorVariable.cs b/Assets/Fungus/Scripts/VariableTypes/AnimatorVariable.cs index 39a411e0..1ded4b0f 100644 --- a/Assets/Fungus/Scripts/VariableTypes/AnimatorVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/AnimatorVariable.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Variables { /// /// Animator variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/AudioSourceVariable.cs b/Assets/Fungus/Scripts/VariableTypes/AudioSourceVariable.cs index 5727e4a4..0170b312 100644 --- a/Assets/Fungus/Scripts/VariableTypes/AudioSourceVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/AudioSourceVariable.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus +namespace Fungus.Variables { /// /// AudioSource variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/BooleanVariable.cs b/Assets/Fungus/Scripts/VariableTypes/BooleanVariable.cs index 0553e094..4294326c 100644 --- a/Assets/Fungus/Scripts/VariableTypes/BooleanVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/BooleanVariable.cs @@ -2,10 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using System; -using System.Collections; -namespace Fungus +namespace Fungus.Variables { /// /// Boolean variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/ColorVariable.cs b/Assets/Fungus/Scripts/VariableTypes/ColorVariable.cs index f27c32ca..7069ff9a 100644 --- a/Assets/Fungus/Scripts/VariableTypes/ColorVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/ColorVariable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus +namespace Fungus.Variables { /// /// Color variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/FloatVariable.cs b/Assets/Fungus/Scripts/VariableTypes/FloatVariable.cs index 8c4fe570..93b32210 100644 --- a/Assets/Fungus/Scripts/VariableTypes/FloatVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/FloatVariable.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using System.Collections; -namespace Fungus +namespace Fungus.Variables { /// /// Float variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/GameObjectVariable.cs b/Assets/Fungus/Scripts/VariableTypes/GameObjectVariable.cs index 8a67c671..bbcf2e4e 100644 --- a/Assets/Fungus/Scripts/VariableTypes/GameObjectVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/GameObjectVariable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus +namespace Fungus.Variables { /// /// GameObject variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/IntegerVariable.cs b/Assets/Fungus/Scripts/VariableTypes/IntegerVariable.cs index e91968ff..1ba0f822 100644 --- a/Assets/Fungus/Scripts/VariableTypes/IntegerVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/IntegerVariable.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using System.Collections; -namespace Fungus +namespace Fungus.Variables { /// /// Integer variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/MaterialVariable.cs b/Assets/Fungus/Scripts/VariableTypes/MaterialVariable.cs index 5f36ff87..84a8719d 100644 --- a/Assets/Fungus/Scripts/VariableTypes/MaterialVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/MaterialVariable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus +namespace Fungus.Variables { /// /// Material variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/ObjectVariable.cs b/Assets/Fungus/Scripts/VariableTypes/ObjectVariable.cs index 1d3fcb9d..d832df48 100644 --- a/Assets/Fungus/Scripts/VariableTypes/ObjectVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/ObjectVariable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus +namespace Fungus.Variables { /// /// Object variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/SpriteVariable.cs b/Assets/Fungus/Scripts/VariableTypes/SpriteVariable.cs index ca7a0d63..51918fb2 100644 --- a/Assets/Fungus/Scripts/VariableTypes/SpriteVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/SpriteVariable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus +namespace Fungus.Variables { /// /// Sprite variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/StringVariable.cs b/Assets/Fungus/Scripts/VariableTypes/StringVariable.cs index 4e85f789..44a9b715 100644 --- a/Assets/Fungus/Scripts/VariableTypes/StringVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/StringVariable.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using System.Collections; -namespace Fungus +namespace Fungus.Variables { /// /// String variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/TextureVariable.cs b/Assets/Fungus/Scripts/VariableTypes/TextureVariable.cs index ad446a9f..1d5fe109 100644 --- a/Assets/Fungus/Scripts/VariableTypes/TextureVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/TextureVariable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus +namespace Fungus.Variables { /// /// Texture variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/TransformVariable.cs b/Assets/Fungus/Scripts/VariableTypes/TransformVariable.cs index bbc32db4..c2551382 100644 --- a/Assets/Fungus/Scripts/VariableTypes/TransformVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/TransformVariable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus +namespace Fungus.Variables { /// /// Transform variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/Vector2Variable.cs b/Assets/Fungus/Scripts/VariableTypes/Vector2Variable.cs index f067aa95..eeca6042 100644 --- a/Assets/Fungus/Scripts/VariableTypes/Vector2Variable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/Vector2Variable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus +namespace Fungus.Variables { /// /// Vector2 variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/Vector3Variable.cs b/Assets/Fungus/Scripts/VariableTypes/Vector3Variable.cs index 16c5511a..e721ab79 100644 --- a/Assets/Fungus/Scripts/VariableTypes/Vector3Variable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/Vector3Variable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus +namespace Fungus.Variables { /// /// Vector3 variable type. diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs index 2a6824cd..553d6d22 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs @@ -9,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; using MoonSharp.Interpreter; +using Fungus.Utils; namespace Fungus { diff --git a/Assets/Tests/Scripting/TestInvoke.cs b/Assets/Tests/Scripting/TestInvoke.cs index aa276cf3..a20a69ee 100644 --- a/Assets/Tests/Scripting/TestInvoke.cs +++ b/Assets/Tests/Scripting/TestInvoke.cs @@ -2,7 +2,7 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using System.Collections; +using Fungus.Variables; namespace Fungus { diff --git a/Assets/Tests/UI/Editor/TextTagParserTests.cs b/Assets/Tests/UI/Editor/TextTagParserTests.cs index 0c7a6c65..9f308ff6 100644 --- a/Assets/Tests/UI/Editor/TextTagParserTests.cs +++ b/Assets/Tests/UI/Editor/TextTagParserTests.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using Fungus; +using Fungus.Utils; #if UNITY_5_3_OR_NEWER