From 2cb21358105c218b9ddd41c3828096e7b60c7452 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Mon, 22 Jun 2015 01:40:07 -0500
Subject: [PATCH 1/5] Big step forward in supporting user-defined types, global
 functions and global variables (still in progress).  This has all the new
 XML/bean support and most of the Blockly glue to make things work.

---
 .../badvision/outlaweditor/MythosEditor.java  |  50 +++++-
 .../ui/MythosScriptEditorController.java      |   5 +-
 .../jaxb/OutlawSchema/OutlawSchema.xsd        |  34 ++++
 .../mythos-editor/js/mythos_uncompressed.js   | 152 +++++++++++++++---
 4 files changed, 210 insertions(+), 31 deletions(-)

diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
index 915d5814..590f83a2 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
@@ -3,12 +3,13 @@ package org.badvision.outlaweditor;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.layout.AnchorPane;
@@ -23,6 +24,8 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import org.badvision.outlaweditor.data.xml.Block;
+import org.badvision.outlaweditor.data.xml.Global.UserTypes.UserType;
+import org.badvision.outlaweditor.data.xml.Global.Variables.Variable;
 import org.badvision.outlaweditor.data.xml.Script;
 import org.badvision.outlaweditor.ui.ApplicationUIController;
 import org.badvision.outlaweditor.ui.MythosScriptEditorController;
@@ -104,7 +107,6 @@ public class MythosEditor {
                 xml = xml.replaceAll("'", "&apos;");
                 xml = xml.replace("?>", "?><xml>");
                 xml += "</xml>";
-                System.out.println("xml: " + xml);
                 return generateLoadScript(xml);
             } catch (JAXBException ex) {
                 Logger.getLogger(MythosEditor.class.getName()).log(Level.SEVERE, null, ex);
@@ -134,8 +136,44 @@ public class MythosEditor {
         script.setName(name);
         ApplicationUIController.getController().redrawScripts();
     }
-    
-    public List getUserTypes() {
-        return new ArrayList();
+
+   public List<Script> getGlobalFunctions() {
+        if (Application.gameData.getGlobal().getScripts() == null) {
+            return Collections.emptyList();
+        } else {
+            List<Script> scripts = Application.gameData.getGlobal().getScripts().getScript();
+            List<Script> filteredList = scripts.stream().filter((Script s) -> {
+                return s.getName() != null && !s.equals(script);
+            }).collect(Collectors.toList());
+            return filteredList;
+        }
     }
-}
+
+    public List<UserType> getUserTypes() {
+        if (Application.gameData.getGlobal().getUserTypes() == null) {
+            return Collections.emptyList();
+        } else {
+            return Application.gameData.getGlobal().getUserTypes().getUserType();
+        }
+    }
+
+    public List<Variable> getGlobalVariables() {
+        if (Application.gameData.getGlobal().getVariables() == null) {
+            return Collections.emptyList();
+        } else {
+            return Application.gameData.getGlobal().getVariables().getVariable();
+        }
+    }
+
+    public List<Variable> getVariablesByType(String type) {
+        return getGlobalVariables().stream().filter(
+                (Variable v) -> {
+                    return v.getType().equals(type);
+                }).collect(Collectors.toList());
+    }
+    
+    public void log(String message) {
+        System.out.println(message);
+    }
+}   
+ 
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/MythosScriptEditorController.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/MythosScriptEditorController.java
index 6351adb4..995eab55 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/MythosScriptEditorController.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/MythosScriptEditorController.java
@@ -3,11 +3,8 @@ package org.badvision.outlaweditor.ui;
 import java.net.URL;
 import java.util.ListResourceBundle;
 import java.util.Map;
-import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.Set;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Worker.State;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -107,7 +104,7 @@ public class MythosScriptEditorController
                             editorView.getEngine().executeScript(loadScript);
                         }
                     });
