From 39258bae2b639670cb0c7458eadb0ae94e98ce44 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Tue, 12 Aug 2014 09:08:18 +0100 Subject: [PATCH] Renamed Jump to Call --- .../{JumpEditor.cs => CallEditor.cs} | 18 +++++++++--------- ...{JumpEditor.cs.meta => CallEditor.cs.meta} | 0 .../VisualScripting/{Jump.cs => Call.cs} | 16 ++++++++-------- .../{Jump.cs.meta => Call.cs.meta} | 0 Assets/Shuttle/ShuttleGame.unity | Bin 80900 -> 80900 bytes 5 files changed, 17 insertions(+), 17 deletions(-) rename Assets/Fungus/Editor/FungusScript/{JumpEditor.cs => CallEditor.cs} (87%) rename Assets/Fungus/Editor/FungusScript/{JumpEditor.cs.meta => CallEditor.cs.meta} (100%) rename Assets/Fungus/VisualScripting/{Jump.cs => Call.cs} (92%) rename Assets/Fungus/VisualScripting/{Jump.cs.meta => Call.cs.meta} (100%) diff --git a/Assets/Fungus/Editor/FungusScript/JumpEditor.cs b/Assets/Fungus/Editor/FungusScript/CallEditor.cs similarity index 87% rename from Assets/Fungus/Editor/FungusScript/JumpEditor.cs rename to Assets/Fungus/Editor/FungusScript/CallEditor.cs index f2b10ddc..34cfc713 100644 --- a/Assets/Fungus/Editor/FungusScript/JumpEditor.cs +++ b/Assets/Fungus/Editor/FungusScript/CallEditor.cs @@ -6,14 +6,14 @@ using System.Collections.Generic; namespace Fungus.Script { - [CustomEditor (typeof(Jump))] - public class JumpEditor : FungusCommandEditor + [CustomEditor (typeof(Call))] + public class CallEditor : FungusCommandEditor { public override void DrawCommandInspectorGUI() { serializedObject.Update(); - Jump t = target as Jump; + Call t = target as Call; FungusScript sc = t.GetFungusScript(); if (sc == null) @@ -21,16 +21,16 @@ namespace Fungus.Script return; } - JumpCondition jumpCondition = (JumpCondition)EditorGUILayout.EnumPopup(new GUIContent("Jump Condition", "Condition when jump will occur"), t.jumpCondition); - if (jumpCondition != t.jumpCondition) + CallCondition callCondition = (CallCondition)EditorGUILayout.EnumPopup(new GUIContent("Call Condition", "Condition when call will occur"), t.callCondition); + if (callCondition != t.callCondition) { - Undo.RecordObject(t, "Set Jump Condition"); - t.jumpCondition = jumpCondition; + Undo.RecordObject(t, "Set Call Condition"); + t.callCondition = callCondition; } - if (t.jumpCondition == JumpCondition.JumpAlways) + if (t.callCondition == CallCondition.CallAlways) { - Sequence targetSequence = SequenceEditor.SequenceField(new GUIContent("Target Sequence", "Sequence to jump to"), t.GetFungusScript(), t.targetSequence); + Sequence targetSequence = SequenceEditor.SequenceField(new GUIContent("Target Sequence", "Sequence to call"), t.GetFungusScript(), t.targetSequence); if (targetSequence != t.targetSequence) { Undo.RecordObject(t, "Set Target Sequence"); diff --git a/Assets/Fungus/Editor/FungusScript/JumpEditor.cs.meta b/Assets/Fungus/Editor/FungusScript/CallEditor.cs.meta similarity index 100% rename from Assets/Fungus/Editor/FungusScript/JumpEditor.cs.meta rename to Assets/Fungus/Editor/FungusScript/CallEditor.cs.meta diff --git a/Assets/Fungus/VisualScripting/Jump.cs b/Assets/Fungus/VisualScripting/Call.cs similarity index 92% rename from Assets/Fungus/VisualScripting/Jump.cs rename to Assets/Fungus/VisualScripting/Call.cs index 6a10ab82..96a08dd6 100644 --- a/Assets/Fungus/VisualScripting/Jump.cs +++ b/Assets/Fungus/VisualScripting/Call.cs @@ -4,10 +4,10 @@ using System.Collections.Generic; namespace Fungus.Script { - public enum JumpCondition + public enum CallCondition { - JumpAlways, - JumpOnCompare + CallAlways, + CallOnCompare } public enum CompareOperator @@ -20,9 +20,9 @@ namespace Fungus.Script GreaterThanOrEquals // >= } - public class Jump : FungusCommand + public class Call : FungusCommand { - public JumpCondition jumpCondition; + public CallCondition callCondition; public Sequence targetSequence; // Only used for Always condition @@ -44,7 +44,7 @@ namespace Fungus.Script public override void OnEnter() { - if (jumpCondition == JumpCondition.JumpAlways && + if (callCondition == CallCondition.CallAlways && targetSequence != null) { ExecuteSequence(targetSequence); @@ -168,7 +168,7 @@ namespace Fungus.Script public override void GetConnectedSequences(ref List connectedSequences) { - if (jumpCondition == JumpCondition.JumpAlways && + if (callCondition == CallCondition.CallAlways && targetSequence != null) { connectedSequences.Add(targetSequence); @@ -187,7 +187,7 @@ namespace Fungus.Script public override string GetCommandName() { - if (jumpCondition == JumpCondition.JumpAlways) + if (callCondition == CallCondition.CallAlways) { return GetType().Name; } diff --git a/Assets/Fungus/VisualScripting/Jump.cs.meta b/Assets/Fungus/VisualScripting/Call.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/Jump.cs.meta rename to Assets/Fungus/VisualScripting/Call.cs.meta diff --git a/Assets/Shuttle/ShuttleGame.unity b/Assets/Shuttle/ShuttleGame.unity index 2aa4aef26cb1939c860d601b9726b91a31c63d03..87c4562d898b9829525e09513a861587a7520731 100644 GIT binary patch delta 35 rcmZqq!P4@BWy6ZuEXj#EIh)tap47uAx7}WY@jVw~!ghUQ#;Y6vAF>WR delta 35 rcmZqq!P4@BWy6ZuELo+w1)JB*p47uAzujJg@jVw~z;=CO#;Y6vB2NxX