Merge pull request #35 from walsh9/bisby-next

Bisby next
walsh9 · Sep 17, 2016 · 24e5a1e · 24e5a1e
2 parents 47b7d88 + ad869f7
commit 24e5a1e
Show file tree

Hide file tree

Showing 14 changed files with 383 additions and 160 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 <img src="docs/screenshot.png" width=480>
 
-A 7-day roguelike about digging tunnels and dropping crates.  
+A 7-day roguelike about digging tunnels and dropping crates.
 
 Made for the 2106 7-day Roguelike Challenge.
 
@@ -13,7 +13,7 @@ Made for the 2106 7-day Roguelike Challenge.
 #Description
 
 Control Bisby with arrow keys, hjkl, or number pad.
-You can clear levels in two different ways:  
+You can clear levels in two different ways:
 
 - Collect all the yellow energy units and open the yellow gate.
 - Crush enemies with crates, collect their blue datachips, and open the blue gate.
@@ -28,6 +28,12 @@ Guide Bisby safely through 7 levels to reach the surface.
 
 #Changelog
 
+## v1.3.0
+- Add 2 exciting new crate types
+- Add random obstacle walls
+- Remove the crate with the down arrow that just digs down if it hits dirt
+- Bug fixes
+
 ## v1.2.2
 - Bug fixes
 
@@ -46,7 +52,7 @@ Guide Bisby safely through 7 levels to reach the surface.
 
 ## v7DRL
 
-Seven-day version features:  
+Seven-day version features:
 
 - Random tunnels
 - Random crates

diff --git a/assets/i/tileset.json b/assets/i/tileset.json
@@ -9,7 +9,7 @@
 	"sourceSize": {"w":34,"h":34},
 	"pivot": {"x":0.5,"y":0.5}
 },
-"crate":
+"checks":
 {
 	"frame": {"x":34,"y":0,"w":34,"h":34},
 	"rotated": false,
@@ -18,7 +18,7 @@
 	"sourceSize": {"w":34,"h":34},
 	"pivot": {"x":0.5,"y":0.5}
 },
-"crate_blast":
+"crate":
 {
 	"frame": {"x":68,"y":0,"w":34,"h":34},
 	"rotated": false,
@@ -27,7 +27,7 @@
 	"sourceSize": {"w":34,"h":34},
 	"pivot": {"x":0.5,"y":0.5}
 },
-"crate_blocks":
+"crate_blast":
 {
 	"frame": {"x":102,"y":0,"w":34,"h":34},
 	"rotated": false,
@@ -36,7 +36,7 @@
 	"sourceSize": {"w":34,"h":34},
 	"pivot": {"x":0.5,"y":0.5}
 },
-"crate_cross":
+"crate_blocks":
 {
 	"frame": {"x":136,"y":0,"w":34,"h":34},
 	"rotated": false,
@@ -45,7 +45,7 @@
 	"sourceSize": {"w":34,"h":34},
 	"pivot": {"x":0.5,"y":0.5}
 },
-"crate_decoy":
+"crate_cross":
 {
 	"frame": {"x":170,"y":0,"w":34,"h":34},
 	"rotated": false,
@@ -54,7 +54,7 @@
 	"sourceSize": {"w":34,"h":34},
 	"pivot": {"x":0.5,"y":0.5}
 },
-"crate_enemy":
+"crate_decoy":
 {
 	"frame": {"x":204,"y":0,"w":34,"h":34},
 	"rotated": false,
@@ -63,7 +63,7 @@
 	"sourceSize": {"w":34,"h":34},
 	"pivot": {"x":0.5,"y":0.5}
 },
-"crate_fall":
+"crate_dirt":
 {
 	"frame": {"x":238,"y":0,"w":34,"h":34},
 	"rotated": false,
@@ -72,7 +72,7 @@
 	"sourceSize": {"w":34,"h":34},
 	"pivot": {"x":0.5,"y":0.5}
 },
-"crate_unknown":
+"crate_enemy":
 {
 	"frame": {"x":272,"y":0,"w":34,"h":34},
 	"rotated": false,
@@ -81,7 +81,7 @@
 	"sourceSize": {"w":34,"h":34},
 	"pivot": {"x":0.5,"y":0.5}
 },
-"datachip":
+"crate_fall":
 {
 	"frame": {"x":306,"y":0,"w":34,"h":34},
 	"rotated": false,
@@ -90,7 +90,7 @@
 	"sourceSize": {"w":34,"h":34},
 	"pivot": {"x":0.5,"y":0.5}
 },
-"door_locked":
+"crate_fire":
 {
 	"frame": {"x":340,"y":0,"w":34,"h":34},
 	"rotated": false,
@@ -99,7 +99,7 @@
 	"sourceSize": {"w":34,"h":34},
 	"pivot": {"x":0.5,"y":0.5}
 },
-"door_open":
+"crate_unknown":
 {
 	"frame": {"x":374,"y":0,"w":34,"h":34},
 	"rotated": false,
@@ -108,7 +108,7 @@
 	"sourceSize": {"w":34,"h":34},
 	"pivot": {"x":0.5,"y":0.5}
 },
-"dugeast":
+"datachip":
 {
 	"frame": {"x":408,"y":0,"w":34,"h":34},
 	"rotated": false,
@@ -117,9 +117,54 @@
 	"sourceSize": {"w":34,"h":34},
 	"pivot": {"x":0.5,"y":0.5}
 },
