From 8e56fa7668cd5d65542d9cdc15bd134da411c908 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Mon, 22 Apr 2013 15:42:26 -0400 Subject: [PATCH] Filename cleanup Avoid spaces and parens, adjust code, change the r-logo name. --- collects/games/scribblings/tally-maze.scrbl | 2 +- collects/games/tally-maze/game.rkt | 16 ++++++---------- .../{bmps => images}/pumpkin/pumpkin-48x48.png | Bin .../{bmps => images}/pumpkin/pumpkin-64x64.png | Bin .../64 (1).png => images/very-emotional/01.png} | Bin .../very-emotional/19.png} | Bin .../very-emotional/20.png} | Bin .../very-emotional/21.png} | Bin .../very-emotional/35.png} | Bin .../very-emotional/36.png} | Bin .../very-emotional/37.png} | Bin ...ass-256x256.png => r-logo-glass-256x256.png} | Bin ...c-256x256.png => r-logo-plastic-256x256.png} | Bin 13 files changed, 7 insertions(+), 11 deletions(-) rename collects/games/tally-maze/{bmps => images}/pumpkin/pumpkin-48x48.png (100%) rename collects/games/tally-maze/{bmps => images}/pumpkin/pumpkin-64x64.png (100%) rename collects/games/tally-maze/{bmps/very-emotional/64 (1).png => images/very-emotional/01.png} (100%) rename collects/games/tally-maze/{bmps/very-emotional/64 (19).png => images/very-emotional/19.png} (100%) rename collects/games/tally-maze/{bmps/very-emotional/64 (20).png => images/very-emotional/20.png} (100%) rename collects/games/tally-maze/{bmps/very-emotional/64 (21).png => images/very-emotional/21.png} (100%) rename collects/games/tally-maze/{bmps/very-emotional/64 (35).png => images/very-emotional/35.png} (100%) rename collects/games/tally-maze/{bmps/very-emotional/64 (36).png => images/very-emotional/36.png} (100%) rename collects/games/tally-maze/{bmps/very-emotional/64 (37).png => images/very-emotional/37.png} (100%) rename collects/icons/{racket-logo-glass-256x256.png => r-logo-glass-256x256.png} (100%) rename collects/icons/{racket-logo-plastic-256x256.png => r-logo-plastic-256x256.png} (100%) diff --git a/collects/games/scribblings/tally-maze.scrbl b/collects/games/scribblings/tally-maze.scrbl index e297a9ae25..48b8d30a4a 100644 --- a/collects/games/scribblings/tally-maze.scrbl +++ b/collects/games/scribblings/tally-maze.scrbl @@ -47,4 +47,4 @@ Not all games are winnable (although I hope most are). Thanks to Lazy Crazy (@url{http://lazycrazy.deviantart.com}) for the blue ball icons and to YOOtheme (@url{http://www.yootheme.com/icons}) -for the pumpkin icon. \ No newline at end of file +for the pumpkin icon. diff --git a/collects/games/tally-maze/game.rkt b/collects/games/tally-maze/game.rkt index 8d20d10faf..3c7fb32055 100644 --- a/collects/games/tally-maze/game.rkt +++ b/collects/games/tally-maze/game.rkt @@ -13,7 +13,7 @@ (provide game@) -(define-runtime-path bmps "bmps") +(define-runtime-path bmps "images") (define big-pumpkin (read-bitmap (build-path bmps "pumpkin" "pumpkin-64x64.png"))) (define two-pumpkins (make-bitmap (send big-pumpkin get-width) (send big-pumpkin get-height))) (let ([small-pumpkin (read-bitmap (build-path bmps "pumpkin" "pumpkin-48x48.png"))] @@ -116,14 +116,10 @@ (length args)))) (define players (make-hash)) -(for ([file (in-directory (build-path bmps "very-emotional"))]) - (when (regexp-match #rx"png$" (path->string file)) - (define name (path->string (last (explode-path file)))) - (define m-num (regexp-match #rx"[(]([0-9]+)[)]" name)) - (define num (if m-num - (string->number (list-ref m-num 1)) - 0)) - (hash-set! players num (read-bitmap file)))) +(for ([file (directory-list (build-path bmps "very-emotional") #:build? #t)]) + (define m (regexp-match #rx"([0-9]+)[.]png$" file)) + (when m + (hash-set! players (string->number (cadr m)) (read-bitmap file)))) (define (move dx dy) (unless (game-over?) @@ -282,4 +278,4 @@ [callback (lambda (_1 _2) (show-help))])) (send f show #t))) -(module+ main (invoke-unit game@)) \ No newline at end of file +(module+ main (invoke-unit game@)) diff --git a/collects/games/tally-maze/bmps/pumpkin/pumpkin-48x48.png b/collects/games/tally-maze/images/pumpkin/pumpkin-48x48.png similarity index 100% rename from collects/games/tally-maze/bmps/pumpkin/pumpkin-48x48.png rename to collects/games/tally-maze/images/pumpkin/pumpkin-48x48.png diff --git a/collects/games/tally-maze/bmps/pumpkin/pumpkin-64x64.png b/collects/games/tally-maze/images/pumpkin/pumpkin-64x64.png similarity index 100% rename from collects/games/tally-maze/bmps/pumpkin/pumpkin-64x64.png rename to collects/games/tally-maze/images/pumpkin/pumpkin-64x64.png diff --git a/collects/games/tally-maze/bmps/very-emotional/64 (1).png b/collects/games/tally-maze/images/very-emotional/01.png similarity index 100% rename from collects/games/tally-maze/bmps/very-emotional/64 (1).png rename to collects/games/tally-maze/images/very-emotional/01.png diff --git a/collects/games/tally-maze/bmps/very-emotional/64 (19).png b/collects/games/tally-maze/images/very-emotional/19.png similarity index 100% rename from collects/games/tally-maze/bmps/very-emotional/64 (19).png rename to collects/games/tally-maze/images/very-emotional/19.png diff --git a/collects/games/tally-maze/bmps/very-emotional/64 (20).png b/collects/games/tally-maze/images/very-emotional/20.png similarity index 100% rename from collects/games/tally-maze/bmps/very-emotional/64 (20).png rename to collects/games/tally-maze/images/very-emotional/20.png diff --git a/collects/games/tally-maze/bmps/very-emotional/64 (21).png b/collects/games/tally-maze/images/very-emotional/21.png similarity index 100% rename from collects/games/tally-maze/bmps/very-emotional/64 (21).png rename to collects/games/tally-maze/images/very-emotional/21.png diff --git a/collects/games/tally-maze/bmps/very-emotional/64 (35).png b/collects/games/tally-maze/images/very-emotional/35.png similarity index 100% rename from collects/games/tally-maze/bmps/very-emotional/64 (35).png rename to collects/games/tally-maze/images/very-emotional/35.png diff --git a/collects/games/tally-maze/bmps/very-emotional/64 (36).png b/collects/games/tally-maze/images/very-emotional/36.png similarity index 100% rename from collects/games/tally-maze/bmps/very-emotional/64 (36).png rename to collects/games/tally-maze/images/very-emotional/36.png diff --git a/collects/games/tally-maze/bmps/very-emotional/64 (37).png b/collects/games/tally-maze/images/very-emotional/37.png similarity index 100% rename from collects/games/tally-maze/bmps/very-emotional/64 (37).png rename to collects/games/tally-maze/images/very-emotional/37.png diff --git a/collects/icons/racket-logo-glass-256x256.png b/collects/icons/r-logo-glass-256x256.png similarity index 100% rename from collects/icons/racket-logo-glass-256x256.png rename to collects/icons/r-logo-glass-256x256.png diff --git a/collects/icons/racket-logo-plastic-256x256.png b/collects/icons/r-logo-plastic-256x256.png similarity index 100% rename from collects/icons/racket-logo-plastic-256x256.png rename to collects/icons/r-logo-plastic-256x256.png