branch: elpa/pacmacs
commit 4ef8e6cdb411c77166a1637e0fff131413fc0a82
Merge: eab5b98b05 69437be130
Author: rexim <[email protected]>
Commit: rexim <[email protected]>
Merge branch 'big-pills-81'. Close #81
---
maps/map01.txt | 2 +-
pacmacs.el | 20 ++++++++---
sprites/Big-Pill.json | 4 +--
sprites/Big-Pill.xpm | 85 +++++++++++++++++++++++------------------------
sprites/src/Big-Pill.ase | Bin 875 -> 660 bytes
5 files changed, 60 insertions(+), 51 deletions(-)
diff --git a/maps/map01.txt b/maps/map01.txt
index bee14b9a8d..f5e806c521 100644
--- a/maps/map01.txt
+++ b/maps/map01.txt
@@ -1,7 +1,7 @@
##########
#o. ##
######
- ####
+ +####
#### ###..
# #. #
## #.##
diff --git a/pacmacs.el b/pacmacs.el
index 0489b93d27..a40c7c8c4f 100644
--- a/pacmacs.el
+++ b/pacmacs.el
@@ -130,11 +130,18 @@
:column column
:type 'wall))
-(defun pacmacs--make-pill (row column)
- (list :current-animation (pacmacs-load-anim "Pill")
+(defun pacmacs--make-pill (row column anim-name points)
+ (list :current-animation (pacmacs-load-anim anim-name)
:row row
:column column
- :type 'pill))
+ :type 'pill
+ :points points))
+
+(defun pacmacs--make-regular-pill (row column)
+ (pacmacs--make-pill row column "Pill" 10))
+
+(defun pacmacs--make-big-pill (row column)
+ (pacmacs--make-pill row column "Big-Pill" 50))
(defun pacmacs--make-ghost (row column)
(list :row row
@@ -329,7 +336,7 @@
(column :column))
pacmacs--player-state
(-when-let (pill (pacmacs--pill-at-p row column))
- (setq pacmacs-score (+ pacmacs-score 10))
+ (setq pacmacs-score (+ pacmacs-score (plist-get pill :points)))
(setq pacmacs--pills (-remove (-partial #'eql pill) pacmacs--pills))
(pacmacs--remove-object pill))))
@@ -544,7 +551,10 @@
(add-to-list 'pacmacs--wall-cells
(pacmacs--make-wall-cell row column)))
((char-equal x ?.)
- (add-to-list 'pacmacs--pills (pacmacs--make-pill
row column)))
+ (add-to-list 'pacmacs--pills
(pacmacs--make-regular-pill row column)))
+
+ ((char-equal x ?+)
+ (add-to-list 'pacmacs--pills
(pacmacs--make-big-pill row column)))
((char-equal x ?o)
(setq pacmacs--player-state (pacmacs--make-player
row column)))
diff --git a/sprites/Big-Pill.json b/sprites/Big-Pill.json
index 3d92181ad9..38e5a90a24 100644
--- a/sprites/Big-Pill.json
+++ b/sprites/Big-Pill.json
@@ -5,7 +5,7 @@
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
"sourceSize": { "w": 40, "h": 40 },
- "duration": 100
+ "duration": 300
},
"Big-Pill 1.ase": {
"frame": { "x": 40, "y": 0, "w": 40, "h": 40 },
@@ -13,7 +13,7 @@
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
"sourceSize": { "w": 40, "h": 40 },
- "duration": 100
+ "duration": 300
}
},
"meta": {
diff --git a/sprites/Big-Pill.xpm b/sprites/Big-Pill.xpm
index 0af26a26e5..23ebe8fb8f 100644
--- a/sprites/Big-Pill.xpm
+++ b/sprites/Big-Pill.xpm
@@ -1,49 +1,48 @@
/* XPM */
static char *Big_Pill[] = {
/* columns rows colors chars-per-pixel */
-"80 40 3 1 ",
+"80 40 2 1 ",
" c #CBDBFC",
-". c gray100",
-"X c None",
+". c None",
/* pixels */
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ..
XXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXX .. XXXXXXXXXXXXXXXXXXXXXXXXXXXX ....
XXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXX .... XXXXXXXXXXXXXXXXXXXXXXXXXXXX ....
XXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXX .... XXXXXXXXXXXXXXXXXXXXXXXXXXXX ..
XXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXX .. XXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+".................
.........................................................",
+"...............
.......................................................",
+"...............
.......................................................",
+"..............
......................................................",
+"..............
......................................................",
+"..............
......................................................",
+"..............
......................................................",
+"..............
......................................................",
+"..............
......................................................",
+"...............
.......................................................",
+"...............
.......................................................",
+".................
.........................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................",
+"................................................................................"
};
diff --git a/sprites/src/Big-Pill.ase b/sprites/src/Big-Pill.ase
index 2b6446c231..5a7471a802 100644
Binary files a/sprites/src/Big-Pill.ase and b/sprites/src/Big-Pill.ase differ
