From 40499d2808a4674147569ddf5895aa9411dc217f Mon Sep 17 00:00:00 2001
From: Spu7Nix <spu7nix@outlook.com>
Date: Tue, 22 Dec 2020 16:02:35 +0100
Subject: [PATCH] beta

---
 spwn-lang/src/levelstring.rs |  2 +-
 spwn-lang/src/optimize.rs    |  2 +-
 spwn-lang/test/calc3.spwn    | 20 ++++++++++++++++++--
 spwn-lang/test/test.spwn     | 12 +++++++-----
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/spwn-lang/src/levelstring.rs b/spwn-lang/src/levelstring.rs
index e6aa6338..9bde42a0 100644
--- a/spwn-lang/src/levelstring.rs
+++ b/spwn-lang/src/levelstring.rs
@@ -307,7 +307,7 @@ pub fn append_objects(
         }
     }
 
-    println!("group_map: {:?}", id_maps[0]);
+    //println!("group_map: {:?}", id_maps[0]);
 
     fn serialize_obj(mut trigger: GDObj) -> String {
         let mut obj_string = String::new();
diff --git a/spwn-lang/src/optimize.rs b/spwn-lang/src/optimize.rs
index 9da8707e..d9acf8bd 100644
--- a/spwn-lang/src/optimize.rs
+++ b/spwn-lang/src/optimize.rs
@@ -449,7 +449,7 @@ fn optimize_from<'a>(
 
     if let Some(targets) = targets {
         if targets.is_empty() {
-            println!("NO TARGET (deleted)");
+            
             return false;
         }
         // else {
diff --git a/spwn-lang/test/calc3.spwn b/spwn-lang/test/calc3.spwn
index a1c2a115..15daabb7 100644
--- a/spwn-lang/test/calc3.spwn
+++ b/spwn-lang/test/calc3.spwn
@@ -19,17 +19,33 @@ on(gamescene.button_b(), {
 
 current_op = counter()
 
+sec_to_main = { sec.add_to([main], speed = 10) }
+
 on(gamescene.button_a(), {
     if selected <= 9 {
         //number
-        
         main.multiply(10, speed = 10)
         main.add(selected.to_const(0..10))
     } else if selected == 10 {
         main.reset(speed = 10)
     } else if selected == 11 {
         //solve
-        ?g!
+        if current_op == 0 {
+            //plus
+            sec_to_main!
+        } else if current_op == 1 {
+            //minus
+            main.subtract_from([sec], speed = 10)
+            sec_to_main!
+        } else if current_op == 2 {
+            //mult
+            main.multiply(sec, speed = 7)
+            sec.reset(speed = 10)
+        } else if current_op == 3 {
+            //div
+            sec.divide(main, speed = 7)
+            sec_to_main!
+        }
     } else {
         //operator
         current_op = selected.to_const(12..17) - 12
diff --git a/spwn-lang/test/test.spwn b/spwn-lang/test/test.spwn
index bb6b97b8..089f428d 100644
--- a/spwn-lang/test/test.spwn
+++ b/spwn-lang/test/test.spwn
@@ -1,6 +1,8 @@
-a = counter(1i)
-a += 444
-b = counter(2i)
-b += 11
-a /= b
+main = counter(1i)
+sec = counter(2i)
+
+main += 222
+sec += 2
+
+main.divide(sec, speed = 5)