diff --git a/images/New_tiles/concreteTiles/concrete_01.png b/images/Tiles/concrete Tiles/concrete_01.png similarity index 100% rename from images/New_tiles/concreteTiles/concrete_01.png rename to images/Tiles/concrete Tiles/concrete_01.png diff --git a/images/New_tiles/concreteTiles/concrete_01_mineAtom.png b/images/Tiles/concrete Tiles/concrete_01_mineADM.png similarity index 100% rename from images/New_tiles/concreteTiles/concrete_01_mineAtom.png rename to images/Tiles/concrete Tiles/concrete_01_mineADM.png diff --git a/images/New_tiles/concreteTiles/concrete_01_mineAP_02.png b/images/Tiles/concrete Tiles/concrete_01_mineAP_02.png similarity index 100% rename from images/New_tiles/concreteTiles/concrete_01_mineAP_02.png rename to images/Tiles/concrete Tiles/concrete_01_mineAP_02.png diff --git a/images/New_tiles/concreteTiles/concrete_01_mineAP_03.png b/images/Tiles/concrete Tiles/concrete_01_mineAP_03.png similarity index 100% rename from images/New_tiles/concreteTiles/concrete_01_mineAP_03.png rename to images/Tiles/concrete Tiles/concrete_01_mineAP_03.png diff --git a/images/New_tiles/concreteTiles/concrete_01_mineAT_01.png b/images/Tiles/concrete Tiles/concrete_01_mineAT_01.png similarity index 100% rename from images/New_tiles/concreteTiles/concrete_01_mineAT_01.png rename to images/Tiles/concrete Tiles/concrete_01_mineAT_01.png diff --git a/images/New_tiles/concreteTiles/concrete_01_mineAT_04.png b/images/Tiles/concrete Tiles/concrete_01_mineAT_04.png similarity index 100% rename from images/New_tiles/concreteTiles/concrete_01_mineAT_04.png rename to images/Tiles/concrete Tiles/concrete_01_mineAT_04.png diff --git a/images/New_tiles/concreteTiles/concrete_01_rock_01.png b/images/Tiles/concrete Tiles/concrete_01_rock_01.png similarity index 100% rename from images/New_tiles/concreteTiles/concrete_01_rock_01.png rename to images/Tiles/concrete Tiles/concrete_01_rock_01.png diff --git a/images/New_tiles/concreteTiles/concrete_01_rock_02.png b/images/Tiles/concrete Tiles/concrete_01_rock_02.png similarity index 100% rename from images/New_tiles/concreteTiles/concrete_01_rock_02.png rename to images/Tiles/concrete Tiles/concrete_01_rock_02.png diff --git a/images/New_tiles/concreteTiles/concrete_02.png b/images/Tiles/concrete Tiles/concrete_02.png similarity index 100% rename from images/New_tiles/concreteTiles/concrete_02.png rename to images/Tiles/concrete Tiles/concrete_02.png diff --git a/images/New_tiles/concreteTiles/concrete_02_mineAtom.png b/images/Tiles/concrete Tiles/concrete_02_mineADM.png similarity index 100% rename from images/New_tiles/concreteTiles/concrete_02_mineAtom.png rename to images/Tiles/concrete Tiles/concrete_02_mineADM.png diff --git a/images/New_tiles/concreteTiles/concrete_02_mineAP_02.png b/images/Tiles/concrete Tiles/concrete_02_mineAP_02.png similarity index 100% rename from images/New_tiles/concreteTiles/concrete_02_mineAP_02.png rename to images/Tiles/concrete Tiles/concrete_02_mineAP_02.png diff --git a/images/New_tiles/concreteTiles/concrete_02_mineAP_03.png b/images/Tiles/concrete Tiles/concrete_02_mineAP_03.png similarity index 100% rename from images/New_tiles/concreteTiles/concrete_02_mineAP_03.png rename to images/Tiles/concrete Tiles/concrete_02_mineAP_03.png diff --git a/images/New_tiles/concreteTiles/concrete_02_mineAT_01.png b/images/Tiles/concrete Tiles/concrete_02_mineAT_01.png similarity index 100% rename from images/New_tiles/concreteTiles/concrete_02_mineAT_01.png rename to images/Tiles/concrete Tiles/concrete_02_mineAT_01.png diff --git a/images/New_tiles/concreteTiles/concrete_02_mineAT_04.png b/images/Tiles/concrete Tiles/concrete_02_mineAT_04.png similarity index 100% rename from images/New_tiles/concreteTiles/concrete_02_mineAT_04.png rename to images/Tiles/concrete Tiles/concrete_02_mineAT_04.png diff --git a/images/New_tiles/concreteTiles/concrete_02_rock_01.png b/images/Tiles/concrete Tiles/concrete_02_rock_01.png similarity index 100% rename from images/New_tiles/concreteTiles/concrete_02_rock_01.png rename to images/Tiles/concrete Tiles/concrete_02_rock_01.png diff --git a/images/New_tiles/concreteTiles/concrete_02_rock_02.png b/images/Tiles/concrete Tiles/concrete_02_rock_02.png similarity index 100% rename from images/New_tiles/concreteTiles/concrete_02_rock_02.png rename to images/Tiles/concrete Tiles/concrete_02_rock_02.png diff --git a/images/New_tiles/dryTiles/dry_ground.png b/images/Tiles/dry ground Tiles/dry ground_01.png similarity index 100% rename from images/New_tiles/dryTiles/dry_ground.png rename to images/Tiles/dry ground Tiles/dry ground_01.png diff --git a/images/New_tiles/dryTiles/dry_ground_mineAtom.png b/images/Tiles/dry ground Tiles/dry ground_01_mineADM.png similarity index 100% rename from images/New_tiles/dryTiles/dry_ground_mineAtom.png rename to images/Tiles/dry ground Tiles/dry ground_01_mineADM.png diff --git a/images/New_tiles/dryTiles/dry_ground_mineAP_02.png b/images/Tiles/dry ground Tiles/dry ground_01_mineAP_02.png similarity index 100% rename from images/New_tiles/dryTiles/dry_ground_mineAP_02.png rename to images/Tiles/dry ground Tiles/dry ground_01_mineAP_02.png diff --git a/images/New_tiles/dryTiles/dry_ground_mineAP_03.png b/images/Tiles/dry ground Tiles/dry ground_01_mineAP_03.png similarity index 100% rename from images/New_tiles/dryTiles/dry_ground_mineAP_03.png rename to images/Tiles/dry ground Tiles/dry ground_01_mineAP_03.png diff --git a/images/New_tiles/dryTiles/dry_ground_mineAT_01.png b/images/Tiles/dry ground Tiles/dry ground_01_mineAT_01.png similarity index 100% rename from images/New_tiles/dryTiles/dry_ground_mineAT_01.png rename to images/Tiles/dry ground Tiles/dry ground_01_mineAT_01.png diff --git a/images/New_tiles/dryTiles/dry_ground_mineAT_04.png b/images/Tiles/dry ground Tiles/dry ground_01_mineAT_04.png similarity index 100% rename from images/New_tiles/dryTiles/dry_ground_mineAT_04.png rename to images/Tiles/dry ground Tiles/dry ground_01_mineAT_04.png diff --git a/images/New_tiles/dryTiles/dry_ground_rock_01.png b/images/Tiles/dry ground Tiles/dry ground_01_rock_01.png similarity index 100% rename from images/New_tiles/dryTiles/dry_ground_rock_01.png rename to images/Tiles/dry ground Tiles/dry ground_01_rock_01.png diff --git a/images/New_tiles/dryTiles/dry_ground_rock_02.png b/images/Tiles/dry ground Tiles/dry ground_01_rock_02.png similarity index 100% rename from images/New_tiles/dryTiles/dry_ground_rock_02.png rename to images/Tiles/dry ground Tiles/dry ground_01_rock_02.png diff --git a/images/New_tiles/grassTiles/grass_01.png b/images/Tiles/grass Tiles/grass_01.png similarity index 100% rename from images/New_tiles/grassTiles/grass_01.png rename to images/Tiles/grass Tiles/grass_01.png diff --git a/images/New_tiles/grassTiles/grass_01_mineAtom.png b/images/Tiles/grass Tiles/grass_01_mineADM.png similarity index 100% rename from images/New_tiles/grassTiles/grass_01_mineAtom.png rename to images/Tiles/grass Tiles/grass_01_mineADM.png diff --git a/images/New_tiles/grassTiles/grass_01_mineAP_02.png b/images/Tiles/grass Tiles/grass_01_mineAP_02.png similarity index 100% rename from images/New_tiles/grassTiles/grass_01_mineAP_02.png rename to images/Tiles/grass Tiles/grass_01_mineAP_02.png diff --git a/images/New_tiles/grassTiles/grass_01_mineAP_03.png b/images/Tiles/grass Tiles/grass_01_mineAP_03.png similarity index 100% rename from images/New_tiles/grassTiles/grass_01_mineAP_03.png rename to images/Tiles/grass Tiles/grass_01_mineAP_03.png diff --git a/images/New_tiles/grassTiles/grass_01_mineAT_01.png b/images/Tiles/grass Tiles/grass_01_mineAT_01.png similarity index 100% rename from images/New_tiles/grassTiles/grass_01_mineAT_01.png rename to images/Tiles/grass Tiles/grass_01_mineAT_01.png diff --git a/images/New_tiles/grassTiles/grass_01_mineAT_04.png b/images/Tiles/grass Tiles/grass_01_mineAT_04.png similarity index 100% rename from images/New_tiles/grassTiles/grass_01_mineAT_04.png rename to images/Tiles/grass Tiles/grass_01_mineAT_04.png diff --git a/images/New_tiles/grassTiles/grass_rock_01.png b/images/Tiles/grass Tiles/grass_01_rock.png similarity index 100% rename from images/New_tiles/grassTiles/grass_rock_01.png rename to images/Tiles/grass Tiles/grass_01_rock.png diff --git a/images/New_tiles/grassTiles/grass_02.png b/images/Tiles/grass Tiles/grass_02.png similarity index 100% rename from images/New_tiles/grassTiles/grass_02.png rename to images/Tiles/grass Tiles/grass_02.png diff --git a/images/New_tiles/grassTiles/grass_02_mineAtom.png b/images/Tiles/grass Tiles/grass_02_mineADM.png similarity index 100% rename from images/New_tiles/grassTiles/grass_02_mineAtom.png rename to images/Tiles/grass Tiles/grass_02_mineADM.png diff --git a/images/New_tiles/grassTiles/grass_02_mineAP_02.png b/images/Tiles/grass Tiles/grass_02_mineAP_02.png similarity index 100% rename from images/New_tiles/grassTiles/grass_02_mineAP_02.png rename to images/Tiles/grass Tiles/grass_02_mineAP_02.png diff --git a/images/New_tiles/grassTiles/grass_02_mineAP_03.png b/images/Tiles/grass Tiles/grass_02_mineAP_03.png similarity index 100% rename from images/New_tiles/grassTiles/grass_02_mineAP_03.png rename to images/Tiles/grass Tiles/grass_02_mineAP_03.png diff --git a/images/New_tiles/grassTiles/grass_02_mineAT_01.png b/images/Tiles/grass Tiles/grass_02_mineAT_01.png similarity index 100% rename from images/New_tiles/grassTiles/grass_02_mineAT_01.png rename to images/Tiles/grass Tiles/grass_02_mineAT_01.png diff --git a/images/New_tiles/grassTiles/grass_rock_02.png b/images/Tiles/grass Tiles/grass_02_rock.png similarity index 100% rename from images/New_tiles/grassTiles/grass_rock_02.png rename to images/Tiles/grass Tiles/grass_02_rock.png diff --git a/images/Tiles/grass_01.png b/images/Tiles/grass_01.png deleted file mode 100644 index 3b2a585..0000000 Binary files a/images/Tiles/grass_01.png and /dev/null differ diff --git a/images/Tiles/grass_01_mineAP_02.png b/images/Tiles/grass_01_mineAP_02.png deleted file mode 100644 index 33be860..0000000 Binary files a/images/Tiles/grass_01_mineAP_02.png and /dev/null differ diff --git a/images/Tiles/grass_01_mineAP_03.png b/images/Tiles/grass_01_mineAP_03.png deleted file mode 100644 index 09daf3b..0000000 Binary files a/images/Tiles/grass_01_mineAP_03.png and /dev/null differ diff --git a/images/Tiles/grass_01_mineAT_01.png b/images/Tiles/grass_01_mineAT_01.png deleted file mode 100644 index df66a94..0000000 Binary files a/images/Tiles/grass_01_mineAT_01.png and /dev/null differ diff --git a/images/Tiles/grass_01_mineAT_04.png b/images/Tiles/grass_01_mineAT_04.png deleted file mode 100644 index fd4ed7d..0000000 Binary files a/images/Tiles/grass_01_mineAT_04.png and /dev/null differ diff --git a/images/Tiles/grass_02.png b/images/Tiles/grass_02.png deleted file mode 100644 index 934b21a..0000000 Binary files a/images/Tiles/grass_02.png and /dev/null differ diff --git a/images/Tiles/grass_02_mineAP_02.png b/images/Tiles/grass_02_mineAP_02.png deleted file mode 100644 index 0606764..0000000 Binary files a/images/Tiles/grass_02_mineAP_02.png and /dev/null differ diff --git a/images/Tiles/grass_02_mineAP_03.png b/images/Tiles/grass_02_mineAP_03.png deleted file mode 100644 index dc5b517..0000000 Binary files a/images/Tiles/grass_02_mineAP_03.png and /dev/null differ diff --git a/images/Tiles/grass_02_mineAT_01.png b/images/Tiles/grass_02_mineAT_01.png deleted file mode 100644 index 753bac2..0000000 Binary files a/images/Tiles/grass_02_mineAT_01.png and /dev/null differ diff --git a/images/Tiles/grass_rock_01.png b/images/Tiles/grass_rock_01.png deleted file mode 100644 index 1a6ad51..0000000 Binary files a/images/Tiles/grass_rock_01.png and /dev/null differ diff --git a/images/Tiles/grass_rock_02.png b/images/Tiles/grass_rock_02.png deleted file mode 100644 index cc96ea5..0000000 Binary files a/images/Tiles/grass_rock_02.png and /dev/null differ diff --git a/images/New_tiles/mudTiles/mud_01.png b/images/Tiles/mud Tiles/mud_01.png similarity index 100% rename from images/New_tiles/mudTiles/mud_01.png rename to images/Tiles/mud Tiles/mud_01.png diff --git a/images/New_tiles/mudTiles/mud_01_mineAP_02.png b/images/Tiles/mud Tiles/mud_01_mineAP_02.png similarity index 100% rename from images/New_tiles/mudTiles/mud_01_mineAP_02.png rename to images/Tiles/mud Tiles/mud_01_mineAP_02.png diff --git a/images/New_tiles/mudTiles/mud_01_mineAP_03.png b/images/Tiles/mud Tiles/mud_01_mineAP_03.png similarity index 100% rename from images/New_tiles/mudTiles/mud_01_mineAP_03.png rename to images/Tiles/mud Tiles/mud_01_mineAP_03.png diff --git a/images/New_tiles/mudTiles/mud_01_mineAT_01.png b/images/Tiles/mud Tiles/mud_01_mineAT_01.png similarity index 100% rename from images/New_tiles/mudTiles/mud_01_mineAT_01.png rename to images/Tiles/mud Tiles/mud_01_mineAT_01.png diff --git a/images/New_tiles/mudTiles/mud_01_mineAT_04.png b/images/Tiles/mud Tiles/mud_01_mineAT_04.png similarity index 100% rename from images/New_tiles/mudTiles/mud_01_mineAT_04.png rename to images/Tiles/mud Tiles/mud_01_mineAT_04.png diff --git a/images/New_tiles/mudTiles/mud_02.png b/images/Tiles/mud Tiles/mud_02.png similarity index 100% rename from images/New_tiles/mudTiles/mud_02.png rename to images/Tiles/mud Tiles/mud_02.png diff --git a/images/New_tiles/mudTiles/mud_02_mineAP_02.png b/images/Tiles/mud Tiles/mud_02_mineAP_02.png similarity index 100% rename from images/New_tiles/mudTiles/mud_02_mineAP_02.png rename to images/Tiles/mud Tiles/mud_02_mineAP_02.png diff --git a/images/New_tiles/mudTiles/mud_02_mineAP_03.png b/images/Tiles/mud Tiles/mud_02_mineAP_03.png similarity index 100% rename from images/New_tiles/mudTiles/mud_02_mineAP_03.png rename to images/Tiles/mud Tiles/mud_02_mineAP_03.png diff --git a/images/New_tiles/mudTiles/mud_02_mineAT_01.png b/images/Tiles/mud Tiles/mud_02_mineAT_01.png similarity index 100% rename from images/New_tiles/mudTiles/mud_02_mineAT_01.png rename to images/Tiles/mud Tiles/mud_02_mineAT_01.png diff --git a/images/New_tiles/mudTiles/mud_rock_02.png b/images/Tiles/mud Tiles/mud_rock_02.png similarity index 100% rename from images/New_tiles/mudTiles/mud_rock_02.png rename to images/Tiles/mud Tiles/mud_rock_02.png diff --git a/images/New_tiles/mudTiles/mud_rock_1.png b/images/Tiles/mud Tiles/mud_rock_1.png similarity index 100% rename from images/New_tiles/mudTiles/mud_rock_1.png rename to images/Tiles/mud Tiles/mud_rock_1.png diff --git a/images/Tiles/mud_01.png b/images/Tiles/mud_01.png deleted file mode 100644 index 3405aad..0000000 Binary files a/images/Tiles/mud_01.png and /dev/null differ diff --git a/images/Tiles/mud_02.png b/images/Tiles/mud_02.png deleted file mode 100644 index a31d75d..0000000 Binary files a/images/Tiles/mud_02.png and /dev/null differ diff --git a/images/Tiles/silt_01.png b/images/Tiles/silt_01.png deleted file mode 100644 index 070163a..0000000 Binary files a/images/Tiles/silt_01.png and /dev/null differ diff --git a/images/Tiles/silt_02.png b/images/Tiles/silt_02.png deleted file mode 100644 index d653768..0000000 Binary files a/images/Tiles/silt_02.png and /dev/null differ diff --git a/images/New_tiles/tallGrassTiles/tall_grass.png b/images/Tiles/tallGrassTiles/tall_grass.png similarity index 100% rename from images/New_tiles/tallGrassTiles/tall_grass.png rename to images/Tiles/tallGrassTiles/tall_grass.png diff --git a/images/New_tiles/tallGrassTiles/tall_grass_mineAP_02.png b/images/Tiles/tallGrassTiles/tall_grass_mineAP_02.png similarity index 100% rename from images/New_tiles/tallGrassTiles/tall_grass_mineAP_02.png rename to images/Tiles/tallGrassTiles/tall_grass_mineAP_02.png diff --git a/images/New_tiles/tallGrassTiles/tall_grass_mineAP_03.png b/images/Tiles/tallGrassTiles/tall_grass_mineAP_03.png similarity index 100% rename from images/New_tiles/tallGrassTiles/tall_grass_mineAP_03.png rename to images/Tiles/tallGrassTiles/tall_grass_mineAP_03.png diff --git a/images/New_tiles/tallGrassTiles/tall_grass_mineAT_01.png b/images/Tiles/tallGrassTiles/tall_grass_mineAT_01.png similarity index 100% rename from images/New_tiles/tallGrassTiles/tall_grass_mineAT_01.png rename to images/Tiles/tallGrassTiles/tall_grass_mineAT_01.png diff --git a/images/New_tiles/tallGrassTiles/tall_grass_mineAT_04.png b/images/Tiles/tallGrassTiles/tall_grass_mineAT_04.png similarity index 100% rename from images/New_tiles/tallGrassTiles/tall_grass_mineAT_04.png rename to images/Tiles/tallGrassTiles/tall_grass_mineAT_04.png diff --git a/images/New_tiles/tallGrassTiles/tall_grass_mineAtom.png b/images/Tiles/tallGrassTiles/tall_grass_mineAtom.png similarity index 100% rename from images/New_tiles/tallGrassTiles/tall_grass_mineAtom.png rename to images/Tiles/tallGrassTiles/tall_grass_mineAtom.png diff --git a/images/New_tiles/tallGrassTiles/tall_grass_rock_01.png b/images/Tiles/tallGrassTiles/tall_grass_rock_01.png similarity index 100% rename from images/New_tiles/tallGrassTiles/tall_grass_rock_01.png rename to images/Tiles/tallGrassTiles/tall_grass_rock_01.png diff --git a/images/New_tiles/tallGrassTiles/tall_grass_rock_02.png b/images/Tiles/tallGrassTiles/tall_grass_rock_02.png similarity index 100% rename from images/New_tiles/tallGrassTiles/tall_grass_rock_02.png rename to images/Tiles/tallGrassTiles/tall_grass_rock_02.png diff --git a/images/New_tiles/agent/agent0.png b/images/agent/agent_idle/agent0.png similarity index 100% rename from images/New_tiles/agent/agent0.png rename to images/agent/agent_idle/agent0.png diff --git a/images/New_tiles/agent/agent1.png b/images/agent/agent_idle/agent1.png similarity index 100% rename from images/New_tiles/agent/agent1.png rename to images/agent/agent_idle/agent1.png diff --git a/images/New_tiles/agent/agent2.png b/images/agent/agent_idle/agent2.png similarity index 100% rename from images/New_tiles/agent/agent2.png rename to images/agent/agent_idle/agent2.png diff --git a/images/New_tiles/agent/agent3.png b/images/agent/agent_idle/agent3.png similarity index 100% rename from images/New_tiles/agent/agent3.png rename to images/agent/agent_idle/agent3.png diff --git a/images/New_tiles/agent_kaboom/agent_kaboom_0.png b/images/agent/agent_kaboom/agent_kaboom_0.png similarity index 100% rename from images/New_tiles/agent_kaboom/agent_kaboom_0.png rename to images/agent/agent_kaboom/agent_kaboom_0.png diff --git a/images/New_tiles/agent_kaboom/agent_kaboom_1.png b/images/agent/agent_kaboom/agent_kaboom_1.png similarity index 100% rename from images/New_tiles/agent_kaboom/agent_kaboom_1.png rename to images/agent/agent_kaboom/agent_kaboom_1.png diff --git a/images/New_tiles/agent_kaboom/agent_kaboom_2.png b/images/agent/agent_kaboom/agent_kaboom_2.png similarity index 100% rename from images/New_tiles/agent_kaboom/agent_kaboom_2.png rename to images/agent/agent_kaboom/agent_kaboom_2.png diff --git a/images/New_tiles/agent_kaboom/agent_kaboom_3.png b/images/agent/agent_kaboom/agent_kaboom_3.png similarity index 100% rename from images/New_tiles/agent_kaboom/agent_kaboom_3.png rename to images/agent/agent_kaboom/agent_kaboom_3.png diff --git a/images/sapper_idle/agent0.png b/images/sapper_idle/agent0.png deleted file mode 100644 index 8869cc5..0000000 Binary files a/images/sapper_idle/agent0.png and /dev/null differ diff --git a/images/sapper_idle/agent1.png b/images/sapper_idle/agent1.png deleted file mode 100644 index c634870..0000000 Binary files a/images/sapper_idle/agent1.png and /dev/null differ diff --git a/images/sapper_idle/agent2.png b/images/sapper_idle/agent2.png deleted file mode 100644 index c3e84ad..0000000 Binary files a/images/sapper_idle/agent2.png and /dev/null differ diff --git a/images/sapper_idle/agent3.png b/images/sapper_idle/agent3.png deleted file mode 100644 index f1b16bb..0000000 Binary files a/images/sapper_idle/agent3.png and /dev/null differ diff --git a/images/sapper_idle/cpt_bomba.png b/images/sapper_idle/cpt_bomba.png deleted file mode 100644 index 1ec8e3f..0000000 Binary files a/images/sapper_idle/cpt_bomba.png and /dev/null differ diff --git a/images/sapper_idle/cpt_bomba_left.png b/images/sapper_idle/cpt_bomba_left.png deleted file mode 100644 index 866ddee..0000000 Binary files a/images/sapper_idle/cpt_bomba_left.png and /dev/null differ diff --git a/images/sapper_idle/cpt_bomba_right.png b/images/sapper_idle/cpt_bomba_right.png deleted file mode 100644 index 0d55992..0000000 Binary files a/images/sapper_idle/cpt_bomba_right.png and /dev/null differ diff --git a/images/sapper_idle/idle.png b/images/sapper_idle/idle.png deleted file mode 100644 index 51711cc..0000000 Binary files a/images/sapper_idle/idle.png and /dev/null differ diff --git a/images/sapper_idle/kaboom.png b/images/sapper_idle/kaboom.png deleted file mode 100644 index 3e33302..0000000 Binary files a/images/sapper_idle/kaboom.png and /dev/null differ diff --git a/images/sapper_run/sapper_run_01.png b/images/sapper_run/sapper_run_01.png deleted file mode 100644 index edbf8be..0000000 Binary files a/images/sapper_run/sapper_run_01.png and /dev/null differ diff --git a/images/sapper_run/sapper_run_02.png b/images/sapper_run/sapper_run_02.png deleted file mode 100644 index 4e6fdce..0000000 Binary files a/images/sapper_run/sapper_run_02.png and /dev/null differ diff --git a/images/sapper_run/sapper_run_03.png b/images/sapper_run/sapper_run_03.png deleted file mode 100644 index eb72fd7..0000000 Binary files a/images/sapper_run/sapper_run_03.png and /dev/null differ diff --git a/images/sapper_run/sapper_run_04.png b/images/sapper_run/sapper_run_04.png deleted file mode 100644 index 3e8c71b..0000000 Binary files a/images/sapper_run/sapper_run_04.png and /dev/null differ diff --git a/images/sapper_run/sapper_run_05.png b/images/sapper_run/sapper_run_05.png deleted file mode 100644 index 4541cd4..0000000 Binary files a/images/sapper_run/sapper_run_05.png and /dev/null differ diff --git a/images/sapper_run/sapper_run_06.png b/images/sapper_run/sapper_run_06.png deleted file mode 100644 index 3438eb3..0000000 Binary files a/images/sapper_run/sapper_run_06.png and /dev/null differ diff --git a/images/sapper_run/sapper_run_07.png b/images/sapper_run/sapper_run_07.png deleted file mode 100644 index 32ce850..0000000 Binary files a/images/sapper_run/sapper_run_07.png and /dev/null differ diff --git a/images/sapper_run/sapper_run_08.png b/images/sapper_run/sapper_run_08.png deleted file mode 100644 index b647522..0000000 Binary files a/images/sapper_run/sapper_run_08.png and /dev/null differ diff --git a/images/New_tiles/template/mineAP_02.png b/images/template/mineAP_02.png similarity index 100% rename from images/New_tiles/template/mineAP_02.png rename to images/template/mineAP_02.png diff --git a/images/New_tiles/template/mineAP_03.png b/images/template/mineAP_03.png similarity index 100% rename from images/New_tiles/template/mineAP_03.png rename to images/template/mineAP_03.png diff --git a/images/New_tiles/template/mineAT_01.png b/images/template/mineAT_01.png similarity index 100% rename from images/New_tiles/template/mineAT_01.png rename to images/template/mineAT_01.png diff --git a/images/New_tiles/template/mineAT_04.png b/images/template/mineAT_04.png similarity index 100% rename from images/New_tiles/template/mineAT_04.png rename to images/template/mineAT_04.png diff --git a/images/New_tiles/template/mineAtom.png b/images/template/mineAtom.png similarity index 100% rename from images/New_tiles/template/mineAtom.png rename to images/template/mineAtom.png diff --git a/images/New_tiles/template/rock_01.png b/images/template/rock_01.png similarity index 100% rename from images/New_tiles/template/rock_01.png rename to images/template/rock_01.png diff --git a/images/New_tiles/template/rock_02.png b/images/template/rock_02.png similarity index 100% rename from images/New_tiles/template/rock_02.png rename to images/template/rock_02.png diff --git a/src/const.py b/src/const.py index d0649c8..e60915b 100644 --- a/src/const.py +++ b/src/const.py @@ -11,27 +11,50 @@ WIDTH = 800 HEIGHT = 800 IMAGES = [] + for name, val in { 'grass_01': 0, 'grass_02': 1, - 'grass_rock_01': 0, - 'grass_rock_02': 1, + 'dry ground_01': 2, + 'concrete_01': 3, + 'concrete_02': 4, + 'grass_01_rock': 0, + 'grass_02_rock': 1, 'grass_01_mineAT_01': 0, 'grass_01_mineAP_02': 0, 'grass_01_mineAP_03': 0, 'grass_01_mineAT_04': 0, + 'grass_01_mineADM': 0, 'grass_02_mineAT_01': 1, 'grass_02_mineAP_02': 1, 'grass_02_mineAP_03': 1, + 'grass_02_mineADM': 1, 'mud_01': 0, 'mud_02': 1, + 'dry ground_01_mineADM': 2, + 'dry ground_01_mineAP_02': 2, + 'dry ground_01_mineAP_03': 2, + 'dry ground_01_mineAT_01': 2, + 'dry ground_01_mineAT_04': 2, + 'dry ground_01_rock_01': 2, + 'dry ground_01_rock_02': 2, + 'concrete_01_mineAT_01': 3, + 'concrete_01_mineAP_02': 3, + 'concrete_01_mineAP_03': 3, + 'concrete_01_mineAT_04': 3, + 'concrete_01_mineADM': 3, + 'concrete_02_mineAT_01': 4, + 'concrete_02_mineAP_02': 4, + 'concrete_02_mineAP_03': 4, + 'concrete_02_mineADM': 4, }.items(): + folder_name = name.split('_')[0] IMAGES.append( Image( val, name, pg.image.load( - main_path + '/images/Tiles/' + name + ".png" + main_path + '/images/Tiles/' + folder_name + ' Tiles/' + name + ".png" ), None if 'mine' not in name else ( 'AP' if 'AP' in name else ( @@ -51,19 +74,18 @@ for name in [ 'agent3', ]: SAPPER_IDLE.append(pg.image.load( - main_path + '/images/sapper_idle/' + name + '.png' + main_path + '/images/agent/agent_idle/' + name + '.png' )) +SAPPER_KABOOM = [] +for name in [ + 'agent_kaboom_0', + 'agent_kaboom_1', + 'agent_kaboom_2', + 'agent_kaboom_3', +]: + SAPPER_KABOOM.append(pg.image.load( + main_path + '/images/agent/agent_kaboom/' + name + '.png' + )) -# DEBUG_FIELD = [ -# [Tile(1, 1), Tile(11, 20), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1)], -# [Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(4, 1, APMine()), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1)], -# [Tile(11, 20), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(11, 20), Tile(4, 0, APMine()), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1)], -# [Tile(4, 0, APMine()), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(11, 20), Tile(1, 1),Tile(1, 1), Tile(4, 0, APMine()), Tile(1, 1),Tile(1, 1)], -# [Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(11, 20), Tile(1, 1), Tile(1, 1)], -# [Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(11, 20), Tile(4, 0, APMine()), Tile(1, 1)], -# [Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(1, 1), Tile(11, 20), Tile(1, 1), Tile(1, 1)], -# [Tile(1, 1) for _ in range(10)], -# [Tile(1, 1) for _ in range(10)], -# [Tile(1, 1) for _ in range(10)], -# ] +ROCK_INDEXES = (5, 6, 23, 24)