From 3b73d9563e202c870a92b4f7cb211f0225c2fe3e Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Fri, 22 May 2015 22:22:49 +0100 Subject: [PATCH] Removed obsolete commands and other dead code --- Assets/Fungus/Flowchart/Scripts/Block.cs | 23 +- .../Fungus/Flowchart/Scripts/Commands/Else.cs | 3 +- .../Flowchart/Scripts/Commands/ElseIf.cs | 4 +- .../Flowchart/Scripts/Commands/EndIf.cs | 30 - .../Flowchart/Scripts/Commands/EndIf.cs.meta | 8 - .../Fungus/Flowchart/Scripts/Commands/If.cs | 3 +- Assets/Fungus/Flowchart/Scripts/Flowchart.cs | 8 - Assets/Fungus/Narrative/Deprecated.meta | 5 - .../Fungus/Narrative/Deprecated/AddOption.cs | 85 - .../Narrative/Deprecated/AddOption.cs.meta | 8 - Assets/Fungus/Narrative/Deprecated/Arrow.png | Bin 17154 -> 0 bytes .../Narrative/Deprecated/Arrow.png.meta | 48 - Assets/Fungus/Narrative/Deprecated/Choose.cs | 202 --- .../Narrative/Deprecated/Choose.cs.meta | 8 - .../Narrative/Deprecated/ChooseDialog.cs | 157 -- .../Narrative/Deprecated/ChooseDialog.cs.meta | 8 - .../Narrative/Deprecated/ChooseDialog.prefab | 1470 ----------------- .../Deprecated/ChooseDialog.prefab.meta | 4 - .../Fungus/Narrative/Deprecated/Editor.meta | 5 - .../Deprecated/Editor/AddOptionEditor.cs | 49 - .../Deprecated/Editor/AddOptionEditor.cs.meta | 8 - .../Deprecated/Editor/ChooseEditor.cs | 110 -- .../Deprecated/Editor/ChooseEditor.cs.meta | 8 - .../Deprecated/NarratorDialog.prefab | 403 ----- .../Deprecated/NarratorDialog.prefab.meta | 4 - .../Narrative/Deprecated/SayDialog.prefab | 547 ------ .../Deprecated/SayDialog.prefab.meta | 4 - .../FungusExamples/TheHunter/TheHunter.unity | 274 ++- .../FungusExamples/Variables/Variables.unity | 2 +- 29 files changed, 139 insertions(+), 3349 deletions(-) delete mode 100644 Assets/Fungus/Flowchart/Scripts/Commands/EndIf.cs delete mode 100644 Assets/Fungus/Flowchart/Scripts/Commands/EndIf.cs.meta delete mode 100644 Assets/Fungus/Narrative/Deprecated.meta delete mode 100644 Assets/Fungus/Narrative/Deprecated/AddOption.cs delete mode 100644 Assets/Fungus/Narrative/Deprecated/AddOption.cs.meta delete mode 100644 Assets/Fungus/Narrative/Deprecated/Arrow.png delete mode 100644 Assets/Fungus/Narrative/Deprecated/Arrow.png.meta delete mode 100644 Assets/Fungus/Narrative/Deprecated/Choose.cs delete mode 100644 Assets/Fungus/Narrative/Deprecated/Choose.cs.meta delete mode 100644 Assets/Fungus/Narrative/Deprecated/ChooseDialog.cs delete mode 100644 Assets/Fungus/Narrative/Deprecated/ChooseDialog.cs.meta delete mode 100644 Assets/Fungus/Narrative/Deprecated/ChooseDialog.prefab delete mode 100644 Assets/Fungus/Narrative/Deprecated/ChooseDialog.prefab.meta delete mode 100644 Assets/Fungus/Narrative/Deprecated/Editor.meta delete mode 100644 Assets/Fungus/Narrative/Deprecated/Editor/AddOptionEditor.cs delete mode 100644 Assets/Fungus/Narrative/Deprecated/Editor/AddOptionEditor.cs.meta delete mode 100644 Assets/Fungus/Narrative/Deprecated/Editor/ChooseEditor.cs delete mode 100644 Assets/Fungus/Narrative/Deprecated/Editor/ChooseEditor.cs.meta delete mode 100644 Assets/Fungus/Narrative/Deprecated/NarratorDialog.prefab delete mode 100644 Assets/Fungus/Narrative/Deprecated/NarratorDialog.prefab.meta delete mode 100644 Assets/Fungus/Narrative/Deprecated/SayDialog.prefab delete mode 100644 Assets/Fungus/Narrative/Deprecated/SayDialog.prefab.meta diff --git a/Assets/Fungus/Flowchart/Scripts/Block.cs b/Assets/Fungus/Flowchart/Scripts/Block.cs index 431bfeb0..94bb56d9 100644 --- a/Assets/Fungus/Flowchart/Scripts/Block.cs +++ b/Assets/Fungus/Flowchart/Scripts/Block.cs @@ -6,16 +6,6 @@ using System.Collections.Generic; namespace Fungus { - /** - * The Sequence class has been renamed to Block to be more descriptive. - */ - [ExecuteInEditMode] - [RequireComponent(typeof(Flowchart))] - [AddComponentMenu("")] - [Obsolete("Use Block class instead")] - public class Sequence : Block - {} - [ExecuteInEditMode] [RequireComponent(typeof(Flowchart))] [AddComponentMenu("")] @@ -107,18 +97,7 @@ namespace Fungus public virtual Flowchart GetFlowchart() { - Flowchart flowchart = GetComponent(); - - if (flowchart == null) - { - // Legacy support for earlier system where Blocks were children of the Flowchart - if (transform.parent != null) - { - flowchart = transform.parent.GetComponent(); - } - } - - return flowchart; + return GetComponent(); } public virtual bool HasError() diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/Else.cs b/Assets/Fungus/Flowchart/Scripts/Commands/Else.cs index 7fee9af5..c140ebf6 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/Else.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/Else.cs @@ -33,8 +33,7 @@ namespace Fungus if (command.indentLevel == indent) { System.Type type = command.GetType(); - if (type == typeof(EndIf) || // Legacy support for old EndIf command - type == typeof(End)) + if (type == typeof(End)) { // Execute command immediately after the EndIf command Continue(command.commandIndex + 1); diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/ElseIf.cs b/Assets/Fungus/Flowchart/Scripts/Commands/ElseIf.cs index 1c5205d7..12095328 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/ElseIf.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/ElseIf.cs @@ -44,9 +44,7 @@ namespace Fungus if (command.indentLevel == indent) { System.Type type = command.GetType(); - if (//type == typeof(Else) || - type == typeof(EndIf) || // Legacy support for old EndIf command - type == typeof(End)) + if (type == typeof(End)) { // Execute command immediately after the Else or End command Continue(command.commandIndex + 1); diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/EndIf.cs b/Assets/Fungus/Flowchart/Scripts/Commands/EndIf.cs deleted file mode 100644 index 84d8c99d..00000000 --- a/Assets/Fungus/Flowchart/Scripts/Commands/EndIf.cs +++ /dev/null @@ -1,30 +0,0 @@ -using UnityEngine; -using System.Collections; -using System.Collections.Generic; - -namespace Fungus -{ - // Note: The End If command is deprecated, use the End command instead. - [CommandInfo("Scripting", - "End", - "Marks the end of a conditional block.", -1)] - [AddComponentMenu("")] - public class EndIf : Command - { - public override void OnEnter() - { - Continue(); - } - - public override bool CloseBlock() - { - return true; - } - - public override Color GetButtonColor() - { - return new Color32(253, 253, 150, 255); - } - } - -} \ No newline at end of file diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/EndIf.cs.meta b/Assets/Fungus/Flowchart/Scripts/Commands/EndIf.cs.meta deleted file mode 100644 index 41cfa6b2..00000000 --- a/Assets/Fungus/Flowchart/Scripts/Commands/EndIf.cs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 00d52e9e9dcf4493c87045f633aefa2e -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/If.cs b/Assets/Fungus/Flowchart/Scripts/Commands/If.cs index f610a37b..f0cfe755 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/If.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/If.cs @@ -117,8 +117,7 @@ namespace Fungus } System.Type type = nextCommand.GetType(); - if (type == typeof(Else) || - type == typeof(EndIf) || // Legacy support for old EndIf command + if (type == typeof(Else) || type == typeof(End)) { if (i >= parentBlock.commandList.Count - 1) diff --git a/Assets/Fungus/Flowchart/Scripts/Flowchart.cs b/Assets/Fungus/Flowchart/Scripts/Flowchart.cs index 8c2616b4..2fb01873 100644 --- a/Assets/Fungus/Flowchart/Scripts/Flowchart.cs +++ b/Assets/Fungus/Flowchart/Scripts/Flowchart.cs @@ -8,14 +8,6 @@ using System.Text.RegularExpressions; namespace Fungus { - /** - * The FungusScript class has been renamed to Flowchart to be more descriptive. - */ - [Obsolete("Use Flowchart class instead")] - [ExecuteInEditMode] - public class FungusScript : Flowchart - {} - /** * Visual scripting controller for the Flowchart programming language. * Flowchart objects may be edited visually using the Flowchart editor window. diff --git a/Assets/Fungus/Narrative/Deprecated.meta b/Assets/Fungus/Narrative/Deprecated.meta deleted file mode 100644 index f3205afb..00000000 --- a/Assets/Fungus/Narrative/Deprecated.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: e28117fbc8861436296315b42526caac -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Fungus/Narrative/Deprecated/AddOption.cs b/Assets/Fungus/Narrative/Deprecated/AddOption.cs deleted file mode 100644 index 198a1641..00000000 --- a/Assets/Fungus/Narrative/Deprecated/AddOption.cs +++ /dev/null @@ -1,85 +0,0 @@ -using UnityEngine; -using UnityEngine.Serialization; -using System; -using System.Collections; -using System.Collections.Generic; - -namespace Fungus -{ - [CommandInfo("Deprecated", - "Add Option", - "Obsolete: This command will be removed in a future update. Please use the Option command instead.", - -1)] - [AddComponentMenu("")] - public class AddOption : SetVariable - { - [Tooltip("Option text to display when presenting the option to the player")] - public string optionText; - - [FormerlySerializedAs("targetSequence")] - [Tooltip("Block to execute when the player selects this option")] - public Block targetBlock; - - [Tooltip("Hide this option once it has been selected so that it won't appear again even if executed again")] - public bool hideOnSelected; - - protected bool wasSelected; - - public override void OnEnter() - { - if (hideOnSelected && wasSelected) - { - Continue(); - return; - } - - Choose.Option option = new Choose.Option(); - option.optionText = optionText; // Note: Variable substitution happens in the Choose command (as late as possible) - option.targetBlock = targetBlock; - - option.action = () => { - wasSelected = true; - DoSetOperation(); // Set variable (if one is specified) - }; - - Choose.options.Add(option); - - Continue(); - } - - public override string GetSummary() - { - string summaryText = optionText; - - if (targetBlock == null) - { - summaryText += " ( )"; - } - else - { - summaryText += " (" + targetBlock.blockName + ")"; - } - - return summaryText; - } - - public override void GetConnectedBlocks(ref List connectedBlocks) - { - if (targetBlock != null) - { - connectedBlocks.Add(targetBlock); - } - } - - public override Color GetButtonColor() - { - return new Color32(184, 210, 235, 255); - } - - public override void OnReset() - { - wasSelected = false; - } - } - -} \ No newline at end of file diff --git a/Assets/Fungus/Narrative/Deprecated/AddOption.cs.meta b/Assets/Fungus/Narrative/Deprecated/AddOption.cs.meta deleted file mode 100644 index 73080a03..00000000 --- a/Assets/Fungus/Narrative/Deprecated/AddOption.cs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9a61ea20fbb744ca2a363c33ad65cd89 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: diff --git a/Assets/Fungus/Narrative/Deprecated/Arrow.png b/Assets/Fungus/Narrative/Deprecated/Arrow.png deleted file mode 100644 index 377f174cac6fdb20cb39af7dd055a398a9f38580..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17154 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 JPDHLkV1f<)+`Rw* diff --git a/Assets/Fungus/Narrative/Deprecated/Arrow.png.meta b/Assets/Fungus/Narrative/Deprecated/Arrow.png.meta deleted file mode 100644 index d3d80465..00000000 --- a/Assets/Fungus/Narrative/Deprecated/Arrow.png.meta +++ /dev/null @@ -1,48 +0,0 @@ -fileFormatVersion: 2 -guid: b3426f0a4460547a69fc64b85700a13d -TextureImporter: - fileIDToRecycleName: - 21300000: Arrow - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Narrative/Deprecated/Choose.cs b/Assets/Fungus/Narrative/Deprecated/Choose.cs deleted file mode 100644 index f88a3784..00000000 --- a/Assets/Fungus/Narrative/Deprecated/Choose.cs +++ /dev/null @@ -1,202 +0,0 @@ -using UnityEngine; -using UnityEngine.Serialization; -using System; -using System.Collections; -using System.Collections.Generic; - -namespace Fungus -{ - [CommandInfo("Deprecated", - "Choose", - "Obsolete: This command will be removed in a future update. Please use the Menu command instead.", - -1)] - [AddComponentMenu("")] - public class Choose : Command - { - public class Option - { - public string optionText; - [FormerlySerializedAs("targetSequence")] - public Block targetBlock; - public Action action; - } - - static public List