From d694caae7d341e6b34c06a160d47126166517875 Mon Sep 17 00:00:00 2001 From: Komron Date: Tue, 30 Jul 2024 16:22:29 +0500 Subject: [PATCH] Undid accidental push --- mu/logic.py | 36 +----------------- mu/resources/neopia/01-01 KobiBot.py | 15 -------- mu/resources/neopia/01-02 FutbolBot.py | 15 -------- mu/resources/neopia/01-06 Sehrli ansanmbl.py | 9 ----- mu/resources/neopia/02-01-01 Barami.py | 11 ------ mu/resources/neopia/02-01-02 Barami.py | 15 -------- mu/resources/neopia/02-02 Neo Bigl.py | 13 ------- mu/resources/neopia/02-03 Neo kliner.py | 8 ---- .../neopia/02-04-01 Aqlli avtomobil.py | 16 -------- .../neopia/02-04-02 Aqlli avtomobil.py | 8 ---- .../neopia/02-05-01 Chiziq trekkeri.py | 11 ------ .../neopia/02-05-02 Chiziq trekkeri.py | 15 -------- mu/resources/neopia/04-01 Fonar.py | 8 ---- .../neopia/04-03-01 Aqlli avtomobil 2.py | 24 ------------ .../neopia/04-03-02 Aqlli avtomobil 2.py | 31 --------------- .../neopia/04-04 Samosval avtomobili.py | 10 ----- mu/resources/neopia/04-05 Robot qo_l.py | 16 -------- mu/resources/neopia/04-06 Konveyer .py | 13 ------- .../pygamezero/{images => }/alien.png | Bin .../pygamezero/{images => }/alien_hurt.png | Bin .../pygamezero/{images => }/background.png | Bin .../pygamezero/{images => }/bird0.png | Bin .../pygamezero/{images => }/bird1.png | Bin .../pygamezero/{images => }/bird2.png | Bin .../pygamezero/{images => }/birddead.png | Bin .../pygamezero/{images => }/bottom.png | Bin .../pygamezero/{images => }/boy_1.png | Bin .../pygamezero/{images => }/boy_2.png | Bin .../pygamezero/{images => }/boy_3.png | Bin mu/resources/pygamezero/{images => }/cat.png | Bin mu/resources/pygamezero/{images => }/cat1.png | Bin mu/resources/pygamezero/{images => }/cat2.png | Bin mu/resources/pygamezero/{images => }/cat3.png | Bin mu/resources/pygamezero/{images => }/cat4.png | Bin .../pygamezero/{sounds => }/cheer.ogg | Bin .../pygamezero/{images => }/cleaner.png | Bin mu/resources/pygamezero/{images => }/dala.png | Bin .../pygamezero/{images => }/desert.png | Bin mu/resources/pygamezero/{images => }/dog.png | Bin mu/resources/pygamezero/{sounds => }/eep.wav | Bin .../pygamezero/{images => }/eraser.png | Bin .../pygamezero/{images => }/field.png | Bin .../pygamezero/{images => }/floor.png | Bin .../pygamezero/{sounds => }/meow1.wav | Bin .../pygamezero/{sounds => }/meow2.wav | Bin .../pygamezero/{sounds => }/meow3.wav | Bin .../pygamezero/{sounds => }/meow4.wav | Bin mu/resources/pygamezero/{images => }/mole.png | Bin .../pygamezero/{fonts => }/nanum_square.ttf | Bin .../pygamezero/{images => }/pencil.png | Bin .../pygamezero/{images => }/pink_leaf.png | Bin .../pygamezero/{images => }/splat.png | Bin .../pygamezero/{sounds => }/splat.wav | Bin mu/resources/pygamezero/{sounds => }/toi.ogg | Bin mu/resources/pygamezero/{images => }/top.png | Bin .../pygamezero/{images => }/toy_hammer.png | Bin .../pygamezero/{images => }/treasure_box.png | Bin .../pygamezero/{sounds => }/warning.ogg | Bin 58 files changed, 1 insertion(+), 273 deletions(-) delete mode 100644 mu/resources/neopia/01-01 KobiBot.py delete mode 100644 mu/resources/neopia/01-02 FutbolBot.py delete mode 100644 mu/resources/neopia/01-06 Sehrli ansanmbl.py delete mode 100644 mu/resources/neopia/02-01-01 Barami.py delete mode 100644 mu/resources/neopia/02-01-02 Barami.py delete mode 100644 mu/resources/neopia/02-02 Neo Bigl.py delete mode 100644 mu/resources/neopia/02-03 Neo kliner.py delete mode 100644 mu/resources/neopia/02-04-01 Aqlli avtomobil.py delete mode 100644 mu/resources/neopia/02-04-02 Aqlli avtomobil.py delete mode 100644 mu/resources/neopia/02-05-01 Chiziq trekkeri.py delete mode 100644 mu/resources/neopia/02-05-02 Chiziq trekkeri.py delete mode 100644 mu/resources/neopia/04-01 Fonar.py delete mode 100644 mu/resources/neopia/04-03-01 Aqlli avtomobil 2.py delete mode 100644 mu/resources/neopia/04-03-02 Aqlli avtomobil 2.py delete mode 100644 mu/resources/neopia/04-04 Samosval avtomobili.py delete mode 100644 mu/resources/neopia/04-05 Robot qo_l.py delete mode 100644 mu/resources/neopia/04-06 Konveyer .py rename mu/resources/pygamezero/{images => }/alien.png (100%) rename mu/resources/pygamezero/{images => }/alien_hurt.png (100%) rename mu/resources/pygamezero/{images => }/background.png (100%) rename mu/resources/pygamezero/{images => }/bird0.png (100%) rename mu/resources/pygamezero/{images => }/bird1.png (100%) rename mu/resources/pygamezero/{images => }/bird2.png (100%) rename mu/resources/pygamezero/{images => }/birddead.png (100%) rename mu/resources/pygamezero/{images => }/bottom.png (100%) rename mu/resources/pygamezero/{images => }/boy_1.png (100%) rename mu/resources/pygamezero/{images => }/boy_2.png (100%) rename mu/resources/pygamezero/{images => }/boy_3.png (100%) rename mu/resources/pygamezero/{images => }/cat.png (100%) rename mu/resources/pygamezero/{images => }/cat1.png (100%) rename mu/resources/pygamezero/{images => }/cat2.png (100%) rename mu/resources/pygamezero/{images => }/cat3.png (100%) rename mu/resources/pygamezero/{images => }/cat4.png (100%) rename mu/resources/pygamezero/{sounds => }/cheer.ogg (100%) rename mu/resources/pygamezero/{images => }/cleaner.png (100%) rename mu/resources/pygamezero/{images => }/dala.png (100%) rename mu/resources/pygamezero/{images => }/desert.png (100%) rename mu/resources/pygamezero/{images => }/dog.png (100%) rename mu/resources/pygamezero/{sounds => }/eep.wav (100%) rename mu/resources/pygamezero/{images => }/eraser.png (100%) rename mu/resources/pygamezero/{images => }/field.png (100%) rename mu/resources/pygamezero/{images => }/floor.png (100%) rename mu/resources/pygamezero/{sounds => }/meow1.wav (100%) rename mu/resources/pygamezero/{sounds => }/meow2.wav (100%) rename mu/resources/pygamezero/{sounds => }/meow3.wav (100%) rename mu/resources/pygamezero/{sounds => }/meow4.wav (100%) rename mu/resources/pygamezero/{images => }/mole.png (100%) rename mu/resources/pygamezero/{fonts => }/nanum_square.ttf (100%) rename mu/resources/pygamezero/{images => }/pencil.png (100%) rename mu/resources/pygamezero/{images => }/pink_leaf.png (100%) rename mu/resources/pygamezero/{images => }/splat.png (100%) rename mu/resources/pygamezero/{sounds => }/splat.wav (100%) rename mu/resources/pygamezero/{sounds => }/toi.ogg (100%) rename mu/resources/pygamezero/{images => }/top.png (100%) rename mu/resources/pygamezero/{images => }/toy_hammer.png (100%) rename mu/resources/pygamezero/{images => }/treasure_box.png (100%) rename mu/resources/pygamezero/{sounds => }/warning.ogg (100%) diff --git a/mu/logic.py b/mu/logic.py index 8f7b999eb..c835c1cac 100644 --- a/mu/logic.py +++ b/mu/logic.py @@ -146,25 +146,7 @@ "flappybird.py", "flappybird_neosoco.py", ] -EXAMPLE_NEOPIA = [ - "01-01_KobiBot.py", - "01-02_FutbolBot.py", - "01-06_Sehrli_ansanmbl.py", - "02-01-01_Barami.py", - "02-01-02_Barami.py", - "02-02_Neo_Bigl.py", - "02-03_Neo_kliner.py", - "02-04-01_Aqlli_avtomobil.py", - "02-04-02_Aqlli_avtomobil.py", - "02-05-01_Chiziq_trekkeri.py", - "02-05-02_Chiziq_trekkeri.py", - "04-01_Fonar.py", - "04-03-01_Aqlli_avtomobil_2.py", - "04-03-02_Aqlli_avtomobil_2.py", - "04-04_Samosval_avtomobili.py", - "04-05_Robot_qol.py", - "04-06_Konveyer.py" -] + MOTD = [ # Candidate phrases for the message of the day (MOTD). _("Hello, World!"), _( @@ -924,7 +906,6 @@ def setup(self, modes): examples_path = os.path.join(wd, "examples") example_entry_b_path = os.path.join(wd, "examples/entry_basic/") example_pgz_path = os.path.join(wd, "examples/pygame_zero/") - example_neopia_path = os.path.join(wd, "examples/neopia/") if not os.path.exists(images_path): logger.debug("Creating directory: {}".format(images_path)) os.makedirs(images_path) @@ -1003,21 +984,6 @@ def setup(self, modes): for sfx in EXAMPLE_PGZ_IMAGES: shutil.copy( path(sfx, "pygamezero/"), os.path.join(example_pgz_path + 'images', sfx) - ) - # Neopia examples - if not os.path.exists(example_neopia_path): - logger.debug("Creating directory: {}".format(example_neopia_path)) - os.makedirs(example_neopia_path) - for sfx in EXAMPLE_NEOPIA: - shutil.copy( - path(sfx, "neopia/"), os.path.join(example_neopia_path, sfx) - ) - if not os.path.exists(example_neopia_path + 'images'): - logger.debug("Creating directory: {}".format('images')) - os.makedirs(example_neopia_path + 'images') - for sfx in EXAMPLE_PGZ_IMAGES: - shutil.copy( - path(sfx, "neopia/"), os.path.join(example_neopia_path + 'images', sfx) ) # Ensure Web based assets are copied over. template_path = os.path.join(wd, "templates") diff --git a/mu/resources/neopia/01-01 KobiBot.py b/mu/resources/neopia/01-01 KobiBot.py deleted file mode 100644 index cfa9c28d2..000000000 --- a/mu/resources/neopia/01-01 KobiBot.py +++ /dev/null @@ -1,15 +0,0 @@ -from neopia import * - -n = Neosoco() - -# LEDni yoqib 1 soniyadan keyin o'chirish -n.led_on('out1','100') -wait(1000) # milisekund orqali hisoblanadi - - -# Takrorlab miltiratish -while True: - n.led_on('out1','100') - wait(1000) - n.led_off('out1') - wait(1000) \ No newline at end of file diff --git a/mu/resources/neopia/01-02 FutbolBot.py b/mu/resources/neopia/01-02 FutbolBot.py deleted file mode 100644 index 5b08cacf2..000000000 --- a/mu/resources/neopia/01-02 FutbolBot.py +++ /dev/null @@ -1,15 +0,0 @@ -from neopia import * - -n = Neosoco() -while True: - key = Keyboard.read() - if key == Keyboard.UP: - n.motor_rotate('both', 'forward', '10') - elif key == Keyboard.DOWN: - n.motor_rotate('both', 'backward', '10') - elif key == Keyboard.LEFT: - n.motor_rotate('both', 'left', '10') - elif key == Keyboard.RIGHT: - n.motor_rotate('both', 'right', '10') - elif key == ' ': - n.motor_stop('both') diff --git a/mu/resources/neopia/01-06 Sehrli ansanmbl.py b/mu/resources/neopia/01-06 Sehrli ansanmbl.py deleted file mode 100644 index 23da41b1d..000000000 --- a/mu/resources/neopia/01-06 Sehrli ansanmbl.py +++ /dev/null @@ -1,9 +0,0 @@ -# Ichki buzzer orqali yangrash - -from neopia import * - -n = Neosoco() -while True: - n.buzzer_by_port('in1') - wait(200) - n.buzzer_stop() \ No newline at end of file diff --git a/mu/resources/neopia/02-01-01 Barami.py b/mu/resources/neopia/02-01-01 Barami.py deleted file mode 100644 index 2b96d7800..000000000 --- a/mu/resources/neopia/02-01-01 Barami.py +++ /dev/null @@ -1,11 +0,0 @@ -# Ovoz sensor orqali Baramining tezligini boshqarish - -from neopia import * - -n = Neosoco() -while True: - if n.get_value('in3') < 30: - n.motor_stop('right') - else: - n.motor_rotate('right', 'forward', 'in3') - \ No newline at end of file diff --git a/mu/resources/neopia/02-01-02 Barami.py b/mu/resources/neopia/02-01-02 Barami.py deleted file mode 100644 index 2d2f19f50..000000000 --- a/mu/resources/neopia/02-01-02 Barami.py +++ /dev/null @@ -1,15 +0,0 @@ -# Klaviatura orqali Baramining tezligini boshqarish - -from neopia import * - -n = Neosoco() -while True: - key = Keyboard.read() - if key == '0': - n.motor_stop('right') - elif key == '1': - n.motor_rotate('right', 'forward', '10') - elif key == '2': - n.motor_rotate('right', 'forward', '50') - elif key == '3': - n.motor_rotate('right', 'forward', '100') \ No newline at end of file diff --git a/mu/resources/neopia/02-02 Neo Bigl.py b/mu/resources/neopia/02-02 Neo Bigl.py deleted file mode 100644 index b61544ae6..000000000 --- a/mu/resources/neopia/02-02 Neo Bigl.py +++ /dev/null @@ -1,13 +0,0 @@ -from neopia import * - -n = Neosoco() - -while True: - while n.get_value('in3') > 50: - continue - while n.get_value('in3') <= 50: - continue - - n.motor_rotate('both', 'left', '50') - wait(3000) - n.motor_stop('both') \ No newline at end of file diff --git a/mu/resources/neopia/02-03 Neo kliner.py b/mu/resources/neopia/02-03 Neo kliner.py deleted file mode 100644 index 73138a151..000000000 --- a/mu/resources/neopia/02-03 Neo kliner.py +++ /dev/null @@ -1,8 +0,0 @@ -from neopia import * - -n = Neosoco() -while True: - if n.get_value('in1') < 20: - n.motor_rotate('both', 'forward', '50') - else: - n.motor_stop('both') \ No newline at end of file diff --git a/mu/resources/neopia/02-04-01 Aqlli avtomobil.py b/mu/resources/neopia/02-04-01 Aqlli avtomobil.py deleted file mode 100644 index 22f48dc76..000000000 --- a/mu/resources/neopia/02-04-01 Aqlli avtomobil.py +++ /dev/null @@ -1,16 +0,0 @@ -# Masofa sensor orqali to’siqdan qochish dasturi - -from neopia import * - -n = Neosoco() -while True: - if n.get_value('in2') <= 7: - n.motor_move('backward') - wait(500) - n.motor_stop('both') - n.motor_move('left') - wait(1000) - n.motor_stop('both') - else: - n.motor_rotate('both', 'forward', '50') - diff --git a/mu/resources/neopia/02-04-02 Aqlli avtomobil.py b/mu/resources/neopia/02-04-02 Aqlli avtomobil.py deleted file mode 100644 index eed3bb390..000000000 --- a/mu/resources/neopia/02-04-02 Aqlli avtomobil.py +++ /dev/null @@ -1,8 +0,0 @@ -# Acc Kontrol dasturalsh - -from neopia import * - -n = Neosoco() -while True: - n.motor_rotate('both', 'forward', 'in2') - n.buzzer_by_port('in2') \ No newline at end of file diff --git a/mu/resources/neopia/02-05-01 Chiziq trekkeri.py b/mu/resources/neopia/02-05-01 Chiziq trekkeri.py deleted file mode 100644 index 60aeb65ac..000000000 --- a/mu/resources/neopia/02-05-01 Chiziq trekkeri.py +++ /dev/null @@ -1,11 +0,0 @@ -from neopia import * - -n = Neosoco() -while True: - if n.get_value('in1') and n.get_value('in2') > 40: - n.motor_rotate('both', 'forward', '30') - else: - if n.get_value('in1') <= 40: - n.motor_stop('left') - if n.get_value('in2') <= 40: - n.motor_stop('right') diff --git a/mu/resources/neopia/02-05-02 Chiziq trekkeri.py b/mu/resources/neopia/02-05-02 Chiziq trekkeri.py deleted file mode 100644 index afb41b8c9..000000000 --- a/mu/resources/neopia/02-05-02 Chiziq trekkeri.py +++ /dev/null @@ -1,15 +0,0 @@ -from neopia import * - -n = Neosoco() -while True: - if n.get_value('in1') and n.get_value('in2') > 40: - n.motor_rotate('both', 'forward', '30') - else: - if n.get_value('in1') <= 40: - n.motor_stop('left') - if n.get_value('in2') <= 40: - n.motor_stop('right') - if n.get_value('in1') and n.get_value('in2') <= 40: - n.motor_move('left') - wait(500) - n.motor_stop('both') \ No newline at end of file diff --git a/mu/resources/neopia/04-01 Fonar.py b/mu/resources/neopia/04-01 Fonar.py deleted file mode 100644 index f9f389d81..000000000 --- a/mu/resources/neopia/04-01 Fonar.py +++ /dev/null @@ -1,8 +0,0 @@ -from neopia import * - -n = Neosoco() -while True: - if n.get_value('in1') == 255: - n.led_on('out1', '100') - else: - n.led_off('out1') \ No newline at end of file diff --git a/mu/resources/neopia/04-03-01 Aqlli avtomobil 2.py b/mu/resources/neopia/04-03-01 Aqlli avtomobil 2.py deleted file mode 100644 index 9ebd3483c..000000000 --- a/mu/resources/neopia/04-03-01 Aqlli avtomobil 2.py +++ /dev/null @@ -1,24 +0,0 @@ -from neopia import * - -n = Neosoco() -while True: - if n.get_value('in2') <= 10: - n.motor_stop('both') - n.servo_reset_degree('out3') - wait(100) - n.servo_rotate_by_degree('out3', 'forward', '100', '90') - wait(1000) - chap_m = n.get_value('in2') - n.servo_rotate_by_degree('out3', 'backward', '100', '90') - wait(1000) - ong_m = n.get_value('in2') - n.servo_rotate_by_degree('out3', 'forward', '100', '0') - wait(1000) - if chap_m > ong_m: - n.motor_rotate('both', 'left', '50') - wait(1000) - else: - n.motor_rotate('both', 'right', '50') - wait(1000) - else: - n.motor_rotate('both', 'forward', '50') diff --git a/mu/resources/neopia/04-03-02 Aqlli avtomobil 2.py b/mu/resources/neopia/04-03-02 Aqlli avtomobil 2.py deleted file mode 100644 index 989b00fcd..000000000 --- a/mu/resources/neopia/04-03-02 Aqlli avtomobil 2.py +++ /dev/null @@ -1,31 +0,0 @@ -from neopia import * - -n = Neosoco() -# Masofa sensor orqali to‘siqni tekshirish uchun funksiya yaratish -def servo_motor(): - n.motor_stop('both') - n.servo_reset_degree('out3') - wait(100) - n.servo_rotate_by_degree('out3', 'forward', '100', '90') - wait(1000) - global chap_m - chap_m = n.get_value('in2') - n.servo_rotate_by_degree('out3', 'backward', '100', '90') - wait(1000) - global ong_m - ong_m = n.get_value('in2') - n.servo_rotate_by_degree('out3', 'forward', '100', '0') - wait(1000) - -# Funksiyadan foydalanib dastur tuzish -while True: - if n.get_value('in2') <= 10: - servo_motor() - if chap_m > ong_m: - n.motor_rotate('both', 'right', '50') - wait(1000) - else: - n.motor_rotate('both', 'left', '50') - wait(1000) - else: - n.motor_rotate('both', 'forward', '50') diff --git a/mu/resources/neopia/04-04 Samosval avtomobili.py b/mu/resources/neopia/04-04 Samosval avtomobili.py deleted file mode 100644 index fc60463f7..000000000 --- a/mu/resources/neopia/04-04 Samosval avtomobili.py +++ /dev/null @@ -1,10 +0,0 @@ -from neopia import * - -n = Neosoco() -n.servo_reset_degree('out1') -while True: - key = Keyboard.read() - if key == '4': - n.servo_rotate_by_degree('out1', 'forward', '20', '60') - if key == '1': - n.servo_rotate_by_degree('out1', 'forward', '20', '0') \ No newline at end of file diff --git a/mu/resources/neopia/04-05 Robot qo_l.py b/mu/resources/neopia/04-05 Robot qo_l.py deleted file mode 100644 index 5feb78199..000000000 --- a/mu/resources/neopia/04-05 Robot qo_l.py +++ /dev/null @@ -1,16 +0,0 @@ -from neopia import * - -n = Neosoco() -while True: - if n.get_value('in1') < 80 and n.get_value('in2') < 80: - n.servo_stop('out1') - n.motor_stop('both') - elif n.get_value('in1') > 80 and n.get_value('in2') > 80: - n.servo_stop('out1') - n.motor_rotate('both', 'backward', '40') - elif n.get_value('in1') > 80 and n.get_value('in2') < 80: - n.servo_rotate('out1', 'forward', '10') - n.motor_rotate('both', 'forward', '30') - elif n.get_value('in1') < 80 and n.get_value('in2') > 80: - n.servo_rotate('out1', 'backward', '10') - n.motor_rotate('both', 'forward', '30') diff --git a/mu/resources/neopia/04-06 Konveyer .py b/mu/resources/neopia/04-06 Konveyer .py deleted file mode 100644 index c9aa1ae3b..000000000 --- a/mu/resources/neopia/04-06 Konveyer .py +++ /dev/null @@ -1,13 +0,0 @@ -from neopia import * - -n = Neosoco() -n.servo_reset_degree('out1') -n.motor_rotate('both', 'forward', '40') -while True: - if n.get_value('in1') > 20 and n.get_value('in2') > 20: - n.servo_rotate_by_degree('out1', 'forward', '50', '20') - wait(500) - if n.get_value('in1') <= 20 and n.get_value('in2') <= 20: - if n.get_value('in2') > 0: - n.servo_rotate_by_degree('out1', 'backward', '50', '20') - wait(500) \ No newline at end of file diff --git a/mu/resources/pygamezero/images/alien.png b/mu/resources/pygamezero/alien.png similarity index 100% rename from mu/resources/pygamezero/images/alien.png rename to mu/resources/pygamezero/alien.png diff --git a/mu/resources/pygamezero/images/alien_hurt.png b/mu/resources/pygamezero/alien_hurt.png similarity index 100% rename from mu/resources/pygamezero/images/alien_hurt.png rename to mu/resources/pygamezero/alien_hurt.png diff --git a/mu/resources/pygamezero/images/background.png b/mu/resources/pygamezero/background.png similarity index 100% rename from mu/resources/pygamezero/images/background.png rename to mu/resources/pygamezero/background.png diff --git a/mu/resources/pygamezero/images/bird0.png b/mu/resources/pygamezero/bird0.png similarity index 100% rename from mu/resources/pygamezero/images/bird0.png rename to mu/resources/pygamezero/bird0.png diff --git a/mu/resources/pygamezero/images/bird1.png b/mu/resources/pygamezero/bird1.png similarity index 100% rename from mu/resources/pygamezero/images/bird1.png rename to mu/resources/pygamezero/bird1.png diff --git a/mu/resources/pygamezero/images/bird2.png b/mu/resources/pygamezero/bird2.png similarity index 100% rename from mu/resources/pygamezero/images/bird2.png rename to mu/resources/pygamezero/bird2.png diff --git a/mu/resources/pygamezero/images/birddead.png b/mu/resources/pygamezero/birddead.png similarity index 100% rename from mu/resources/pygamezero/images/birddead.png rename to mu/resources/pygamezero/birddead.png diff --git a/mu/resources/pygamezero/images/bottom.png b/mu/resources/pygamezero/bottom.png similarity index 100% rename from mu/resources/pygamezero/images/bottom.png rename to mu/resources/pygamezero/bottom.png diff --git a/mu/resources/pygamezero/images/boy_1.png b/mu/resources/pygamezero/boy_1.png similarity index 100% rename from mu/resources/pygamezero/images/boy_1.png rename to mu/resources/pygamezero/boy_1.png diff --git a/mu/resources/pygamezero/images/boy_2.png b/mu/resources/pygamezero/boy_2.png similarity index 100% rename from mu/resources/pygamezero/images/boy_2.png rename to mu/resources/pygamezero/boy_2.png diff --git a/mu/resources/pygamezero/images/boy_3.png b/mu/resources/pygamezero/boy_3.png similarity index 100% rename from mu/resources/pygamezero/images/boy_3.png rename to mu/resources/pygamezero/boy_3.png diff --git a/mu/resources/pygamezero/images/cat.png b/mu/resources/pygamezero/cat.png similarity index 100% rename from mu/resources/pygamezero/images/cat.png rename to mu/resources/pygamezero/cat.png diff --git a/mu/resources/pygamezero/images/cat1.png b/mu/resources/pygamezero/cat1.png similarity index 100% rename from mu/resources/pygamezero/images/cat1.png rename to mu/resources/pygamezero/cat1.png diff --git a/mu/resources/pygamezero/images/cat2.png b/mu/resources/pygamezero/cat2.png similarity index 100% rename from mu/resources/pygamezero/images/cat2.png rename to mu/resources/pygamezero/cat2.png diff --git a/mu/resources/pygamezero/images/cat3.png b/mu/resources/pygamezero/cat3.png similarity index 100% rename from mu/resources/pygamezero/images/cat3.png rename to mu/resources/pygamezero/cat3.png diff --git a/mu/resources/pygamezero/images/cat4.png b/mu/resources/pygamezero/cat4.png similarity index 100% rename from mu/resources/pygamezero/images/cat4.png rename to mu/resources/pygamezero/cat4.png diff --git a/mu/resources/pygamezero/sounds/cheer.ogg b/mu/resources/pygamezero/cheer.ogg similarity index 100% rename from mu/resources/pygamezero/sounds/cheer.ogg rename to mu/resources/pygamezero/cheer.ogg diff --git a/mu/resources/pygamezero/images/cleaner.png b/mu/resources/pygamezero/cleaner.png similarity index 100% rename from mu/resources/pygamezero/images/cleaner.png rename to mu/resources/pygamezero/cleaner.png diff --git a/mu/resources/pygamezero/images/dala.png b/mu/resources/pygamezero/dala.png similarity index 100% rename from mu/resources/pygamezero/images/dala.png rename to mu/resources/pygamezero/dala.png diff --git a/mu/resources/pygamezero/images/desert.png b/mu/resources/pygamezero/desert.png similarity index 100% rename from mu/resources/pygamezero/images/desert.png rename to mu/resources/pygamezero/desert.png diff --git a/mu/resources/pygamezero/images/dog.png b/mu/resources/pygamezero/dog.png similarity index 100% rename from mu/resources/pygamezero/images/dog.png rename to mu/resources/pygamezero/dog.png diff --git a/mu/resources/pygamezero/sounds/eep.wav b/mu/resources/pygamezero/eep.wav similarity index 100% rename from mu/resources/pygamezero/sounds/eep.wav rename to mu/resources/pygamezero/eep.wav diff --git a/mu/resources/pygamezero/images/eraser.png b/mu/resources/pygamezero/eraser.png similarity index 100% rename from mu/resources/pygamezero/images/eraser.png rename to mu/resources/pygamezero/eraser.png diff --git a/mu/resources/pygamezero/images/field.png b/mu/resources/pygamezero/field.png similarity index 100% rename from mu/resources/pygamezero/images/field.png rename to mu/resources/pygamezero/field.png diff --git a/mu/resources/pygamezero/images/floor.png b/mu/resources/pygamezero/floor.png similarity index 100% rename from mu/resources/pygamezero/images/floor.png rename to mu/resources/pygamezero/floor.png diff --git a/mu/resources/pygamezero/sounds/meow1.wav b/mu/resources/pygamezero/meow1.wav similarity index 100% rename from mu/resources/pygamezero/sounds/meow1.wav rename to mu/resources/pygamezero/meow1.wav diff --git a/mu/resources/pygamezero/sounds/meow2.wav b/mu/resources/pygamezero/meow2.wav similarity index 100% rename from mu/resources/pygamezero/sounds/meow2.wav rename to mu/resources/pygamezero/meow2.wav diff --git a/mu/resources/pygamezero/sounds/meow3.wav b/mu/resources/pygamezero/meow3.wav similarity index 100% rename from mu/resources/pygamezero/sounds/meow3.wav rename to mu/resources/pygamezero/meow3.wav diff --git a/mu/resources/pygamezero/sounds/meow4.wav b/mu/resources/pygamezero/meow4.wav similarity index 100% rename from mu/resources/pygamezero/sounds/meow4.wav rename to mu/resources/pygamezero/meow4.wav diff --git a/mu/resources/pygamezero/images/mole.png b/mu/resources/pygamezero/mole.png similarity index 100% rename from mu/resources/pygamezero/images/mole.png rename to mu/resources/pygamezero/mole.png diff --git a/mu/resources/pygamezero/fonts/nanum_square.ttf b/mu/resources/pygamezero/nanum_square.ttf similarity index 100% rename from mu/resources/pygamezero/fonts/nanum_square.ttf rename to mu/resources/pygamezero/nanum_square.ttf diff --git a/mu/resources/pygamezero/images/pencil.png b/mu/resources/pygamezero/pencil.png similarity index 100% rename from mu/resources/pygamezero/images/pencil.png rename to mu/resources/pygamezero/pencil.png diff --git a/mu/resources/pygamezero/images/pink_leaf.png b/mu/resources/pygamezero/pink_leaf.png similarity index 100% rename from mu/resources/pygamezero/images/pink_leaf.png rename to mu/resources/pygamezero/pink_leaf.png diff --git a/mu/resources/pygamezero/images/splat.png b/mu/resources/pygamezero/splat.png similarity index 100% rename from mu/resources/pygamezero/images/splat.png rename to mu/resources/pygamezero/splat.png diff --git a/mu/resources/pygamezero/sounds/splat.wav b/mu/resources/pygamezero/splat.wav similarity index 100% rename from mu/resources/pygamezero/sounds/splat.wav rename to mu/resources/pygamezero/splat.wav diff --git a/mu/resources/pygamezero/sounds/toi.ogg b/mu/resources/pygamezero/toi.ogg similarity index 100% rename from mu/resources/pygamezero/sounds/toi.ogg rename to mu/resources/pygamezero/toi.ogg diff --git a/mu/resources/pygamezero/images/top.png b/mu/resources/pygamezero/top.png similarity index 100% rename from mu/resources/pygamezero/images/top.png rename to mu/resources/pygamezero/top.png diff --git a/mu/resources/pygamezero/images/toy_hammer.png b/mu/resources/pygamezero/toy_hammer.png similarity index 100% rename from mu/resources/pygamezero/images/toy_hammer.png rename to mu/resources/pygamezero/toy_hammer.png diff --git a/mu/resources/pygamezero/images/treasure_box.png b/mu/resources/pygamezero/treasure_box.png similarity index 100% rename from mu/resources/pygamezero/images/treasure_box.png rename to mu/resources/pygamezero/treasure_box.png diff --git a/mu/resources/pygamezero/sounds/warning.ogg b/mu/resources/pygamezero/warning.ogg similarity index 100% rename from mu/resources/pygamezero/sounds/warning.ogg rename to mu/resources/pygamezero/warning.ogg