Changed position parameters on the levels files

  - load_levels reflect this too, we don't need to convert to int

7 files changed, 39 insertions, 39 deletions

diff --git a/Gambiarra/levels.py b/Gambiarra/levels.py
index 41051d5..86ac98b 100644
--- a/Gambiarra/levels.py
+++ b/Gambiarra/levels.py
@@ -169,7 +169,7 @@ def load_levels():
         objs = {}
         for obj in level["placed"]:
             klass = globals()[obj["type"]]
-            o = klass( (int(obj["xpos"]), int(obj["ypos"])), editable=False)
+            o = klass( (obj["xpos"], obj["ypos"]), editable=False)
             objs[obj["name"]] = o
 
         toadd = {}
diff --git a/data/levels/level1.level b/data/levels/level1.level
index 2eb66de..441059a 100644
--- a/data/levels/level1.level
+++ b/data/levels/level1.level
@@ -4,20 +4,20 @@
                  {
                    "type" : "SoccerBall",
                    "name" : "bola",
-                   "xpos" : "200",
-                   "ypos" : "300"
+                   "xpos" : 200,
+                   "ypos" : 300
                  },
                  {
                    "type" : "Esteira",
                    "name" : "rolante",
-                   "xpos" : "300",
-                   "ypos" : "500"
+                   "xpos" : 300,
+                   "ypos" : 500
                  },
                  {
                    "type" : "Target",
                    "name" : "alvo",
-                   "xpos" : "1000",
-                   "ypos" : "600"
+                   "xpos" : 1000,
+                   "ypos" : 600
                  }
                ],
   "available": [
diff --git a/data/levels/level2.level b/data/levels/level2.level
index 88de2fe..9b63e41 100644
--- a/data/levels/level2.level
+++ b/data/levels/level2.level
@@ -4,14 +4,14 @@
                  {
                    "type" : "Penguin",
                    "name" : "tux",
-                   "xpos" : "300",
-                   "ypos" : "500"
+                   "xpos" : 300,
+                   "ypos" : 500
                  },
                  {
                    "type" : "Target",
                    "name" : "alvo",
-                   "xpos" : "500",
-                   "ypos" : "600"
+                   "xpos" : 500,
+                   "ypos" : 600
                  }
                ],
   "available": [
diff --git a/data/levels/level3.level b/data/levels/level3.level
index b6477ed..3faaaa7 100644
--- a/data/levels/level3.level
+++ b/data/levels/level3.level
@@ -4,20 +4,20 @@
                  {
                    "type" : "BowlingBall",
                    "name" : "boliche",
-                   "xpos" : "20",
-                   "ypos" : "20"
+                   "xpos" : 20,
+                   "ypos" : 20
                  },
                  {
                    "type" : "Esteira",
                    "name" : "esteira",
-                   "xpos" : "10",
-                   "ypos" : "300"
+                   "xpos" : 10,
+                   "ypos" : 300
                  },
                  {
                    "type" : "Target",
                    "name" : "alvo",
-                   "xpos" : "1100",
-                   "ypos" : "20"
+                   "xpos" : 1100,
+                   "ypos" : 20
                  }
                ],
   "available": [
diff --git a/data/levels/level4.level b/data/levels/level4.level
index aa7f028..cc921b7 100644
--- a/data/levels/level4.level
+++ b/data/levels/level4.level
@@ -4,26 +4,26 @@
                  {
                    "type" : "BowlingBall",
                    "name" : "boliche",
-                   "xpos" : "20",
-                   "ypos" : "20"
+                   "xpos" : 20,
+                   "ypos" : 20
                  },
                  {
                    "type" : "SoccerBall",
                    "name" : "futebol",
-                   "xpos" : "800",
-                   "ypos" : "300"
+                   "xpos" : 800,
+                   "ypos" : 300
                  },
                  {
                    "type" : "Target",
                    "name" : "alvo1",
-                   "xpos" : "900",
-                   "ypos" : "90"
+                   "xpos" : 900,
+                   "ypos" : 90
                  },
                  {
                    "type" : "Target",
                    "name" : "alvo2",
-                   "xpos" : "100",
-                   "ypos" : "550"
+                   "xpos" : 100,
+                   "ypos" : 550
                  }
                ],
   "available": [
diff --git a/data/levels/level5.level b/data/levels/level5.level
index d05b1a9..47bea9c 100644
--- a/data/levels/level5.level
+++ b/data/levels/level5.level
@@ -4,20 +4,20 @@
                  {
                    "type" : "BowlingBall",
                    "name" : "boliche",
-                   "xpos" : "1000",
-                   "ypos" : "300"
+                   "xpos" : 1000,
+                   "ypos" : 300
                  },
                  {
                    "type" : "Esteira",
                    "name" : "esteira",
-                   "xpos" : "1000",
-                   "ypos" : "500"
+                   "xpos" : 1000,
+                   "ypos" : 500
                  },
                  {
                    "type" : "Target",
                    "name" : "alvo",
-                   "xpos" : "1100",
-                   "ypos" : "650"
+                   "xpos" : 1100,
+                   "ypos" : 650
                  }
                ],
   "available": [
diff --git a/data/levels/level6.level b/data/levels/level6.level
index 057b099..76e3e55 100644
--- a/data/levels/level6.level
+++ b/data/levels/level6.level
@@ -4,26 +4,26 @@
                  {
                    "type" : "BeachBall",
                    "name" : "praia",
-                   "xpos" : "800",
-                   "ypos" : "50"
+                   "xpos" : 800,
+                   "ypos" : 50
                  },
                  {
                    "type" : "Elastica",
                    "name" : "elastica1",
-                   "xpos" : "800",
-                   "ypos" : "400"
+                   "xpos" : 800,
+                   "ypos" : 400
                  },
                  {
                    "type" : "Elastica",
                    "name" : "elastica2",
-                   "xpos" : "900",
-                   "ypos" : "200"
+                   "xpos" : 900,
+                   "ypos" : 200
                  },
                  {
                    "type" : "Target",
                    "name" : "alvo",
-                   "xpos" : "1070",
-                   "ypos" : "650"
+                   "xpos" : 1070,
+                   "ypos" : 650
                  }
                ],
   "available": [