Browse Source

Renamed Jump to Call

master
chrisgregan 11 years ago
parent
commit
39258bae2b
  1. 18
      Assets/Fungus/Editor/FungusScript/CallEditor.cs
  2. 0
      Assets/Fungus/Editor/FungusScript/CallEditor.cs.meta
  3. 16
      Assets/Fungus/VisualScripting/Call.cs
  4. 0
      Assets/Fungus/VisualScripting/Call.cs.meta
  5. BIN
      Assets/Shuttle/ShuttleGame.unity

18
Assets/Fungus/Editor/FungusScript/JumpEditor.cs → Assets/Fungus/Editor/FungusScript/CallEditor.cs

@ -6,14 +6,14 @@ using System.Collections.Generic;
namespace Fungus.Script namespace Fungus.Script
{ {
[CustomEditor (typeof(Jump))] [CustomEditor (typeof(Call))]
public class JumpEditor : FungusCommandEditor public class CallEditor : FungusCommandEditor
{ {
public override void DrawCommandInspectorGUI() public override void DrawCommandInspectorGUI()
{ {
serializedObject.Update(); serializedObject.Update();
Jump t = target as Jump; Call t = target as Call;
FungusScript sc = t.GetFungusScript(); FungusScript sc = t.GetFungusScript();
if (sc == null) if (sc == null)
@ -21,16 +21,16 @@ namespace Fungus.Script
return; return;
} }
JumpCondition jumpCondition = (JumpCondition)EditorGUILayout.EnumPopup(new GUIContent("Jump Condition", "Condition when jump will occur"), t.jumpCondition); CallCondition callCondition = (CallCondition)EditorGUILayout.EnumPopup(new GUIContent("Call Condition", "Condition when call will occur"), t.callCondition);
if (jumpCondition != t.jumpCondition) if (callCondition != t.callCondition)
{ {
Undo.RecordObject(t, "Set Jump Condition"); Undo.RecordObject(t, "Set Call Condition");
t.jumpCondition = jumpCondition; 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) if (targetSequence != t.targetSequence)
{ {
Undo.RecordObject(t, "Set Target Sequence"); Undo.RecordObject(t, "Set Target Sequence");

0
Assets/Fungus/Editor/FungusScript/JumpEditor.cs.meta → Assets/Fungus/Editor/FungusScript/CallEditor.cs.meta

16
Assets/Fungus/VisualScripting/Jump.cs → Assets/Fungus/VisualScripting/Call.cs

@ -4,10 +4,10 @@ using System.Collections.Generic;
namespace Fungus.Script namespace Fungus.Script
{ {
public enum JumpCondition public enum CallCondition
{ {
JumpAlways, CallAlways,
JumpOnCompare CallOnCompare
} }
public enum CompareOperator public enum CompareOperator
@ -20,9 +20,9 @@ namespace Fungus.Script
GreaterThanOrEquals // >= GreaterThanOrEquals // >=
} }
public class Jump : FungusCommand public class Call : FungusCommand
{ {
public JumpCondition jumpCondition; public CallCondition callCondition;
public Sequence targetSequence; // Only used for Always condition public Sequence targetSequence; // Only used for Always condition
@ -44,7 +44,7 @@ namespace Fungus.Script
public override void OnEnter() public override void OnEnter()
{ {
if (jumpCondition == JumpCondition.JumpAlways && if (callCondition == CallCondition.CallAlways &&
targetSequence != null) targetSequence != null)
{ {
ExecuteSequence(targetSequence); ExecuteSequence(targetSequence);
@ -168,7 +168,7 @@ namespace Fungus.Script
public override void GetConnectedSequences(ref List<Sequence> connectedSequences) public override void GetConnectedSequences(ref List<Sequence> connectedSequences)
{ {
if (jumpCondition == JumpCondition.JumpAlways && if (callCondition == CallCondition.CallAlways &&
targetSequence != null) targetSequence != null)
{ {
connectedSequences.Add(targetSequence); connectedSequences.Add(targetSequence);
@ -187,7 +187,7 @@ namespace Fungus.Script
public override string GetCommandName() public override string GetCommandName()
{ {
if (jumpCondition == JumpCondition.JumpAlways) if (callCondition == CallCondition.CallAlways)
{ {
return GetType().Name; return GetType().Name;
} }

0
Assets/Fungus/VisualScripting/Jump.cs.meta → Assets/Fungus/VisualScripting/Call.cs.meta

BIN
Assets/Shuttle/ShuttleGame.unity

Binary file not shown.
Loading…
Cancel
Save