[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/pacmacs fa41daf2ca 149/472: Merge branch 'master' into sco
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/pacmacs fa41daf2ca 149/472: Merge branch 'master' into score-table-92 |
Date: |
Thu, 6 Jan 2022 21:59:20 -0500 (EST) |
branch: elpa/pacmacs
commit fa41daf2ca53b29f451c508f15a1aa95743d5e09
Merge: 7058b61e47 a460cd8b06
Author: rexim <reximkut@gmail.com>
Commit: rexim <reximkut@gmail.com>
Merge branch 'master' into score-table-92
We need the new levels from the master branch
---
maps/map01.txt | 17 ++++++++++-------
maps/map02.txt | 20 ++++++++------------
maps/map03.txt | 14 +++++++-------
maps/map04.txt | 13 ++++++++++---
maps/map05.txt | 19 ++++++++++++-------
maps/map06.txt | 14 +++++++++++---
6 files changed, 58 insertions(+), 39 deletions(-)
diff --git a/maps/map01.txt b/maps/map01.txt
index 674169eee4..bee14b9a8d 100644
--- a/maps/map01.txt
+++ b/maps/map01.txt
@@ -1,7 +1,10 @@
-#########
-#.......#####
-#. . #
-#.g## . ##
-#. ## . o#
-#.......####
-#########
+##########
+#o. ##
+ ######
+ ####
+#### ###..
+ # #. #
+## #.##
+ # #..#
+...#.....#
+##########
diff --git a/maps/map02.txt b/maps/map02.txt
index fe3db346f1..5631b824ea 100644
--- a/maps/map02.txt
+++ b/maps/map02.txt
@@ -1,12 +1,8 @@
-#### ####
-#. .#
-# ## ## #
-# #
-# ## ## #
-# #
-# ## ## #
- o
-# ## ## #
-# #
-#g #
-#### ####
+##############
+#...#...#....#
+#.#.#.#.#..#.#
+#o#.#.#.#..#.#
+# #.#.#.#..#.#
+# #.#.#.#..#.#
+#g#...#....#.#
+##############
diff --git a/maps/map03.txt b/maps/map03.txt
index 8935913fad..1f1b8e95e0 100644
--- a/maps/map03.txt
+++ b/maps/map03.txt
@@ -1,7 +1,7 @@
-######
-# .#
-# ## #
-# ## #
-# ## #
-# o #
-######
+##########
+#o.......#
+#........#
+#........#
+#........#
+#.......g#
+##########
diff --git a/maps/map04.txt b/maps/map04.txt
index 70d8183d9d..d03e9a952d 100644
--- a/maps/map04.txt
+++ b/maps/map04.txt
@@ -1,3 +1,10 @@
-#######
-. o .
-#######
+############
+#o . g#
+##### ######
+#..........#
+#..........#
+#..........#
+#..........#
+#..........#
+#..........#
+############
diff --git a/maps/map05.txt b/maps/map05.txt
index a045f8d51e..73ad0a000b 100644
--- a/maps/map05.txt
+++ b/maps/map05.txt
@@ -1,7 +1,12 @@
-##########
-#o.......#
-#. #
-#. #
-#. #
-#. g#
-##########
+#### ####
+#. . .#
+# ## ## #
+# ..... #
+# ## ## #
+# ..... #
+# ## ## #
+ o
+# ## ## #
+#. . . .#
+#g . #
+#### ####
diff --git a/maps/map06.txt b/maps/map06.txt
index 4b60914044..4bec64ec94 100644
--- a/maps/map06.txt
+++ b/maps/map06.txt
@@ -1,3 +1,11 @@
-############
-#o . g#
-############
+###########
+#.. ... ..#
+### ### # #
+ ...
+#.# ### #.#
+#.# .o. #.#
+#.# ### #.#
+ ...
+# # ### ###
+#.. ... .g#
+###########
- [nongnu] elpa/pacmacs a460cd8b06 148/472: Merge pull request #107 from rexim/feature/new-maps, (continued)
- [nongnu] elpa/pacmacs a460cd8b06 148/472: Merge pull request #107 from rexim/feature/new-maps, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs c426f6ac91 078/472: Fix some accidental paredit typo, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 4341b23d87 094/472: Implement wraparound. Close #67, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 12942ddeff 113/472: Refactor out pacmacs--fill-board (#74), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 91408c074d 115/472: Refactor pacmacs--track-object (#74), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs ed40addf95 116/472: Refactor pacmacs--put-object (#74), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs eac9d47c62 117/472: Refactor pacmacs-render-track-board (#74), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs d763bd0f82 121/472: Fix the UTs, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 9527a965e1 134/472: Merge branch 'switch-game-state-in-logic-functions-97'. Close #97, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 86f76c4bef 129/472: Implement switching level mechanics. Close #79, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs fa41daf2ca 149/472: Merge branch 'master' into score-table-92,
ELPA Syncer <=
- [nongnu] elpa/pacmacs 85069784fb 147/472: Add a couple of new maps., ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 39fc09baf3 161/472: Load cl-lib.el for using its macros and functions, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 9ddaedae20 174/472: UT for pacmacs--file-content-test, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs b6141dc8e3 175/472: UT for pacmacs--anim-object-list-next-frame, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 1186dcdaa1 197/472: Double dash pacmacs-render-state function (#126), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 57b0e8566b 204/472: Get pacmacs-quit back, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 531386d7f1 208/472: Merge pull request #128 from rexim/readme-fix, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 775a2d3ec5 211/472: Convert recorder module to a tool (#115), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs a0d9c1bbbc 212/472: Reverse test case before saving (#115), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs d5bdd0b20a 025/472: Slightly refactored pacman-anim:, ELPA Syncer, 2022/01/06