-
+            
             editorView.getEngine().setPromptHandler((PromptData prompt) -> {
                 TextInputDialog dialog = new TextInputDialog(prompt.getDefaultValue());
                 dialog.setTitle("MythosScript Editor");
diff --git a/OutlawEditor/src/main/resources/jaxb/OutlawSchema/OutlawSchema.xsd b/OutlawEditor/src/main/resources/jaxb/OutlawSchema/OutlawSchema.xsd
index cfa83417..708db8ec 100644
--- a/OutlawEditor/src/main/resources/jaxb/OutlawSchema/OutlawSchema.xsd
+++ b/OutlawEditor/src/main/resources/jaxb/OutlawSchema/OutlawSchema.xsd
@@ -74,6 +74,40 @@
     <xs:complexType name="global">
         <xs:sequence>
             <xs:element name="scripts" type="tns:scripts"/>
+            <xs:element name="userTypes" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="userType" minOccurs="0" maxOccurs="unbounded">
+                            <xs:complexType>
+                                <xs:sequence>
+                                    <xs:element name="attribute" minOccurs="1" maxOccurs="unbounded">
+                                        <xs:complexType>
+                                            <xs:attribute name="name" use="required" type="xs:NCName"/>
+                                            <xs:attribute name="type" use="required" type="xs:NMTOKEN"/>
+                                            <xs:attribute name="comment" type="xs:string"/>                            
+                                        </xs:complexType>
+                                    </xs:element>
+                                </xs:sequence>
+                                <xs:attribute name="name" use="required" type="xs:NCName"/>                            
+                                <xs:attribute name="comment" use="required" type="xs:string"/>                            
+                            </xs:complexType>
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="variables">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="variable" minOccurs="0" maxOccurs="unbounded">
+                            <xs:complexType>
+                                <xs:attribute name="name" use="required" type="xs:NCName"/>
+                                <xs:attribute name="type" use="required" type="xs:NMTOKEN"/>
+                                <xs:attribute name="comment" type="xs:string"/>                                
+                            </xs:complexType>
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
         </xs:sequence>
     </xs:complexType>
     <xs:complexType name="scripts">
diff --git a/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js b/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js
index 97f732f4..a35b481f 100644
--- a/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js
+++ b/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js
@@ -24,38 +24,148 @@ if (typeof Mythos === "undefined") {
             return Blockly.Xml.workspaceToDom(Blockly.mainWorkspace).innerHTML;
         },
         helpUrl: 'https://docs.google.com/document/d/1VXbiY4G533-cokjQevZFhwvqMMCL--17ziMAoFoeJ5M/edit#heading=h.yv9dmneqjr2b',
-        initCustomDefinitions: function() {
+        initCustomDefinitions: function () {
+//            Mythos.editor.log("Add user defined types");
             Mythos.addUserDefinedTypes();
+//            Mythos.editor.log("Add global variables");
             Mythos.addVariablesFromGlobalScope();
+//            Mythos.editor.log("Add global functions");
             Mythos.addFunctionsFromGlobalScope();
+//            Mythos.editor.log("Add local variables");
             Mythos.addVariablesFromLocalScope();
+//            Mythos.editor.log("Add local functions");
             Mythos.addFunctionsFromLocalScope();
+//            Mythos.editor.log("Reinitalizing toolbox");
+            Blockly.mainWorkspace.updateToolbox(document.getElementById('toolbox'));
+//            Mythos.editor.log("Done");
         },
-        addUserDefinedTypes: function() {
-            var toolbarCategory = document.getElementById("customTypes");
-            for (var userType in Mythos.editor.getUserTypes()) {
-                var typeNode = document.createElement("block");
-                typeNode.setAttribute("type", "new_"+userType);                
-                toolbarCategory.appendChild(typeNode);
-                Mythos.buildCustomType(userType);
+        each: function (list, func) {
+//            Mythos.editor.log(list.toString());
+            if (list && list.length > 0) {
+                for (var i = 0; i < list.length; i++) {
+                    func(list[i]);
+                }
             }
         },
-        buildCustomType: function(userType) {
-            //Blockly.Blocks['new_']
+        addUserDefinedTypes: function () {
+            var toolbarCategory = document.getElementById("customTypes");
+            Mythos.each(Mythos.editor.getUserTypes(), function (userType) {
+                var typeNode = document.createElement("block");
+                typeNode.setAttribute("type", "userType_" + userType.getName());
+                toolbarCategory.appendChild(typeNode);
+                var getNode = document.createElement("block");
+                getNode.setAttribute("type", "get_" + userType.getName());
+                toolbarCategory.appendChild(getNode);
+                var setNode = document.createElement("block");
+                setNode.setAttribute("type", "set_" + userType.getName());
+                toolbarCategory.appendChild(setNode);
+                Mythos.buildCustomTypeBlocks(userType);
+            });
         },
-        addVariablesFromGlobalScope: function() {
-            
+        buildCustomType: function (userType) {
+            Blockly.Blocks['userType_' + userType.getName()] = {
+                init: function () {
+                    var typeConstructor = this;
+                    typeConstructor.setColour(200);
+                    typeConstructor.appendDummyInput()
+                            .appendField("Create " + userType.getName());
+                    Mythos.each(userType.getAttribute(), function (attribute) {
+                        typeConstructor.appendValueInput(attribute.getName())
+                                .setAlign(Blockly.ALIGN_RIGHT)
+                                .setCheck(attribute.getType())
+                                .appendField(attribute.getName());
+                    });
+                    typeConstructor.setPreviousStatement(true);
+                    typeConstructor.setNextStatement(true);
+                    typeConstructor.setOutput(true, userType.getName());
+                }
+            };
+            Blockly.Blocks['set_' + userType.getName()] = {
+                init: function () {
+                    var typeSetter = this;
+                    typeSetter.setColour(200);
+                    typeSetter.appendValueInput("Set ")
+                            .setAlign(Blockly.ALIGN_LEFT)
+                            .setCheck(null)
+                            .appendField(Mythos.getVariableDropdown(userType), "VAR")
+                            .appendField(".")
+                            .appendField(Mythos.getAttributeDropdoen(userType), "ATTR");
+                    typeSetter.setPreviousStatement(true);
+                    typeSetter.setNextStatement(true);
+                    typeSetter.setOutput(false);
+                }
+            };
+            Blockly.Blocks['get_' + userType.getName()] = {
+                init: function () {
+                    var typeGetter = this;
+                    typeGetter.setColour(200);
+                    typeGetter.appendDummyInput()
+                            .setAlign(Blockly.ALIGN_LEFT)
+                            .setCheck(null)
+                            .appendField(Mythos.getVariableDropdown(userType), "VAR")
+                            .appendField(".")
+                            .appendField(Mythos.getAttributeDropdoen(userType), "ATTR");
+                    typeGetter.setPreviousStatement(false);
+                    typeGetter.setNextStatement(false);
+                    typeGetter.setOutput(true, null);
+                }
+            };
         },
-        addFunctionsFromGlobalScope: function() {
+        getVariableDropdown: function (userType) {
+            var variables = Mythos.editor.getVariablesByType(userType.getName());
+            var options = [];
+            Mythos.each(variables, function (variable) {
+                options.push([variable.getName(), variable.getName()]);
+            });
+            return Blockly.FieldDropdown(options);
+        },
+        getAttributeDropdown: function (userType) {
+            var options = [];
+            Mythos.each(userType.getAttribute(), function (attribute) {
+                options.push([attribute.getName(), attribute.getName()]);
+            });
+            return Blockly.FieldDropdown(options);
+        },
+        addVariablesFromGlobalScope: function () {
+            Blockly.Variables.allVariables_old = Blockly.Variables.allVariables;
+            Blockly.Variables.allVariables = function (workspace) {
+                var list = Blockly.Variables.allVariables_old(workspace);
+                var variable;
+                Mythos.each(Mythos.editor.getVariablesByType("String"), function (variable) {
+                    list.push(variable.getName());
+                });
+                Mythos.each(Mythos.editor.getVariablesByType("Number"), function (variable) {
+                    list.push(variable.getName());
+                });
+                Mythos.each(Mythos.editor.getVariablesByType("Boolean"), function (variable) {
+                    list.push(variable.getName());
+                });
+                return list;
+            };
+        },
+        addFunctionsFromGlobalScope: function () {
             var toolbarCategory = document.getElementById("globalFunctions");
-            
+            Mythos.each(Mythos.editor.getGlobalFunctions(), function (func) {
+                var scriptNode = document.createElement("block");
+                scriptNode.setAttribute("type", "global_" + func.getName());
+                toolbarCategory.appendChild(scriptNode);
+                Blockly.blocks['global_' + func.getName()] = {
+                    init: function () {
+                        this.setColour(250);
+                        this.appendDummyInput()
+                                .appendField("Global " + func.getName());
+                        this.setPreviousStatement(true);
+                        this.setNextStatement(true);
+                    }
+                };
+            });
         },
-        addVariablesFromLocalScope: function() {
-            
+        addVariablesFromLocalScope: function () {
+
         },
-        addFunctionsFromLocalScope: function() {
-            var toolbarCategory = document.getElementById("localFunctions");
-            
+        addFunctionsFromLocalScope: function () {
+//            var toolbarCategory = document.getElementById("localFunctions");
+
         },
         initBlocks: function () {
             Blockly.Blocks['flow_for'] = {
@@ -162,7 +272,7 @@ if (typeof Mythos === "undefined") {
                 }
             };
             Blockly.Blocks['events_move_backward'] = {
-                init: function() {
+                init: function () {
                     this.setHelpUrl(Mythos.helpUrl);
                     this.setColour(54);
                     this.setPreviousStatement(true);
@@ -382,4 +492,4 @@ if (typeof Mythos === "undefined") {
         }
     };
 }
-;
\ No newline at end of file
+;

From f94e2beeb7a84850609e76926afa9c6998134e78 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Mon, 22 Jun 2015 02:14:12 -0500
Subject: [PATCH 2/5] Global functions now show up!!

---
 .../org/badvision/outlaweditor/MythosEditor.java    |  7 ++++---
 .../resources/mythos/mythos-editor/html/editor.html |  2 +-
 .../mythos/mythos-editor/js/mythos_uncompressed.js  | 13 +++++++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
index 590f83a2..5fcaf3ea 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
@@ -3,6 +3,7 @@ package org.badvision.outlaweditor;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.StringWriter;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -139,7 +140,7 @@ public class MythosEditor {
 
    public List<Script> getGlobalFunctions() {
         if (Application.gameData.getGlobal().getScripts() == null) {
-            return Collections.emptyList();
+            return new ArrayList<>();
         } else {
             List<Script> scripts = Application.gameData.getGlobal().getScripts().getScript();
             List<Script> filteredList = scripts.stream().filter((Script s) -> {
@@ -151,7 +152,7 @@ public class MythosEditor {
 
     public List<UserType> getUserTypes() {
         if (Application.gameData.getGlobal().getUserTypes() == null) {
-            return Collections.emptyList();
+            return new ArrayList<>();
         } else {
             return Application.gameData.getGlobal().getUserTypes().getUserType();
         }
@@ -159,7 +160,7 @@ public class MythosEditor {
 
     public List<Variable> getGlobalVariables() {
         if (Application.gameData.getGlobal().getVariables() == null) {
-            return Collections.emptyList();
+            return new ArrayList<>();
         } else {
             return Application.gameData.getGlobal().getVariables().getVariable();
         }
diff --git a/OutlawEditor/src/main/resources/mythos/mythos-editor/html/editor.html b/OutlawEditor/src/main/resources/mythos/mythos-editor/html/editor.html
index 826e801f..6ca4911d 100644
--- a/OutlawEditor/src/main/resources/mythos/mythos-editor/html/editor.html
+++ b/OutlawEditor/src/main/resources/mythos/mythos-editor/html/editor.html
@@ -86,7 +86,7 @@
 
     <script>
         Mythos.initBlocks();
-        Blockly.inject(document.getElementById('blocklyDiv'),
+        Mythos.workspace = Blockly.inject(document.getElementById('blocklyDiv'),
                 {path: '../../', toolbox: document.getElementById('toolbox')});
     </script>
 
diff --git a/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js b/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js
index a35b481f..38ec6232 100644
--- a/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js
+++ b/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js
@@ -36,15 +36,18 @@ if (typeof Mythos === "undefined") {
 //            Mythos.editor.log("Add local functions");
             Mythos.addFunctionsFromLocalScope();
 //            Mythos.editor.log("Reinitalizing toolbox");
-            Blockly.mainWorkspace.updateToolbox(document.getElementById('toolbox'));
+            Mythos.workspace.updateToolbox(document.getElementById('toolbox'));
 //            Mythos.editor.log("Done");
         },
         each: function (list, func) {
-//            Mythos.editor.log(list.toString());
-            if (list && list.length > 0) {
+            if (list && list instanceof Array) {
                 for (var i = 0; i < list.length; i++) {
                     func(list[i]);
                 }
+            } else if (list) {
+                for (var i=0; i < list.size(); i++) {
+                    func(list.get(i));
+                }
             }
         },
         addUserDefinedTypes: function () {
@@ -146,10 +149,11 @@ if (typeof Mythos === "undefined") {
         addFunctionsFromGlobalScope: function () {
             var toolbarCategory = document.getElementById("globalFunctions");
             Mythos.each(Mythos.editor.getGlobalFunctions(), function (func) {
+                Mythos.editor.log("Adding "+func.getName());
                 var scriptNode = document.createElement("block");
                 scriptNode.setAttribute("type", "global_" + func.getName());
                 toolbarCategory.appendChild(scriptNode);
-                Blockly.blocks['global_' + func.getName()] = {
+                Blockly.Blocks['global_' + func.getName()] = {
                     init: function () {
                         this.setColour(250);
                         this.appendDummyInput()
@@ -159,6 +163,7 @@ if (typeof Mythos === "undefined") {
                     }
                 };
             });
+            Mythos.editor.log(toolbarCategory.outerHTML);
         },
         addVariablesFromLocalScope: function () {
 

From e41e515014cf6d790ca8443dace8baa78bbdbf94 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Tue, 23 Jun 2015 01:37:39 -0500
Subject: [PATCH 3/5] Global functions now have proper return and non-return
 variant calls and full parameter support!

---
 .../badvision/outlaweditor/MythosEditor.java  | 24 +++++++++---
 .../mythos-editor/js/mythos_uncompressed.js   | 38 +++++++++++++++----
 2 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
index 5fcaf3ea..ba74ec6b 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
@@ -11,6 +11,7 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.layout.AnchorPane;
@@ -24,9 +25,11 @@ import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import org.badvision.outlaweditor.data.xml.Arg;
 import org.badvision.outlaweditor.data.xml.Block;
 import org.badvision.outlaweditor.data.xml.Global.UserTypes.UserType;
 import org.badvision.outlaweditor.data.xml.Global.Variables.Variable;
+import org.badvision.outlaweditor.data.xml.Mutation;
 import org.badvision.outlaweditor.data.xml.Script;
 import org.badvision.outlaweditor.ui.ApplicationUIController;
 import org.badvision.outlaweditor.ui.MythosScriptEditorController;
@@ -138,13 +141,13 @@ public class MythosEditor {
         ApplicationUIController.getController().redrawScripts();
     }
 
-   public List<Script> getGlobalFunctions() {
+    public List<Script> getGlobalFunctions() {
         if (Application.gameData.getGlobal().getScripts() == null) {
             return new ArrayList<>();
         } else {
             List<Script> scripts = Application.gameData.getGlobal().getScripts().getScript();
             List<Script> filteredList = scripts.stream().filter((Script s) -> {
-                return s.getName() != null && !s.equals(script);
+                return s.getName() != null;
             }).collect(Collectors.toList());
             return filteredList;
         }
@@ -172,9 +175,20 @@ public class MythosEditor {
                     return v.getType().equals(type);
                 }).collect(Collectors.toList());
     }
-    
+
+    public List<String> getParametersForScript(Script script) {
+        List<String> allArgs = new ArrayList();
+        script.getBlock().getFieldOrMutationOrStatement()
+                .stream().filter((o) -> (o instanceof Mutation))
+                .map((o) -> (Mutation) o).findFirst().ifPresent((m) -> {
+                    m.getArg().stream().forEach((a) -> {
+                        allArgs.add(a.getName());
+                    });
+                });
+        return allArgs;
+    }
+
     public void log(String message) {
         System.out.println(message);
     }
-}   
- 
+}
diff --git a/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js b/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js
index 38ec6232..1b2afa11 100644
--- a/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js
+++ b/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js
@@ -45,7 +45,7 @@ if (typeof Mythos === "undefined") {
                     func(list[i]);
                 }
             } else if (list) {
-                for (var i=0; i < list.size(); i++) {
+                for (var i = 0; i < list.size(); i++) {
                     func(list.get(i));
                 }
             }
@@ -133,7 +133,6 @@ if (typeof Mythos === "undefined") {
             Blockly.Variables.allVariables_old = Blockly.Variables.allVariables;
             Blockly.Variables.allVariables = function (workspace) {
                 var list = Blockly.Variables.allVariables_old(workspace);
-                var variable;
                 Mythos.each(Mythos.editor.getVariablesByType("String"), function (variable) {
                     list.push(variable.getName());
                 });
@@ -149,21 +148,46 @@ if (typeof Mythos === "undefined") {
         addFunctionsFromGlobalScope: function () {
             var toolbarCategory = document.getElementById("globalFunctions");
             Mythos.each(Mythos.editor.getGlobalFunctions(), function (func) {
-                Mythos.editor.log("Adding "+func.getName());
                 var scriptNode = document.createElement("block");
                 scriptNode.setAttribute("type", "global_" + func.getName());
                 toolbarCategory.appendChild(scriptNode);
-                Blockly.Blocks['global_' + func.getName()] = {
+                scriptNode = document.createElement("block");
+                scriptNode.setAttribute("type", "globalignore_" + func.getName());
+                toolbarCategory.appendChild(scriptNode);
+                Blockly.Blocks['globalignore_' + func.getName()] = {
                     init: function () {
+                        this.setPreviousStatement(true);
+                        this.setNextStatement(true);
                         this.setColour(250);
                         this.appendDummyInput()
                                 .appendField("Global " + func.getName());
-                        this.setPreviousStatement(true);
-                        this.setNextStatement(true);
+                        var functionBlock = this;
+                        Mythos.each(Mythos.editor.getParametersForScript(func), function (argName) {
+                            functionBlock.appendValueInput(argName)
+                                    .setAlign(Blockly.ALIGN_RIGHT)
+                                    .setCheck(null)
+                                    .appendField(argName);
+                        });
+                    }
+                };
+                Blockly.Blocks['global_' + func.getName()] = {
+                    init: function () {
+                        this.setColour(250);
+                        this.setPreviousStatement(false);
+                        this.setNextStatement(false);
+                        this.setOutput(true, null);
+                        this.appendDummyInput()
+                                .appendField("Global " + func.getName());
+                        var functionBlock = this;
+                        Mythos.each(Mythos.editor.getParametersForScript(func), function (argName) {
+                            functionBlock.appendValueInput(argName)
+                                    .setAlign(Blockly.ALIGN_RIGHT)
+                                    .setCheck(null)
+                                    .appendField(argName);
+                        });
                     }
                 };
             });
-            Mythos.editor.log(toolbarCategory.outerHTML);
         },
         addVariablesFromLocalScope: function () {
 

From 050613781db8850609690346d77784ded24a7cf6 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Tue, 23 Jun 2015 16:31:37 -0500
Subject: [PATCH 4/5] Abstracted Map and Global to both be scopes and share
 common constructs.

---
 .../badvision/outlaweditor/MythosEditor.java  |  12 +-
 .../badvision/outlaweditor/ui/UIAction.java   |   9 +-
 .../impl/GlobalEditorTabControllerImpl.java   |   6 +-
 .../ui/impl/MapEditorTabControllerImpl.java   |   7 +-
 .../jaxb/OutlawSchema/OutlawSchema.xsd        | 130 ++++++++++--------
 5 files changed, 86 insertions(+), 78 deletions(-)

diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
index ba74ec6b..049b221a 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
@@ -4,14 +4,12 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.layout.AnchorPane;
@@ -25,12 +23,12 @@ import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import org.badvision.outlaweditor.data.xml.Arg;
 import org.badvision.outlaweditor.data.xml.Block;
-import org.badvision.outlaweditor.data.xml.Global.UserTypes.UserType;
-import org.badvision.outlaweditor.data.xml.Global.Variables.Variable;
 import org.badvision.outlaweditor.data.xml.Mutation;
+import org.badvision.outlaweditor.data.xml.Scope;
 import org.badvision.outlaweditor.data.xml.Script;
+import org.badvision.outlaweditor.data.xml.UserType;
+import org.badvision.outlaweditor.data.xml.Variable;
 import org.badvision.outlaweditor.ui.ApplicationUIController;
 import org.badvision.outlaweditor.ui.MythosScriptEditorController;
 import org.w3c.dom.Document;
@@ -43,13 +41,15 @@ import org.xml.sax.SAXException;
  */
 public class MythosEditor {
 
+    Scope scope;
     Script script;
     Stage primaryStage;
     MythosScriptEditorController controller;
     public static final String XML_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
 
-    public MythosEditor(Script theScript) {
+    public MythosEditor(Script theScript, Scope theScope) {
         script = theScript;
+        scope = theScope;
     }
 
     public void show() {
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/UIAction.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/UIAction.java
index d6905964..3a5067e1 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/UIAction.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/UIAction.java
@@ -56,6 +56,7 @@ import org.badvision.outlaweditor.data.DataUtilities;
 import org.badvision.outlaweditor.data.TileUtils;
 import org.badvision.outlaweditor.data.TilesetUtils;
 import org.badvision.outlaweditor.data.xml.GameData;
+import org.badvision.outlaweditor.data.xml.Scope;
 import org.badvision.outlaweditor.data.xml.Script;
 import org.badvision.outlaweditor.data.xml.Tile;
 import org.badvision.outlaweditor.ui.impl.ImageConversionWizardController;
@@ -223,19 +224,19 @@ public class UIAction {
         dialogStage.show();
     }
 
-    public static Script createAndEditScript() {
+    public static Script createAndEditScript(Scope scope) {
         Script script = new Script();
         script.setName("New Script");
         ApplicationUIController.getController().getVisibleEditor().addScript(script);
-        return editScript(script);
+        return editScript(script, scope);
     }
 
-    public static Script editScript(Script script) {
+    public static Script editScript(Script script, Scope scope) {
         if (script == null) {
             System.err.println("Requested to edit a null script object, ignoring!");
             return null;
         }
-        MythosEditor editor = new MythosEditor(script);
+        MythosEditor editor = new MythosEditor(script, scope);
         editor.show();
         return script;
     }
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/GlobalEditorTabControllerImpl.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/GlobalEditorTabControllerImpl.java
index cd537fd0..146c7a4e 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/GlobalEditorTabControllerImpl.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/GlobalEditorTabControllerImpl.java
@@ -21,7 +21,7 @@ public class GlobalEditorTabControllerImpl extends GlobalEditorTabController {
 
     @Override
     protected void onScriptAddPressed(ActionEvent event) {
-        UIAction.createAndEditScript();
+        UIAction.createAndEditScript(Application.gameData.getGlobal());
     }
 
     @Override
@@ -50,7 +50,7 @@ public class GlobalEditorTabControllerImpl extends GlobalEditorTabController {
                 Script script = TransferHelper.cloneObject(source, Script.class, "script");
                 script.setName(source.getName() + " CLONE");
                 getCurrentEditor().addScript(script);
-                editScript(script);
+                editScript(script, Application.gameData.getGlobal());
             } catch (JAXBException ex) {
                 Logger.getLogger(MapEditorTabControllerImpl.class.getName()).log(Level.SEVERE, null, ex);
                 UIAction.alert("Error occured when attempting clone operation:\n" + ex.getMessage());
@@ -86,7 +86,7 @@ public class GlobalEditorTabControllerImpl extends GlobalEditorTabController {
     public void redrawGlobalScripts() {
         DataUtilities.ensureGlobalExists();
         globalScriptList.setOnEditStart((ListView.EditEvent<Script> event) -> {
-            UIAction.editScript(event.getSource().getItems().get(event.getIndex()));
+            UIAction.editScript(event.getSource().getItems().get(event.getIndex()), Application.gameData.getGlobal());
         });
         globalScriptList.setCellFactory(new Callback<ListView<Script>, ListCell<Script>>() {
             @Override
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/MapEditorTabControllerImpl.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/MapEditorTabControllerImpl.java
index 053f6020..028b3713 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/MapEditorTabControllerImpl.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/MapEditorTabControllerImpl.java
@@ -28,7 +28,6 @@ import static org.badvision.outlaweditor.data.PropertyHelper.stringProp;
 import org.badvision.outlaweditor.data.TileUtils;
 import org.badvision.outlaweditor.data.xml.Map;
 import org.badvision.outlaweditor.data.xml.Script;
-import org.badvision.outlaweditor.data.xml.Scripts;
 import org.badvision.outlaweditor.data.xml.Tile;
 import org.badvision.outlaweditor.ui.EntitySelectorCell;
 import org.badvision.outlaweditor.ui.MapEditorTabController;
@@ -148,7 +147,7 @@ public class MapEditorTabControllerImpl extends MapEditorTabController {
 
     @Override
     public void onMapScriptAddPressed(ActionEvent event) {
-        createAndEditScript();
+        createAndEditScript(getCurrentMap());
     }
 
     int errorCount = 0;
@@ -185,7 +184,7 @@ public class MapEditorTabControllerImpl extends MapEditorTabController {
                 Script script = TransferHelper.cloneObject(source, Script.class, "script");
                 script.setName(source.getName() + " CLONE");
                 getCurrentEditor().addScript(script);
-                editScript(script);
+                editScript(script, getCurrentMap());
             } catch (JAXBException ex) {
                 Logger.getLogger(MapEditorTabControllerImpl.class.getName()).log(Level.SEVERE, null, ex);
                 UIAction.alert("Error occured when attempting clone operation:\n" + ex.getMessage());
@@ -393,7 +392,7 @@ public class MapEditorTabControllerImpl extends MapEditorTabController {
     @Override
     public void redrawMapScripts() {
         mapScriptsList.setOnEditStart((ListView.EditEvent<Script> event) -> {
-            UIAction.editScript(event.getSource().getItems().get(event.getIndex()));
+            UIAction.editScript(event.getSource().getItems().get(event.getIndex()), getCurrentMap());
         });
         mapScriptsList.setCellFactory(new Callback<ListView<Script>, ListCell<Script>>() {
             @Override
diff --git a/OutlawEditor/src/main/resources/jaxb/OutlawSchema/OutlawSchema.xsd b/OutlawEditor/src/main/resources/jaxb/OutlawSchema/OutlawSchema.xsd
index 708db8ec..eeb887db 100644
--- a/OutlawEditor/src/main/resources/jaxb/OutlawSchema/OutlawSchema.xsd
+++ b/OutlawEditor/src/main/resources/jaxb/OutlawSchema/OutlawSchema.xsd
@@ -50,71 +50,79 @@
             </xs:element>
         </xs:sequence>
     </xs:complexType>
-    <xs:complexType name="map">
-        <xs:sequence>
-            <xs:element name="chunk" maxOccurs="unbounded">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="row" maxOccurs="unbounded" type="xs:NMTOKENS"/>
-                    </xs:sequence>
-                    <xs:attribute name="x" type="xs:int"/>
-                    <xs:attribute name="y" type="xs:int"/>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="scripts" type="tns:scripts"/>
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:string"/>
-        <xs:attribute name="width" type="xs:int"/>
-        <xs:attribute name="height" type="xs:int"/>
-        <xs:attribute name="category" type="xs:string"/>
-        <xs:attribute name="wrap" type="xs:boolean" default="false"/>
-        <xs:attribute name="startX" type="xs:int" default="0"/>
-        <xs:attribute name="startY" type="xs:int" default="0"/>
-    </xs:complexType>
-    <xs:complexType name="global">
-        <xs:sequence>
-            <xs:element name="scripts" type="tns:scripts"/>
-            <xs:element name="userTypes" minOccurs="0" maxOccurs="1">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="userType" minOccurs="0" maxOccurs="unbounded">
-                            <xs:complexType>
-                                <xs:sequence>
-                                    <xs:element name="attribute" minOccurs="1" maxOccurs="unbounded">
-                                        <xs:complexType>
-                                            <xs:attribute name="name" use="required" type="xs:NCName"/>
-                                            <xs:attribute name="type" use="required" type="xs:NMTOKEN"/>
-                                            <xs:attribute name="comment" type="xs:string"/>                            
-                                        </xs:complexType>
-                                    </xs:element>
-                                </xs:sequence>
-                                <xs:attribute name="name" use="required" type="xs:NCName"/>                            
-                                <xs:attribute name="comment" use="required" type="xs:string"/>                            
-                            </xs:complexType>
-                        </xs:element>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="variables">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="variable" minOccurs="0" maxOccurs="unbounded">
-                            <xs:complexType>
-                                <xs:attribute name="name" use="required" type="xs:NCName"/>
-                                <xs:attribute name="type" use="required" type="xs:NMTOKEN"/>
-                                <xs:attribute name="comment" type="xs:string"/>                                
-                            </xs:complexType>
-                        </xs:element>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-        </xs:sequence>
-    </xs:complexType>
     <xs:complexType name="scripts">
         <xs:sequence>
-            <xs:element name="script" type="tns:script" minOccurs="1" maxOccurs="unbounded"/>
+            <xs:element name="script" type="tns:script" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
+    <xs:complexType name="variable">
+        <xs:attribute name="name" use="required" type="xs:NCName"/>
+        <xs:attribute name="type" use="required" type="xs:NMTOKEN"/>
+        <xs:attribute name="comment" type="xs:string"/>
+    </xs:complexType>
+    <xs:complexType name="variables">
+        <xs:sequence>
+            <xs:element name="variable" minOccurs="0" maxOccurs="unbounded" type="tns:variable"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="map">
+        <xs:complexContent>
+            <xs:extension base="tns:scope">
+                <xs:sequence>
+                    <xs:element name="chunk" maxOccurs="unbounded">
+                        <xs:complexType>
+                            <xs:sequence>
+                                <xs:element name="row" maxOccurs="unbounded" type="xs:NMTOKENS"/>
+                            </xs:sequence>
+                            <xs:attribute name="x" type="xs:int"/>
+                            <xs:attribute name="y" type="xs:int"/>
+                        </xs:complexType>
+                    </xs:element>
+                </xs:sequence>
+                <xs:attribute name="name" type="xs:string"/>
+                <xs:attribute name="width" type="xs:int"/>
+                <xs:attribute name="height" type="xs:int"/>
+                <xs:attribute name="category" type="xs:string"/>
+                <xs:attribute name="wrap" type="xs:boolean" default="false"/>
+                <xs:attribute name="startX" type="xs:int" default="0"/>
+                <xs:attribute name="startY" type="xs:int" default="0"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="global">
+        <xs:complexContent>
+            <xs:extension base="tns:scope">
+                <xs:sequence>
+                    <xs:element name="userTypes" minOccurs="0" maxOccurs="1">
+                        <xs:complexType>
+                            <xs:sequence>
+                                <xs:element name="userType" minOccurs="0" maxOccurs="unbounded" type="tns:userType"/>
+                            </xs:sequence>
+                        </xs:complexType>
+                    </xs:element>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="userType">
+        <xs:sequence>
+            <xs:element name="attribute" minOccurs="1" maxOccurs="unbounded">
+                <xs:complexType>
+                    <xs:attribute name="name" use="required" type="xs:NCName"/>
+                    <xs:attribute name="type" use="required" type="xs:NMTOKEN"/>
+                    <xs:attribute name="comment" type="xs:string"/>                            
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="name" use="required" type="xs:NCName"/>                            
+        <xs:attribute name="comment" use="required" type="xs:string"/>                            
+    </xs:complexType>
+    <xs:complexType name="scope">
+        <xs:sequence>
+            <xs:element name="scripts" type="tns:scripts"/>
+            <xs:element name="variables" type="tns:variables"/>
+        </xs:sequence>        
+    </xs:complexType>
     <xs:complexType name="block">
         <xs:sequence>
             <xs:element minOccurs="0" name="next" type="tns:next"/>

From 314102bba7ddf03ecfdeceea35faad35158deef0 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Tue, 23 Jun 2015 17:07:19 -0500
Subject: [PATCH 5/5] Global and Local functions are now working!  All
 underlying functionality for global/local variables is also in place but
 untested until variable UI is hooked up

---
 .../badvision/outlaweditor/MythosEditor.java  |  51 +++++---
 .../mythos-editor/js/mythos_uncompressed.js   | 114 +++++++++---------
 2 files changed, 91 insertions(+), 74 deletions(-)

diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
index 049b221a..7d4acc36 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.layout.AnchorPane;
@@ -141,18 +142,6 @@ public class MythosEditor {
         ApplicationUIController.getController().redrawScripts();
     }
 
-    public List<Script> getGlobalFunctions() {
-        if (Application.gameData.getGlobal().getScripts() == null) {
-            return new ArrayList<>();
-        } else {
-            List<Script> scripts = Application.gameData.getGlobal().getScripts().getScript();
-            List<Script> filteredList = scripts.stream().filter((Script s) -> {
-                return s.getName() != null;
-            }).collect(Collectors.toList());
-            return filteredList;
-        }
-    }
-
     public List<UserType> getUserTypes() {
         if (Application.gameData.getGlobal().getUserTypes() == null) {
             return new ArrayList<>();
@@ -161,16 +150,44 @@ public class MythosEditor {
         }
     }
 
-    public List<Variable> getGlobalVariables() {
-        if (Application.gameData.getGlobal().getVariables() == null) {
+    public List<Script> getGlobalFunctions() {
+        return getFunctions(Application.gameData.getGlobal());
+    }
+    public List<Script> getLocalFunctions() {
+        return getFunctions(scope);
+    }
+    private List<Script> getFunctions(Scope scriptScope) {
+        if (scriptScope.getScripts() == null) {
             return new ArrayList<>();
         } else {
-            return Application.gameData.getGlobal().getVariables().getVariable();
+            List<Script> scripts = scriptScope.getScripts().getScript();
+            List<Script> filteredList = scripts.stream().filter((Script s) -> {
+                return s.getName() != null;
+            }).collect(Collectors.toList());
+            return filteredList;
         }
     }
 
+    public List<Variable> getGlobalVariables() {
+        return getVariables(Application.gameData.getGlobal());
+    }
+
+    public List<Variable> getLocalVariables() {
+        return getVariables(scope);
+    }
+    
+    private List<Variable> getVariables(Scope scriptScope) {
+        if (scriptScope.getVariables() == null) {
+            return new ArrayList<>();
+        } else {
+            return scriptScope.getVariables().getVariable();
+        }        
+    }
+
     public List<Variable> getVariablesByType(String type) {
-        return getGlobalVariables().stream().filter(
+        Stream<Variable> allGlobals = getGlobalVariables().stream();
+        Stream<Variable> allLocals = getLocalVariables().stream();
+        return Stream.concat(allGlobals, allLocals).filter(
                 (Variable v) -> {
                     return v.getType().equals(type);
                 }).collect(Collectors.toList());
@@ -178,6 +195,7 @@ public class MythosEditor {
 
     public List<String> getParametersForScript(Script script) {
         List<String> allArgs = new ArrayList();
+        if (script.getBlock() != null && script.getBlock().getFieldOrMutationOrStatement() != null) {
         script.getBlock().getFieldOrMutationOrStatement()
                 .stream().filter((o) -> (o instanceof Mutation))
                 .map((o) -> (Mutation) o).findFirst().ifPresent((m) -> {
@@ -185,6 +203,7 @@ public class MythosEditor {
                         allArgs.add(a.getName());
                     });
                 });
+        }
         return allArgs;
     }
 
diff --git a/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js b/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js
index 1b2afa11..79f14370 100644
--- a/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js
+++ b/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js
@@ -27,12 +27,10 @@ if (typeof Mythos === "undefined") {
         initCustomDefinitions: function () {
 //            Mythos.editor.log("Add user defined types");
             Mythos.addUserDefinedTypes();
-//            Mythos.editor.log("Add global variables");
-            Mythos.addVariablesFromGlobalScope();
+//            Mythos.editor.log("Add custom variables");
+            Mythos.addCustomVariables();
 //            Mythos.editor.log("Add global functions");
             Mythos.addFunctionsFromGlobalScope();
-//            Mythos.editor.log("Add local variables");
-            Mythos.addVariablesFromLocalScope();
 //            Mythos.editor.log("Add local functions");
             Mythos.addFunctionsFromLocalScope();
 //            Mythos.editor.log("Reinitalizing toolbox");
@@ -92,7 +90,7 @@ if (typeof Mythos === "undefined") {
                             .setCheck(null)
                             .appendField(Mythos.getVariableDropdown(userType), "VAR")
                             .appendField(".")
-                            .appendField(Mythos.getAttributeDropdoen(userType), "ATTR");
+                            .appendField(Mythos.getAttributeDropdown(userType), "ATTR");
                     typeSetter.setPreviousStatement(true);
                     typeSetter.setNextStatement(true);
                     typeSetter.setOutput(false);
@@ -107,7 +105,7 @@ if (typeof Mythos === "undefined") {
                             .setCheck(null)
                             .appendField(Mythos.getVariableDropdown(userType), "VAR")
                             .appendField(".")
-                            .appendField(Mythos.getAttributeDropdoen(userType), "ATTR");
+                            .appendField(Mythos.getAttributeDropdown(userType), "ATTR");
                     typeGetter.setPreviousStatement(false);
                     typeGetter.setNextStatement(false);
                     typeGetter.setOutput(true, null);
@@ -129,7 +127,58 @@ if (typeof Mythos === "undefined") {
             });
             return Blockly.FieldDropdown(options);
         },
-        addVariablesFromGlobalScope: function () {
+        addFunctionsFromScope: function(target, prefix, functions) {
+            Mythos.each(functions, function (func) {
+                var scriptNode = document.createElement("block");
+                scriptNode.setAttribute("type", prefix + "_" + func.getName());
+                target.appendChild(scriptNode);
+                scriptNode = document.createElement("block");
+                scriptNode.setAttribute("type", prefix + "ignore_" + func.getName());
+                target.appendChild(scriptNode);
+                Blockly.Blocks[prefix + 'ignore_' + func.getName()] = {
+                    init: function () {
+                        this.setPreviousStatement(true);
+                        this.setNextStatement(true);
+                        this.setColour(250);
+                        this.appendDummyInput()
+                                .appendField(prefix + " " + func.getName());
+                        var functionBlock = this;
+                        Mythos.each(Mythos.editor.getParametersForScript(func), function (argName) {
+                            functionBlock.appendValueInput(argName)
+                                    .setAlign(Blockly.ALIGN_RIGHT)
+                                    .setCheck(null)
+                                    .appendField(argName);
+                        });
+                    }
+                };
+                Blockly.Blocks[prefix + '_' + func.getName()] = {
+                    init: function () {
+                        this.setColour(250);
+                        this.setPreviousStatement(false);
+                        this.setNextStatement(false);
+                        this.setOutput(true, null);
+                        this.appendDummyInput()
+                                .appendField(prefix + " " + func.getName());
+                        var functionBlock = this;
+                        Mythos.each(Mythos.editor.getParametersForScript(func), function (argName) {
+                            functionBlock.appendValueInput(argName)
+                                    .setAlign(Blockly.ALIGN_RIGHT)
+                                    .setCheck(null)
+                                    .appendField(argName);
+                        });
+                    }
+                };
+            });            
+        },
+        addFunctionsFromGlobalScope: function () {
+            var toolbarCategory = document.getElementById("globalFunctions");
+            Mythos.addFunctionsFromScope(toolbarCategory, "Global", Mythos.editor.getGlobalFunctions());
+        },
+        addFunctionsFromLocalScope: function () {
+            var toolbarCategory = document.getElementById("localFunctions");
+            Mythos.addFunctionsFromScope(toolbarCategory, "Local", Mythos.editor.getLocalFunctions());
+        },
+        addCustomVariables: function () {
             Blockly.Variables.allVariables_old = Blockly.Variables.allVariables;
             Blockly.Variables.allVariables = function (workspace) {
                 var list = Blockly.Variables.allVariables_old(workspace);
@@ -145,57 +194,6 @@ if (typeof Mythos === "undefined") {
                 return list;
             };
         },
-        addFunctionsFromGlobalScope: function () {
-            var toolbarCategory = document.getElementById("globalFunctions");
-            Mythos.each(Mythos.editor.getGlobalFunctions(), function (func) {
-                var scriptNode = document.createElement("block");
-                scriptNode.setAttribute("type", "global_" + func.getName());
-                toolbarCategory.appendChild(scriptNode);
-                scriptNode = document.createElement("block");
-                scriptNode.setAttribute("type", "globalignore_" + func.getName());
-                toolbarCategory.appendChild(scriptNode);
-                Blockly.Blocks['globalignore_' + func.getName()] = {
-                    init: function () {
-                        this.setPreviousStatement(true);
-                        this.setNextStatement(true);
-                        this.setColour(250);
-                        this.appendDummyInput()
-                                .appendField("Global " + func.getName());
-                        var functionBlock = this;
-                        Mythos.each(Mythos.editor.getParametersForScript(func), function (argName) {
-                            functionBlock.appendValueInput(argName)
-                                    .setAlign(Blockly.ALIGN_RIGHT)
-                                    .setCheck(null)
-                                    .appendField(argName);
-                        });
-                    }
-                };
-                Blockly.Blocks['global_' + func.getName()] = {
-                    init: function () {
-                        this.setColour(250);
-                        this.setPreviousStatement(false);
-                        this.setNextStatement(false);
-                        this.setOutput(true, null);
-                        this.appendDummyInput()
-                                .appendField("Global " + func.getName());
-                        var functionBlock = this;
-                        Mythos.each(Mythos.editor.getParametersForScript(func), function (argName) {
-                            functionBlock.appendValueInput(argName)
-                                    .setAlign(Blockly.ALIGN_RIGHT)
-                                    .setCheck(null)
-                                    .appendField(argName);
-                        });
-                    }
-                };
-            });
-        },
-        addVariablesFromLocalScope: function () {
-
-        },
-        addFunctionsFromLocalScope: function () {
-//            var toolbarCategory = document.getElementById("localFunctions");
-
-        },
         initBlocks: function () {
             Blockly.Blocks['flow_for'] = {
                 init: function () {