diff --git a/art/animals/badger.png b/art/animals/orig/badger.png similarity index 100% rename from art/animals/badger.png rename to art/animals/orig/badger.png diff --git a/art/animals/sad_frog.png b/art/animals/orig/sad_frog.png similarity index 100% rename from art/animals/sad_frog.png rename to art/animals/orig/sad_frog.png diff --git a/art/animals/smile_dog.jpg b/art/animals/orig/smile_dog.jpg similarity index 100% rename from art/animals/smile_dog.jpg rename to art/animals/orig/smile_dog.jpg diff --git a/art/animals/smile_dog.png b/art/animals/orig/smile_dog.png similarity index 100% rename from art/animals/smile_dog.png rename to art/animals/orig/smile_dog.png diff --git a/art/animals/processed/sad_frog_b.png b/art/animals/sad_frog_b.png similarity index 100% rename from art/animals/processed/sad_frog_b.png rename to art/animals/sad_frog_b.png diff --git a/art/animals/processed/sad_frog_g.png b/art/animals/sad_frog_g.png similarity index 100% rename from art/animals/processed/sad_frog_g.png rename to art/animals/sad_frog_g.png diff --git a/art/animals/processed/sad_frog_r.png b/art/animals/sad_frog_r.png similarity index 100% rename from art/animals/processed/sad_frog_r.png rename to art/animals/sad_frog_r.png diff --git a/art/animals/processed/sad_frog_reduced.png b/art/animals/sad_frog_reduced.png similarity index 100% rename from art/animals/processed/sad_frog_reduced.png rename to art/animals/sad_frog_reduced.png diff --git a/art/animals/processed/smile_dog_b.png b/art/animals/smile_dog_b.png similarity index 100% rename from art/animals/processed/smile_dog_b.png rename to art/animals/smile_dog_b.png diff --git a/art/animals/processed/smile_dog_g.png b/art/animals/smile_dog_g.png similarity index 100% rename from art/animals/processed/smile_dog_g.png rename to art/animals/smile_dog_g.png diff --git a/art/animals/processed/smile_dog_r.png b/art/animals/smile_dog_r.png similarity index 100% rename from art/animals/processed/smile_dog_r.png rename to art/animals/smile_dog_r.png diff --git a/art/animals/processed/smile_dog_reduced.png b/art/animals/smile_dog_reduced.png similarity index 100% rename from art/animals/processed/smile_dog_reduced.png rename to art/animals/smile_dog_reduced.png diff --git a/art/art/player_w.png b/art/art/player_w.png deleted file mode 100644 index 0449da5..0000000 Binary files a/art/art/player_w.png and /dev/null differ diff --git a/art/cloud.ase b/art/ase_orig/cloud.ase similarity index 100% rename from art/cloud.ase rename to art/ase_orig/cloud.ase diff --git a/art/crying_moai_r.ase b/art/ase_orig/crying_moai_r.ase similarity index 100% rename from art/crying_moai_r.ase rename to art/ase_orig/crying_moai_r.ase diff --git a/art/drool.ase b/art/ase_orig/drool.ase similarity index 100% rename from art/drool.ase rename to art/ase_orig/drool.ase diff --git a/art/art/eye.ase b/art/ase_orig/eye.ase similarity index 100% rename from art/art/eye.ase rename to art/ase_orig/eye.ase diff --git a/art/art/heart.ase b/art/ase_orig/heart.ase similarity index 100% rename from art/art/heart.ase rename to art/ase_orig/heart.ase diff --git a/art/ase/image2_b.ase b/art/ase_orig/image2_b.ase similarity index 100% rename from art/ase/image2_b.ase rename to art/ase_orig/image2_b.ase diff --git a/art/ase/image_r.ase b/art/ase_orig/image_r.ase similarity index 100% rename from art/ase/image_r.ase rename to art/ase_orig/image_r.ase diff --git a/art/kiiro.ase b/art/ase_orig/kiiro.ase similarity index 100% rename from art/kiiro.ase rename to art/ase_orig/kiiro.ase diff --git a/art/ase/palette.png b/art/ase_orig/palette.png similarity index 100% rename from art/ase/palette.png rename to art/ase_orig/palette.png diff --git a/art/slime_woman.ase b/art/ase_orig/slime_woman.ase similarity index 100% rename from art/slime_woman.ase rename to art/ase_orig/slime_woman.ase diff --git a/art/wall.ase b/art/ase_orig/wall.ase similarity index 100% rename from art/wall.ase rename to art/ase_orig/wall.ase diff --git a/art/warai.ase b/art/ase_orig/warai.ase similarity index 100% rename from art/warai.ase rename to art/ase_orig/warai.ase diff --git a/art/crying_moai_b.png b/art/crying_moai_b.png deleted file mode 100644 index 2113759..0000000 Binary files a/art/crying_moai_b.png and /dev/null differ diff --git a/art/eye.ase b/art/eye.ase deleted file mode 100644 index c63c065..0000000 Binary files a/art/eye.ase and /dev/null differ diff --git a/art/food/processed/apple_scaled_b.png b/art/food/apple_scaled_b.png similarity index 100% rename from art/food/processed/apple_scaled_b.png rename to art/food/apple_scaled_b.png diff --git a/art/food/processed/apple_scaled_g.png b/art/food/apple_scaled_g.png similarity index 100% rename from art/food/processed/apple_scaled_g.png rename to art/food/apple_scaled_g.png diff --git a/art/food/processed/apple_scaled_r.png b/art/food/apple_scaled_r.png similarity index 100% rename from art/food/processed/apple_scaled_r.png rename to art/food/apple_scaled_r.png diff --git a/art/food/processed/apple_scaled_reduced.png b/art/food/apple_scaled_reduced.png similarity index 100% rename from art/food/processed/apple_scaled_reduced.png rename to art/food/apple_scaled_reduced.png diff --git a/art/food/processed/banana_b.png b/art/food/banana_b.png similarity index 100% rename from art/food/processed/banana_b.png rename to art/food/banana_b.png diff --git a/art/food/processed/banana_g.png b/art/food/banana_g.png similarity index 100% rename from art/food/processed/banana_g.png rename to art/food/banana_g.png diff --git a/art/food/processed/banana_r.png b/art/food/banana_r.png similarity index 100% rename from art/food/processed/banana_r.png rename to art/food/banana_r.png diff --git a/art/food/processed/banana_reduced.png b/art/food/banana_reduced.png similarity index 100% rename from art/food/processed/banana_reduced.png rename to art/food/banana_reduced.png diff --git a/art/food/processed/beer_mug_b.png b/art/food/beer_mug_b.png similarity index 100% rename from art/food/processed/beer_mug_b.png rename to art/food/beer_mug_b.png diff --git a/art/food/processed/beer_mug_g.png b/art/food/beer_mug_g.png similarity index 100% rename from art/food/processed/beer_mug_g.png rename to art/food/beer_mug_g.png diff --git a/art/food/processed/beer_mug_r.png b/art/food/beer_mug_r.png similarity index 100% rename from art/food/processed/beer_mug_r.png rename to art/food/beer_mug_r.png diff --git a/art/food/processed/beer_mug_reduced.png b/art/food/beer_mug_reduced.png similarity index 100% rename from art/food/processed/beer_mug_reduced.png rename to art/food/beer_mug_reduced.png diff --git a/art/food/processed/grapefruit_b.png b/art/food/grapefruit_b.png similarity index 100% rename from art/food/processed/grapefruit_b.png rename to art/food/grapefruit_b.png diff --git a/art/food/processed/grapefruit_g.png b/art/food/grapefruit_g.png similarity index 100% rename from art/food/processed/grapefruit_g.png rename to art/food/grapefruit_g.png diff --git a/art/food/processed/grapefruit_r.png b/art/food/grapefruit_r.png similarity index 100% rename from art/food/processed/grapefruit_r.png rename to art/food/grapefruit_r.png diff --git a/art/food/processed/grapefruit_reduced.png b/art/food/grapefruit_reduced.png similarity index 100% rename from art/food/processed/grapefruit_reduced.png rename to art/food/grapefruit_reduced.png diff --git a/art/food/processed/kiwi_b.png b/art/food/kiwi_b.png similarity index 100% rename from art/food/processed/kiwi_b.png rename to art/food/kiwi_b.png diff --git a/art/food/processed/kiwi_g.png b/art/food/kiwi_g.png similarity index 100% rename from art/food/processed/kiwi_g.png rename to art/food/kiwi_g.png diff --git a/art/food/processed/kiwi_r.png b/art/food/kiwi_r.png similarity index 100% rename from art/food/processed/kiwi_r.png rename to art/food/kiwi_r.png diff --git a/art/food/processed/kiwi_reduced.png b/art/food/kiwi_reduced.png similarity index 100% rename from art/food/processed/kiwi_reduced.png rename to art/food/kiwi_reduced.png diff --git a/art/food/bread.png b/art/food/orig/bread.png similarity index 100% rename from art/food/bread.png rename to art/food/orig/bread.png diff --git a/art/food/beer_mug.png b/art/food/processed/beer_mug.png similarity index 100% rename from art/food/beer_mug.png rename to art/food/processed/beer_mug.png diff --git a/art/food/processed/bread_b.png b/art/food/processed/bread_b.png deleted file mode 100644 index 3392eb7..0000000 Binary files a/art/food/processed/bread_b.png and /dev/null differ diff --git a/art/food/processed/bread_g.png b/art/food/processed/bread_g.png deleted file mode 100644 index deb1d47..0000000 Binary files a/art/food/processed/bread_g.png and /dev/null differ diff --git a/art/food/processed/bread_r.png b/art/food/processed/bread_r.png deleted file mode 100644 index 6b7fde7..0000000 Binary files a/art/food/processed/bread_r.png and /dev/null differ diff --git a/art/food/processed/bread_reduced.png b/art/food/processed/bread_reduced.png deleted file mode 100644 index 91a8cbc..0000000 Binary files a/art/food/processed/bread_reduced.png and /dev/null differ diff --git a/art/food/processed/wine_b.png b/art/food/wine_b.png similarity index 100% rename from art/food/processed/wine_b.png rename to art/food/wine_b.png diff --git a/art/food/processed/wine_g.png b/art/food/wine_g.png similarity index 100% rename from art/food/processed/wine_g.png rename to art/food/wine_g.png diff --git a/art/food/processed/wine_r.png b/art/food/wine_r.png similarity index 100% rename from art/food/processed/wine_r.png rename to art/food/wine_r.png diff --git a/art/food/processed/wine_reduced.png b/art/food/wine_reduced.png similarity index 100% rename from art/food/processed/wine_reduced.png rename to art/food/wine_reduced.png diff --git a/art/heart.ase b/art/heart.ase deleted file mode 100644 index ad30c84..0000000 Binary files a/art/heart.ase and /dev/null differ diff --git a/art/museum/to_process/cropped/processed/birth_of_venus_b.png b/art/museum/birth_of_venus_b.png similarity index 100% rename from art/museum/to_process/cropped/processed/birth_of_venus_b.png rename to art/museum/birth_of_venus_b.png diff --git a/art/museum/to_process/cropped/processed/birth_of_venus_g.png b/art/museum/birth_of_venus_g.png similarity index 100% rename from art/museum/to_process/cropped/processed/birth_of_venus_g.png rename to art/museum/birth_of_venus_g.png diff --git a/art/museum/to_process/cropped/processed/birth_of_venus_r.png b/art/museum/birth_of_venus_r.png similarity index 100% rename from art/museum/to_process/cropped/processed/birth_of_venus_r.png rename to art/museum/birth_of_venus_r.png diff --git a/art/museum/to_process/cropped/processed/birth_of_venus_reduced.png b/art/museum/birth_of_venus_reduced.png similarity index 100% rename from art/museum/to_process/cropped/processed/birth_of_venus_reduced.png rename to art/museum/birth_of_venus_reduced.png diff --git a/art/museum/to_process/cropped/processed/delacroix_b.png b/art/museum/delacroix_b.png similarity index 100% rename from art/museum/to_process/cropped/processed/delacroix_b.png rename to art/museum/delacroix_b.png diff --git a/art/museum/to_process/cropped/processed/delacroix_g.png b/art/museum/delacroix_g.png similarity index 100% rename from art/museum/to_process/cropped/processed/delacroix_g.png rename to art/museum/delacroix_g.png diff --git a/art/museum/to_process/cropped/processed/delacroix_r.png b/art/museum/delacroix_r.png similarity index 100% rename from art/museum/to_process/cropped/processed/delacroix_r.png rename to art/museum/delacroix_r.png diff --git a/art/museum/to_process/cropped/processed/delacroix_reduced.png b/art/museum/delacroix_reduced.png similarity index 100% rename from art/museum/to_process/cropped/processed/delacroix_reduced.png rename to art/museum/delacroix_reduced.png diff --git a/art/museum/to_process/cropped/processed/lisa_b.png b/art/museum/lisa_1_b.png similarity index 100% rename from art/museum/to_process/cropped/processed/lisa_b.png rename to art/museum/lisa_1_b.png diff --git a/art/museum/to_process/cropped/processed/lisa_g.png b/art/museum/lisa_1_g.png similarity index 100% rename from art/museum/to_process/cropped/processed/lisa_g.png rename to art/museum/lisa_1_g.png diff --git a/art/museum/to_process/cropped/processed/lisa_r.png b/art/museum/lisa_1_r.png similarity index 100% rename from art/museum/to_process/cropped/processed/lisa_r.png rename to art/museum/lisa_1_r.png diff --git a/art/museum/to_process/cropped/processed/lisa_reduced.png b/art/museum/lisa_reduced.png similarity index 100% rename from art/museum/to_process/cropped/processed/lisa_reduced.png rename to art/museum/lisa_reduced.png diff --git a/art/museum/palette.png b/art/museum/palette.png deleted file mode 100644 index 0af48a8..0000000 Binary files a/art/museum/palette.png and /dev/null differ diff --git a/art/museum/to_process/cropped/processed/pearl_earing_b.png b/art/museum/pearl_earing_b.png similarity index 100% rename from art/museum/to_process/cropped/processed/pearl_earing_b.png rename to art/museum/pearl_earing_b.png diff --git a/art/museum/to_process/cropped/processed/pearl_earing_g.png b/art/museum/pearl_earing_g.png similarity index 100% rename from art/museum/to_process/cropped/processed/pearl_earing_g.png rename to art/museum/pearl_earing_g.png diff --git a/art/museum/to_process/cropped/processed/pearl_earing_r.png b/art/museum/pearl_earing_r.png similarity index 100% rename from art/museum/to_process/cropped/processed/pearl_earing_r.png rename to art/museum/pearl_earing_r.png diff --git a/art/museum/to_process/cropped/processed/pearl_earing_reduced.png b/art/museum/pearl_earing_reduced.png similarity index 100% rename from art/museum/to_process/cropped/processed/pearl_earing_reduced.png rename to art/museum/pearl_earing_reduced.png diff --git a/art/museum/the_scream.jpg b/art/museum/processed/the_scream.jpg similarity index 100% rename from art/museum/the_scream.jpg rename to art/museum/processed/the_scream.jpg diff --git a/art/museum/to_process/cropped/processed/saturn_son_b.png b/art/museum/saturn_son_b.png similarity index 100% rename from art/museum/to_process/cropped/processed/saturn_son_b.png rename to art/museum/saturn_son_b.png diff --git a/art/museum/to_process/cropped/processed/saturn_son_g.png b/art/museum/saturn_son_g.png similarity index 100% rename from art/museum/to_process/cropped/processed/saturn_son_g.png rename to art/museum/saturn_son_g.png diff --git a/art/museum/to_process/cropped/processed/saturn_son_r.png b/art/museum/saturn_son_r.png similarity index 100% rename from art/museum/to_process/cropped/processed/saturn_son_r.png rename to art/museum/saturn_son_r.png diff --git a/art/museum/to_process/cropped/processed/saturn_son_reduced.png b/art/museum/saturn_son_reduced.png similarity index 100% rename from art/museum/to_process/cropped/processed/saturn_son_reduced.png rename to art/museum/saturn_son_reduced.png diff --git a/art/museum/the_scream.png b/art/museum/to_process/the_scream.png similarity index 100% rename from art/museum/the_scream.png rename to art/museum/to_process/the_scream.png diff --git a/art/museum/the_scream_big.png b/art/museum/to_process/the_scream_big.png similarity index 100% rename from art/museum/the_scream_big.png rename to art/museum/to_process/the_scream_big.png diff --git a/art/museum/to_process/cropped/processed/van_gogh_b.png b/art/museum/van_gogh_b.png similarity index 100% rename from art/museum/to_process/cropped/processed/van_gogh_b.png rename to art/museum/van_gogh_b.png diff --git a/art/museum/to_process/cropped/processed/van_gogh_g.png b/art/museum/van_gogh_g.png similarity index 100% rename from art/museum/to_process/cropped/processed/van_gogh_g.png rename to art/museum/van_gogh_g.png diff --git a/art/museum/to_process/cropped/processed/van_gogh_r.png b/art/museum/van_gogh_r.png similarity index 100% rename from art/museum/to_process/cropped/processed/van_gogh_r.png rename to art/museum/van_gogh_r.png diff --git a/art/museum/to_process/cropped/processed/van_gogh_reduced.png b/art/museum/van_gogh_reduced.png similarity index 100% rename from art/museum/to_process/cropped/processed/van_gogh_reduced.png rename to art/museum/van_gogh_reduced.png diff --git a/art/nature/banana.png b/art/nature/banana.png deleted file mode 100644 index 6267d7a..0000000 Binary files a/art/nature/banana.png and /dev/null differ diff --git a/art/nature/flower_vase.png b/art/nature/flower_vase.png deleted file mode 100644 index b697a52..0000000 Binary files a/art/nature/flower_vase.png and /dev/null differ diff --git a/art/nature/flower_vase_b.png b/art/nature/flower_vase_b.png new file mode 100644 index 0000000..17c32ca Binary files /dev/null and b/art/nature/flower_vase_b.png differ diff --git a/art/nature/flower_vase_g.png b/art/nature/flower_vase_g.png new file mode 100644 index 0000000..26150af Binary files /dev/null and b/art/nature/flower_vase_g.png differ diff --git a/art/nature/flower_vase_r.png b/art/nature/flower_vase_r.png new file mode 100644 index 0000000..00cf753 Binary files /dev/null and b/art/nature/flower_vase_r.png differ diff --git a/art/nature/flower_vase_reduced.png b/art/nature/flower_vase_reduced.png new file mode 100644 index 0000000..e9280d5 Binary files /dev/null and b/art/nature/flower_vase_reduced.png differ diff --git a/art/nature/kiwi.png b/art/nature/kiwi.png deleted file mode 100644 index 0941f66..0000000 Binary files a/art/nature/kiwi.png and /dev/null differ diff --git a/art/nature/apple_scaled.png b/art/nature/orig/apple_scaled.png similarity index 100% rename from art/nature/apple_scaled.png rename to art/nature/orig/apple_scaled.png diff --git a/art/nature/grapefruit.png b/art/nature/orig/grapefruit.png similarity index 100% rename from art/nature/grapefruit.png rename to art/nature/orig/grapefruit.png diff --git a/art/nature/palette b/art/nature/orig/palette similarity index 100% rename from art/nature/palette rename to art/nature/orig/palette diff --git a/art/nature/palm_scaled.png b/art/nature/orig/palm_scaled.png similarity index 100% rename from art/nature/palm_scaled.png rename to art/nature/orig/palm_scaled.png diff --git a/art/nature/water.png b/art/nature/orig/water.png similarity index 100% rename from art/nature/water.png rename to art/nature/orig/water.png diff --git a/art/nature/palm_scaled_b.png b/art/nature/palm_scaled_b.png new file mode 100644 index 0000000..4620c40 Binary files /dev/null and b/art/nature/palm_scaled_b.png differ diff --git a/art/nature/palm_scaled_g.png b/art/nature/palm_scaled_g.png new file mode 100644 index 0000000..7e1fd0c Binary files /dev/null and b/art/nature/palm_scaled_g.png differ diff --git a/art/nature/palm_scaled_r.png b/art/nature/palm_scaled_r.png new file mode 100644 index 0000000..c5e048a Binary files /dev/null and b/art/nature/palm_scaled_r.png differ diff --git a/art/nature/palm_scaled_reduced_b.png b/art/nature/palm_scaled_reduced_b.png new file mode 100644 index 0000000..7721481 Binary files /dev/null and b/art/nature/palm_scaled_reduced_b.png differ diff --git a/art/nature/palm_scaled_reduced_g.png b/art/nature/palm_scaled_reduced_g.png new file mode 100644 index 0000000..8ec09a8 Binary files /dev/null and b/art/nature/palm_scaled_reduced_g.png differ diff --git a/art/nature/palm_scaled_reduced_r.png b/art/nature/palm_scaled_reduced_r.png new file mode 100644 index 0000000..37e49aa Binary files /dev/null and b/art/nature/palm_scaled_reduced_r.png differ diff --git a/art/food/processed/palm_scaled_reduced.png b/art/nature/palm_scaled_reduced_reduced.png similarity index 56% rename from art/food/processed/palm_scaled_reduced.png rename to art/nature/palm_scaled_reduced_reduced.png index 8c04070..53e72ee 100644 Binary files a/art/food/processed/palm_scaled_reduced.png and b/art/nature/palm_scaled_reduced_reduced.png differ diff --git a/art/nature/water_b.png b/art/nature/water_b.png new file mode 100644 index 0000000..76346c5 Binary files /dev/null and b/art/nature/water_b.png differ diff --git a/art/nature/water_g.png b/art/nature/water_g.png new file mode 100644 index 0000000..a0c8b4d Binary files /dev/null and b/art/nature/water_g.png differ diff --git a/art/nature/water_r.png b/art/nature/water_r.png new file mode 100644 index 0000000..47051aa Binary files /dev/null and b/art/nature/water_r.png differ diff --git a/art/nature/water_reduced.png b/art/nature/water_reduced.png new file mode 100644 index 0000000..ea3492f Binary files /dev/null and b/art/nature/water_reduced.png differ diff --git a/art/nature/wine.png b/art/nature/wine.png deleted file mode 100644 index 13cb972..0000000 Binary files a/art/nature/wine.png and /dev/null differ diff --git a/art/cloud_b.png b/art/npc/cloud_b.png similarity index 100% rename from art/cloud_b.png rename to art/npc/cloud_b.png diff --git a/art/cloud_g.png b/art/npc/cloud_g.png similarity index 100% rename from art/cloud_g.png rename to art/npc/cloud_g.png diff --git a/art/cloud_r.png b/art/npc/cloud_r.png similarity index 100% rename from art/cloud_r.png rename to art/npc/cloud_r.png diff --git a/art/art/crying_moai_b.png b/art/npc/crying_moai_b.png similarity index 100% rename from art/art/crying_moai_b.png rename to art/npc/crying_moai_b.png diff --git a/art/crying_moai_g.png b/art/npc/crying_moai_g.png similarity index 100% rename from art/crying_moai_g.png rename to art/npc/crying_moai_g.png diff --git a/art/crying_moai_r.png b/art/npc/crying_moai_r.png similarity index 100% rename from art/crying_moai_r.png rename to art/npc/crying_moai_r.png diff --git a/art/drool_b.png b/art/npc/drool_b.png similarity index 100% rename from art/drool_b.png rename to art/npc/drool_b.png diff --git a/art/drool_g.png b/art/npc/drool_g.png similarity index 100% rename from art/drool_g.png rename to art/npc/drool_g.png diff --git a/art/drool_r.png b/art/npc/drool_r.png similarity index 100% rename from art/drool_r.png rename to art/npc/drool_r.png diff --git a/art/eye_b.png b/art/npc/eye_b.png similarity index 100% rename from art/eye_b.png rename to art/npc/eye_b.png diff --git a/art/eye_g.png b/art/npc/eye_g.png similarity index 100% rename from art/eye_g.png rename to art/npc/eye_g.png diff --git a/art/eye_r.png b/art/npc/eye_r.png similarity index 100% rename from art/eye_r.png rename to art/npc/eye_r.png diff --git a/art/heart.png b/art/npc/heart.png similarity index 100% rename from art/heart.png rename to art/npc/heart.png diff --git a/art/heart_b.png b/art/npc/heart_b.png similarity index 100% rename from art/heart_b.png rename to art/npc/heart_b.png diff --git a/art/heart_g.png b/art/npc/heart_g.png similarity index 100% rename from art/heart_g.png rename to art/npc/heart_g.png diff --git a/art/heart_r.png b/art/npc/heart_r.png similarity index 100% rename from art/heart_r.png rename to art/npc/heart_r.png diff --git a/art/kiiro_b.png b/art/npc/kiiro_b.png similarity index 100% rename from art/kiiro_b.png rename to art/npc/kiiro_b.png diff --git a/art/kiiro_g.png b/art/npc/kiiro_g.png similarity index 100% rename from art/kiiro_g.png rename to art/npc/kiiro_g.png diff --git a/art/kiiro_r.png b/art/npc/kiiro_r.png similarity index 100% rename from art/kiiro_r.png rename to art/npc/kiiro_r.png diff --git a/art/momoiro_b.png b/art/npc/momoiro_b.png similarity index 100% rename from art/momoiro_b.png rename to art/npc/momoiro_b.png diff --git a/art/momoiro_g.png b/art/npc/momoiro_g.png similarity index 100% rename from art/momoiro_g.png rename to art/npc/momoiro_g.png diff --git a/art/momoiro_r.png b/art/npc/momoiro_r.png similarity index 100% rename from art/momoiro_r.png rename to art/npc/momoiro_r.png diff --git a/art/slime_woman.png b/art/npc/slime_woman.png similarity index 100% rename from art/slime_woman.png rename to art/npc/slime_woman.png diff --git a/art/slime_woman_b.png b/art/npc/slime_woman_b.png similarity index 100% rename from art/slime_woman_b.png rename to art/npc/slime_woman_b.png diff --git a/art/slime_woman_g.png b/art/npc/slime_woman_g.png similarity index 100% rename from art/slime_woman_g.png rename to art/npc/slime_woman_g.png diff --git a/art/slime_woman_r.png b/art/npc/slime_woman_r.png similarity index 100% rename from art/slime_woman_r.png rename to art/npc/slime_woman_r.png diff --git a/art/start_sign_b.png b/art/npc/start_sign_b.png similarity index 100% rename from art/start_sign_b.png rename to art/npc/start_sign_b.png diff --git a/art/start_sign_g.png b/art/npc/start_sign_g.png similarity index 100% rename from art/start_sign_g.png rename to art/npc/start_sign_g.png diff --git a/art/start_sign_r.png b/art/npc/start_sign_r.png similarity index 100% rename from art/start_sign_r.png rename to art/npc/start_sign_r.png diff --git a/art/warai_b.png b/art/npc/warai_b.png similarity index 100% rename from art/warai_b.png rename to art/npc/warai_b.png diff --git a/art/warai_g.png b/art/npc/warai_g.png similarity index 100% rename from art/warai_g.png rename to art/npc/warai_g.png diff --git a/art/warai_r.png b/art/npc/warai_r.png similarity index 100% rename from art/warai_r.png rename to art/npc/warai_r.png diff --git a/art/image2_b.png b/art/tech/processed/image2_b.png similarity index 100% rename from art/image2_b.png rename to art/tech/processed/image2_b.png diff --git a/art/image2_g.png b/art/tech/processed/image2_g.png similarity index 100% rename from art/image2_g.png rename to art/tech/processed/image2_g.png diff --git a/art/image2_r.png b/art/tech/processed/image2_r.png similarity index 100% rename from art/image2_r.png rename to art/tech/processed/image2_r.png diff --git a/art/image_b.png b/art/tech/processed/image_b.png similarity index 100% rename from art/image_b.png rename to art/tech/processed/image_b.png diff --git a/art/image_g.png b/art/tech/processed/image_g.png similarity index 100% rename from art/image_g.png rename to art/tech/processed/image_g.png diff --git a/art/image_r.png b/art/tech/processed/image_r.png similarity index 100% rename from art/image_r.png rename to art/tech/processed/image_r.png diff --git a/art/test_object.png b/art/test_object.png index 3f31bc2..1eacb38 100644 Binary files a/art/test_object.png and b/art/test_object.png differ diff --git a/assorted.lua b/assorted.lua index 83b790f..650a494 100644 --- a/assorted.lua +++ b/assorted.lua @@ -8,8 +8,8 @@ function Ass:initialize(x, y, color, folder, name) x = x, y = y, color = color, - cellShape = spriteCells["mac_smaller"], - collision = "moveable", --player can't push other player + cellShape = spriteCells["tree"][color], + collision = "unmoveable", --player can't push other player sprite = spr }) end diff --git a/entity.lua b/entity.lua index b5033f6..075d036 100644 --- a/entity.lua +++ b/entity.lua @@ -10,6 +10,7 @@ function Entity:initialize(t) self.collision = t.collision --"none", "moveable", "unmoveable" self.sprite = t.sprite self.shaAmount = t.sha or 1 + self.onBump = t.onBump or function() return true end self.drawOffset = {x = 0, y = 0} if self.size.w < 1 or self.size.h < 1 then @@ -122,4 +123,8 @@ end function Entity:sha() return math.random(-worldSha, worldSha) * .5 +end + +function Entity:bump() + return self.onBump() end \ No newline at end of file diff --git a/room.lua b/room.lua index c786319..90066ad 100644 --- a/room.lua +++ b/room.lua @@ -62,7 +62,7 @@ function Room:initialize(t) -- if active then self.collideables[color]["n: " .. x .. ", " .. y] = Ass:new(x, y, color, "animals/processed/", "me_rach") end local x, y = 1, 1 - if active then self.collideables[color]["n: " .. x .. ", " .. y] = Ass:new(x, y, color, "tech/processed/", "mac_smaller") end + if active then self.collideables[color]["n: " .. x .. ", " .. y] = Ass:new(x, y, color, "nature/", "palm_scaled_reduced") end self.collideables[color]["n: " .. x .. ", " .. y]:getOccupiedCells() -- local x, y = 7, 7 @@ -168,9 +168,18 @@ function Room:movePlayer(key) x = pos.x + dir.x, y = pos.y + dir.y } -- this is for reference for each color as we change the targetCells table + local initialTargetEntities = {} + + for _, color in pairs(self:getActiveColors()) do + initialTargetEntities[color] = self:getCellInMatrix(self.collidableMatrices[color], initialTargetCell) + if initialTargetEntities[color] then initialTargetEntities[color]:bump() print(bump) end + end + if not self:isInBounds(initialTargetCell) then + -- let's us move out of bounds to Change Rooms without pulling a bloc_ move = true - elseif self:getCellInMatrix(self.collidableMatrices["red"], initialTargetCell) and self:getCellInMatrix(self.collidableMatrices["red"], initialTargetCell):canPassOver() then + elseif initialTargetEntities["red"] and initialTargetEntities["red"]:canPassOver() then + --we should put this in the else statement actually move = true else local targetCells diff --git a/sprite_manager.lua b/sprite_manager.lua index 1f59cd8..d287598 100644 --- a/sprite_manager.lua +++ b/sprite_manager.lua @@ -19,11 +19,16 @@ sprites = { blue = love.graphics.newImage("art/switch_b.png") }, water = { - red = love.graphics.newImage("art/nature/processed/water_r.png"), - green = love.graphics.newImage("art/nature/processed/water_g.png"), - blue = love.graphics.newImage("art/nature/processed/water_b.png") + red = love.graphics.newImage("art/nature/water_r.png"), + green = love.graphics.newImage("art/nature/water_g.png"), + blue = love.graphics.newImage("art/nature/water_b.png") }, mac_smaller = love.graphics.newImage("art/tech/processed/mac_smaller_r.png"), + tree = { + red = love.graphics.newImage("art/nature/palm_scaled_r.png"), + green = love.graphics.newImage("art/nature/palm_scaled_g.png"), + blue = love.graphics.newImage("art/nature/palm_scaled_b.png") + }, test_object = love.graphics.newImage("art/test_object.png"), npcs = { @@ -43,7 +48,7 @@ function processSprites() spriteCells[name] = {} --this is multicolored so... for color, sprite in pairs(spriteObj) do - spriteCells[color] = getCellsFromSprite(sprite) + spriteCells[name][color] = getCellsFromSprite(sprite) end else --assume it's an image obj