Merge pull request #17 from lathan/master

Fixed bug in e2.py, Wrapped all lines in tiles longer than 79 characters to conform to PEP 8

1 files changed, 11 insertions, 10 deletions

diff --git a/weatbag/tiles/s3.py b/weatbag/tiles/s3.py
index 657f4a3..2eab970 100644
--- a/weatbag/tiles/s3.py
+++ b/weatbag/tiles/s3.py
@@ -14,8 +14,8 @@ class Tile:
       self.pants_on_fire = True
       print( "Just as you are returning to the path, a ball of fire "
              "hurtles through the air and explodes at your feet, setting "
-             "one of your pant legs on fire. You hear high pitched cackling and "
-             "snorting.")
+             "one of your pant legs on fire. You hear high pitched cackling "
+             "and snorting.")
     else:
       print( "You see the charred ground, "
              "reminding you of your encounter with the short man who set "
@@ -52,15 +52,15 @@ class Tile:
              "drop to the ground and roll around until the fire is "
              "extinguished. Covered in dirt and pantleg in tatters, you "
              "stand up and face your assailant, a rather short man "
-            "with pale skin and bushy orange hair."
+            "with pale skin and bushy orange hair. "
              "Do you talk to him or rush him?")
 
     elif 'puddle' in do:
       self.pants_on_fire = False
       print("You dash over the the mud puddle and splash water on your "
-            "legs until the fire is quenched. Covered in mud and pantleg"
-            "in taters, you stand up and face your assailant, a rather short man "
-            "with pale skin and bushy orange hair."
+            "legs until the fire is quenched. Covered in mud and pantleg "
+            "in taters, you stand up and face your assailant, "
+            "a rather short man with pale skin and bushy orange hair."
             "Do you talk to him or attack him?")
     else:
       print("You had better find a way to put out this fire. Your legs "
@@ -70,10 +70,11 @@ class Tile:
   def action_short_man(self, player, do):
     if do[0] in words.attack:
       self.short_man_here = False
-      print("Not one to be played around with, you charge the man. His amusement "
-            "quickly turns to surprise and then fear as your size and "
-            "determination become apparent. The man stumbles backwards and emits "
-            "a yelp. Just before he hits the groud there is a dry popping noise "
+      print("Not one to be played around with, you charge the man. "
+            "His amusement quickly turns to surprise "
+            "and then fear as your size and determination become apparent. "
+            "The man stumbles backwards and emits a yelp. "
+            "Just before he hits the groud there is a dry popping noise "
             "a flash of light and the man is gone. ")
     elif do[0] in words.talk:
       self.short_man_here = False