id_

2015-03-25 01:38:53 -04:00 · 2015-03-25 01:38:53 -04:00 · 01d272981e
commit 01d272981e
parent b19f58726c
133 changed files with 822 additions and 66 deletions
--- a/art/_ase_orig/cloud.ase
+++ b/art/_ase_orig/cloud.ase
--- a/art/_ase_orig/crying_moai_r.ase
+++ b/art/_ase_orig/crying_moai_r.ase
--- a/art/_ase_orig/drool.ase
+++ b/art/_ase_orig/drool.ase
--- a/art/_ase_orig/eye.ase
+++ b/art/_ase_orig/eye.ase
--- a/art/_ase_orig/heart.ase
+++ b/art/_ase_orig/heart.ase
--- a/art/_ase_orig/image2_b.ase
+++ b/art/_ase_orig/image2_b.ase
--- a/art/_ase_orig/image_r.ase
+++ b/art/_ase_orig/image_r.ase
--- a/art/_ase_orig/kiiro.ase
+++ b/art/_ase_orig/kiiro.ase
--- a/art/_ase_orig/palette.png
+++ b/art/_ase_orig/palette.png
--- a/art/_ase_orig/slime_woman.ase
+++ b/art/_ase_orig/slime_woman.ase
--- a/art/_ase_orig/wall.ase
+++ b/art/_ase_orig/wall.ase
--- a/art/_ase_orig/warai.ase
+++ b/art/_ase_orig/warai.ase
--- a/art/_font/slime_a.png
+++ b/art/_font/slime_a.png
--- a/art/_font/slime_c.png
+++ b/art/_font/slime_c.png
--- a/art/_font/slime_e.png
+++ b/art/_font/slime_e.png
--- a/art/_font/slime_h.png
+++ b/art/_font/slime_h.png
--- a/art/_font/slime_i.png
+++ b/art/_font/slime_i.png
--- a/art/_font/slime_l.png
+++ b/art/_font/slime_l.png
--- a/art/_font/slime_m.png
+++ b/art/_font/slime_m.png
--- a/art/_font/slime_o.png
+++ b/art/_font/slime_o.png
--- a/art/_font/slime_r.png
+++ b/art/_font/slime_r.png
--- a/art/_font/slime_s.png
+++ b/art/_font/slime_s.png
--- a/art/_font/slime_t.png
+++ b/art/_font/slime_t.png
--- a/art/_process/cone.png
+++ b/art/_process/cone.png
--- a/art/_process/kanashi.png
+++ b/art/_process/kanashi.png
--- a/art/_process/kinoko.png
+++ b/art/_process/kinoko.png
--- a/art/_process/lisa.png
+++ b/art/_process/lisa.png
--- a/art/test_object.png
+++ b/art/test_object.png
--- a/art/_ui/blue.png
+++ b/art/_ui/blue.png
--- a/art/_ui/cancel.png
+++ b/art/_ui/cancel.png
--- a/art/_ui/confirm.png
+++ b/art/_ui/confirm.png
--- a/art/_ui/folder.png
+++ b/art/_ui/folder.png
--- a/art/_ui/forward.png
+++ b/art/_ui/forward.png
--- a/art/_ui/green.png
+++ b/art/_ui/green.png
--- a/art/_ui/red.png
+++ b/art/_ui/red.png
--- a/art/_ui/save.png
+++ b/art/_ui/save.png
--- a/art/_ui/white.png
+++ b/art/_ui/white.png
--- a/art/_ui/world.png
+++ b/art/_ui/world.png
--- a/art/door_locked.png
+++ b/art/door_locked.png
--- a/art/door_locked_W.png
+++ b/art/door_locked_W.png
--- a/art/game/ahhh/switch_b.png
+++ b/art/game/ahhh/switch_b.png
--- a/art/game/ahhh/switch_g.png
+++ b/art/game/ahhh/switch_g.png
--- a/art/game/ahhh/switch_r.png
+++ b/art/game/ahhh/switch_r.png
--- a/art/game/color_changing_floor_tile.png
+++ b/art/game/color_changing_floor_tile.png
--- a/art/game/color_changing_floor_tile_b.png
+++ b/art/game/color_changing_floor_tile_b.png
--- a/art/game/color_changing_floor_tile_g.png
+++ b/art/game/color_changing_floor_tile_g.png
--- a/art/game/color_changing_floor_tile_r.png
+++ b/art/game/color_changing_floor_tile_r.png
--- a/art/game/color_changing_wall.png
+++ b/art/game/color_changing_wall.png
--- a/art/game/door_locked_b.png
+++ b/art/game/door_locked_b.png
--- a/art/game/door_locked_g.png
+++ b/art/game/door_locked_g.png
--- a/art/game/door_locked_r.png
+++ b/art/game/door_locked_r.png
--- a/art/game/door_locked_w.png
+++ b/art/game/door_locked_w.png
--- a/art/game/door_unlocked.png
+++ b/art/game/door_unlocked.png
--- a/art/game/palette.png
+++ b/art/game/palette.png
--- a/art/game/player.png
+++ b/art/game/player.png
--- a/art/game/player_b.png
+++ b/art/game/player_b.png
--- a/art/game/player_g.png
+++ b/art/game/player_g.png
--- a/art/game/player_r.png
+++ b/art/game/player_r.png
--- a/art/game/player_sad.png
+++ b/art/game/player_sad.png
--- a/art/game/player_w.png
+++ b/art/game/player_w.png
--- a/art/game/static_wall.png
+++ b/art/game/static_wall.png
--- a/art/game/switch_b.png
+++ b/art/game/switch_b.png
--- a/art/game/switch_g.png
+++ b/art/game/switch_g.png
--- a/art/game/switch_pressed.png
+++ b/art/game/switch_pressed.png
--- a/art/game/switch_r.png
+++ b/art/game/switch_r.png
--- a/art/game/switch_reduced.png
+++ b/art/game/switch_reduced.png
--- a/art/game/wall_b.png
+++ b/art/game/wall_b.png
--- a/art/game/wall_g.png
+++ b/art/game/wall_g.png
--- a/art/game/wall_r.png
+++ b/art/game/wall_r.png
--- a/art/game2/processed/switch_reduced.png
+++ b/art/game2/processed/switch_reduced.png
--- a/art/game2/switch.png
+++ b/art/game2/switch.png
--- a/art/house/books_stack.png
+++ b/art/house/books_stack.png
--- a/art/house/processed/books_stack_b.png
+++ b/art/house/processed/books_stack_b.png
--- a/art/house/processed/books_stack_g.png
+++ b/art/house/processed/books_stack_g.png
--- a/art/house/processed/books_stack_r.png
+++ b/art/house/processed/books_stack_r.png
--- a/art/house/bookshelf.png
+++ b/art/house/bookshelf.png
--- a/art/house/processed/bookshelf_b.png
+++ b/art/house/processed/bookshelf_b.png
--- a/art/house/processed/bookshelf_g.png
+++ b/art/house/processed/bookshelf_g.png
--- a/art/house/processed/bookshelf_r.png
+++ b/art/house/processed/bookshelf_r.png
--- a/art/house/processed/books_stack_reduced.png
+++ b/art/house/processed/books_stack_reduced.png
--- a/art/house/processed/bookshelf_reduced.png
+++ b/art/house/processed/bookshelf_reduced.png
--- a/art/house/processed/table_reduced.png
+++ b/art/house/processed/table_reduced.png
--- a/art/house/processed/toilet_reduced.png
+++ b/art/house/processed/toilet_reduced.png
--- a/art/house/table.png
+++ b/art/house/table.png
--- a/art/house/processed/table_b.png
+++ b/art/house/processed/table_b.png
--- a/art/house/processed/table_g.png
+++ b/art/house/processed/table_g.png
--- a/art/house/processed/table_r.png
+++ b/art/house/processed/table_r.png
--- a/art/house/toilet.png
+++ b/art/house/toilet.png
--- a/art/house/processed/toilet_b.png
+++ b/art/house/processed/toilet_b.png
--- a/art/house/processed/toilet_g.png
+++ b/art/house/processed/toilet_g.png
--- a/art/house/processed/toilet_r.png
+++ b/art/house/processed/toilet_r.png
--- a/art/reduce_and_extract.sh
+++ b/art/reduce_and_extract.sh
@ -6,7 +6,7 @@ do

 	echo "mapping $f to palette..."

-	convert $f +dither -map ../palette "processed/${NAME}_reduced.png"
+	convert $f +dither -map ../palette.png "processed/${NAME}_reduced.png"

 	TARGET="processed/${NAME}_reduced.png"

--- a/art/tech/processed/cd_b.png
+++ b/art/tech/processed/cd_b.png
--- a/art/tech/processed/cd_g.png
+++ b/art/tech/processed/cd_g.png
--- a/art/tech/processed/cd_r.png
+++ b/art/tech/processed/cd_r.png
--- a/art/tech/processed/cd_reduced.png
+++ b/art/tech/processed/cd_reduced.png
--- a/art/tech/processed/image2_b.png
+++ b/art/tech/processed/image2_b.png
--- a/art/tech/processed/image2_g.png
+++ b/art/tech/processed/image2_g.png
--- a/art/tech/processed/image2_r.png
+++ b/art/tech/processed/image2_r.png
--- a/art/tech/processed/image_b.png
+++ b/art/tech/processed/image_b.png
--- a/Show more
+++ b/Show more