[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/pacmacs 93d8b91792 266/472: Merge branch 'automate-sprite-
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/pacmacs 93d8b91792 266/472: Merge branch 'automate-sprite-generting-26'. |
Date: |
Thu, 6 Jan 2022 21:59:30 -0500 (EST) |
branch: elpa/pacmacs
commit 93d8b91792b76255b7c05b323e0d48268912546e
Merge: 0f403095f0 b6c02d6f38
Author: rexim <reximkut@gmail.com>
Commit: rexim <reximkut@gmail.com>
Merge branch 'automate-sprite-generting-26'.
Close #26
---
sprites/.gitignore | 2 +
sprites/Big-Pill.json | 82 +++++++----
sprites/Makefile | 32 +++++
sprites/Pacman-Death.json | 343 +++++++++++++++++++++++++++++++++-------------
sprites/Pill.json | 82 +++++++----
5 files changed, 391 insertions(+), 150 deletions(-)
diff --git a/sprites/.gitignore b/sprites/.gitignore
new file mode 100644
index 0000000000..edb9e31526
--- /dev/null
+++ b/sprites/.gitignore
@@ -0,0 +1,2 @@
+*.raw.json
+*.png
\ No newline at end of file
diff --git a/sprites/Big-Pill.json b/sprites/Big-Pill.json
index 38e5a90a24..a459b2b549 100644
--- a/sprites/Big-Pill.json
+++ b/sprites/Big-Pill.json
@@ -1,27 +1,57 @@
-{ "frames": {
- "Big-Pill 0.ase": {
- "frame": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "sourceSize": { "w": 40, "h": 40 },
- "duration": 300
- },
- "Big-Pill 1.ase": {
- "frame": { "x": 40, "y": 0, "w": 40, "h": 40 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "sourceSize": { "w": 40, "h": 40 },
- "duration": 300
- }
- },
- "meta": {
- "app": "http://www.aseprite.org/",
- "version": "1.1.0-dev",
- "image": "Big-Pill.xpm",
- "format": "RGBA8888",
- "size": { "w": 80, "h": 40 },
- "scale": "1"
- }
+{
+ "meta": {
+ "scale": "1",
+ "size": {
+ "h": 40,
+ "w": 80
+ },
+ "format": "RGBA8888",
+ "image": "Big-Pill.xpm",
+ "version": "1.1.0-dev",
+ "app": "http://www.aseprite.org/"
+ },
+ "frames": {
+ "Big-Pill 1.ase": {
+ "duration": 300,
+ "sourceSize": {
+ "h": 40,
+ "w": 40
+ },
+ "spriteSourceSize": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ },
+ "trimmed": false,
+ "rotated": false,
+ "frame": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 40
+ }
+ },
+ "Big-Pill 0.ase": {
+ "duration": 300,
+ "sourceSize": {
+ "h": 40,
+ "w": 40
+ },
+ "spriteSourceSize": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ },
+ "trimmed": false,
+ "rotated": false,
+ "frame": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ }
+ }
+ }
}
diff --git a/sprites/Makefile b/sprites/Makefile
new file mode 100644
index 0000000000..ebbf8879b4
--- /dev/null
+++ b/sprites/Makefile
@@ -0,0 +1,32 @@
+PILL=Pill.json Pill.xpm
+BIG_PILL=Big-Pill.json Big-Pill.xpm
+PACMAN_DEATH=Pacman-Death.json Pacman-Death.xpm
+
+all: $(PILL) $(BIG_PILL) $(PACMAN_DEATH) Makefile
+
+Pill.json: Pill.raw.json
+ jq ".meta.image |= \"Pill.xpm\"" Pill.raw.json > Pill.json
+
+Pill.xpm: Pill.png
+ convert Pill.png Pill.xpm
+
+Pill.raw%json Pill%png: src/Pill.ase
+ aseprite -b src/Pill.ase --sheet Pill$*png --data Pill.raw$*json
+
+Big-Pill.json: Big-Pill.raw.json
+ jq ".meta.image |= \"Big-Pill.xpm\"" Big-Pill.raw.json > Big-Pill.json
+
+Big-Pill.xpm: Big-Pill.png
+ convert Big-Pill.png Big-Pill.xpm
+
+Big-Pill.raw%json Big-Pill%png: src/Big-Pill.ase
+ aseprite -b src/Big-Pill.ase --sheet Big-Pill$*png --data
Big-Pill.raw$*json
+
+Pacman-Death.json: Pacman-Death.raw.json
+ jq ".meta.image |= \"Pacman-Death.xpm\"" Pacman-Death.raw.json >
Pacman-Death.json
+
+Pacman-Death.xpm: Pacman-Death.png
+ convert Pacman-Death.png Pacman-Death.xpm
+
+Pacman-Death.raw%json Pacman-Death%png: src/Pacman-Death.ase
+ aseprite -b src/Pacman-Death.ase --sheet Pacman-Death$*png --data
Pacman-Death.raw$*json
diff --git a/sprites/Pacman-Death.json b/sprites/Pacman-Death.json
index d8295fc3c9..b3ed2b66a7 100644
--- a/sprites/Pacman-Death.json
+++ b/sprites/Pacman-Death.json
@@ -1,99 +1,246 @@
-{ "frames": {
- "Pacman-Death 0.ase": {
- "frame": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "sourceSize": { "w": 40, "h": 40 },
- "duration": 100
- },
- "Pacman-Death 1.ase": {
- "frame": { "x": 40, "y": 0, "w": 40, "h": 40 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "sourceSize": { "w": 40, "h": 40 },
- "duration": 100
- },
- "Pacman-Death 2.ase": {
- "frame": { "x": 80, "y": 0, "w": 40, "h": 40 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "sourceSize": { "w": 40, "h": 40 },
- "duration": 100
- },
- "Pacman-Death 3.ase": {
- "frame": { "x": 120, "y": 0, "w": 40, "h": 40 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "sourceSize": { "w": 40, "h": 40 },
- "duration": 100
- },
- "Pacman-Death 4.ase": {
- "frame": { "x": 160, "y": 0, "w": 40, "h": 40 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "sourceSize": { "w": 40, "h": 40 },
- "duration": 100
- },
- "Pacman-Death 5.ase": {
- "frame": { "x": 200, "y": 0, "w": 40, "h": 40 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "sourceSize": { "w": 40, "h": 40 },
- "duration": 100
- },
- "Pacman-Death 6.ase": {
- "frame": { "x": 240, "y": 0, "w": 40, "h": 40 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "sourceSize": { "w": 40, "h": 40 },
- "duration": 100
- },
- "Pacman-Death 7.ase": {
- "frame": { "x": 280, "y": 0, "w": 40, "h": 40 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "sourceSize": { "w": 40, "h": 40 },
- "duration": 100
- },
- "Pacman-Death 8.ase": {
- "frame": { "x": 320, "y": 0, "w": 40, "h": 40 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "sourceSize": { "w": 40, "h": 40 },
- "duration": 200
- },
- "Pacman-Death 9.ase": {
- "frame": { "x": 360, "y": 0, "w": 40, "h": 40 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "sourceSize": { "w": 40, "h": 40 },
- "duration": 200
- },
- "Pacman-Death 10.ase": {
- "frame": { "x": 400, "y": 0, "w": 40, "h": 40 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "sourceSize": { "w": 40, "h": 40 },
- "duration": 400
- }
- },
- "meta": {
- "app": "http://www.aseprite.org/",
- "version": "1.1.0-dev",
- "image": "Pacman-Death.png",
- "format": "RGBA8888",
- "size": { "w": 440, "h": 40 },
- "scale": "1"
- }
+{
+ "meta": {
+ "scale": "1",
+ "size": {
+ "h": 40,
+ "w": 440
+ },
+ "format": "RGBA8888",
+ "image": "Pacman-Death.xpm",
+ "version": "1.1.0-dev",
+ "app": "http://www.aseprite.org/"
+ },
+ "frames": {
+ "Pacman-Death 10.ase": {
+ "duration": 400,
+ "sourceSize": {
+ "h": 40,
+ "w": 40
+ },
+ "spriteSourceSize": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ },
+ "trimmed": false,
+ "rotated": false,
+ "frame": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 400
+ }
+ },
+ "Pacman-Death 9.ase": {
+ "duration": 200,
+ "sourceSize": {
+ "h": 40,
+ "w": 40
+ },
+ "spriteSourceSize": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ },
+ "trimmed": false,
+ "rotated": false,
+ "frame": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 360
+ }
+ },
+ "Pacman-Death 8.ase": {
+ "duration": 200,
+ "sourceSize": {
+ "h": 40,
+ "w": 40
+ },
+ "spriteSourceSize": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ },
+ "trimmed": false,
+ "rotated": false,
+ "frame": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 320
+ }
+ },
+ "Pacman-Death 0.ase": {
+ "duration": 100,
+ "sourceSize": {
+ "h": 40,
+ "w": 40
+ },
+ "spriteSourceSize": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ },
+ "trimmed": false,
+ "rotated": false,
+ "frame": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ }
+ },
+ "Pacman-Death 1.ase": {
+ "duration": 100,
+ "sourceSize": {
+ "h": 40,
+ "w": 40
+ },
+ "spriteSourceSize": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ },
+ "trimmed": false,
+ "rotated": false,
+ "frame": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 40
+ }
+ },
+ "Pacman-Death 2.ase": {
+ "duration": 100,
+ "sourceSize": {
+ "h": 40,
+ "w": 40
+ },
+ "spriteSourceSize": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ },
+ "trimmed": false,
+ "rotated": false,
+ "frame": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 80
+ }
+ },
+ "Pacman-Death 3.ase": {
+ "duration": 100,
+ "sourceSize": {
+ "h": 40,
+ "w": 40
+ },
+ "spriteSourceSize": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ },
+ "trimmed": false,
+ "rotated": false,
+ "frame": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 120
+ }
+ },
+ "Pacman-Death 4.ase": {
+ "duration": 100,
+ "sourceSize": {
+ "h": 40,
+ "w": 40
+ },
+ "spriteSourceSize": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ },
+ "trimmed": false,
+ "rotated": false,
+ "frame": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 160
+ }
+ },
+ "Pacman-Death 5.ase": {
+ "duration": 100,
+ "sourceSize": {
+ "h": 40,
+ "w": 40
+ },
+ "spriteSourceSize": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ },
+ "trimmed": false,
+ "rotated": false,
+ "frame": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 200
+ }
+ },
+ "Pacman-Death 6.ase": {
+ "duration": 100,
+ "sourceSize": {
+ "h": 40,
+ "w": 40
+ },
+ "spriteSourceSize": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ },
+ "trimmed": false,
+ "rotated": false,
+ "frame": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 240
+ }
+ },
+ "Pacman-Death 7.ase": {
+ "duration": 100,
+ "sourceSize": {
+ "h": 40,
+ "w": 40
+ },
+ "spriteSourceSize": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ },
+ "trimmed": false,
+ "rotated": false,
+ "frame": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 280
+ }
+ }
+ }
}
diff --git a/sprites/Pill.json b/sprites/Pill.json
index 65ce904c18..6373ea647c 100644
--- a/sprites/Pill.json
+++ b/sprites/Pill.json
@@ -1,27 +1,57 @@
-{ "frames": {
- "Pill 0.ase": {
- "frame": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "sourceSize": { "w": 40, "h": 40 },
- "duration": 100
- },
- "Pill 1.ase": {
- "frame": { "x": 40, "y": 0, "w": 40, "h": 40 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 },
- "sourceSize": { "w": 40, "h": 40 },
- "duration": 100
- }
- },
- "meta": {
- "app": "http://www.aseprite.org/",
- "version": "1.1.0-dev",
- "image": "Pill.xpm",
- "format": "RGBA8888",
- "size": { "w": 80, "h": 40 },
- "scale": "1"
- }
+{
+ "meta": {
+ "scale": "1",
+ "size": {
+ "h": 40,
+ "w": 80
+ },
+ "format": "RGBA8888",
+ "image": "Pill.xpm",
+ "version": "1.1.0-dev",
+ "app": "http://www.aseprite.org/"
+ },
+ "frames": {
+ "Pill 1.ase": {
+ "duration": 100,
+ "sourceSize": {
+ "h": 40,
+ "w": 40
+ },
+ "spriteSourceSize": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ },
+ "trimmed": false,
+ "rotated": false,
+ "frame": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 40
+ }
+ },
+ "Pill 0.ase": {
+ "duration": 100,
+ "sourceSize": {
+ "h": 40,
+ "w": 40
+ },
+ "spriteSourceSize": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ },
+ "trimmed": false,
+ "rotated": false,
+ "frame": {
+ "h": 40,
+ "w": 40,
+ "y": 0,
+ "x": 0
+ }
+ }
+ }
}
- [nongnu] elpa/pacmacs fe40eb20c7 190/472: Merge branch 'coverage-dropped-124' (#124), (continued)
- [nongnu] elpa/pacmacs fe40eb20c7 190/472: Merge branch 'coverage-dropped-124' (#124), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 8e36b66a6f 199/472: Make object-board contain list of object (#126), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 6b43cde65d 223/472: Add big pill game object (#81), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 0546e964b1 222/472: Connected walls proof of concept for #131, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 19ffa64f7e 230/472: Merge branch 'master' into connecte-walls, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs e0856fc881 244/472: Refactor wall tiles functions (#131):, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 79aa80e1d2 245/472: Merge branch 'connecte-walls'. Close #131, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 2b9811e71b 246/472: Add README for tools, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 8e00815b4f 253/472: Disable undo for Pacmacs buffer. Close #143, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 8a79a510ea 257/472: Blinking big pill (#81), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 93d8b91792 266/472: Merge branch 'automate-sprite-generting-26'.,
ELPA Syncer <=
- [nongnu] elpa/pacmacs e618da968d 279/472: Add UT for pacmacs--sort-score-table, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 9ec0ff9f4d 280/472: Add UT for pacmacs--render-score-table, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 612d7ff1dd 297/472: UT for pacmacs--decrease-terrified-timers (#153), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 4ab8f5d799 300/472: Unbind replace-game-objects from glob lists (#153), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 4396ec7412 315/472: Fix FIXME in handle-ghost-blinking-threshold, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 5f3fbbab5a 319/472: Introduce distance based tracking (#159), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 784b5c60e4 350/472: Merge pull request #177 from codingteam/qfix/broken-att-script, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs b7a57c2d8e 353/472: Remove w/o BP tutorial level (#162), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 4ce9773129 365/472: Merge pull request #183 from codingteam/push-instead-of-add-to-list-182, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 25e1fc9f85 369/472: Interactive function to clean wall cache (#138), ELPA Syncer, 2022/01/06