From 1c1ec291a74362d71db56e05968dbb33851d7d94 Mon Sep 17 00:00:00 2001 From: 0x81c Date: Mon, 16 Mar 2015 07:39:54 -0400 Subject: [PATCH] bump chec~~ --- art/animals/{ => orig}/badger.png | Bin art/animals/{ => orig}/sad_frog.png | Bin art/animals/{ => orig}/smile_dog.jpg | Bin art/animals/{ => orig}/smile_dog.png | Bin art/animals/{processed => }/sad_frog_b.png | Bin art/animals/{processed => }/sad_frog_g.png | Bin art/animals/{processed => }/sad_frog_r.png | Bin .../{processed => }/sad_frog_reduced.png | Bin art/animals/{processed => }/smile_dog_b.png | Bin art/animals/{processed => }/smile_dog_g.png | Bin art/animals/{processed => }/smile_dog_r.png | Bin .../{processed => }/smile_dog_reduced.png | Bin art/art/player_w.png | Bin 147 -> 0 bytes art/{ => ase_orig}/cloud.ase | Bin art/{ => ase_orig}/crying_moai_r.ase | Bin art/{ => ase_orig}/drool.ase | Bin art/{art => ase_orig}/eye.ase | Bin art/{art => ase_orig}/heart.ase | Bin art/{ase => ase_orig}/image2_b.ase | Bin art/{ase => ase_orig}/image_r.ase | Bin art/{ => ase_orig}/kiiro.ase | Bin art/{ase => ase_orig}/palette.png | Bin art/{ => ase_orig}/slime_woman.ase | Bin art/{ => ase_orig}/wall.ase | Bin art/{ => ase_orig}/warai.ase | Bin art/crying_moai_b.png | Bin 165 -> 0 bytes art/eye.ase | Bin 721 -> 0 bytes art/food/{processed => }/apple_scaled_b.png | Bin art/food/{processed => }/apple_scaled_g.png | Bin art/food/{processed => }/apple_scaled_r.png | Bin .../{processed => }/apple_scaled_reduced.png | Bin art/food/{processed => }/banana_b.png | Bin art/food/{processed => }/banana_g.png | Bin art/food/{processed => }/banana_r.png | Bin art/food/{processed => }/banana_reduced.png | Bin art/food/{processed => }/beer_mug_b.png | Bin art/food/{processed => }/beer_mug_g.png | Bin art/food/{processed => }/beer_mug_r.png | Bin art/food/{processed => }/beer_mug_reduced.png | Bin art/food/{processed => }/grapefruit_b.png | Bin art/food/{processed => }/grapefruit_g.png | Bin art/food/{processed => }/grapefruit_r.png | Bin art/food/{processed => }/grapefruit_reduced.png | Bin art/food/{processed => }/kiwi_b.png | Bin art/food/{processed => }/kiwi_g.png | Bin art/food/{processed => }/kiwi_r.png | Bin art/food/{processed => }/kiwi_reduced.png | Bin art/food/{ => orig}/bread.png | Bin art/food/{ => processed}/beer_mug.png | Bin art/food/processed/bread_b.png | Bin 403 -> 0 bytes art/food/processed/bread_g.png | Bin 312 -> 0 bytes art/food/processed/bread_r.png | Bin 308 -> 0 bytes art/food/processed/bread_reduced.png | Bin 456 -> 0 bytes art/food/{processed => }/wine_b.png | Bin art/food/{processed => }/wine_g.png | Bin art/food/{processed => }/wine_r.png | Bin art/food/{processed => }/wine_reduced.png | Bin art/heart.ase | Bin 604 -> 0 bytes .../cropped/processed => }/birth_of_venus_b.png | Bin .../cropped/processed => }/birth_of_venus_g.png | Bin .../cropped/processed => }/birth_of_venus_r.png | Bin .../processed => }/birth_of_venus_reduced.png | Bin .../cropped/processed => }/delacroix_b.png | Bin .../cropped/processed => }/delacroix_g.png | Bin .../cropped/processed => }/delacroix_r.png | Bin .../processed => }/delacroix_reduced.png | Bin .../processed/lisa_b.png => lisa_1_b.png} | Bin .../processed/lisa_g.png => lisa_1_g.png} | Bin .../processed/lisa_r.png => lisa_1_r.png} | Bin .../cropped/processed => }/lisa_reduced.png | Bin art/museum/palette.png | Bin 867 -> 0 bytes .../cropped/processed => }/pearl_earing_b.png | Bin .../cropped/processed => }/pearl_earing_g.png | Bin .../cropped/processed => }/pearl_earing_r.png | Bin .../processed => }/pearl_earing_reduced.png | Bin art/museum/{ => processed}/the_scream.jpg | Bin .../cropped/processed => }/saturn_son_b.png | Bin .../cropped/processed => }/saturn_son_g.png | Bin .../cropped/processed => }/saturn_son_r.png | Bin .../processed => }/saturn_son_reduced.png | Bin art/museum/{ => to_process}/the_scream.png | Bin art/museum/{ => to_process}/the_scream_big.png | Bin .../cropped/processed => }/van_gogh_b.png | Bin .../cropped/processed => }/van_gogh_g.png | Bin .../cropped/processed => }/van_gogh_r.png | Bin .../cropped/processed => }/van_gogh_reduced.png | Bin art/nature/banana.png | Bin 602 -> 0 bytes art/nature/flower_vase.png | Bin 2845 -> 0 bytes art/nature/flower_vase_b.png | Bin 0 -> 275 bytes art/nature/flower_vase_g.png | Bin 0 -> 451 bytes art/nature/flower_vase_r.png | Bin 0 -> 392 bytes art/nature/flower_vase_reduced.png | Bin 0 -> 512 bytes art/nature/kiwi.png | Bin 665 -> 0 bytes art/nature/{ => orig}/apple_scaled.png | Bin art/nature/{ => orig}/grapefruit.png | Bin art/nature/{ => orig}/palette | Bin art/nature/{ => orig}/palm_scaled.png | Bin art/nature/{ => orig}/water.png | Bin art/nature/palm_scaled_b.png | Bin 0 -> 581 bytes art/nature/palm_scaled_g.png | Bin 0 -> 588 bytes art/nature/palm_scaled_r.png | Bin 0 -> 642 bytes art/nature/palm_scaled_reduced_b.png | Bin 0 -> 579 bytes art/nature/palm_scaled_reduced_g.png | Bin 0 -> 588 bytes art/nature/palm_scaled_reduced_r.png | Bin 0 -> 642 bytes .../palm_scaled_reduced_reduced.png} | Bin 937 -> 948 bytes art/nature/water_b.png | Bin 0 -> 281 bytes art/nature/water_g.png | Bin 0 -> 695 bytes art/nature/water_r.png | Bin 0 -> 406 bytes art/nature/water_reduced.png | Bin 0 -> 818 bytes art/nature/wine.png | Bin 586 -> 0 bytes art/{ => npc}/cloud_b.png | Bin art/{ => npc}/cloud_g.png | Bin art/{ => npc}/cloud_r.png | Bin art/{art => npc}/crying_moai_b.png | Bin art/{ => npc}/crying_moai_g.png | Bin art/{ => npc}/crying_moai_r.png | Bin art/{ => npc}/drool_b.png | Bin art/{ => npc}/drool_g.png | Bin art/{ => npc}/drool_r.png | Bin art/{ => npc}/eye_b.png | Bin art/{ => npc}/eye_g.png | Bin art/{ => npc}/eye_r.png | Bin art/{ => npc}/heart.png | Bin art/{ => npc}/heart_b.png | Bin art/{ => npc}/heart_g.png | Bin art/{ => npc}/heart_r.png | Bin art/{ => npc}/kiiro_b.png | Bin art/{ => npc}/kiiro_g.png | Bin art/{ => npc}/kiiro_r.png | Bin art/{ => npc}/momoiro_b.png | Bin art/{ => npc}/momoiro_g.png | Bin art/{ => npc}/momoiro_r.png | Bin art/{ => npc}/slime_woman.png | Bin art/{ => npc}/slime_woman_b.png | Bin art/{ => npc}/slime_woman_g.png | Bin art/{ => npc}/slime_woman_r.png | Bin art/{ => npc}/start_sign_b.png | Bin art/{ => npc}/start_sign_g.png | Bin art/{ => npc}/start_sign_r.png | Bin art/{ => npc}/warai_b.png | Bin art/{ => npc}/warai_g.png | Bin art/{ => npc}/warai_r.png | Bin art/{ => tech/processed}/image2_b.png | Bin art/{ => tech/processed}/image2_g.png | Bin art/{ => tech/processed}/image2_r.png | Bin art/{ => tech/processed}/image_b.png | Bin art/{ => tech/processed}/image_g.png | Bin art/{ => tech/processed}/image_r.png | Bin art/test_object.png | Bin 948 -> 950 bytes assorted.lua | 4 ++-- entity.lua | 5 +++++ room.lua | 13 +++++++++++-- sprite_manager.lua | 13 +++++++++---- 153 files changed, 27 insertions(+), 8 deletions(-) rename art/animals/{ => orig}/badger.png (100%) rename art/animals/{ => orig}/sad_frog.png (100%) rename art/animals/{ => orig}/smile_dog.jpg (100%) rename art/animals/{ => orig}/smile_dog.png (100%) rename art/animals/{processed => }/sad_frog_b.png (100%) rename art/animals/{processed => }/sad_frog_g.png (100%) rename art/animals/{processed => }/sad_frog_r.png (100%) rename art/animals/{processed => }/sad_frog_reduced.png (100%) rename art/animals/{processed => }/smile_dog_b.png (100%) rename art/animals/{processed => }/smile_dog_g.png (100%) rename art/animals/{processed => }/smile_dog_r.png (100%) rename art/animals/{processed => }/smile_dog_reduced.png (100%) delete mode 100644 art/art/player_w.png rename art/{ => ase_orig}/cloud.ase (100%) rename art/{ => ase_orig}/crying_moai_r.ase (100%) rename art/{ => ase_orig}/drool.ase (100%) rename art/{art => ase_orig}/eye.ase (100%) rename art/{art => ase_orig}/heart.ase (100%) rename art/{ase => ase_orig}/image2_b.ase (100%) rename art/{ase => ase_orig}/image_r.ase (100%) rename art/{ => ase_orig}/kiiro.ase (100%) rename art/{ase => ase_orig}/palette.png (100%) rename art/{ => ase_orig}/slime_woman.ase (100%) rename art/{ => ase_orig}/wall.ase (100%) rename art/{ => ase_orig}/warai.ase (100%) delete mode 100644 art/crying_moai_b.png delete mode 100644 art/eye.ase rename art/food/{processed => }/apple_scaled_b.png (100%) rename art/food/{processed => }/apple_scaled_g.png (100%) rename art/food/{processed => }/apple_scaled_r.png (100%) rename art/food/{processed => }/apple_scaled_reduced.png (100%) rename art/food/{processed => }/banana_b.png (100%) rename art/food/{processed => }/banana_g.png (100%) rename art/food/{processed => }/banana_r.png (100%) rename art/food/{processed => }/banana_reduced.png (100%) rename art/food/{processed => }/beer_mug_b.png (100%) rename art/food/{processed => }/beer_mug_g.png (100%) rename art/food/{processed => }/beer_mug_r.png (100%) rename art/food/{processed => }/beer_mug_reduced.png (100%) rename art/food/{processed => }/grapefruit_b.png (100%) rename art/food/{processed => }/grapefruit_g.png (100%) rename art/food/{processed => }/grapefruit_r.png (100%) rename art/food/{processed => }/grapefruit_reduced.png (100%) rename art/food/{processed => }/kiwi_b.png (100%) rename art/food/{processed => }/kiwi_g.png (100%) rename art/food/{processed => }/kiwi_r.png (100%) rename art/food/{processed => }/kiwi_reduced.png (100%) rename art/food/{ => orig}/bread.png (100%) rename art/food/{ => processed}/beer_mug.png (100%) delete mode 100644 art/food/processed/bread_b.png delete mode 100644 art/food/processed/bread_g.png delete mode 100644 art/food/processed/bread_r.png delete mode 100644 art/food/processed/bread_reduced.png rename art/food/{processed => }/wine_b.png (100%) rename art/food/{processed => }/wine_g.png (100%) rename art/food/{processed => }/wine_r.png (100%) rename art/food/{processed => }/wine_reduced.png (100%) delete mode 100644 art/heart.ase rename art/museum/{to_process/cropped/processed => }/birth_of_venus_b.png (100%) rename art/museum/{to_process/cropped/processed => }/birth_of_venus_g.png (100%) rename art/museum/{to_process/cropped/processed => }/birth_of_venus_r.png (100%) rename art/museum/{to_process/cropped/processed => }/birth_of_venus_reduced.png (100%) rename art/museum/{to_process/cropped/processed => }/delacroix_b.png (100%) rename art/museum/{to_process/cropped/processed => }/delacroix_g.png (100%) rename art/museum/{to_process/cropped/processed => }/delacroix_r.png (100%) rename art/museum/{to_process/cropped/processed => }/delacroix_reduced.png (100%) rename art/museum/{to_process/cropped/processed/lisa_b.png => lisa_1_b.png} (100%) rename art/museum/{to_process/cropped/processed/lisa_g.png => lisa_1_g.png} (100%) rename art/museum/{to_process/cropped/processed/lisa_r.png => lisa_1_r.png} (100%) rename art/museum/{to_process/cropped/processed => }/lisa_reduced.png (100%) delete mode 100644 art/museum/palette.png rename art/museum/{to_process/cropped/processed => }/pearl_earing_b.png (100%) rename art/museum/{to_process/cropped/processed => }/pearl_earing_g.png (100%) rename art/museum/{to_process/cropped/processed => }/pearl_earing_r.png (100%) rename art/museum/{to_process/cropped/processed => }/pearl_earing_reduced.png (100%) rename art/museum/{ => processed}/the_scream.jpg (100%) rename art/museum/{to_process/cropped/processed => }/saturn_son_b.png (100%) rename art/museum/{to_process/cropped/processed => }/saturn_son_g.png (100%) rename art/museum/{to_process/cropped/processed => }/saturn_son_r.png (100%) rename art/museum/{to_process/cropped/processed => }/saturn_son_reduced.png (100%) rename art/museum/{ => to_process}/the_scream.png (100%) rename art/museum/{ => to_process}/the_scream_big.png (100%) rename art/museum/{to_process/cropped/processed => }/van_gogh_b.png (100%) rename art/museum/{to_process/cropped/processed => }/van_gogh_g.png (100%) rename art/museum/{to_process/cropped/processed => }/van_gogh_r.png (100%) rename art/museum/{to_process/cropped/processed => }/van_gogh_reduced.png (100%) delete mode 100644 art/nature/banana.png delete mode 100644 art/nature/flower_vase.png create mode 100644 art/nature/flower_vase_b.png create mode 100644 art/nature/flower_vase_g.png create mode 100644 art/nature/flower_vase_r.png create mode 100644 art/nature/flower_vase_reduced.png delete mode 100644 art/nature/kiwi.png rename art/nature/{ => orig}/apple_scaled.png (100%) rename art/nature/{ => orig}/grapefruit.png (100%) rename art/nature/{ => orig}/palette (100%) rename art/nature/{ => orig}/palm_scaled.png (100%) rename art/nature/{ => orig}/water.png (100%) create mode 100644 art/nature/palm_scaled_b.png create mode 100644 art/nature/palm_scaled_g.png create mode 100644 art/nature/palm_scaled_r.png create mode 100644 art/nature/palm_scaled_reduced_b.png create mode 100644 art/nature/palm_scaled_reduced_g.png create mode 100644 art/nature/palm_scaled_reduced_r.png rename art/{food/processed/palm_scaled_reduced.png => nature/palm_scaled_reduced_reduced.png} (56%) create mode 100644 art/nature/water_b.png create mode 100644 art/nature/water_g.png create mode 100644 art/nature/water_r.png create mode 100644 art/nature/water_reduced.png delete mode 100644 art/nature/wine.png rename art/{ => npc}/cloud_b.png (100%) rename art/{ => npc}/cloud_g.png (100%) rename art/{ => npc}/cloud_r.png (100%) rename art/{art => npc}/crying_moai_b.png (100%) rename art/{ => npc}/crying_moai_g.png (100%) rename art/{ => npc}/crying_moai_r.png (100%) rename art/{ => npc}/drool_b.png (100%) rename art/{ => npc}/drool_g.png (100%) rename art/{ => npc}/drool_r.png (100%) rename art/{ => npc}/eye_b.png (100%) rename art/{ => npc}/eye_g.png (100%) rename art/{ => npc}/eye_r.png (100%) rename art/{ => npc}/heart.png (100%) rename art/{ => npc}/heart_b.png (100%) rename art/{ => npc}/heart_g.png (100%) rename art/{ => npc}/heart_r.png (100%) rename art/{ => npc}/kiiro_b.png (100%) rename art/{ => npc}/kiiro_g.png (100%) rename art/{ => npc}/kiiro_r.png (100%) rename art/{ => npc}/momoiro_b.png (100%) rename art/{ => npc}/momoiro_g.png (100%) rename art/{ => npc}/momoiro_r.png (100%) rename art/{ => npc}/slime_woman.png (100%) rename art/{ => npc}/slime_woman_b.png (100%) rename art/{ => npc}/slime_woman_g.png (100%) rename art/{ => npc}/slime_woman_r.png (100%) rename art/{ => npc}/start_sign_b.png (100%) rename art/{ => npc}/start_sign_g.png (100%) rename art/{ => npc}/start_sign_r.png (100%) rename art/{ => npc}/warai_b.png (100%) rename art/{ => npc}/warai_g.png (100%) rename art/{ => npc}/warai_r.png (100%) rename art/{ => tech/processed}/image2_b.png (100%) rename art/{ => tech/processed}/image2_g.png (100%) rename art/{ => tech/processed}/image2_r.png (100%) rename art/{ => tech/processed}/image_b.png (100%) rename art/{ => tech/processed}/image_g.png (100%) rename art/{ => tech/processed}/image_r.png (100%) 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 0449da52651380a352d49c8747a43de5df2bc584..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`QJyZ2Ar`$yCwlT7P~c&HyXyb{ zPhWzxL^f(DT-n)pFfxaMHOKm1X(yZRVUb8?`Sli;7~fqyTs1RL|JKx(+m3EKXnsiN w_q;m0R>}W*f(g5sKW_TuKPg7uXi9|q_i4_r6F<2Z18rgOboFyt=akR{0Ns~2bpQYW 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 2113759a709540015f74bddee7b9ee1beaaf306a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ii4<#Ar`%BgB1SSI-XHnl<_DRSghucO&Ebd`+t4pfZHk$w1q{18O<(s2A{;r)FK5# zX|Oa<4+>yrC`wI{#45$ekOYxHH2z)#{y=}iC??vgme9h`6q(!CW$ruQ|JBC|LVi}x93jne4FLHXU@Wy*$E%- zZk<%O$NAvhT+X$j(O^eGLLJ>v$q5Ho{x@<+A6qmjt~v2Cft>f{y1*WVtWao9EZqaXkD^GWOL#Eb83Tz2We$0gN4YwLSnINxu2 zwX&+zV)x7`@!$Su__dbq<@ zTdem9f0xENs|yj9;mcS2@Z|q~uWmC2Dsq!`1Ju_tf a>6cqd>QZuJ`>Gtui)s_@vK{)U^acP1L(66W 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 3392eb74e0a476ebb8f2c14519be4371b1d64597..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 403 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk~Bp9L@-6Me%OS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lweBo zc6VW5yxS$b1jyqo@Q5r1(jH*!b~4)z$msEOaSY+OZrf+bb;v=)gpD;(|4d<8X(K(-v_j3Cg?va#`c(DFaz_l6Qr!$tt%uDoK zv`FY&am(yS+pGoM7y57P-RbROBD~hrC1l?9J*A5#o#dKtFzd{#-^|7?Nu~TlUp1}0Vp2D5^u@S|wR%}>cptHiD0HNVbgpaup{S3j3^P645bDP46hOx7_4S6Fo+k-*%fF5lweBo zc6VW5yxS$b1jyqo@Q5r1(jH*!b~4)z$T0MDaSY+Oo}AFY{A{ugzr>IK|NkFW021~B zALX5HEEf72ab$((p8fylA8crim3^bZAfXrWSkeDsAW*YviEBhjN@7W>RdP`(kYX@0 zFf`RQFxE9R4Kc8=GBvR>HqbRNu`)226*Pq(MMG|WN@iLmZVj*bbv6SvFnGH9xvX45bDP46hOx7_4S6Fo+k-*%fF5lweBo zc6VW5yxS$b1jyqo@Q5r1(jH*!b~4)z$k6q4aSY+Oo}AFY{A~Xleu*Fd|NlR%03_@M zKFT}YSS<84;>Zf$hz%RAH_Ngz*vyYy#ke`g9jH;Y#5JNMC9x#cD!C{XNHG{07@F!D z80#9Eh8S2_nVMJ`8|WICSQ!}13Yx-?q9HdwB{QuOw}#jJI-7wS7(8A5T-G@yGywox C=~Tx6 diff --git a/art/food/processed/bread_reduced.png b/art/food/processed/bread_reduced.png deleted file mode 100644 index 91a8cbc40f56dfa7ff3f4bbd42260a762eae4a6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 456 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@mUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UV>C6dj$D1FjT2AFf_Cn{WH8I!!-T^Ro}>D~i!I14-?i-EKU7`vU!wgWO&dAc};NL)^x zV90mKK!C-(RoPOMmsOPip|DB$rHk^1se z|MJ&?x@85M7fx4}65Q>3SY{EQ)bo`ho;o~>Bf>IEB%R-M9dmoNs^bU$=R%E|!c9i& zCY+ROY*t!tP#lt4T4ZraykskjE8n4z!=IA{^_2iGr zUB*mrg{5=&*T0Y7!&oWkHM8&gCoQ0>RZCnWN>UO_QmvAUQh^kMk%6J9u7R9?%F@1&BHS;UR~Nrrq33Or0d|1U2r3<%;r zmT@S_(m?BhxZ|pz_np`0#SMTqOXAdT;FOi>bqv*4; zF6xG}_SPkBwuV)lOD7*(As-*5Znk$)GTX+gjW5+*^><1BxB`r@GhRoGz{W#-foZ%1 zYYF53#tC9s?gup%09F2KXa1WE)&U7HOdSerfByG(c7}F)+wZdc@r3i`adm%=;8pX* yzFqLrU76_L6PHuie>Ns2t6-_D*Hh1}vn7fi31U#Kx_I^gFN2$=$t?hA>4!Z4 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 0af48a861574b800a018c0040425316e9957c8b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 867 zcmeAS@N?(olHy`uVBq!ia0vp^96-#-!3-p?+>5M}9Q+~F99PH`p K=d#Wzp$P!D!c3R| 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 6267d7a2493a542b443e5f87addc1fb09ef62985..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 602 zcmV-g0;T00E<&M*(5<)#ijEEnI{FW|>Ecq+LM=L2 z5GkT=9c&N^7PU%inxuWwBu}0^zu$8Xnc5`YcHG_P?t8~s{Kp>Ny^JdD^Q#Q0x8=*nWt^nP&PJ8Zb?RE(^PyYUC&-T} zk$hI3-9aQjC=X^3DUZqOJR+MzBEh7Hyy_xBy%Vw(qLR<0QDC5t+3SGka{fXe6nuz* zjr-CDkm3y3KCG`3)$*>ebBo}C5_af6$W&jB`6tMn9rga?KNqA`8INq}n{0_=ZU zKs1OAx)*k;&@@Qr0C52awn|J-VbIVJ9+DvC2vGy#srEXLWCGQ=HVF6c!t6A^32@#x%a%!-u*F!#5IqZ$X>s; z&e>RT^B9#ZGiHLJJf&uRH#Jy(%%(S2OgWO*&3*2TY^0Z>1osm5ZAA41*{xN(S<3c?yR z8zt(Cbw)N0F@ACmUl;_HdFpeL-gZF}*^Hkp<4$a6)4mYg0Jjc795J|6Cv28j9=B-) z3ASwm{>2_}BZyo(a?2;lnNmPp&!PB9C=AFIpF-wv|4`f-I>0`@S zlN&!%;=B7dp$C&hn&kTZ7e=1e*7p-psy7gNh5T?zw#}i{1arMXWQ1fb3$GC%0>$E+ zlF}5o)rhB`QtbV3FE{R6M@Rc8fA@`79j)J_fIRf-*(61Dbwb_ju0oK*t>5B&;IN+wqI?66Vsf_@XAEMhK*1_CrncYu7q+$qyLH= zfBU6`t2D(As{yZnFNY?3IQ#2qXxS{4BKCg7;?W<4jBM9`ABJApBj084mj|}+wfi+H z)f79Y_`rvTsd`nM9?&ul%{s(Nf*n@Y~z<~q}^cg z^a9AKU5Q z422CTU;VYiN3Tk;+a#4K$=Gd0dbX#${BwzA!EFyoApl-GDpb}`1T|0^4D@d%_Lpe* z4P;fZa2Dp~OwLtf9{86|=I1nq;Z0KWOHZsFuDItHO<(8l#AX|_TduA*~5CkzCKwU`&LuyK738>OLg9OwMng3!=}KoXA^WKP|`qVEWE<+jb9Lk z<0tc~+X`q_B#mVo?38n7BQ|z|(+BfY7Gu}z9DU4ZXp=!Hklgi{B$wBC?h4cxzCujM36gGJQ-jzZjqr!S1~}!&i?o zJKkVuPnE|G`sDK__dXdjaUS;U>}7gliGeFKwEP6ml>}ATeM>|XNSxH9UW)m%2NBUH zq$(COKziX>@c$2oe}8zpT6p6$3yTHrzAvUW?Qwn<^6OysH?aGf4sJfu!go^&wn4Fw z5WkV~&{aD1s^mj=!SN#+tx}4eg~3jnC=EGq$P)i{s9SBlZvNdXB7i&ZJ0-sGuTmVA zb=o?z-2L~6Q|CMR`ULFxNIQ2tQ3WD|P@u&q!{DoXAlIoeJ!hheEae#usRTj^7MGyX zfD=;@pS!np(SqN#CLFj2r4ZPMGotHmsp^SEZP^7oPZ$N*hK?>15@B%oCW{jnRxEwl3^yw;Rde8Gc{C;=V-KP7rc{qNfs_+Awy z6CxR67fqBEqYJ^*sVbH*`0TV!TU!@D$#(E3XY&{ucz(+Dw-(<|_38kIUf3v1( zLpRCiZMbT!xHAM+W+POg?{nb&b+{HYRV$%@6NXubrC$J0_R2 zL1~2XN<79}fhARiq zGX^M0E|1S&~EuI-{^O#n&MAn_AY6=9hcSv!lc z6}m1lGy|c5rd`G@KuR(_?ZjOvW#7fm2GA);yTH|5k~Ahs-Z|%A5&*xDa_-IZ=%z^; zNrVoDr6cA4b<;h@<@JCP0u&g!1_)HTQunDO#dLI(l%(q77W|R{pi&SkS23n#5r!!} zy#+LM3PlH$Mv`1c04WtxfK-aE&OA!RXto3?NmYzOVw&dV1JLvo%>aSIj{~fXO(Z2G zIv`OBbg`!FzQ$CHfoXzL3Umn55P^mtC8$^-Q;B<*zota6YJkCiwv~a206afJsRUCq zk+DLB3MX4c6N2{kBG+8K?$QE`err%=F%g=?z{UtQRI(BcVLb$)z)P?!g9w+#ovTlW zs{&YBC{q|MU}sZ=fH;Y8awb+@(N-)#toUMZ6B!gzN!)L`qW8=BRYANjz{X7jxZe&% zwml+|2~t8FgKp~>1}w~!uyP59wmnZnrszsAvruR0E6qz&lEu+V?H9`!)oe$z6{cy? v)|Dqw2?FTs@59a(5SrqO^#iN1`?mZqKb$Ci6oB@B00000NkvXXu0mjfV767i diff --git a/art/nature/flower_vase_b.png b/art/nature/flower_vase_b.png new file mode 100644 index 0000000000000000000000000000000000000000..17c32caea3d1cbeb8bba0c44c48f8cfde8f2b28e GIT binary patch literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^3P5bY2qYLHuDc!rQY`6?zK#qG8~eHcB(ehejKx9j zP7LeL$-D$|6p}rHd>I(3)EF2VS{N990fib~Fff!FFfhDIU|_JC!N4G1FlSew4N!t9 z$=lt9f$?sa@Dd=8v%n*=7)X17vD?XPJ0OF{)5S4_<9c#}L?n>+fr0V*_GycNEY%X% zh?11Vl2ohYqEsNoU}Ruus%v1ZYiJx|WME}tYGr7oYhYq!V9*)i(TJiUH$NpatrE9} UAFLm2ff^V*UHx3vIVCg!0IH%ww*UYD literal 0 HcmV?d00001 diff --git a/art/nature/flower_vase_g.png b/art/nature/flower_vase_g.png new file mode 100644 index 0000000000000000000000000000000000000000..26150af41631f16e7264ab8bda9dd566f7cde69a GIT binary patch literal 451 zcmeAS@N?(olHy`uVBq!ia0vp^3P5bY2qYLHuDc!rQY`6?zK#qG8~eHcB(ehejKx9j zP7LeL$-D$|6p}rHd>I(3)EF2VS{N990fib~Fff!FFfhDIU|_JC!N4G1FlSew4N!t9 z$=lt9f$?sa@Dd=8v%n*=7)X17vD?XPJ0N3^r;B3<$9329`?(woMc6;+H`}XDJmT;! z!hUX?l>;zN1TaA2N^h zd3L^M<=L4JgYHFf1l^N($n0U}a)zWoV>pU}9xp&>7*;h@v4kKP5A*61RpQtRHNF8W=oX{an^LB{Ts5HsP6g literal 0 HcmV?d00001 diff --git a/art/nature/flower_vase_r.png b/art/nature/flower_vase_r.png new file mode 100644 index 0000000000000000000000000000000000000000..00cf7535486b42b2a4990b4f1291bd9dc3a74338 GIT binary patch literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^3P5bY2qYLHuDc!rQY`6?zK#qG8~eHcB(ehejKx9j zP7LeL$-D$|6p}rHd>I(3)EF2VS{N990fib~Fff!FFfhDIU|_JC!N4G1FlSew4N!t9 z$=lt9f$?sa@Dd=8v%n*=7)X17vD?XPJ0PRc)5S4_<9c#JLO=o#m@o((`)_aXp^@YF zeT7H%6IQef{I)mv^Z)-Ih7(rdj8lGmYd`qu|N8$t+y2}COTX~{|4;koKmXtVZ`}0% zpW&7NtN$NPsNeUGz4`C{ss)<%uhb1b{M)eqzyXN~^$Z!FRm>B9>|^lQ!f41W-SHrC zfo6b15;Mcw|2B#xJGwRi9iv*}8c~vxSdwa$T$Bo=7>o=IO?3^7bq$R}j0~(yOsx!! obPY_b3=BFWJQ`6nl4r>mdKI;Vst0LQt83IG5A literal 0 HcmV?d00001 diff --git a/art/nature/flower_vase_reduced.png b/art/nature/flower_vase_reduced.png new file mode 100644 index 0000000000000000000000000000000000000000..e9280d5c234b2fba01c1d80a21c7a8cc20aa4740 GIT binary patch literal 512 zcmeAS@N?(olHy`uVBq!ia0vp^3P5bY!VDyvno?tc6id3JuOkD)#(wTUiL5|AV{wqX z6T`Z5GB1G~g=CK)Uj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(FffQ0%-I!a1C-zo z@Ck7R(*OT6{0C7$#{UO9UrYzG8I!!-U0C`vZUzE5oCO|{#X#BvjNMLV+W{H(JzX3_ zG|sn9crD1R$k7rg#c-)1sIl|!cd-wZv*Z(>9eX_cE-UK{*Mbm+x@|mnR+pDFeVd$j zK$^u~HNL?(ST13uX2A`v$qf>VGzEV@%C5L1F!B7kbrJ{e+*I9CmT@_J6{oTG>vyfX zAwle~qJONcU2`TSw%Vk1)t1{)-!=s0@T)W)U7~d=aZh>;v&$s0o$;2nCTH2SMXoI{ z@nqF$Ddb$B)U;fuA%e?6PkP2ntu;?swlmesnrqmL{aL-kX@mZMhB)&bqR-!5`_KNA z;p)NW8+Wr-p1&)z=M?7y4#UGSPq@Fb$WASD-B1Sfs%nXAL`h0wNvc(HQ7VvPFfuSS z)ip5IH8c(}GO#i+wKA~OH88OHq)$ literal 0 HcmV?d00001 diff --git a/art/nature/kiwi.png b/art/nature/kiwi.png deleted file mode 100644 index 0941f66871032547957ab2189ac057c87cdbf1e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 665 zcmV;K0%rY*P)Aps2`E{r>uE;TNUMkOvJ!G&?5 zQ4?2MQ5SWiQNtjEP$p@G1Ze5NE3~vccTH*m7vAl?=gT?&e-HfU5q7%_e!8wi1c9(G zK$I}WXM0oL?+93RTu~N(^^<0)K*}n?;~rtr?d3p00aYE(6FSv);%|M8%8F;6(0UMg zL&oDC#x?Cm(ZsHaCz~prfo?Lymbbv&()$@d!4% z6?<-eGN7-=sEFxhL^reWEyeikSY&Q!4;962NK!fbnvF!GGVw@^K+wQeW}%P-SW*SC z+gf;h>obMfQ5KvWv*DScU2{my>5;%*>?U`H=JNCull( z98;zZm0Hc++k@0MeWaxDAiB~Rjcu=!{!YSyL9e55|0y2bbKrb`A6b?uEo`Qw3|>6> z$@1C^F8`O5jU^n!*Fy-pX|CO*F|mv>@+veeL^3$nnNPOGgrM@#+UERs7asH(mAw3F(o}jxQG-S_<6Rl&u==8K zq@^n*!nS34bF)ryZB3(Ogs9Zl($M{3$I|@)wqoWs{9SVG00000NkvXXu0mjfTkbdv 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 0000000000000000000000000000000000000000..4620c405812782ccc9ce4e9cfba0fbafa1fa83aa GIT binary patch literal 581 zcmeAS@N?(olHy`uVBq!ia0vp^4j{}3Bp8~6e2Re-OS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lweBo zc6VW5yxS$b1jyqo@Q4H%?*YbcC$sH)-MxMK8uugKJQ+Jr zDJqEx1?c#TaMm3t%~DR^FyT+r6zPtn%$Y`v+S>Jp6a_DF{9~!_GCsZb?9tZSwbuD* z@7_u$T!RfUd)SfQ-Y_K+(ndQ8gsqfk&Hr}CgXFOeh^CB;IhyJV?ADWL`6OmQV zHaXJ$(0+}>zG4>--Js>0($AWQa~fW-p-}jVEk(tZ%T-dUvpy{Z{k3`40~?=e2%fUjH$ro^kFJ zW7!u*P2s>GRV{IiC`m~yNwrEYN(E93Mh1qax(3F&hQ=XA2397fR)$8p1}0Vp2AvTe fjVKy&^HVa@DsgN0!TP}#sDZ)L)z4*}Q$iB}J4W1S literal 0 HcmV?d00001 diff --git a/art/nature/palm_scaled_g.png b/art/nature/palm_scaled_g.png new file mode 100644 index 0000000000000000000000000000000000000000..7e1fd0c0b12475563012cef153d312b501ff6043 GIT binary patch literal 588 zcmeAS@N?(olHy`uVBq!ia0vp^4j{}3Bp8~6e2Re-OS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lweBo zc6VW5yxS$b1jyqo@Q4H%?*YbcC$sHu`Vw`-jPGW?WveF3rw& z&M5788F1p&8vO?k9*M9!woEGfB6#Q33uBH;U0jd2Z@5aiF65J9f9ac9{D0o$XMS5F zKRuo|r`nF=qJ95dsSM^bEzQdsEicw=ifZ|^dsR)pI)}xT6aEfjyLxi(mRv}mleH>M zC@VASVssDh+578-W$g_%@de(!Xy3SHiSCk%wu=)PZ%oWP*SOH6DbFMz=t0_rhLR_m za~vnl5nT6CcdfSHB(F(#62O^wn+9L6is=Sy?hU95XlIPK%duS#dvt5(?WN;%Wok=?Xu zbyEDY4f)?6+umI2nzzT~U`>tT&G(P8H@^53-PqMwn^0iUTF0n8x5?i6OU8!me|@aM zQ@;Dvn;&0wa2BVAF)(CROI#yLQW8s2t&)pUffR$0fuX6cfw8Wkafp$Dm5Hg9p^>hE miIsstXM{&1iiX_$l+3hB+!}tcey{~45bDP46hOx7_4S6Fo+k-*%fF5lweBo zc6VW5yxS$b1jyqo@Q4H%?*YbcC$sHAa}3G$?JRem;Nt9@;4QI*Bhbm2U8De~!D zmo}+>aw~M9^X#N>yy~}XI^POVx2Mep7F2D3dXj|Ev34hLrElQrHQODIC z8+<3*45bDP46hOx7_4S6Fo+k-*%fF5lweBo zc6VW5yxS$b1jyqo@Q4H%?*YbcC$sH)-Mzg$vcIF;aKTfp z_KpY-hmAIYDnA&nuk4+3(CHI*P@Y29($rHdYu5bXY?4hLYpwIs zzP;tya6;%$deOPXV#hQ1zwNnxN$j@dipxWaX3@Vmns}ZvJCxxhs+Jq-&R8y+=;(#iC7Y zwR!hIR2lNU$Ry?}4!o=}#<1A|nR*S#nj ca`RI%(<*Um5UC6{1ZrULboFyt=akR{0K9S74FCWD literal 0 HcmV?d00001 diff --git a/art/nature/palm_scaled_reduced_g.png b/art/nature/palm_scaled_reduced_g.png new file mode 100644 index 0000000000000000000000000000000000000000..8ec09a8d1d4255ce8a586fbe6a04b63fa441ca91 GIT binary patch literal 588 zcmeAS@N?(olHy`uVBq!ia0vp^4j{}3Bp8~6e2Re-OS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lweBo zc6VW5yxS$b1jyqo@Q4H%?*YbcC$sHu`Vw`-jPGW?WveF3rw& z&M5788F1p&8vO?k9*M9!woEGfB6#Q33uBH;U0jd2Z@5aiF65J9f9ac9{D0o$XMS5F zKRuo|r`nF=qJ95dsSM^bEzQdsEicw=ifZ|^dsR)pI)}xT6aEfjyLxi(mRv}mleH>M zC@VASVssDh+578-W$g_%@de(!Xy3SHiSCk%wu=)PZ%oWP*SOH6DbFMz=t0_rhLR_m za~vnl5nT6CcdfSHB(F(#62O^wn+9L6is=Sy?hU95XlIPK%duS#dvt5(?WN;%Wok=?Xu zbyEDY4f)?6+umI2nzzR!@^wv(;lW4Q8((~iZtQBTO(?Kvtz*=l+hlM3C1XSOzdqLB zDc}9-%?(x^Sj^;=0}NT!64!{5l*E!$tK_0oAjM#0U}&mqV61Cs7Ghv%WoT|?VxVha lVr5{Es`9!QMMG|WN@iLmZVe)p!G=H$44$rjF6*2UngCi>-+KT6 literal 0 HcmV?d00001 diff --git a/art/nature/palm_scaled_reduced_r.png b/art/nature/palm_scaled_reduced_r.png new file mode 100644 index 0000000000000000000000000000000000000000..37e49aab3fcd0542b307874d1558a5dd168001e2 GIT binary patch literal 642 zcmeAS@N?(olHy`uVBq!ia0vp^4j{}3Bp8~6e2Re-OS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lweBo zc6VW5yxS$b1jyqo@Q4H%?*YbcC$sHAa}3G$?JRem;Nt9@;4QI*Bhbm2U8De~!D zmo}+>aw~M9^X#N>yy~}XI^POVx2Mep7F2D3dXj|Ev34hLrElQrHQODIC z8+<3*;WHn6Kh@{!iDFxba>f zVLIQ#kF1UjlVa;x`X2)0L$$;;q9i4;B-JXpC>2OC7#SFv>KYj98k&U|7+M*cTbUT> n8kkra7^JGa?nTj%o1c=IR*74KNM*1gPy>UftDnm{r-UW|x31{c literal 0 HcmV?d00001 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 8c04070cf79bf9e54605e84ad4071e710da3d5f4..53e72eea7adfe08140fd3fad9d378816ad6ab576 100644 GIT binary patch delta 176 zcmZ31wt8S6J5)Mcu_biASE!l@lERBJzJ9J4v|{fEHgwE^cCo^mR@{GD0J z_`$MaKI4~zkL&-e*d2bky&+pdz2UA{?V%4#SY_{>muEWH>+|Q|W0?v2RBTl>UjFFU z`OCWak&mq$l3NRU%L{zecJJ2WwPgg&ebxsLQ06B45bDP46hOx7_4S6Fo+k-*%fF5lweBo zc6VW5yxS$b1jyqo@Q4H%?*YbcC$sH<3?WY!#}JM4$v^m6c^3Bsvc2SCczpSvKqFjj2V0;922WQ%mvv4FO#n)RMGyc0 literal 0 HcmV?d00001 diff --git a/art/nature/water_g.png b/art/nature/water_g.png new file mode 100644 index 0000000000000000000000000000000000000000..a0c8b4df66864d1b19286b5f4065b4521ba0f4f3 GIT binary patch literal 695 zcmeAS@N?(olHy`uVBq!ia0vp^4j{}3Bp8~6e2Re-OS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lweBo zc6VW5yxS$b1jyqo@Q4H%?*YbcC$sHN zLK+LTI>dWUetx&8`@w_e_j~U@{{3J6{qGC^oP48h%dzkLXs0zLVOo1yxbRf27iaYs zOifsD-_Q4N)heg*j$5@_ii?k&I_1I4@kF1`Co98ZW6#O@lkXif)?RnA%X)w4#9I?L z{`;j5XTH0Ul(Vj{&bf`JSy9yS{G;f;3wtx%_S@R3d@xh`y5ZijpibLHhja`72(N~Y zhYm{}@7~mO$g9&cjV_b!+pA~3#H8KuWsBN$hBX^HEL3+j6a;+as@kH-J>wrk+=t(J z-}ijsoR@Hb*|*18zv{~TQ+plKs%(jWIspi!Z82!A2voE*%Wfq?{(z&Q%_PS|4k|AOU$e(WfI!{Fv`g|Z`SiW zM-CkQSN`+&hlc%DRr2LxE{yyg4|FrOA9$znXs-F=z!l7Mbnh8=?_T*bXSwYzNx6uQ z>bm*yxd)3{8UG8fXFT_1hDhi4x+q{Is+PD$l%yngTe~DWM4f0{R(s literal 0 HcmV?d00001 diff --git a/art/nature/water_r.png b/art/nature/water_r.png new file mode 100644 index 0000000000000000000000000000000000000000..47051aa2f1e1d92ab655f87e0abb95d117186f10 GIT binary patch literal 406 zcmeAS@N?(olHy`uVBq!ia0vp^4j{}3Bp8~6e2Re-OS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lweBo zc6VW5yxS$b1jyqo@Q4H%?*YbcC$sHmnSeaFMmM z`HkSVB~LW=F@|qC!fGM3(frY62iHdK+xaGw`MHcPYdzod-BU|bExPOUf;ov*f9rPu;&RTXT``aN6y{a_2!z~JfX=d#Wzp$PzB C%!8Ex literal 0 HcmV?d00001 diff --git a/art/nature/water_reduced.png b/art/nature/water_reduced.png new file mode 100644 index 0000000000000000000000000000000000000000..ea3492f77d04aa4bc6ce03af33772a7617557e83 GIT binary patch literal 818 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZeimKEY7#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f-}G; z#P$FG{|rFH@Za62eJxOsG0EHAg`tC0)&r!Xz$3C4NQ2lO3~nd0?HCxC#64XcLo80O z4LX>0$ARbS!jlV^%k66a!p!wHUgwS2t>9Rljq{=vk|qAS>bKq#I>A$MPBQSN_UgiI zyFK|@olC# zYn*@E-|WT%lU(DcZSgE?74JNB-S@*P@B5OSz0wTpl8S0wlipfyl8i_?BE(l%(|Y1+ zLt6sp^s`UzSm+9{! zbDfv&I#VP+?PefLbkPpClj~*p)A%wg{Xt0#Tr z+QD}9-cyMLyQGU(Q$O3T(Ej?}QtZX~sPi0uR$eP%`J=wQbiz-MtW%+uKg@cvQ}ky> zmvr8_-e}>tX@dRJo4cgLuV@*lm2b{Ue&=QU<4T^S=i*D2$`9VOs47oSjy}KPjM=31 z{+=~8d%jFvz(09LiCF>LoMYc#wtK(c(y%+*-lFT`cC($T4ds&`AFOF{i{h5p^=&bu zSLC&i#fG&ldya(U?YnsM@Vgt2*9!~i+HAa_aPu?6Z~lgTEU&y9{-3*e?Qy}sbzc6A zZ`J?Bx4bl7An{r9g6Ee=&r^5&di`al&iG}Opcwr^- literal 0 HcmV?d00001 diff --git a/art/nature/wine.png b/art/nature/wine.png deleted file mode 100644 index 13cb97271c7eff27a1cffe9e32c6c757714b1e62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 586 zcmV-Q0=4~#P)1ve5JDPa)edPvEP`MM!Ocn$K_>?(4&u;)xJVJlIw;twqhxZ?QEV4?mkv@y z&?S>lP^8inM3JME5F`{I2mjN%>s^hCFMQmQ@Bg0f{r}u|S0YFyp>iUI!f(4F`thPt zsr0KtMJ=oI2KD=Wd%fPa3ANj8)kdb_Pr$gksy+>i%859o-cp~d7h=Fr8pBcGQLwp_ zu)Pc10d4?~fo5Eg1snr+8qqbYOEc$G{#{vJPt7 z-L9UU-oHEO#DwbU>>2b93=iL<-uQj*xw&`1`>X@h37403bhNm8v#ENqXqZs1xVWgb z+TP+y#W%CFs`dQ zTm{Yp9iT;KM)KZB*%%KKcs(y4cNs)GMTtQHdE@;@fPPV8P{6l;1r)9u6i_Zo{C5Y1 zod*TPFO9!G#7W=@KRznCDzaDurhzlSZD2V-UIJgpdoB{s_}#?EcrA*eHTAw}or`DT YJIGh!x9*EKPyhe`07*qoM6N<$g45*&Y5)KL 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 3f31bc2ac46dd1f1817d0601bcea41901794d126..1eacb380698ddf5ca946d3e3aad4d0f6f1172771 100644 GIT binary patch delta 129 zcmV-{0Dk|p2et>WJp*}UNklV(GXpm%0MI!NS%82P01yJ!_SpG)z&OF(K)?q8|BZI1B(M%G7;Kks h0Qw061k?b)0Ui2`Zh+a%8~^|S002ovPDHLkV1mV$F^m8J 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