+"debris":
+{
+	"frame": {"x":0,"y":34,"w":34,"h":34},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
+	"sourceSize": {"w":34,"h":34},
+	"pivot": {"x":0.5,"y":0.5}
+},
+"door_locked":
+{
+	"frame": {"x":34,"y":34,"w":34,"h":34},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
+	"sourceSize": {"w":34,"h":34},
+	"pivot": {"x":0.5,"y":0.5}
+},
+"door_open":
+{
+	"frame": {"x":68,"y":34,"w":34,"h":34},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
+	"sourceSize": {"w":34,"h":34},
+	"pivot": {"x":0.5,"y":0.5}
+},
+"dugeast":
+{
+	"frame": {"x":102,"y":34,"w":34,"h":34},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
+	"sourceSize": {"w":34,"h":34},
+	"pivot": {"x":0.5,"y":0.5}
+},
 "dugnorth":
 {
-	"frame": {"x":442,"y":0,"w":34,"h":34},
+	"frame": {"x":136,"y":34,"w":34,"h":34},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
+	"sourceSize": {"w":34,"h":34},
+	"pivot": {"x":0.5,"y":0.5}
+},
+"dugpocket":
+{
+	"frame": {"x":170,"y":34,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -128,7 +173,7 @@
 },
 "dugsouth":
 {
-	"frame": {"x":476,"y":0,"w":34,"h":34},
+	"frame": {"x":204,"y":34,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -137,7 +182,7 @@
 },
 "dugwest":
 {
-	"frame": {"x":510,"y":0,"w":34,"h":34},
+	"frame": {"x":238,"y":34,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -146,7 +191,16 @@
 },
 "energy":
 {
-	"frame": {"x":544,"y":0,"w":34,"h":34},
+	"frame": {"x":272,"y":34,"w":34,"h":34},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
+	"sourceSize": {"w":34,"h":34},
+	"pivot": {"x":0.5,"y":0.5}
+},
+"fire":
+{
+	"frame": {"x":306,"y":34,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -155,7 +209,7 @@
 },
 "laser_bottom":
 {
-	"frame": {"x":578,"y":0,"w":34,"h":34},
+	"frame": {"x":340,"y":34,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -164,7 +218,7 @@
 },
 "laser_center":
 {
-	"frame": {"x":612,"y":0,"w":34,"h":34},
+	"frame": {"x":374,"y":34,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -173,7 +227,7 @@
 },
 "laser_horizontal":
 {
-	"frame": {"x":646,"y":0,"w":34,"h":34},
+	"frame": {"x":408,"y":34,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -182,7 +236,7 @@
 },
 "laser_left":
 {
-	"frame": {"x":680,"y":0,"w":34,"h":34},
+	"frame": {"x":0,"y":68,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -191,7 +245,7 @@
 },
 "laser_right":
 {
-	"frame": {"x":714,"y":0,"w":34,"h":34},
+	"frame": {"x":34,"y":68,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -200,7 +254,7 @@
 },
 "laser_top":
 {
-	"frame": {"x":748,"y":0,"w":34,"h":34},
+	"frame": {"x":68,"y":68,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -209,7 +263,7 @@
 },
 "laser_vertical":
 {
-	"frame": {"x":782,"y":0,"w":34,"h":34},
+	"frame": {"x":102,"y":68,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -218,7 +272,16 @@
 },
 "playerbot":
 {
-	"frame": {"x":816,"y":0,"w":34,"h":34},
+	"frame": {"x":136,"y":68,"w":34,"h":34},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
+	"sourceSize": {"w":34,"h":34},
+	"pivot": {"x":0.5,"y":0.5}
+},
+"poof":
+{
+	"frame": {"x":170,"y":68,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -227,7 +290,7 @@
 },
 "skullbot":
 {
-	"frame": {"x":850,"y":0,"w":34,"h":34},
+	"frame": {"x":204,"y":68,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -236,7 +299,7 @@
 },
 "skullbot_spiky":
 {
-	"frame": {"x":884,"y":0,"w":34,"h":34},
+	"frame": {"x":238,"y":68,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -245,7 +308,7 @@
 },
 "spookbot":
 {
-	"frame": {"x":918,"y":0,"w":34,"h":34},
+	"frame": {"x":272,"y":68,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -254,7 +317,16 @@
 },
 "spookbot_phasing":
 {
-	"frame": {"x":952,"y":0,"w":34,"h":34},
+	"frame": {"x":306,"y":68,"w":34,"h":34},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
+	"sourceSize": {"w":34,"h":34},
+	"pivot": {"x":0.5,"y":0.5}
+},
+"square":
+{
+	"frame": {"x":340,"y":68,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -263,7 +335,7 @@
 },
 "wall":
 {
-	"frame": {"x":986,"y":0,"w":34,"h":34},
+	"frame": {"x":374,"y":68,"w":34,"h":34},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":34,"h":34},
@@ -275,8 +347,8 @@
 	"version": "1.0",
 	"image": "tileset.png",
 	"format": "RGBA8888",
-	"size": {"w":1020,"h":34},
+	"size": {"w":442,"h":102},
 	"scale": "1",
-	"smartupdate": "$TexturePacker:SmartUpdate:019d838f8569b1ed4df04654629e1187:86bcb9e005b02439d776e77b05a44005:ace0e5e82375743ccde85e973fd84fb5$"
+	"smartupdate": "$TexturePacker:SmartUpdate:1a77d772b7f206cc7b460c38b381d71b:5c7d8142fe70a8248aa68dd8d2c8b428:ace0e5e82375743ccde85e973fd84fb5$"
 }
 }
diff --git a/assets/i/tileset.png b/assets/i/tileset.png