Merge branch 'master' of https://github.com/viking-sudo-rm/SpokenWord

SnorriDev · Nov 28, 2016 · 64a66c3 · 64a66c3
2 parents e39567a + 63a69c4
commit 64a66c3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 *The Book of Thoth* is a 2D puzzle game set in Ancient Egypt. Unlock new hieroglyphs as you progress, and write spells with the words you know to defeat enemies and solve challenging puzzles. Enter a world where your power is limited only by your linguistic ingenuity. 
 
-The central mechanic in *the Book of Thoth* is the ability to create customizable spells written in Ancient Egyptian. With a wide vocabulary and complex grammar at your disposal, enchant weapons and spells which will make you into an unstoppable force. 
+The central mechanic in *the Book of Thoth* is the ability to create customizable spells written in the language of Ancient Egypt. With a wide vocabulary and complex grammar at your disposal, enchant weapons and spells which will make you into an unstoppable force. 
 
 For more info:
 

diff --git a/bin/snorri/world/Tile$TileType.class b/bin/snorri/world/Tile$TileType.class
diff --git a/bin/snorri/world/Tile.class b/bin/snorri/world/Tile.class
diff --git a/src/snorri/world/Tile.java b/src/snorri/world/Tile.java
@@ -192,7 +192,8 @@ public enum TileType implements Nominal {
 		SANDSTONE(false, false, new BufferedImage[] {
 				getImage("/textures/tiles/sandstone00.png"),
 				getImage("/textures/tiles/sandstone01.png"),
-				getImage("/textures/tiles/sandstone02.png")}, false, true),
+				getImage("/textures/tiles/sandstone02.png"),
+				getImage("/textures/tiles/default00.png")}, false, true), //will change to look like bricks
 		FLOOR(true, new BufferedImage[] {getImage("/textures/tiles/floor00.png"),
 			getImage("/textures/tiles/floor01.png"),
 			getImage("/textures/tiles/floor02.png"),