diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b9f8f82..1f1cc25 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,409 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -106,7 +506,7 @@ - + @@ -125,6 +525,6 @@ - + \ No newline at end of file diff --git a/IDManager.py b/IDManager.py index 6ad892d..9ed4cc7 100644 --- a/IDManager.py +++ b/IDManager.py @@ -1,4 +1,28 @@ +import random +import csv class idManager(): + levelNum = 200 + ip_dic = {} + def __int__(self): + self.levelNum = 200 + def getLevels(self,ip): + if ip not in self.ip_dic.keys(): + self.ip_dic[ip] = [] + + levels = [random.randint(1,self.levelNum), random.randint(1,self.levelNum)] + while levels[0] in self.ip_dic[ip]: + levels[0] = random.randint(1,self.levelNum) + self.ip_dic[ip].append(levels[0]) + while levels[1] in self.ip_dic[ip]: + levels[1] = random.randint(1, self.levelNum) + self.ip_dic[ip].append(levels[1]) + + #return ["lvl"+str(levels[0]),"lvl"+str(levels[1])] return ["test1","test2"] + + def write_csv(self,path, data): + with open(path, 'a+') as f: + csv_write = csv.writer(f) + csv_write.writerow(data) \ No newline at end of file diff --git a/__pycache__/IDManager.cpython-39.pyc b/__pycache__/IDManager.cpython-39.pyc index 414d365..21b5842 100644 Binary files a/__pycache__/IDManager.cpython-39.pyc and b/__pycache__/IDManager.cpython-39.pyc differ diff --git a/__pycache__/main.cpython-39.pyc b/__pycache__/main.cpython-39.pyc index f9deae6..df0fa2f 100644 Binary files a/__pycache__/main.cpython-39.pyc and b/__pycache__/main.cpython-39.pyc differ diff --git a/data/questionare.csv b/data/questionare.csv index 5c9e176..d2893a4 100644 --- a/data/questionare.csv +++ b/data/questionare.csv @@ -5,3 +5,31 @@ 127.0.0.1,A,A,B 127.0.0.1,C,A,A 127.0.0.1,D,A,B +127.0.0.1,C,A,G +127.0.0.1,A,C,E +127.0.0.1,A,A,A +127.0.0.1,C,A,A +127.0.0.1,B,A,A +127.0.0.1,A,A,D +127.0.0.1,A,A,G +127.0.0.1,A,D,C +127.0.0.1,A,E,A +127.0.0.1,A,A,G +127.0.0.1,B,A,D +127.0.0.1,B,A,B +127.0.0.1,A,C,A +127.0.0.1,A,A,G +127.0.0.1,A,A,C +127.0.0.1,C,A,A +127.0.0.1,B,A,A +127.0.0.1,C,D,D +127.0.0.1,A,A,A +127.0.0.1,B,A,D +127.0.0.1,A,C,G +127.0.0.1,A,A,A +127.0.0.1,A,A,B +127.0.0.1,A,A,B +127.0.0.1,B,A,A +127.0.0.1,C,A,A +127.0.0.1,A,A,C +127.0.0.1,A,A,A diff --git a/levels/part1/lvl1.lvl b/levels/lvl1.lvl similarity index 100% rename from levels/part1/lvl1.lvl rename to levels/lvl1.lvl diff --git a/levels/part1/lvl1.png b/levels/lvl1.png similarity index 100% rename from levels/part1/lvl1.png rename to levels/lvl1.png diff --git a/levels/part1/lvl10.lvl b/levels/lvl10.lvl similarity index 100% rename from levels/part1/lvl10.lvl rename to levels/lvl10.lvl diff --git a/levels/part1/lvl10.png b/levels/lvl10.png similarity index 100% rename from levels/part1/lvl10.png rename to levels/lvl10.png diff --git a/levels/part1/lvl100.lvl b/levels/lvl100.lvl similarity index 100% rename from levels/part1/lvl100.lvl rename to levels/lvl100.lvl diff --git a/levels/part1/lvl100.png b/levels/lvl100.png similarity index 100% rename from levels/part1/lvl100.png rename to levels/lvl100.png diff --git a/levels/part1/lvl101.lvl b/levels/lvl101.lvl similarity index 100% rename from levels/part1/lvl101.lvl rename to levels/lvl101.lvl diff --git a/levels/part1/lvl101.png b/levels/lvl101.png similarity index 100% rename from levels/part1/lvl101.png rename to levels/lvl101.png diff --git a/levels/part1/lvl102.lvl b/levels/lvl102.lvl similarity index 100% rename from levels/part1/lvl102.lvl rename to levels/lvl102.lvl diff --git a/levels/part1/lvl102.png b/levels/lvl102.png similarity index 100% rename from levels/part1/lvl102.png rename to levels/lvl102.png diff --git a/levels/part1/lvl103.lvl b/levels/lvl103.lvl similarity index 100% rename from levels/part1/lvl103.lvl rename to levels/lvl103.lvl diff --git a/levels/part1/lvl103.png b/levels/lvl103.png similarity index 100% rename from levels/part1/lvl103.png rename to levels/lvl103.png diff --git a/levels/part1/lvl104.lvl b/levels/lvl104.lvl similarity index 100% rename from levels/part1/lvl104.lvl rename to levels/lvl104.lvl diff --git a/levels/part1/lvl104.png b/levels/lvl104.png similarity index 100% rename from levels/part1/lvl104.png rename to levels/lvl104.png diff --git a/levels/part1/lvl105.lvl b/levels/lvl105.lvl similarity index 100% rename from levels/part1/lvl105.lvl rename to levels/lvl105.lvl diff --git a/levels/part1/lvl105.png b/levels/lvl105.png similarity index 100% rename from levels/part1/lvl105.png rename to levels/lvl105.png diff --git a/levels/part1/lvl106.lvl b/levels/lvl106.lvl similarity index 100% rename from levels/part1/lvl106.lvl rename to levels/lvl106.lvl diff --git a/levels/part1/lvl106.png b/levels/lvl106.png similarity index 100% rename from levels/part1/lvl106.png rename to levels/lvl106.png diff --git a/levels/part1/lvl107.lvl b/levels/lvl107.lvl similarity index 100% rename from levels/part1/lvl107.lvl rename to levels/lvl107.lvl diff --git a/levels/part1/lvl107.png b/levels/lvl107.png similarity index 100% rename from levels/part1/lvl107.png rename to levels/lvl107.png diff --git a/levels/part1/lvl108.lvl b/levels/lvl108.lvl similarity index 100% rename from levels/part1/lvl108.lvl rename to levels/lvl108.lvl diff --git a/levels/part1/lvl108.png b/levels/lvl108.png similarity index 100% rename from levels/part1/lvl108.png rename to levels/lvl108.png diff --git a/levels/part1/lvl109.lvl b/levels/lvl109.lvl similarity index 100% rename from levels/part1/lvl109.lvl rename to levels/lvl109.lvl diff --git a/levels/part1/lvl109.png b/levels/lvl109.png similarity index 100% rename from levels/part1/lvl109.png rename to levels/lvl109.png diff --git a/levels/part1/lvl11.lvl b/levels/lvl11.lvl similarity index 100% rename from levels/part1/lvl11.lvl rename to levels/lvl11.lvl diff --git a/levels/part1/lvl11.png b/levels/lvl11.png similarity index 100% rename from levels/part1/lvl11.png rename to levels/lvl11.png diff --git a/levels/part1/lvl110.lvl b/levels/lvl110.lvl similarity index 100% rename from levels/part1/lvl110.lvl rename to levels/lvl110.lvl diff --git a/levels/part1/lvl110.png b/levels/lvl110.png similarity index 100% rename from levels/part1/lvl110.png rename to levels/lvl110.png diff --git a/levels/part1/lvl111.lvl b/levels/lvl111.lvl similarity index 100% rename from levels/part1/lvl111.lvl rename to levels/lvl111.lvl diff --git a/levels/part1/lvl111.png b/levels/lvl111.png similarity index 100% rename from levels/part1/lvl111.png rename to levels/lvl111.png diff --git a/levels/part1/lvl112.lvl b/levels/lvl112.lvl similarity index 100% rename from levels/part1/lvl112.lvl rename to levels/lvl112.lvl diff --git a/levels/part1/lvl112.png b/levels/lvl112.png similarity index 100% rename from levels/part1/lvl112.png rename to levels/lvl112.png diff --git a/levels/part1/lvl113.lvl b/levels/lvl113.lvl similarity index 100% rename from levels/part1/lvl113.lvl rename to levels/lvl113.lvl diff --git a/levels/part1/lvl113.png b/levels/lvl113.png similarity index 100% rename from levels/part1/lvl113.png rename to levels/lvl113.png diff --git a/levels/part1/lvl114.lvl b/levels/lvl114.lvl similarity index 100% rename from levels/part1/lvl114.lvl rename to levels/lvl114.lvl diff --git a/levels/part1/lvl114.png b/levels/lvl114.png similarity index 100% rename from levels/part1/lvl114.png rename to levels/lvl114.png diff --git a/levels/part1/lvl115.lvl b/levels/lvl115.lvl similarity index 100% rename from levels/part1/lvl115.lvl rename to levels/lvl115.lvl diff --git a/levels/part1/lvl115.png b/levels/lvl115.png similarity index 100% rename from levels/part1/lvl115.png rename to levels/lvl115.png diff --git a/levels/part1/lvl116.lvl b/levels/lvl116.lvl similarity index 100% rename from levels/part1/lvl116.lvl rename to levels/lvl116.lvl diff --git a/levels/part1/lvl116.png b/levels/lvl116.png similarity index 100% rename from levels/part1/lvl116.png rename to levels/lvl116.png diff --git a/levels/part1/lvl117.lvl b/levels/lvl117.lvl similarity index 100% rename from levels/part1/lvl117.lvl rename to levels/lvl117.lvl diff --git a/levels/part1/lvl117.png b/levels/lvl117.png similarity index 100% rename from levels/part1/lvl117.png rename to levels/lvl117.png diff --git a/levels/part1/lvl118.lvl b/levels/lvl118.lvl similarity index 100% rename from levels/part1/lvl118.lvl rename to levels/lvl118.lvl diff --git a/levels/part1/lvl118.png b/levels/lvl118.png similarity index 100% rename from levels/part1/lvl118.png rename to levels/lvl118.png diff --git a/levels/part1/lvl119.lvl b/levels/lvl119.lvl similarity index 100% rename from levels/part1/lvl119.lvl rename to levels/lvl119.lvl diff --git a/levels/part1/lvl119.png b/levels/lvl119.png similarity index 100% rename from levels/part1/lvl119.png rename to levels/lvl119.png diff --git a/levels/part1/lvl12.lvl b/levels/lvl12.lvl similarity index 100% rename from levels/part1/lvl12.lvl rename to levels/lvl12.lvl diff --git a/levels/part1/lvl12.png b/levels/lvl12.png similarity index 100% rename from levels/part1/lvl12.png rename to levels/lvl12.png diff --git a/levels/part1/lvl120.lvl b/levels/lvl120.lvl similarity index 100% rename from levels/part1/lvl120.lvl rename to levels/lvl120.lvl diff --git a/levels/part1/lvl120.png b/levels/lvl120.png similarity index 100% rename from levels/part1/lvl120.png rename to levels/lvl120.png diff --git a/levels/part1/lvl121.lvl b/levels/lvl121.lvl similarity index 100% rename from levels/part1/lvl121.lvl rename to levels/lvl121.lvl diff --git a/levels/part1/lvl121.png b/levels/lvl121.png similarity index 100% rename from levels/part1/lvl121.png rename to levels/lvl121.png diff --git a/levels/part1/lvl122.lvl b/levels/lvl122.lvl similarity index 100% rename from levels/part1/lvl122.lvl rename to levels/lvl122.lvl diff --git a/levels/part1/lvl122.png b/levels/lvl122.png similarity index 100% rename from levels/part1/lvl122.png rename to levels/lvl122.png diff --git a/levels/part1/lvl123.lvl b/levels/lvl123.lvl similarity index 100% rename from levels/part1/lvl123.lvl rename to levels/lvl123.lvl diff --git a/levels/part1/lvl123.png b/levels/lvl123.png similarity index 100% rename from levels/part1/lvl123.png rename to levels/lvl123.png diff --git a/levels/part1/lvl124.lvl b/levels/lvl124.lvl similarity index 100% rename from levels/part1/lvl124.lvl rename to levels/lvl124.lvl diff --git a/levels/part1/lvl124.png b/levels/lvl124.png similarity index 100% rename from levels/part1/lvl124.png rename to levels/lvl124.png diff --git a/levels/part1/lvl125.lvl b/levels/lvl125.lvl similarity index 100% rename from levels/part1/lvl125.lvl rename to levels/lvl125.lvl diff --git a/levels/part1/lvl125.png b/levels/lvl125.png similarity index 100% rename from levels/part1/lvl125.png rename to levels/lvl125.png diff --git a/levels/part1/lvl126.lvl b/levels/lvl126.lvl similarity index 100% rename from levels/part1/lvl126.lvl rename to levels/lvl126.lvl diff --git a/levels/part1/lvl126.png b/levels/lvl126.png similarity index 100% rename from levels/part1/lvl126.png rename to levels/lvl126.png diff --git a/levels/part1/lvl127.lvl b/levels/lvl127.lvl similarity index 100% rename from levels/part1/lvl127.lvl rename to levels/lvl127.lvl diff --git a/levels/part1/lvl127.png b/levels/lvl127.png similarity index 100% rename from levels/part1/lvl127.png rename to levels/lvl127.png diff --git a/levels/part1/lvl128.lvl b/levels/lvl128.lvl similarity index 100% rename from levels/part1/lvl128.lvl rename to levels/lvl128.lvl diff --git a/levels/part1/lvl128.png b/levels/lvl128.png similarity index 100% rename from levels/part1/lvl128.png rename to levels/lvl128.png diff --git a/levels/part1/lvl129.lvl b/levels/lvl129.lvl similarity index 100% rename from levels/part1/lvl129.lvl rename to levels/lvl129.lvl diff --git a/levels/part1/lvl129.png b/levels/lvl129.png similarity index 100% rename from levels/part1/lvl129.png rename to levels/lvl129.png diff --git a/levels/part1/lvl13.lvl b/levels/lvl13.lvl similarity index 100% rename from levels/part1/lvl13.lvl rename to levels/lvl13.lvl diff --git a/levels/part1/lvl13.png b/levels/lvl13.png similarity index 100% rename from levels/part1/lvl13.png rename to levels/lvl13.png diff --git a/levels/part1/lvl130.lvl b/levels/lvl130.lvl similarity index 100% rename from levels/part1/lvl130.lvl rename to levels/lvl130.lvl diff --git a/levels/part1/lvl130.png b/levels/lvl130.png similarity index 100% rename from levels/part1/lvl130.png rename to levels/lvl130.png diff --git a/levels/part1/lvl131.lvl b/levels/lvl131.lvl similarity index 100% rename from levels/part1/lvl131.lvl rename to levels/lvl131.lvl diff --git a/levels/part1/lvl131.png b/levels/lvl131.png similarity index 100% rename from levels/part1/lvl131.png rename to levels/lvl131.png diff --git a/levels/part1/lvl132.lvl b/levels/lvl132.lvl similarity index 100% rename from levels/part1/lvl132.lvl rename to levels/lvl132.lvl diff --git a/levels/part1/lvl132.png b/levels/lvl132.png similarity index 100% rename from levels/part1/lvl132.png rename to levels/lvl132.png diff --git a/levels/part1/lvl133.lvl b/levels/lvl133.lvl similarity index 100% rename from levels/part1/lvl133.lvl rename to levels/lvl133.lvl diff --git a/levels/part1/lvl133.png b/levels/lvl133.png similarity index 100% rename from levels/part1/lvl133.png rename to levels/lvl133.png diff --git a/levels/part1/lvl134.lvl b/levels/lvl134.lvl similarity index 100% rename from levels/part1/lvl134.lvl rename to levels/lvl134.lvl diff --git a/levels/part1/lvl134.png b/levels/lvl134.png similarity index 100% rename from levels/part1/lvl134.png rename to levels/lvl134.png diff --git a/levels/part1/lvl135.lvl b/levels/lvl135.lvl similarity index 100% rename from levels/part1/lvl135.lvl rename to levels/lvl135.lvl diff --git a/levels/part1/lvl135.png b/levels/lvl135.png similarity index 100% rename from levels/part1/lvl135.png rename to levels/lvl135.png diff --git a/levels/part1/lvl136.lvl b/levels/lvl136.lvl similarity index 100% rename from levels/part1/lvl136.lvl rename to levels/lvl136.lvl diff --git a/levels/part1/lvl136.png b/levels/lvl136.png similarity index 100% rename from levels/part1/lvl136.png rename to levels/lvl136.png diff --git a/levels/part1/lvl137.lvl b/levels/lvl137.lvl similarity index 100% rename from levels/part1/lvl137.lvl rename to levels/lvl137.lvl diff --git a/levels/part1/lvl137.png b/levels/lvl137.png similarity index 100% rename from levels/part1/lvl137.png rename to levels/lvl137.png diff --git a/levels/part1/lvl138.lvl b/levels/lvl138.lvl similarity index 100% rename from levels/part1/lvl138.lvl rename to levels/lvl138.lvl diff --git a/levels/part1/lvl138.png b/levels/lvl138.png similarity index 100% rename from levels/part1/lvl138.png rename to levels/lvl138.png diff --git a/levels/part1/lvl139.lvl b/levels/lvl139.lvl similarity index 100% rename from levels/part1/lvl139.lvl rename to levels/lvl139.lvl diff --git a/levels/part1/lvl139.png b/levels/lvl139.png similarity index 100% rename from levels/part1/lvl139.png rename to levels/lvl139.png diff --git a/levels/part1/lvl14.lvl b/levels/lvl14.lvl similarity index 100% rename from levels/part1/lvl14.lvl rename to levels/lvl14.lvl diff --git a/levels/part1/lvl14.png b/levels/lvl14.png similarity index 100% rename from levels/part1/lvl14.png rename to levels/lvl14.png diff --git a/levels/part1/lvl140.lvl b/levels/lvl140.lvl similarity index 100% rename from levels/part1/lvl140.lvl rename to levels/lvl140.lvl diff --git a/levels/part1/lvl140.png b/levels/lvl140.png similarity index 100% rename from levels/part1/lvl140.png rename to levels/lvl140.png diff --git a/levels/part1/lvl141.lvl b/levels/lvl141.lvl similarity index 100% rename from levels/part1/lvl141.lvl rename to levels/lvl141.lvl diff --git a/levels/part1/lvl141.png b/levels/lvl141.png similarity index 100% rename from levels/part1/lvl141.png rename to levels/lvl141.png diff --git a/levels/part1/lvl142.lvl b/levels/lvl142.lvl similarity index 100% rename from levels/part1/lvl142.lvl rename to levels/lvl142.lvl diff --git a/levels/part1/lvl142.png b/levels/lvl142.png similarity index 100% rename from levels/part1/lvl142.png rename to levels/lvl142.png diff --git a/levels/part1/lvl143.lvl b/levels/lvl143.lvl similarity index 100% rename from levels/part1/lvl143.lvl rename to levels/lvl143.lvl diff --git a/levels/part1/lvl143.png b/levels/lvl143.png similarity index 100% rename from levels/part1/lvl143.png rename to levels/lvl143.png diff --git a/levels/part1/lvl144.lvl b/levels/lvl144.lvl similarity index 100% rename from levels/part1/lvl144.lvl rename to levels/lvl144.lvl diff --git a/levels/part1/lvl144.png b/levels/lvl144.png similarity index 100% rename from levels/part1/lvl144.png rename to levels/lvl144.png diff --git a/levels/part1/lvl145.lvl b/levels/lvl145.lvl similarity index 100% rename from levels/part1/lvl145.lvl rename to levels/lvl145.lvl diff --git a/levels/part1/lvl145.png b/levels/lvl145.png similarity index 100% rename from levels/part1/lvl145.png rename to levels/lvl145.png diff --git a/levels/part1/lvl146.lvl b/levels/lvl146.lvl similarity index 100% rename from levels/part1/lvl146.lvl rename to levels/lvl146.lvl diff --git a/levels/part1/lvl146.png b/levels/lvl146.png similarity index 100% rename from levels/part1/lvl146.png rename to levels/lvl146.png diff --git a/levels/part1/lvl147.lvl b/levels/lvl147.lvl similarity index 100% rename from levels/part1/lvl147.lvl rename to levels/lvl147.lvl diff --git a/levels/part1/lvl147.png b/levels/lvl147.png similarity index 100% rename from levels/part1/lvl147.png rename to levels/lvl147.png diff --git a/levels/part1/lvl148.lvl b/levels/lvl148.lvl similarity index 100% rename from levels/part1/lvl148.lvl rename to levels/lvl148.lvl diff --git a/levels/part1/lvl148.png b/levels/lvl148.png similarity index 100% rename from levels/part1/lvl148.png rename to levels/lvl148.png diff --git a/levels/part1/lvl149.lvl b/levels/lvl149.lvl similarity index 100% rename from levels/part1/lvl149.lvl rename to levels/lvl149.lvl diff --git a/levels/part1/lvl149.png b/levels/lvl149.png similarity index 100% rename from levels/part1/lvl149.png rename to levels/lvl149.png diff --git a/levels/part1/lvl15.lvl b/levels/lvl15.lvl similarity index 100% rename from levels/part1/lvl15.lvl rename to levels/lvl15.lvl diff --git a/levels/part1/lvl15.png b/levels/lvl15.png similarity index 100% rename from levels/part1/lvl15.png rename to levels/lvl15.png diff --git a/levels/part1/lvl150.lvl b/levels/lvl150.lvl similarity index 100% rename from levels/part1/lvl150.lvl rename to levels/lvl150.lvl diff --git a/levels/part1/lvl150.png b/levels/lvl150.png similarity index 100% rename from levels/part1/lvl150.png rename to levels/lvl150.png diff --git a/levels/part1/lvl151.lvl b/levels/lvl151.lvl similarity index 100% rename from levels/part1/lvl151.lvl rename to levels/lvl151.lvl diff --git a/levels/part1/lvl151.png b/levels/lvl151.png similarity index 100% rename from levels/part1/lvl151.png rename to levels/lvl151.png diff --git a/levels/part1/lvl152.lvl b/levels/lvl152.lvl similarity index 100% rename from levels/part1/lvl152.lvl rename to levels/lvl152.lvl diff --git a/levels/part1/lvl152.png b/levels/lvl152.png similarity index 100% rename from levels/part1/lvl152.png rename to levels/lvl152.png diff --git a/levels/part1/lvl153.lvl b/levels/lvl153.lvl similarity index 100% rename from levels/part1/lvl153.lvl rename to levels/lvl153.lvl diff --git a/levels/part1/lvl153.png b/levels/lvl153.png similarity index 100% rename from levels/part1/lvl153.png rename to levels/lvl153.png diff --git a/levels/part1/lvl154.lvl b/levels/lvl154.lvl similarity index 100% rename from levels/part1/lvl154.lvl rename to levels/lvl154.lvl diff --git a/levels/part1/lvl154.png b/levels/lvl154.png similarity index 100% rename from levels/part1/lvl154.png rename to levels/lvl154.png diff --git a/levels/part1/lvl155.lvl b/levels/lvl155.lvl similarity index 100% rename from levels/part1/lvl155.lvl rename to levels/lvl155.lvl diff --git a/levels/part1/lvl155.png b/levels/lvl155.png similarity index 100% rename from levels/part1/lvl155.png rename to levels/lvl155.png diff --git a/levels/part1/lvl156.lvl b/levels/lvl156.lvl similarity index 100% rename from levels/part1/lvl156.lvl rename to levels/lvl156.lvl diff --git a/levels/part1/lvl156.png b/levels/lvl156.png similarity index 100% rename from levels/part1/lvl156.png rename to levels/lvl156.png diff --git a/levels/part1/lvl157.lvl b/levels/lvl157.lvl similarity index 100% rename from levels/part1/lvl157.lvl rename to levels/lvl157.lvl diff --git a/levels/part1/lvl157.png b/levels/lvl157.png similarity index 100% rename from levels/part1/lvl157.png rename to levels/lvl157.png diff --git a/levels/part1/lvl158.lvl b/levels/lvl158.lvl similarity index 100% rename from levels/part1/lvl158.lvl rename to levels/lvl158.lvl diff --git a/levels/part1/lvl158.png b/levels/lvl158.png similarity index 100% rename from levels/part1/lvl158.png rename to levels/lvl158.png diff --git a/levels/part1/lvl159.lvl b/levels/lvl159.lvl similarity index 100% rename from levels/part1/lvl159.lvl rename to levels/lvl159.lvl diff --git a/levels/part1/lvl159.png b/levels/lvl159.png similarity index 100% rename from levels/part1/lvl159.png rename to levels/lvl159.png diff --git a/levels/part1/lvl16.lvl b/levels/lvl16.lvl similarity index 100% rename from levels/part1/lvl16.lvl rename to levels/lvl16.lvl diff --git a/levels/part1/lvl16.png b/levels/lvl16.png similarity index 100% rename from levels/part1/lvl16.png rename to levels/lvl16.png diff --git a/levels/part1/lvl160.lvl b/levels/lvl160.lvl similarity index 100% rename from levels/part1/lvl160.lvl rename to levels/lvl160.lvl diff --git a/levels/part1/lvl160.png b/levels/lvl160.png similarity index 100% rename from levels/part1/lvl160.png rename to levels/lvl160.png diff --git a/levels/part1/lvl161.lvl b/levels/lvl161.lvl similarity index 100% rename from levels/part1/lvl161.lvl rename to levels/lvl161.lvl diff --git a/levels/part1/lvl161.png b/levels/lvl161.png similarity index 100% rename from levels/part1/lvl161.png rename to levels/lvl161.png diff --git a/levels/part1/lvl162.lvl b/levels/lvl162.lvl similarity index 100% rename from levels/part1/lvl162.lvl rename to levels/lvl162.lvl diff --git a/levels/part1/lvl162.png b/levels/lvl162.png similarity index 100% rename from levels/part1/lvl162.png rename to levels/lvl162.png diff --git a/levels/part1/lvl163.lvl b/levels/lvl163.lvl similarity index 100% rename from levels/part1/lvl163.lvl rename to levels/lvl163.lvl diff --git a/levels/part1/lvl163.png b/levels/lvl163.png similarity index 100% rename from levels/part1/lvl163.png rename to levels/lvl163.png diff --git a/levels/part1/lvl164.lvl b/levels/lvl164.lvl similarity index 100% rename from levels/part1/lvl164.lvl rename to levels/lvl164.lvl diff --git a/levels/part1/lvl164.png b/levels/lvl164.png similarity index 100% rename from levels/part1/lvl164.png rename to levels/lvl164.png diff --git a/levels/part1/lvl165.lvl b/levels/lvl165.lvl similarity index 100% rename from levels/part1/lvl165.lvl rename to levels/lvl165.lvl diff --git a/levels/part1/lvl165.png b/levels/lvl165.png similarity index 100% rename from levels/part1/lvl165.png rename to levels/lvl165.png diff --git a/levels/part1/lvl166.lvl b/levels/lvl166.lvl similarity index 100% rename from levels/part1/lvl166.lvl rename to levels/lvl166.lvl diff --git a/levels/part1/lvl166.png b/levels/lvl166.png similarity index 100% rename from levels/part1/lvl166.png rename to levels/lvl166.png diff --git a/levels/part1/lvl167.lvl b/levels/lvl167.lvl similarity index 100% rename from levels/part1/lvl167.lvl rename to levels/lvl167.lvl diff --git a/levels/part1/lvl167.png b/levels/lvl167.png similarity index 100% rename from levels/part1/lvl167.png rename to levels/lvl167.png diff --git a/levels/part1/lvl168.lvl b/levels/lvl168.lvl similarity index 100% rename from levels/part1/lvl168.lvl rename to levels/lvl168.lvl diff --git a/levels/part1/lvl168.png b/levels/lvl168.png similarity index 100% rename from levels/part1/lvl168.png rename to levels/lvl168.png diff --git a/levels/part1/lvl169.lvl b/levels/lvl169.lvl similarity index 100% rename from levels/part1/lvl169.lvl rename to levels/lvl169.lvl diff --git a/levels/part1/lvl169.png b/levels/lvl169.png similarity index 100% rename from levels/part1/lvl169.png rename to levels/lvl169.png diff --git a/levels/part1/lvl17.lvl b/levels/lvl17.lvl similarity index 100% rename from levels/part1/lvl17.lvl rename to levels/lvl17.lvl diff --git a/levels/part1/lvl17.png b/levels/lvl17.png similarity index 100% rename from levels/part1/lvl17.png rename to levels/lvl17.png diff --git a/levels/part1/lvl170.lvl b/levels/lvl170.lvl similarity index 100% rename from levels/part1/lvl170.lvl rename to levels/lvl170.lvl diff --git a/levels/part1/lvl170.png b/levels/lvl170.png similarity index 100% rename from levels/part1/lvl170.png rename to levels/lvl170.png diff --git a/levels/part1/lvl171.lvl b/levels/lvl171.lvl similarity index 100% rename from levels/part1/lvl171.lvl rename to levels/lvl171.lvl diff --git a/levels/part1/lvl171.png b/levels/lvl171.png similarity index 100% rename from levels/part1/lvl171.png rename to levels/lvl171.png diff --git a/levels/part1/lvl172.lvl b/levels/lvl172.lvl similarity index 100% rename from levels/part1/lvl172.lvl rename to levels/lvl172.lvl diff --git a/levels/part1/lvl172.png b/levels/lvl172.png similarity index 100% rename from levels/part1/lvl172.png rename to levels/lvl172.png diff --git a/levels/part1/lvl173.lvl b/levels/lvl173.lvl similarity index 100% rename from levels/part1/lvl173.lvl rename to levels/lvl173.lvl diff --git a/levels/part1/lvl173.png b/levels/lvl173.png similarity index 100% rename from levels/part1/lvl173.png rename to levels/lvl173.png diff --git a/levels/part1/lvl174.lvl b/levels/lvl174.lvl similarity index 100% rename from levels/part1/lvl174.lvl rename to levels/lvl174.lvl diff --git a/levels/part1/lvl174.png b/levels/lvl174.png similarity index 100% rename from levels/part1/lvl174.png rename to levels/lvl174.png diff --git a/levels/part1/lvl175.lvl b/levels/lvl175.lvl similarity index 100% rename from levels/part1/lvl175.lvl rename to levels/lvl175.lvl diff --git a/levels/part1/lvl175.png b/levels/lvl175.png similarity index 100% rename from levels/part1/lvl175.png rename to levels/lvl175.png diff --git a/levels/part1/lvl176.lvl b/levels/lvl176.lvl similarity index 100% rename from levels/part1/lvl176.lvl rename to levels/lvl176.lvl diff --git a/levels/part1/lvl176.png b/levels/lvl176.png similarity index 100% rename from levels/part1/lvl176.png rename to levels/lvl176.png diff --git a/levels/part1/lvl177.lvl b/levels/lvl177.lvl similarity index 100% rename from levels/part1/lvl177.lvl rename to levels/lvl177.lvl diff --git a/levels/part1/lvl177.png b/levels/lvl177.png similarity index 100% rename from levels/part1/lvl177.png rename to levels/lvl177.png diff --git a/levels/part1/lvl178.lvl b/levels/lvl178.lvl similarity index 100% rename from levels/part1/lvl178.lvl rename to levels/lvl178.lvl diff --git a/levels/part1/lvl178.png b/levels/lvl178.png similarity index 100% rename from levels/part1/lvl178.png rename to levels/lvl178.png diff --git a/levels/part1/lvl179.lvl b/levels/lvl179.lvl similarity index 100% rename from levels/part1/lvl179.lvl rename to levels/lvl179.lvl diff --git a/levels/part1/lvl179.png b/levels/lvl179.png similarity index 100% rename from levels/part1/lvl179.png rename to levels/lvl179.png diff --git a/levels/part1/lvl18.lvl b/levels/lvl18.lvl similarity index 100% rename from levels/part1/lvl18.lvl rename to levels/lvl18.lvl diff --git a/levels/part1/lvl18.png b/levels/lvl18.png similarity index 100% rename from levels/part1/lvl18.png rename to levels/lvl18.png diff --git a/levels/part1/lvl180.lvl b/levels/lvl180.lvl similarity index 100% rename from levels/part1/lvl180.lvl rename to levels/lvl180.lvl diff --git a/levels/part1/lvl180.png b/levels/lvl180.png similarity index 100% rename from levels/part1/lvl180.png rename to levels/lvl180.png diff --git a/levels/part1/lvl181.lvl b/levels/lvl181.lvl similarity index 100% rename from levels/part1/lvl181.lvl rename to levels/lvl181.lvl diff --git a/levels/part1/lvl181.png b/levels/lvl181.png similarity index 100% rename from levels/part1/lvl181.png rename to levels/lvl181.png diff --git a/levels/part1/lvl182.lvl b/levels/lvl182.lvl similarity index 100% rename from levels/part1/lvl182.lvl rename to levels/lvl182.lvl diff --git a/levels/part1/lvl182.png b/levels/lvl182.png similarity index 100% rename from levels/part1/lvl182.png rename to levels/lvl182.png diff --git a/levels/part1/lvl183.lvl b/levels/lvl183.lvl similarity index 100% rename from levels/part1/lvl183.lvl rename to levels/lvl183.lvl diff --git a/levels/part1/lvl183.png b/levels/lvl183.png similarity index 100% rename from levels/part1/lvl183.png rename to levels/lvl183.png diff --git a/levels/part1/lvl184.lvl b/levels/lvl184.lvl similarity index 100% rename from levels/part1/lvl184.lvl rename to levels/lvl184.lvl diff --git a/levels/part1/lvl184.png b/levels/lvl184.png similarity index 100% rename from levels/part1/lvl184.png rename to levels/lvl184.png diff --git a/levels/part1/lvl185.lvl b/levels/lvl185.lvl similarity index 100% rename from levels/part1/lvl185.lvl rename to levels/lvl185.lvl diff --git a/levels/part1/lvl185.png b/levels/lvl185.png similarity index 100% rename from levels/part1/lvl185.png rename to levels/lvl185.png diff --git a/levels/part1/lvl186.lvl b/levels/lvl186.lvl similarity index 100% rename from levels/part1/lvl186.lvl rename to levels/lvl186.lvl diff --git a/levels/part1/lvl186.png b/levels/lvl186.png similarity index 100% rename from levels/part1/lvl186.png rename to levels/lvl186.png diff --git a/levels/part1/lvl187.lvl b/levels/lvl187.lvl similarity index 100% rename from levels/part1/lvl187.lvl rename to levels/lvl187.lvl diff --git a/levels/part1/lvl187.png b/levels/lvl187.png similarity index 100% rename from levels/part1/lvl187.png rename to levels/lvl187.png diff --git a/levels/part1/lvl188.lvl b/levels/lvl188.lvl similarity index 100% rename from levels/part1/lvl188.lvl rename to levels/lvl188.lvl diff --git a/levels/part1/lvl188.png b/levels/lvl188.png similarity index 100% rename from levels/part1/lvl188.png rename to levels/lvl188.png diff --git a/levels/part1/lvl189.lvl b/levels/lvl189.lvl similarity index 100% rename from levels/part1/lvl189.lvl rename to levels/lvl189.lvl diff --git a/levels/part1/lvl189.png b/levels/lvl189.png similarity index 100% rename from levels/part1/lvl189.png rename to levels/lvl189.png diff --git a/levels/part1/lvl19.lvl b/levels/lvl19.lvl similarity index 100% rename from levels/part1/lvl19.lvl rename to levels/lvl19.lvl diff --git a/levels/part1/lvl19.png b/levels/lvl19.png similarity index 100% rename from levels/part1/lvl19.png rename to levels/lvl19.png diff --git a/levels/part1/lvl190.lvl b/levels/lvl190.lvl similarity index 100% rename from levels/part1/lvl190.lvl rename to levels/lvl190.lvl diff --git a/levels/part1/lvl190.png b/levels/lvl190.png similarity index 100% rename from levels/part1/lvl190.png rename to levels/lvl190.png diff --git a/levels/part1/lvl191.lvl b/levels/lvl191.lvl similarity index 100% rename from levels/part1/lvl191.lvl rename to levels/lvl191.lvl diff --git a/levels/part1/lvl191.png b/levels/lvl191.png similarity index 100% rename from levels/part1/lvl191.png rename to levels/lvl191.png diff --git a/levels/part1/lvl192.lvl b/levels/lvl192.lvl similarity index 100% rename from levels/part1/lvl192.lvl rename to levels/lvl192.lvl diff --git a/levels/part1/lvl192.png b/levels/lvl192.png similarity index 100% rename from levels/part1/lvl192.png rename to levels/lvl192.png diff --git a/levels/part1/lvl193.lvl b/levels/lvl193.lvl similarity index 100% rename from levels/part1/lvl193.lvl rename to levels/lvl193.lvl diff --git a/levels/part1/lvl193.png b/levels/lvl193.png similarity index 100% rename from levels/part1/lvl193.png rename to levels/lvl193.png diff --git a/levels/part1/lvl194.lvl b/levels/lvl194.lvl similarity index 100% rename from levels/part1/lvl194.lvl rename to levels/lvl194.lvl diff --git a/levels/part1/lvl194.png b/levels/lvl194.png similarity index 100% rename from levels/part1/lvl194.png rename to levels/lvl194.png diff --git a/levels/part1/lvl195.lvl b/levels/lvl195.lvl similarity index 100% rename from levels/part1/lvl195.lvl rename to levels/lvl195.lvl diff --git a/levels/part1/lvl195.png b/levels/lvl195.png similarity index 100% rename from levels/part1/lvl195.png rename to levels/lvl195.png diff --git a/levels/part1/lvl196.lvl b/levels/lvl196.lvl similarity index 100% rename from levels/part1/lvl196.lvl rename to levels/lvl196.lvl diff --git a/levels/part1/lvl196.png b/levels/lvl196.png similarity index 100% rename from levels/part1/lvl196.png rename to levels/lvl196.png diff --git a/levels/part1/lvl197.lvl b/levels/lvl197.lvl similarity index 100% rename from levels/part1/lvl197.lvl rename to levels/lvl197.lvl diff --git a/levels/part1/lvl197.png b/levels/lvl197.png similarity index 100% rename from levels/part1/lvl197.png rename to levels/lvl197.png diff --git a/levels/part1/lvl198.lvl b/levels/lvl198.lvl similarity index 100% rename from levels/part1/lvl198.lvl rename to levels/lvl198.lvl diff --git a/levels/part1/lvl198.png b/levels/lvl198.png similarity index 100% rename from levels/part1/lvl198.png rename to levels/lvl198.png diff --git a/levels/part1/lvl199.lvl b/levels/lvl199.lvl similarity index 100% rename from levels/part1/lvl199.lvl rename to levels/lvl199.lvl diff --git a/levels/part1/lvl199.png b/levels/lvl199.png similarity index 100% rename from levels/part1/lvl199.png rename to levels/lvl199.png diff --git a/levels/part1/lvl2.lvl b/levels/lvl2.lvl similarity index 100% rename from levels/part1/lvl2.lvl rename to levels/lvl2.lvl diff --git a/levels/part1/lvl2.png b/levels/lvl2.png similarity index 100% rename from levels/part1/lvl2.png rename to levels/lvl2.png diff --git a/levels/part1/lvl20.lvl b/levels/lvl20.lvl similarity index 100% rename from levels/part1/lvl20.lvl rename to levels/lvl20.lvl diff --git a/levels/part1/lvl20.png b/levels/lvl20.png similarity index 100% rename from levels/part1/lvl20.png rename to levels/lvl20.png diff --git a/levels/part1/lvl200.lvl b/levels/lvl200.lvl similarity index 100% rename from levels/part1/lvl200.lvl rename to levels/lvl200.lvl diff --git a/levels/part1/lvl200.png b/levels/lvl200.png similarity index 100% rename from levels/part1/lvl200.png rename to levels/lvl200.png diff --git a/levels/part1/lvl21.lvl b/levels/lvl21.lvl similarity index 100% rename from levels/part1/lvl21.lvl rename to levels/lvl21.lvl diff --git a/levels/part1/lvl21.png b/levels/lvl21.png similarity index 100% rename from levels/part1/lvl21.png rename to levels/lvl21.png diff --git a/levels/part1/lvl22.lvl b/levels/lvl22.lvl similarity index 100% rename from levels/part1/lvl22.lvl rename to levels/lvl22.lvl diff --git a/levels/part1/lvl22.png b/levels/lvl22.png similarity index 100% rename from levels/part1/lvl22.png rename to levels/lvl22.png diff --git a/levels/part1/lvl23.lvl b/levels/lvl23.lvl similarity index 100% rename from levels/part1/lvl23.lvl rename to levels/lvl23.lvl diff --git a/levels/part1/lvl23.png b/levels/lvl23.png similarity index 100% rename from levels/part1/lvl23.png rename to levels/lvl23.png diff --git a/levels/part1/lvl24.lvl b/levels/lvl24.lvl similarity index 100% rename from levels/part1/lvl24.lvl rename to levels/lvl24.lvl diff --git a/levels/part1/lvl24.png b/levels/lvl24.png similarity index 100% rename from levels/part1/lvl24.png rename to levels/lvl24.png diff --git a/levels/part1/lvl25.lvl b/levels/lvl25.lvl similarity index 100% rename from levels/part1/lvl25.lvl rename to levels/lvl25.lvl diff --git a/levels/part1/lvl25.png b/levels/lvl25.png similarity index 100% rename from levels/part1/lvl25.png rename to levels/lvl25.png diff --git a/levels/part1/lvl26.lvl b/levels/lvl26.lvl similarity index 100% rename from levels/part1/lvl26.lvl rename to levels/lvl26.lvl diff --git a/levels/part1/lvl26.png b/levels/lvl26.png similarity index 100% rename from levels/part1/lvl26.png rename to levels/lvl26.png diff --git a/levels/part1/lvl27.lvl b/levels/lvl27.lvl similarity index 100% rename from levels/part1/lvl27.lvl rename to levels/lvl27.lvl diff --git a/levels/part1/lvl27.png b/levels/lvl27.png similarity index 100% rename from levels/part1/lvl27.png rename to levels/lvl27.png diff --git a/levels/part1/lvl28.lvl b/levels/lvl28.lvl similarity index 100% rename from levels/part1/lvl28.lvl rename to levels/lvl28.lvl diff --git a/levels/part1/lvl28.png b/levels/lvl28.png similarity index 100% rename from levels/part1/lvl28.png rename to levels/lvl28.png diff --git a/levels/part1/lvl29.lvl b/levels/lvl29.lvl similarity index 100% rename from levels/part1/lvl29.lvl rename to levels/lvl29.lvl diff --git a/levels/part1/lvl29.png b/levels/lvl29.png similarity index 100% rename from levels/part1/lvl29.png rename to levels/lvl29.png diff --git a/levels/part1/lvl3.lvl b/levels/lvl3.lvl similarity index 100% rename from levels/part1/lvl3.lvl rename to levels/lvl3.lvl diff --git a/levels/part1/lvl3.png b/levels/lvl3.png similarity index 100% rename from levels/part1/lvl3.png rename to levels/lvl3.png diff --git a/levels/part1/lvl30.lvl b/levels/lvl30.lvl similarity index 100% rename from levels/part1/lvl30.lvl rename to levels/lvl30.lvl diff --git a/levels/part1/lvl30.png b/levels/lvl30.png similarity index 100% rename from levels/part1/lvl30.png rename to levels/lvl30.png diff --git a/levels/part1/lvl31.lvl b/levels/lvl31.lvl similarity index 100% rename from levels/part1/lvl31.lvl rename to levels/lvl31.lvl diff --git a/levels/part1/lvl31.png b/levels/lvl31.png similarity index 100% rename from levels/part1/lvl31.png rename to levels/lvl31.png diff --git a/levels/part1/lvl32.lvl b/levels/lvl32.lvl similarity index 100% rename from levels/part1/lvl32.lvl rename to levels/lvl32.lvl diff --git a/levels/part1/lvl32.png b/levels/lvl32.png similarity index 100% rename from levels/part1/lvl32.png rename to levels/lvl32.png diff --git a/levels/part1/lvl33.lvl b/levels/lvl33.lvl similarity index 100% rename from levels/part1/lvl33.lvl rename to levels/lvl33.lvl diff --git a/levels/part1/lvl33.png b/levels/lvl33.png similarity index 100% rename from levels/part1/lvl33.png rename to levels/lvl33.png diff --git a/levels/part1/lvl34.lvl b/levels/lvl34.lvl similarity index 100% rename from levels/part1/lvl34.lvl rename to levels/lvl34.lvl diff --git a/levels/part1/lvl34.png b/levels/lvl34.png similarity index 100% rename from levels/part1/lvl34.png rename to levels/lvl34.png diff --git a/levels/part1/lvl35.lvl b/levels/lvl35.lvl similarity index 100% rename from levels/part1/lvl35.lvl rename to levels/lvl35.lvl diff --git a/levels/part1/lvl35.png b/levels/lvl35.png similarity index 100% rename from levels/part1/lvl35.png rename to levels/lvl35.png diff --git a/levels/part1/lvl36.lvl b/levels/lvl36.lvl similarity index 100% rename from levels/part1/lvl36.lvl rename to levels/lvl36.lvl diff --git a/levels/part1/lvl36.png b/levels/lvl36.png similarity index 100% rename from levels/part1/lvl36.png rename to levels/lvl36.png diff --git a/levels/part1/lvl37.lvl b/levels/lvl37.lvl similarity index 100% rename from levels/part1/lvl37.lvl rename to levels/lvl37.lvl diff --git a/levels/part1/lvl37.png b/levels/lvl37.png similarity index 100% rename from levels/part1/lvl37.png rename to levels/lvl37.png diff --git a/levels/part1/lvl38.lvl b/levels/lvl38.lvl similarity index 100% rename from levels/part1/lvl38.lvl rename to levels/lvl38.lvl diff --git a/levels/part1/lvl38.png b/levels/lvl38.png similarity index 100% rename from levels/part1/lvl38.png rename to levels/lvl38.png diff --git a/levels/part1/lvl39.lvl b/levels/lvl39.lvl similarity index 100% rename from levels/part1/lvl39.lvl rename to levels/lvl39.lvl diff --git a/levels/part1/lvl39.png b/levels/lvl39.png similarity index 100% rename from levels/part1/lvl39.png rename to levels/lvl39.png diff --git a/levels/part1/lvl4.lvl b/levels/lvl4.lvl similarity index 100% rename from levels/part1/lvl4.lvl rename to levels/lvl4.lvl diff --git a/levels/part1/lvl4.png b/levels/lvl4.png similarity index 100% rename from levels/part1/lvl4.png rename to levels/lvl4.png diff --git a/levels/part1/lvl40.lvl b/levels/lvl40.lvl similarity index 100% rename from levels/part1/lvl40.lvl rename to levels/lvl40.lvl diff --git a/levels/part1/lvl40.png b/levels/lvl40.png similarity index 100% rename from levels/part1/lvl40.png rename to levels/lvl40.png diff --git a/levels/part1/lvl41.lvl b/levels/lvl41.lvl similarity index 100% rename from levels/part1/lvl41.lvl rename to levels/lvl41.lvl diff --git a/levels/part1/lvl41.png b/levels/lvl41.png similarity index 100% rename from levels/part1/lvl41.png rename to levels/lvl41.png diff --git a/levels/part1/lvl42.lvl b/levels/lvl42.lvl similarity index 100% rename from levels/part1/lvl42.lvl rename to levels/lvl42.lvl diff --git a/levels/part1/lvl42.png b/levels/lvl42.png similarity index 100% rename from levels/part1/lvl42.png rename to levels/lvl42.png diff --git a/levels/part1/lvl43.lvl b/levels/lvl43.lvl similarity index 100% rename from levels/part1/lvl43.lvl rename to levels/lvl43.lvl diff --git a/levels/part1/lvl43.png b/levels/lvl43.png similarity index 100% rename from levels/part1/lvl43.png rename to levels/lvl43.png diff --git a/levels/part1/lvl44.lvl b/levels/lvl44.lvl similarity index 100% rename from levels/part1/lvl44.lvl rename to levels/lvl44.lvl diff --git a/levels/part1/lvl44.png b/levels/lvl44.png similarity index 100% rename from levels/part1/lvl44.png rename to levels/lvl44.png diff --git a/levels/part1/lvl45.lvl b/levels/lvl45.lvl similarity index 100% rename from levels/part1/lvl45.lvl rename to levels/lvl45.lvl diff --git a/levels/part1/lvl45.png b/levels/lvl45.png similarity index 100% rename from levels/part1/lvl45.png rename to levels/lvl45.png diff --git a/levels/part1/lvl46.lvl b/levels/lvl46.lvl similarity index 100% rename from levels/part1/lvl46.lvl rename to levels/lvl46.lvl diff --git a/levels/part1/lvl46.png b/levels/lvl46.png similarity index 100% rename from levels/part1/lvl46.png rename to levels/lvl46.png diff --git a/levels/part1/lvl47.lvl b/levels/lvl47.lvl similarity index 100% rename from levels/part1/lvl47.lvl rename to levels/lvl47.lvl diff --git a/levels/part1/lvl47.png b/levels/lvl47.png similarity index 100% rename from levels/part1/lvl47.png rename to levels/lvl47.png diff --git a/levels/part1/lvl48.lvl b/levels/lvl48.lvl similarity index 100% rename from levels/part1/lvl48.lvl rename to levels/lvl48.lvl diff --git a/levels/part1/lvl48.png b/levels/lvl48.png similarity index 100% rename from levels/part1/lvl48.png rename to levels/lvl48.png diff --git a/levels/part1/lvl49.lvl b/levels/lvl49.lvl similarity index 100% rename from levels/part1/lvl49.lvl rename to levels/lvl49.lvl diff --git a/levels/part1/lvl49.png b/levels/lvl49.png similarity index 100% rename from levels/part1/lvl49.png rename to levels/lvl49.png diff --git a/levels/part1/lvl5.lvl b/levels/lvl5.lvl similarity index 100% rename from levels/part1/lvl5.lvl rename to levels/lvl5.lvl diff --git a/levels/part1/lvl5.png b/levels/lvl5.png similarity index 100% rename from levels/part1/lvl5.png rename to levels/lvl5.png diff --git a/levels/part1/lvl50.lvl b/levels/lvl50.lvl similarity index 100% rename from levels/part1/lvl50.lvl rename to levels/lvl50.lvl diff --git a/levels/part1/lvl50.png b/levels/lvl50.png similarity index 100% rename from levels/part1/lvl50.png rename to levels/lvl50.png diff --git a/levels/part1/lvl51.lvl b/levels/lvl51.lvl similarity index 100% rename from levels/part1/lvl51.lvl rename to levels/lvl51.lvl diff --git a/levels/part1/lvl51.png b/levels/lvl51.png similarity index 100% rename from levels/part1/lvl51.png rename to levels/lvl51.png diff --git a/levels/part1/lvl52.lvl b/levels/lvl52.lvl similarity index 100% rename from levels/part1/lvl52.lvl rename to levels/lvl52.lvl diff --git a/levels/part1/lvl52.png b/levels/lvl52.png similarity index 100% rename from levels/part1/lvl52.png rename to levels/lvl52.png diff --git a/levels/part1/lvl53.lvl b/levels/lvl53.lvl similarity index 100% rename from levels/part1/lvl53.lvl rename to levels/lvl53.lvl diff --git a/levels/part1/lvl53.png b/levels/lvl53.png similarity index 100% rename from levels/part1/lvl53.png rename to levels/lvl53.png diff --git a/levels/part1/lvl54.lvl b/levels/lvl54.lvl similarity index 100% rename from levels/part1/lvl54.lvl rename to levels/lvl54.lvl diff --git a/levels/part1/lvl54.png b/levels/lvl54.png similarity index 100% rename from levels/part1/lvl54.png rename to levels/lvl54.png diff --git a/levels/part1/lvl55.lvl b/levels/lvl55.lvl similarity index 100% rename from levels/part1/lvl55.lvl rename to levels/lvl55.lvl diff --git a/levels/part1/lvl55.png b/levels/lvl55.png similarity index 100% rename from levels/part1/lvl55.png rename to levels/lvl55.png diff --git a/levels/part1/lvl56.lvl b/levels/lvl56.lvl similarity index 100% rename from levels/part1/lvl56.lvl rename to levels/lvl56.lvl diff --git a/levels/part1/lvl56.png b/levels/lvl56.png similarity index 100% rename from levels/part1/lvl56.png rename to levels/lvl56.png diff --git a/levels/part1/lvl57.lvl b/levels/lvl57.lvl similarity index 100% rename from levels/part1/lvl57.lvl rename to levels/lvl57.lvl diff --git a/levels/part1/lvl57.png b/levels/lvl57.png similarity index 100% rename from levels/part1/lvl57.png rename to levels/lvl57.png diff --git a/levels/part1/lvl58.lvl b/levels/lvl58.lvl similarity index 100% rename from levels/part1/lvl58.lvl rename to levels/lvl58.lvl diff --git a/levels/part1/lvl58.png b/levels/lvl58.png similarity index 100% rename from levels/part1/lvl58.png rename to levels/lvl58.png diff --git a/levels/part1/lvl59.lvl b/levels/lvl59.lvl similarity index 100% rename from levels/part1/lvl59.lvl rename to levels/lvl59.lvl diff --git a/levels/part1/lvl59.png b/levels/lvl59.png similarity index 100% rename from levels/part1/lvl59.png rename to levels/lvl59.png diff --git a/levels/part1/lvl6.lvl b/levels/lvl6.lvl similarity index 100% rename from levels/part1/lvl6.lvl rename to levels/lvl6.lvl diff --git a/levels/part1/lvl6.png b/levels/lvl6.png similarity index 100% rename from levels/part1/lvl6.png rename to levels/lvl6.png diff --git a/levels/part1/lvl60.lvl b/levels/lvl60.lvl similarity index 100% rename from levels/part1/lvl60.lvl rename to levels/lvl60.lvl diff --git a/levels/part1/lvl60.png b/levels/lvl60.png similarity index 100% rename from levels/part1/lvl60.png rename to levels/lvl60.png diff --git a/levels/part1/lvl61.lvl b/levels/lvl61.lvl similarity index 100% rename from levels/part1/lvl61.lvl rename to levels/lvl61.lvl diff --git a/levels/part1/lvl61.png b/levels/lvl61.png similarity index 100% rename from levels/part1/lvl61.png rename to levels/lvl61.png diff --git a/levels/part1/lvl62.lvl b/levels/lvl62.lvl similarity index 100% rename from levels/part1/lvl62.lvl rename to levels/lvl62.lvl diff --git a/levels/part1/lvl62.png b/levels/lvl62.png similarity index 100% rename from levels/part1/lvl62.png rename to levels/lvl62.png diff --git a/levels/part1/lvl63.lvl b/levels/lvl63.lvl similarity index 100% rename from levels/part1/lvl63.lvl rename to levels/lvl63.lvl diff --git a/levels/part1/lvl63.png b/levels/lvl63.png similarity index 100% rename from levels/part1/lvl63.png rename to levels/lvl63.png diff --git a/levels/part1/lvl64.lvl b/levels/lvl64.lvl similarity index 100% rename from levels/part1/lvl64.lvl rename to levels/lvl64.lvl diff --git a/levels/part1/lvl64.png b/levels/lvl64.png similarity index 100% rename from levels/part1/lvl64.png rename to levels/lvl64.png diff --git a/levels/part1/lvl65.lvl b/levels/lvl65.lvl similarity index 100% rename from levels/part1/lvl65.lvl rename to levels/lvl65.lvl diff --git a/levels/part1/lvl65.png b/levels/lvl65.png similarity index 100% rename from levels/part1/lvl65.png rename to levels/lvl65.png diff --git a/levels/part1/lvl66.lvl b/levels/lvl66.lvl similarity index 100% rename from levels/part1/lvl66.lvl rename to levels/lvl66.lvl diff --git a/levels/part1/lvl66.png b/levels/lvl66.png similarity index 100% rename from levels/part1/lvl66.png rename to levels/lvl66.png diff --git a/levels/part1/lvl67.lvl b/levels/lvl67.lvl similarity index 100% rename from levels/part1/lvl67.lvl rename to levels/lvl67.lvl diff --git a/levels/part1/lvl67.png b/levels/lvl67.png similarity index 100% rename from levels/part1/lvl67.png rename to levels/lvl67.png diff --git a/levels/part1/lvl68.lvl b/levels/lvl68.lvl similarity index 100% rename from levels/part1/lvl68.lvl rename to levels/lvl68.lvl diff --git a/levels/part1/lvl68.png b/levels/lvl68.png similarity index 100% rename from levels/part1/lvl68.png rename to levels/lvl68.png diff --git a/levels/part1/lvl69.lvl b/levels/lvl69.lvl similarity index 100% rename from levels/part1/lvl69.lvl rename to levels/lvl69.lvl diff --git a/levels/part1/lvl69.png b/levels/lvl69.png similarity index 100% rename from levels/part1/lvl69.png rename to levels/lvl69.png diff --git a/levels/part1/lvl7.lvl b/levels/lvl7.lvl similarity index 100% rename from levels/part1/lvl7.lvl rename to levels/lvl7.lvl diff --git a/levels/part1/lvl7.png b/levels/lvl7.png similarity index 100% rename from levels/part1/lvl7.png rename to levels/lvl7.png diff --git a/levels/part1/lvl70.lvl b/levels/lvl70.lvl similarity index 100% rename from levels/part1/lvl70.lvl rename to levels/lvl70.lvl diff --git a/levels/part1/lvl70.png b/levels/lvl70.png similarity index 100% rename from levels/part1/lvl70.png rename to levels/lvl70.png diff --git a/levels/part1/lvl71.lvl b/levels/lvl71.lvl similarity index 100% rename from levels/part1/lvl71.lvl rename to levels/lvl71.lvl diff --git a/levels/part1/lvl71.png b/levels/lvl71.png similarity index 100% rename from levels/part1/lvl71.png rename to levels/lvl71.png diff --git a/levels/part1/lvl72.lvl b/levels/lvl72.lvl similarity index 100% rename from levels/part1/lvl72.lvl rename to levels/lvl72.lvl diff --git a/levels/part1/lvl72.png b/levels/lvl72.png similarity index 100% rename from levels/part1/lvl72.png rename to levels/lvl72.png diff --git a/levels/part1/lvl73.lvl b/levels/lvl73.lvl similarity index 100% rename from levels/part1/lvl73.lvl rename to levels/lvl73.lvl diff --git a/levels/part1/lvl73.png b/levels/lvl73.png similarity index 100% rename from levels/part1/lvl73.png rename to levels/lvl73.png diff --git a/levels/part1/lvl74.lvl b/levels/lvl74.lvl similarity index 100% rename from levels/part1/lvl74.lvl rename to levels/lvl74.lvl diff --git a/levels/part1/lvl74.png b/levels/lvl74.png similarity index 100% rename from levels/part1/lvl74.png rename to levels/lvl74.png diff --git a/levels/part1/lvl75.lvl b/levels/lvl75.lvl similarity index 100% rename from levels/part1/lvl75.lvl rename to levels/lvl75.lvl diff --git a/levels/part1/lvl75.png b/levels/lvl75.png similarity index 100% rename from levels/part1/lvl75.png rename to levels/lvl75.png diff --git a/levels/part1/lvl76.lvl b/levels/lvl76.lvl similarity index 100% rename from levels/part1/lvl76.lvl rename to levels/lvl76.lvl diff --git a/levels/part1/lvl76.png b/levels/lvl76.png similarity index 100% rename from levels/part1/lvl76.png rename to levels/lvl76.png diff --git a/levels/part1/lvl77.lvl b/levels/lvl77.lvl similarity index 100% rename from levels/part1/lvl77.lvl rename to levels/lvl77.lvl diff --git a/levels/part1/lvl77.png b/levels/lvl77.png similarity index 100% rename from levels/part1/lvl77.png rename to levels/lvl77.png diff --git a/levels/part1/lvl78.lvl b/levels/lvl78.lvl similarity index 100% rename from levels/part1/lvl78.lvl rename to levels/lvl78.lvl diff --git a/levels/part1/lvl78.png b/levels/lvl78.png similarity index 100% rename from levels/part1/lvl78.png rename to levels/lvl78.png diff --git a/levels/part1/lvl79.lvl b/levels/lvl79.lvl similarity index 100% rename from levels/part1/lvl79.lvl rename to levels/lvl79.lvl diff --git a/levels/part1/lvl79.png b/levels/lvl79.png similarity index 100% rename from levels/part1/lvl79.png rename to levels/lvl79.png diff --git a/levels/part1/lvl8.lvl b/levels/lvl8.lvl similarity index 100% rename from levels/part1/lvl8.lvl rename to levels/lvl8.lvl diff --git a/levels/part1/lvl8.png b/levels/lvl8.png similarity index 100% rename from levels/part1/lvl8.png rename to levels/lvl8.png diff --git a/levels/part1/lvl80.lvl b/levels/lvl80.lvl similarity index 100% rename from levels/part1/lvl80.lvl rename to levels/lvl80.lvl diff --git a/levels/part1/lvl80.png b/levels/lvl80.png similarity index 100% rename from levels/part1/lvl80.png rename to levels/lvl80.png diff --git a/levels/part1/lvl81.lvl b/levels/lvl81.lvl similarity index 100% rename from levels/part1/lvl81.lvl rename to levels/lvl81.lvl diff --git a/levels/part1/lvl81.png b/levels/lvl81.png similarity index 100% rename from levels/part1/lvl81.png rename to levels/lvl81.png diff --git a/levels/part1/lvl82.lvl b/levels/lvl82.lvl similarity index 100% rename from levels/part1/lvl82.lvl rename to levels/lvl82.lvl diff --git a/levels/part1/lvl82.png b/levels/lvl82.png similarity index 100% rename from levels/part1/lvl82.png rename to levels/lvl82.png diff --git a/levels/part1/lvl83.lvl b/levels/lvl83.lvl similarity index 100% rename from levels/part1/lvl83.lvl rename to levels/lvl83.lvl diff --git a/levels/part1/lvl83.png b/levels/lvl83.png similarity index 100% rename from levels/part1/lvl83.png rename to levels/lvl83.png diff --git a/levels/part1/lvl84.lvl b/levels/lvl84.lvl similarity index 100% rename from levels/part1/lvl84.lvl rename to levels/lvl84.lvl diff --git a/levels/part1/lvl84.png b/levels/lvl84.png similarity index 100% rename from levels/part1/lvl84.png rename to levels/lvl84.png diff --git a/levels/part1/lvl85.lvl b/levels/lvl85.lvl similarity index 100% rename from levels/part1/lvl85.lvl rename to levels/lvl85.lvl diff --git a/levels/part1/lvl85.png b/levels/lvl85.png similarity index 100% rename from levels/part1/lvl85.png rename to levels/lvl85.png diff --git a/levels/part1/lvl86.lvl b/levels/lvl86.lvl similarity index 100% rename from levels/part1/lvl86.lvl rename to levels/lvl86.lvl diff --git a/levels/part1/lvl86.png b/levels/lvl86.png similarity index 100% rename from levels/part1/lvl86.png rename to levels/lvl86.png diff --git a/levels/part1/lvl87.lvl b/levels/lvl87.lvl similarity index 100% rename from levels/part1/lvl87.lvl rename to levels/lvl87.lvl diff --git a/levels/part1/lvl87.png b/levels/lvl87.png similarity index 100% rename from levels/part1/lvl87.png rename to levels/lvl87.png diff --git a/levels/part1/lvl88.lvl b/levels/lvl88.lvl similarity index 100% rename from levels/part1/lvl88.lvl rename to levels/lvl88.lvl diff --git a/levels/part1/lvl88.png b/levels/lvl88.png similarity index 100% rename from levels/part1/lvl88.png rename to levels/lvl88.png diff --git a/levels/part1/lvl89.lvl b/levels/lvl89.lvl similarity index 100% rename from levels/part1/lvl89.lvl rename to levels/lvl89.lvl diff --git a/levels/part1/lvl89.png b/levels/lvl89.png similarity index 100% rename from levels/part1/lvl89.png rename to levels/lvl89.png diff --git a/levels/part1/lvl9.lvl b/levels/lvl9.lvl similarity index 100% rename from levels/part1/lvl9.lvl rename to levels/lvl9.lvl diff --git a/levels/part1/lvl9.png b/levels/lvl9.png similarity index 100% rename from levels/part1/lvl9.png rename to levels/lvl9.png diff --git a/levels/part1/lvl90.lvl b/levels/lvl90.lvl similarity index 100% rename from levels/part1/lvl90.lvl rename to levels/lvl90.lvl diff --git a/levels/part1/lvl90.png b/levels/lvl90.png similarity index 100% rename from levels/part1/lvl90.png rename to levels/lvl90.png diff --git a/levels/part1/lvl91.lvl b/levels/lvl91.lvl similarity index 100% rename from levels/part1/lvl91.lvl rename to levels/lvl91.lvl diff --git a/levels/part1/lvl91.png b/levels/lvl91.png similarity index 100% rename from levels/part1/lvl91.png rename to levels/lvl91.png diff --git a/levels/part1/lvl92.lvl b/levels/lvl92.lvl similarity index 100% rename from levels/part1/lvl92.lvl rename to levels/lvl92.lvl diff --git a/levels/part1/lvl92.png b/levels/lvl92.png similarity index 100% rename from levels/part1/lvl92.png rename to levels/lvl92.png diff --git a/levels/part1/lvl93.lvl b/levels/lvl93.lvl similarity index 100% rename from levels/part1/lvl93.lvl rename to levels/lvl93.lvl diff --git a/levels/part1/lvl93.png b/levels/lvl93.png similarity index 100% rename from levels/part1/lvl93.png rename to levels/lvl93.png diff --git a/levels/part1/lvl94.lvl b/levels/lvl94.lvl similarity index 100% rename from levels/part1/lvl94.lvl rename to levels/lvl94.lvl diff --git a/levels/part1/lvl94.png b/levels/lvl94.png similarity index 100% rename from levels/part1/lvl94.png rename to levels/lvl94.png diff --git a/levels/part1/lvl95.lvl b/levels/lvl95.lvl similarity index 100% rename from levels/part1/lvl95.lvl rename to levels/lvl95.lvl diff --git a/levels/part1/lvl95.png b/levels/lvl95.png similarity index 100% rename from levels/part1/lvl95.png rename to levels/lvl95.png diff --git a/levels/part1/lvl96.lvl b/levels/lvl96.lvl similarity index 100% rename from levels/part1/lvl96.lvl rename to levels/lvl96.lvl diff --git a/levels/part1/lvl96.png b/levels/lvl96.png similarity index 100% rename from levels/part1/lvl96.png rename to levels/lvl96.png diff --git a/levels/part1/lvl97.lvl b/levels/lvl97.lvl similarity index 100% rename from levels/part1/lvl97.lvl rename to levels/lvl97.lvl diff --git a/levels/part1/lvl97.png b/levels/lvl97.png similarity index 100% rename from levels/part1/lvl97.png rename to levels/lvl97.png diff --git a/levels/part1/lvl98.lvl b/levels/lvl98.lvl similarity index 100% rename from levels/part1/lvl98.lvl rename to levels/lvl98.lvl diff --git a/levels/part1/lvl98.png b/levels/lvl98.png similarity index 100% rename from levels/part1/lvl98.png rename to levels/lvl98.png diff --git a/levels/part1/lvl99.lvl b/levels/lvl99.lvl similarity index 100% rename from levels/part1/lvl99.lvl rename to levels/lvl99.lvl diff --git a/levels/part1/lvl99.png b/levels/lvl99.png similarity index 100% rename from levels/part1/lvl99.png rename to levels/lvl99.png diff --git a/main.py b/main.py index 15d3a82..1a1aab3 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,5 @@ import os -import csv + from IDManager import idManager from flask import Flask, render_template, request, redirect, url_for @@ -11,6 +11,7 @@ replayDataPath = "reps/" evalDataPath = "evals/" questionarePath = "data/questionare.csv" +annotationPath = "data/annotation.csv" @app.route('/annotation') @@ -21,10 +22,11 @@ def gamepreanno(): @app.route('/result', methods=['POST', 'GET']) def gamepreplay(): if request.method == 'POST': + result = request.form ip = request.remote_addr # Save the result to questionare - write_csv(questionarePath,[ip,result.get("gamestyle"),result.get("frequency"),result.get("age")]) + idm.write_csv(questionarePath, [ip, result.get("gamestyle"), result.get("frequency"), result.get("age")]) # excel = ExcelWork(questionarePath) # questionareLine = excel.getMaxRow()+1 # print(questionareLine) @@ -46,13 +48,17 @@ def gamequestion(): @app.route('/gameplay/') def gameplay(id): gamelevels = idm.getLevels(id) - return render_template('GamePlay.html',gamelevels = gamelevels) + return render_template('GamePlay.html', gamelevels=gamelevels) @app.route('/annotation/') def gameanno(id): print("anno " + id) - return render_template('GameAnnotation.html') + + gamelevels = idm.getLevels(id) + level1 = gamelevels[0] + level2 = gamelevels[1] + return render_template('GameAnnotation.html', level1=level1, level2=level2) # @@ -61,6 +67,7 @@ def getJSONData(id): if request.method == 'POST': print("POST Game") print(request.values) + #FIXME: NOT SAVING! saveFile(replayDataPath, request.json[4], request.json) return "Catch JSON Data" @@ -70,6 +77,9 @@ def getRadioData(id): if request.method == 'POST': print("POST Eval") print(request.values) + result = request.form + ip = request.remote_addr + idm.write_csv(annotationPath,[ip,"a","b","anno"]) # saveFile(evalDataPath,"gameanno",request.json[0]+request.json[1]+request.json[2]) return "catch Radio" @@ -81,10 +91,7 @@ def saveFile(path, filename, content): f = open(file_path, "w", encoding="utf8") f.write(content) f.close() -def write_csv(path, data): - with open(path,'a+') as f: - csv_write = csv.writer(f) - csv_write.writerow(data) + if __name__ == '__main__': app.debug = True diff --git a/templates/GameAnnotation.html b/templates/GameAnnotation.html index 6c65df7..cf788cc 100644 --- a/templates/GameAnnotation.html +++ b/templates/GameAnnotation.html @@ -197,7 +197,24 @@ +