v0.2.3 fixed watch reset variables

Stevertus · Stevertus · commit 4ec14f8d60af · 2019-02-10T14:51:26.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -2,11 +2,12 @@ node_modules
 package-lock.json
 lib/modals/cam.mcscript
 examples - Kopie
-examples
+examples/function
+#examples
 mcscript.tmlanguage.json
 Nodepad++ Highlighter.xml
-_changelog.md
-Core Modals.md
+#_changelog.md
+#Core Modals.md
 *.html
-README-DE.md
+#README-DE.md
 .bat
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/Core Modals.md b/Core Modals.md
@@ -7,9 +7,24 @@
 
 ` this | or that`
 ### console
-> `log( - text <string | number> - , [entity] )`
-### ToDo
-Logges into a console for the Minecraft Chat
+> `log( - text <string | number> - , [target entity] )`
+
+Logs a message into the Minecraft Chat.
+
+### log variable
+> `log.var( - objective <string> - , [entityname], [target entity] )`
+
+Logs a variable into the Minecraft Chat.
+
+### newStand
+> `newStand( [name] , [position], [tags], [marker], [invisible], [noGravity] )`
+
+Summons a new armor_stand with opional parameters.
+
+### play
+> `play(- sound_name - <String>, [target entiy] [type] )`
+
+Plays a sound
 ## Minecraft Cam Modals
 These are integrated Modals from my Camera Datapack for Mapmaking.
 Install it [here](https://github.com/Stevertus/McCam).
diff --git a/_changelog.md b/_changelog.md
@@ -1,7 +1,10 @@
 
 Minecraft Script Changes
 ==============================
-> Update your Version by running: `npm install -g mcscript@`
+> Update your Version by running: `npm install -g mcscript@latest`
+### v0.2.2
+* added: log.var core modal and documentation
+* fixed: watch did not reset variables, modals and booleans on recompile
 ### v0.2.1
 * added: new JavaScript Modal [here](https://github.com/Stevertus/mcscript#modaljs) by cblech.
 * added: Map const type
diff --git a/examples/functions/arrays.mcfunction b/examples/functions/arrays.mcfunction
@@ -0,0 +1,16 @@
+#######
+# Compiled from /examples/functions/arrays.mcscript
+# to .//examples/functions/arrays.mcfunction
+#
+# Generated by Minecraft Script for 1.13
+######
+
+say value
+say no value2
+
+# calling it with Inline Array
+say value
+# with defaults
+
+say value
+say value2
diff --git a/examples/functions/maps.mcfunction b/examples/functions/maps.mcfunction
@@ -0,0 +1,14 @@
+#######
+# Compiled from /examples/functions/maps.mcscript
+# to .//examples/functions/maps.mcfunction
+#
+# Generated by Minecraft Script for 1.13
+######
+
+say value
+say no value2
+
+say undefined
+
+say value
+say undefined
diff --git a/examples/functions/mcscript/raycast1.mcfunction b/examples/functions/mcscript/raycast1.mcfunction
@@ -0,0 +1,12 @@
+#######
+# Compiled from /examples/functions/raycasting.mcscript
+# to examples/functions/mcscript/raycast1.mcfunction
+#
+# Generated by Minecraft Script for 1.13
+######
+particle flame ~ ~ ~
+scoreboard players add raycast1 mcscript_raycast 1
+execute positioned ^ ^ ^1 unless block ~ ~ ~ air run tag @s add mcscriptStop
+execute positioned ^ ^ ^1 if entity @s[tag=!mcscriptStop] if block ~ ~ ~ air if score raycast1 mcscript_raycast matches ..10 run function examples:mcscript/raycast1
+execute if score raycast1 mcscript_raycast matches ..10 if entity @s[tag=mcscriptStop] positioned ^ ^ ^1 run setblock ~ ~ ~ stone
+tag @s[tag=mcscriptStop] remove mcscriptStop
diff --git a/examples/functions/mcscript/while2.mcfunction b/examples/functions/mcscript/while2.mcfunction
@@ -0,0 +1,9 @@
+#######
+# Compiled from /examples/functions/while-Loops.mcscript
+# to examples/functions/mcscript/while2.mcfunction
+#
+# Generated by Minecraft Script for 1.13
+######
+tellraw @a [{"text":"console => ","color":"aqua"},{"text":"commands","color":"white"}]
+execute if entity @s[tag=!mcscriptStop] if entity @s[tag=loop] run function examples:mcscript/while2
+tag @s[tag=mcscriptStop] remove mcscriptStop
diff --git a/examples/scripts/arrays.mcscript b/examples/scripts/arrays.mcscript
@@ -0,0 +1,23 @@
+const arr = Array{
+    "value",
+    "value2"
+}
+/say $(arr).0
+
+/say $(arr).1.replace("value","no value")
+
+// with modal
+modal testMap(args){
+    /say $(args).0
+}
+# calling it with Inline Array
+testMap(Array{"value"})
+
+# with defaults
+modal defaultMap(args = Array{"value"}){
+    /say $(args).0
+}
+defaultMap()
+defaultMap(Array{
+    "value2"
+})
diff --git a/examples/scripts/debugging.mcscript b/examples/scripts/debugging.mcscript
@@ -0,0 +1,2 @@
+debug message: Hello
+debug error: Hello
diff --git a/examples/scripts/jsmodal.mcfunction b/examples/scripts/jsmodal.mcfunction
@@ -0,0 +1,11 @@
+#######
+# Compiled from modaljs.mcscript
+# to jsmodal.mcfunction
+#
+# Generated by Minecraft Script for 1.13
+######
+
+
+
+say Hello World!
+summon minecraft:zombie
diff --git a/examples/scripts/maps.mcscript b/examples/scripts/maps.mcscript
@@ -0,0 +1,23 @@
+const map = Map{
+    "key":"value",
+    "key2":"value2"
+}
+/say $(map).key
+
+/say $(map).key2.replace("value","no value")
+
+// with modal
+modal testMap(args){
+    /say $(args).key
+}
+// calling it with Inline Map
+testMap(Map{"key":"value"})
+
+// with defaults
+modal defaultMap(args = Map{"key":"value"}){
+    /say $(args).key
+}
+defaultMap()
+defaultMap(Map{
+    "key":"value2"
+})
diff --git a/examples/scripts/modaljs.mcscript b/examples/scripts/modaljs.mcscript
@@ -0,0 +1,19 @@
+#file: ./jsmodal
+// here goes your main content
+// executes 20 times a second
+
+modaljs newModal(argument,monster){
+  var ret ="";
+  ret+= "say "+argument+"\n";
+  ret+= "summon "+monster+"\n";
+
+  return ret;
+};
+
+modal Modal1337(argument,monster){
+	/say $(argument)
+  /summon $(monster)
+}
+
+newModal("Hello World!","minecraft:zombie")
+Modal1337("Hello World!","minecraft:zombie")
diff --git a/function examples b/function examples
diff --git a/lib/generator.js b/lib/generator.js
@@ -560,9 +560,9 @@ generate = function (exp, oldFile, prjPath = oldFile.split("/").indexOf("functio
         }
       }
       // nodejs way (more secure in a seperate vm)
-      // jsArgs.console = console
-      // let virtualRes = vm.runInNewContext("var res = function(){"+modal.after[0].value+"};res = res()",jsArgs);
-      // return jsArgs.res
+       jsArgs.console = console
+       let virtualRes = vm.runInNewContext("var res = function(){"+modal.after[0].value+"};res = res()",jsArgs);
+       return jsArgs.res
       // vanilla way for browser usage
       /*
       let virtualRes = new Function(...Object.keys(jsArgs).concat([modal.after[0].value]))
@@ -597,7 +597,16 @@ getFiles = function (dir, end) {
     });
     return results;
 };
-
+exports.clearVars = function (){
+  modals = [];
+  genID = 0;
+  vars = [];
+  tags = [];
+  tagOhne = false;
+  consts = [];
+  modals = modals.concat(basicModals);
+  modals = modals.concat(camModals);
+}
 exports.getFiles = getFiles;
 exports.getModals = function (ast, oldFile) {
     let data = generate(ast, oldFile);
diff --git a/lib/index.js b/lib/index.js
@@ -9,6 +9,7 @@ let preOptions;
 const compile = function (path, fullErr) {
 
     let num = 1;
+    gen.clearVars();
     if (fs.lstatSync(path).isFile()) {
 
         readFile(path);
diff --git a/lib/modals/basic.json b/lib/modals/basic.json
diff --git a/lib/modals/basic.mcscript b/lib/modals/basic.mcscript
diff --git a/lib/modals/cam.mcfunction b/lib/modals/cam.mcfunction
diff --git a/package.json b/package.json
