[nongnu] elpa/pacmacs b7caafa647 436/472: Merge pull request #200 from codingteam/customize-level-folder-191

[ELPA Syncer]

branch: elpa/pacmacs
commit b7caafa647c9bd988db50919765ede7c2e55efe7
Merge: 542e38a612 7f980e59a4
Author: Alexey Kutepov <reximkut@gmail.com>
Commit: Alexey Kutepov <reximkut@gmail.com>

    Merge pull request #200 from codingteam/customize-level-folder-191
    
    Customize level folder
---
 Cask                          |  1 +
 pacmacs.el                    | 47 +++++++++++++++++++++++++++++++++++++------
 {maps => signs}/game-over.txt |  0
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/Cask b/Cask
index 9f5be6eb2f..f266b0edf2 100644
--- a/Cask
+++ b/Cask
@@ -5,6 +5,7 @@
 
 (files "*.el"
        ("maps" "maps/*.txt")
+       ("signs" "signs/*.txt")
        ("sprites" "sprites/*.json")
        ("sprites" "sprites/*.xpm"))
 
diff --git a/pacmacs.el b/pacmacs.el
index 0ac35b98d8..8e008f0fa8 100644
--- a/pacmacs.el
+++ b/pacmacs.el
@@ -83,6 +83,18 @@
 
 (defvar pacmacs-waiting-counter 0)
 
+(defgroup pacmacs nil
+  "Customizations for Pacmacs game."
+  :prefix "pacmacs-"
+  :group 'wp
+  :link '(url-link "https://github.com/codingteam/pacmacs.el";))
+
+(defcustom pacmacs-levels-folder nil
+  "A folder from where the Pacmacs game loads its levels."
+  :group 'pacmacs
+  :type '(radio (const :tag "Default path")
+                (directory :tag "Custom path")))
+
 (define-derived-mode pacmacs-mode special-mode "pacmacs-mode"
   (define-key pacmacs-mode-map (kbd "<up>") 'pacmacs-up)
   (define-key pacmacs-mode-map (kbd "<down>") 'pacmacs-down)
@@ -111,6 +123,12 @@
   (setq pacmacs-lives 3)
   (setq pacmacs-score 0)
   (setq pacmacs-levels (pacmacs--get-list-of-levels))
+
+  (when (zerop (length pacmacs-levels))
+    (error (concat "`%s' doesn't contain levels. Nothing to play. "
+                   "Customize `pacmacs-levels-folder' accordingly")
+           (pacmacs--get-levels-folder)))
+
   (setq pacmacs-current-level 0)
 
   (pacmacs--load-current-level)
@@ -574,7 +592,7 @@
       (widget-delete widget))))
 
 (defun pacmacs--switch-to-game-over-state ()
-  (pacmacs--load-map "game-over")
+  (pacmacs--load-map-sign "game-over")
   (pacmacs-destroy)
   (setq pacmacs-game-state 'game-over)
   (pacmacs--render-state)
@@ -695,8 +713,17 @@
   (when (equal pacmacs-game-state 'play)
     (setq pacmacs-play-pause (not pacmacs-play-pause))))
 
+(defun pacmacs--get-levels-folder ()
+  (if pacmacs-levels-folder
+      pacmacs-levels-folder
+    (pacmacs--find-resource-file "./maps/")))
+
 (defun pacmacs--get-list-of-levels ()
-  (->> (directory-files (pacmacs--find-resource-file "./maps/"))
+  (->> (condition-case err
+           (directory-files (pacmacs--get-levels-folder))
+         (file-error (error (concat "Error during loading levels: `%s'. "
+                                    "Customize `pacmacs-levels-folder' 
accordingly.")
+                            err)))
        (-map #'pacmacs--levelname-from-filename)
        (-remove #'null)
        (-sort #'string-lessp)
@@ -711,10 +738,18 @@
                  (pacmacs--possible-diagonal-ways row column)))))
 
 (defun pacmacs--load-map (map-name)
-  (let* ((lines (split-string (->> map-name
-                                   (format "./maps/%s.txt")
-                                   (pacmacs--find-resource-file)
-                                   (f-read-text))
+  (->> map-name
+       (format "%s/%s.txt" (pacmacs--get-levels-folder))
+       (pacmacs--load-map-file)))
+
+(defun pacmacs--load-map-sign (sign-name)
+  (->> sign-name
+       (format "./signs/%s.txt")
+       (pacmacs--find-resource-file)
+       (pacmacs--load-map-file)))
+
+(defun pacmacs--load-map-file (map-file-name)
+  (let* ((lines (split-string (f-read-text map-file-name)
                               "\n" t))
          (board-width (apply 'max (mapcar #'length lines)))
          (board-height (length lines)))
diff --git a/maps/game-over.txt b/signs/game-over.txt
similarity index 100%
rename from maps/game-over.txt
rename to signs/game-over.txt