Cleaned section 7 turtle recipes with @mballin

lynnlangit · lynnlangit · commit 4a8d30f44e96 · 2015-11-29T16:01:37.000-08:00
diff --git a/src/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/ChooseYourOwnAdventure.java b/src/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/ChooseYourOwnAdventure.java
@@ -20,7 +20,7 @@ private static void startStory()
     String action = askAQuestion("Do you want to 'wake up' or 'explore' the dream?");
     if ("wake up".equalsIgnoreCase(action))
     {
-      tellMoreStory("You wake up and have a boring day.  The End.");
+      tellMoreStory("You wake up and have a boring day. The end.");
     }
     else if ("explore".equalsIgnoreCase(action))
     {
@@ -33,12 +33,12 @@ else if ("explore".equalsIgnoreCase(action))
   }
   private static void endStory()
   {
-    tellMoreStory("You don't know how to read directions.  You can't play this game.  The End.");
+    tellMoreStory("You don't know how to read directions. You can't play this game. The end.");
   }
   private static void approachOoze()
   {
     tellMoreStory(
-        "You approach a glowing, green bucket of ooze, worried that you will get in trouble, you pick up the bucket.");
+        "You approach a glowing, green bucket of ooze. Worried that you will get in trouble, you pick up the bucket.");
     String pourTo = askAQuestion(" Do you want to pour the ooze into the 'backyard' or 'toilet'?");
     if ("toilet".equalsIgnoreCase(pourTo))
     {
@@ -56,15 +56,15 @@ else if ("backyard".equalsIgnoreCase(pourTo))
   private static void pourIntoToilet()
   {
     tellMoreStory(
-        "As you pour the ooze into the toilet it backs up, gurgles and explodes covering you in radio-active waste.");
+        "As you pour the ooze into the toilet it backs up, gurgles, and explodes, covering you in radioactive waste.");
     String pourTo = askAQuestion("Do you want to train to be a NINJA?  'Yes' or 'HECK YES'?");
     if ("yes".equalsIgnoreCase(pourTo))
     {
-      tellMoreStory("Awesome Dude!  You live out the rest of your life fighting crimes and eating pizza!");
+      tellMoreStory("Awesome dude! You live out the rest of your life fighting crimes and eating pizza!");
     }
     else if ("heck yes".equalsIgnoreCase(pourTo))
     {
-      tellMoreStory("Awesome Dude!  You live out the rest of your life fighting crimes and eating pizza!");
+      tellMoreStory("Awesome dude! You live out the rest of your life fighting crimes and eating pizza!");
     }
     else
     {
@@ -75,10 +75,10 @@ private static void pourIntoBackyard()
   {
     tellMoreStory(
         "As you walk into the backyard a net scoops you up and a giant takes you to a boiling pot of water.");
-    String action = askAQuestion("As the man starts to prepare you as soup, do you...  'Scream' or 'Faint'?");
+    String action = askAQuestion("As the man starts to prepare you as soup, do you...'Scream' or 'Faint'?");
     if ("faint".equalsIgnoreCase(action))
     {
-      tellMoreStory("You made a delicious soup!  Yum!  The End.");
+      tellMoreStory("You made a delicious soup! Yum! The end.");
     }
     else if ("scream".equalsIgnoreCase(action))
     {
diff --git a/src/main/java/org/teachingkidsprogramming/recipes/completed/section07objects/CloneTurtles.java b/src/main/java/org/teachingkidsprogramming/recipes/completed/section07objects/CloneTurtles.java
@@ -7,13 +7,13 @@
 import org.teachingextensions.logo.utils.ColorUtils.PenColors;
 import org.teachingextensions.logo.utils.LineAndShapeUtils.Text;
 
-public class MyTurtles
+public class CloneTurtles
 {
   //Uncomment the two lines of code below to create a container and a window for your turtles --#1
   public ArrayList<Turtle> turtles = new ArrayList<Turtle>();
   public MultiTurtleWindow mtw     = new MultiTurtleWindow();
   //
-  public MyTurtles()
+  public CloneTurtles()
   {
     showSomeTurtles();
   }
@@ -66,6 +66,6 @@ private void showSomeTurtles()
   //
   public static void main(String[] args)
   {
-    new MyTurtles();
+    new CloneTurtles();
   }
 }
diff --git a/src/main/java/org/teachingkidsprogramming/recipes/completed/section07objects/SuperTurtles.java b/src/main/java/org/teachingkidsprogramming/recipes/completed/section07objects/SuperTurtles.java
@@ -3,16 +3,16 @@
 import org.teachingextensions.WindowUtils.MultiTurtleWindow;
 import org.teachingextensions.logo.Turtle;
 
-public class TurtleObjects
+public class SuperTurtles
 {
   public MultiTurtleWindow mtw = new MultiTurtleWindow();
-  public TurtleObjects()
+  public SuperTurtles()
   {
     showSomeTurtles();
   }
   public static void main(String[] args)
   {
-    new TurtleObjects();
+    new SuperTurtles();
   }
   private void showSomeTurtles()
   {
diff --git a/src/main/java/org/teachingkidsprogramming/recipes/completed/section08events/TortoiseMaze.java b/src/main/java/org/teachingkidsprogramming/recipes/completed/section08events/TortoiseMaze.java
@@ -1,4 +1,4 @@
-package org.teachingkidsprogramming.recipes.completed.section07objects;
+package org.teachingkidsprogramming.recipes.completed.section08events;
 
 import java.awt.Color;
 import java.awt.event.ActionEvent;
@@ -15,13 +15,13 @@
 
 @SuppressWarnings("unused")
 //***********************In Progress***************************//
-public class TortoiseMobile implements MouseRightClickListener
+public class TortoiseMaze implements MouseRightClickListener
 {
   public static void main(String[] args)
   {
-    new TortoiseMobile();
+    new TortoiseMaze();
   }
-  public TortoiseMobile()
+  public TortoiseMaze()
   {
     Tortoise.getBackgroundWindow().addMouseRightClickListener(this);
     Tortoise.setSpeed(10);
diff --git a/src/main/java/org/teachingkidsprogramming/section03ifs/ChooseYourOwnAdventure.java b/src/main/java/org/teachingkidsprogramming/section03ifs/ChooseYourOwnAdventure.java
@@ -22,34 +22,34 @@ private static void startStory()
     {
       //          wakeUp (recipe below) --#2.1
       //          ------------- Recipe for wakeUp --#2.2
-      //              Tell the user "You wake up and have a boring day.  The End." --#1
+      //              Tell the user "You wake up and have a boring day. The end." --#1
       //          ------------- End of wakeUp recipe --#2.3
     }
     else if ("explore".equalsIgnoreCase(action))
     {
       //      approachOoze (recipe below) --#4.1
       //      ------------- Recipe for approachOoze --#4.2
-      //         Tell the user "You approach a glowing, green bucket of ooze, worried that you will get in trouble, you pick up the bucket." --#3
+      //         Tell the user "You approach a glowing, green bucket of ooze. Worried that you will get in trouble, you pick up the bucket." --#3
       //         Ask the user "Do you want to pour the ooze into the 'backyard' or 'toilet'?" --#7
       //         If they answer "toilet" --#8.1
       //            pourIntoToilet (recipe below) --#12.1
       //            ------------- Recipe for pourIntoToilet --#12.2
-      //               Tell the user "As you pour the ooze into the toilet it backs up, gurgles and explodes covering you in radio-active waste." --#10
+      //               Tell the user "As you pour the ooze into the toilet it backs up, gurgles, and explodes, covering you in radioactive waste." --#10
       //               Ask the user "Do you want to train to be a NINJA?  'Yes' or 'HECK YES'?" --#11
       //               If they answer "yes" --#13.1
-      //                    Tell the user "Awesome Dude!  You live out the rest of your life fighting crimes and eating pizza!" --#14
+      //                    Tell the user "Awesome dude!  You live out the rest of your life fighting crimes and eating pizza!" --#14
       //               Otherwise, if they answer "heck yes" --#13.2
-      //                    Tell the user "Awesome Dude!  You live out the rest of your life fighting crimes and eating pizza!" --#15
+      //                    Tell the user "Awesome dude!  You live out the rest of your life fighting crimes and eating pizza!" --#15
       //               Otherwise, if they answer anything else --#13.3
       //                    endStory --#16
       //            ------------- End of pourIntoToilet recipe --#12.3
       //         Otherwise, if they answer "backyard" --#8.2
       //            pourIntoBackyard (recipe below) --#19.1
       //            ------------- Recipe for pourIntoBackyard --#19.2
       //                Tell the user "As you walk into the backyard a net scoops you up and a giant takes you to a boiling pot of water." --#17
-      //                Ask the user "As the man starts to prepare you as soup, do you...  'Scream' or 'Faint'?" --#18
+      //                Ask the user "As the man starts to prepare you as soup, do you...'Scream' or 'Faint'?" --#18
       //                If they answer "faint" --#20.1
-      //                        Tell the user "You made a delicious soup!  Yum!  The End." --#21
+      //                        Tell the user "You made a delicious soup! Yum! The end." --#21
       //                Otherwise, if they answer "scream" --#20.2
       //                    startStory --#22
       //                Otherwise, if they answer anything else --#20.3
@@ -63,7 +63,7 @@ else if ("explore".equalsIgnoreCase(action))
     {
       //      endStory (recipe below) --#6.1
       //      ------------- Recipe for endStory --#6.2
-      //         Tell the user "You don't know how to read directions.  You can't play this game.  The End." --#5
+      //         Tell the user "You don't know how to read directions. You can't play this game. The end." --#5
       //      ------------- End of endStory recipe --#6.3
     }
   }
diff --git a/src/main/java/org/teachingkidsprogramming/section07objects/CloneTurtles.java b/src/main/java/org/teachingkidsprogramming/section07objects/CloneTurtles.java
@@ -1,12 +1,12 @@
 package org.teachingkidsprogramming.section07objects;
 
-public class MyTurtles
+public class CloneTurtles
 {
   // Uncomment the two lines of code below to create a container and a window for your turtles --#1
   // public ArrayList<Turtle> turtles = new ArrayList<Turtle>();
   // public MultiTurtleWindow mtw     = new MultiTurtleWindow();
   //
-  public MyTurtles()
+  public CloneTurtles()
   {
     showSomeTurtles();
   }
@@ -40,6 +40,6 @@ private void showSomeTurtles()
   //
   public static void main(String[] args)
   {
-    new MyTurtles();
+    new CloneTurtles();
   }
 }
diff --git a/src/main/java/org/teachingkidsprogramming/section07objects/SuperTurtles.java b/src/main/java/org/teachingkidsprogramming/section07objects/SuperTurtles.java
@@ -2,16 +2,16 @@
 
 import org.teachingextensions.WindowUtils.MultiTurtleWindow;
 
-public class TurtleObjects
+public class SuperTurtles
 {
   public MultiTurtleWindow mtw = new MultiTurtleWindow();
-  public TurtleObjects()
+  public SuperTurtles()
   {
     showSomeTurtles();
   }
   public static void main(String[] args)
   {
-    new TurtleObjects();
+    new SuperTurtles();
   }
   private void showSomeTurtles()
   {
@@ -27,7 +27,7 @@ private void showSomeTurtles()
     //        Create a new slowTurtle instance 
     //        Add your slowTurtle to your MultiTurtleWindow
     //        Have your slowTurtle draw a upside down triangle with 50 pixel sides
-    //  ------------- End of makeSlowTurtle --#2.2
+    //  ------------- End of makeSlowTurtle --#3.1
     //  makeCrazyTurtle (recipe below) --#6.0
     //  ------------- Recipe for makeCrazyTurtle --#5.1
     //        Create a new crazyTurtle instance  

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ private static void startStory()`
`20`	`20`	`String action = askAQuestion("Do you want to 'wake up' or 'explore' the dream?");`
`21`	`21`	`if ("wake up".equalsIgnoreCase(action))`
`22`	`22`	`{`
`23`		`- tellMoreStory("You wake up and have a boring day. The End.");`
	`23`	`+ tellMoreStory("You wake up and have a boring day. The end.");`
`24`	`24`	`}`
`25`	`25`	`else if ("explore".equalsIgnoreCase(action))`
`26`	`26`	`{`
`@@ -33,12 +33,12 @@ else if ("explore".equalsIgnoreCase(action))`
`33`	`33`	`}`
`34`	`34`	`private static void endStory()`
`35`	`35`	`{`
`36`		`- tellMoreStory("You don't know how to read directions. You can't play this game. The End.");`
	`36`	`+ tellMoreStory("You don't know how to read directions. You can't play this game. The end.");`
`37`	`37`	`}`
`38`	`38`	`private static void approachOoze()`
`39`	`39`	`{`
`40`	`40`	`tellMoreStory(`
`41`		`- "You approach a glowing, green bucket of ooze, worried that you will get in trouble, you pick up the bucket.");`
	`41`	`+ "You approach a glowing, green bucket of ooze. Worried that you will get in trouble, you pick up the bucket.");`
`42`	`42`	`String pourTo = askAQuestion(" Do you want to pour the ooze into the 'backyard' or 'toilet'?");`
`43`	`43`	`if ("toilet".equalsIgnoreCase(pourTo))`
`44`	`44`	`{`
`@@ -56,15 +56,15 @@ else if ("backyard".equalsIgnoreCase(pourTo))`
`56`	`56`	`private static void pourIntoToilet()`
`57`	`57`	`{`
`58`	`58`	`tellMoreStory(`
`59`		`- "As you pour the ooze into the toilet it backs up, gurgles and explodes covering you in radio-active waste.");`
	`59`	`+ "As you pour the ooze into the toilet it backs up, gurgles, and explodes, covering you in radioactive waste.");`
`60`	`60`	`String pourTo = askAQuestion("Do you want to train to be a NINJA? 'Yes' or 'HECK YES'?");`
`61`	`61`	`if ("yes".equalsIgnoreCase(pourTo))`
`62`	`62`	`{`
`63`		`- tellMoreStory("Awesome Dude! You live out the rest of your life fighting crimes and eating pizza!");`
	`63`	`+ tellMoreStory("Awesome dude! You live out the rest of your life fighting crimes and eating pizza!");`
`64`	`64`	`}`
`65`	`65`	`else if ("heck yes".equalsIgnoreCase(pourTo))`
`66`	`66`	`{`
`67`		`- tellMoreStory("Awesome Dude! You live out the rest of your life fighting crimes and eating pizza!");`
	`67`	`+ tellMoreStory("Awesome dude! You live out the rest of your life fighting crimes and eating pizza!");`
`68`	`68`	`}`
`69`	`69`	`else`
`70`	`70`	`{`
`@@ -75,10 +75,10 @@ private static void pourIntoBackyard()`
`75`	`75`	`{`
`76`	`76`	`tellMoreStory(`
`77`	`77`	`"As you walk into the backyard a net scoops you up and a giant takes you to a boiling pot of water.");`
`78`		`- String action = askAQuestion("As the man starts to prepare you as soup, do you... 'Scream' or 'Faint'?");`
	`78`	`+ String action = askAQuestion("As the man starts to prepare you as soup, do you...'Scream' or 'Faint'?");`
`79`	`79`	`if ("faint".equalsIgnoreCase(action))`
`80`	`80`	`{`
`81`		`- tellMoreStory("You made a delicious soup! Yum! The End.");`
	`81`	`+ tellMoreStory("You made a delicious soup! Yum! The end.");`
`82`	`82`	`}`
`83`	`83`	`else if ("scream".equalsIgnoreCase(action))`
`84`	`84`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@`
`7`	`7`	`import org.teachingextensions.logo.utils.ColorUtils.PenColors;`
`8`	`8`	`import org.teachingextensions.logo.utils.LineAndShapeUtils.Text;`
`9`	`9`
`10`		`-public class MyTurtles`
	`10`	`+public class CloneTurtles`
`11`	`11`	`{`
`12`	`12`	`//Uncomment the two lines of code below to create a container and a window for your turtles --#1`
`13`	`13`	`public ArrayList<Turtle> turtles = new ArrayList<Turtle>();`
`14`	`14`	`public MultiTurtleWindow mtw = new MultiTurtleWindow();`
`15`	`15`	`//`
`16`		`- public MyTurtles()`
	`16`	`+ public CloneTurtles()`
`17`	`17`	`{`
`18`	`18`	`showSomeTurtles();`
`19`	`19`	`}`
`@@ -66,6 +66,6 @@ private void showSomeTurtles()`
`66`	`66`	`//`
`67`	`67`	`public static void main(String[] args)`
`68`	`68`	`{`
`69`		`- new MyTurtles();`
	`69`	`+ new CloneTurtles();`
`70`	`70`	`}`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,16 +3,16 @@`
`3`	`3`	`import org.teachingextensions.WindowUtils.MultiTurtleWindow;`
`4`	`4`	`import org.teachingextensions.logo.Turtle;`
`5`	`5`
`6`		`-public class TurtleObjects`
	`6`	`+public class SuperTurtles`
`7`	`7`	`{`
`8`	`8`	`public MultiTurtleWindow mtw = new MultiTurtleWindow();`
`9`		`- public TurtleObjects()`
	`9`	`+ public SuperTurtles()`
`10`	`10`	`{`
`11`	`11`	`showSomeTurtles();`
`12`	`12`	`}`
`13`	`13`	`public static void main(String[] args)`
`14`	`14`	`{`
`15`		`- new TurtleObjects();`
	`15`	`+ new SuperTurtles();`
`16`	`16`	`}`
`17`	`17`	`private void showSomeTurtles()`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.teachingkidsprogramming.recipes.completed.section07objects;`
	`1`	`+package org.teachingkidsprogramming.recipes.completed.section08events;`
`2`	`2`
`3`	`3`	`import java.awt.Color;`
`4`	`4`	`import java.awt.event.ActionEvent;`
`@@ -15,13 +15,13 @@`
`15`	`15`
`16`	`16`	`@SuppressWarnings("unused")`
`17`	`17`	`//*********************In Progress*************************//`
`18`		`-public class TortoiseMobile implements MouseRightClickListener`
	`18`	`+public class TortoiseMaze implements MouseRightClickListener`
`19`	`19`	`{`
`20`	`20`	`public static void main(String[] args)`
`21`	`21`	`{`
`22`		`- new TortoiseMobile();`
	`22`	`+ new TortoiseMaze();`
`23`	`23`	`}`
`24`		`- public TortoiseMobile()`
	`24`	`+ public TortoiseMaze()`
`25`	`25`	`{`
`26`	`26`	`Tortoise.getBackgroundWindow().addMouseRightClickListener(this);`
`27`	`27`	`Tortoise.setSpeed(10);`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`package org.teachingkidsprogramming.section07objects;`
`2`	`2`
`3`		`-public class MyTurtles`
	`3`	`+public class CloneTurtles`
`4`	`4`	`{`
`5`	`5`	`// Uncomment the two lines of code below to create a container and a window for your turtles --#1`
`6`	`6`	`// public ArrayList<Turtle> turtles = new ArrayList<Turtle>();`
`7`	`7`	`// public MultiTurtleWindow mtw = new MultiTurtleWindow();`
`8`	`8`	`//`
`9`		`- public MyTurtles()`
	`9`	`+ public CloneTurtles()`
`10`	`10`	`{`
`11`	`11`	`showSomeTurtles();`
`12`	`12`	`}`
`@@ -40,6 +40,6 @@ private void showSomeTurtles()`
`40`	`40`	`//`
`41`	`41`	`public static void main(String[] args)`
`42`	`42`	`{`
`43`		`- new MyTurtles();`
	`43`	`+ new CloneTurtles();`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,16 +2,16 @@`
`2`	`2`
`3`	`3`	`import org.teachingextensions.WindowUtils.MultiTurtleWindow;`
`4`	`4`
`5`		`-public class TurtleObjects`
	`5`	`+public class SuperTurtles`
`6`	`6`	`{`
`7`	`7`	`public MultiTurtleWindow mtw = new MultiTurtleWindow();`
`8`		`- public TurtleObjects()`
	`8`	`+ public SuperTurtles()`
`9`	`9`	`{`
`10`	`10`	`showSomeTurtles();`
`11`	`11`	`}`
`12`	`12`	`public static void main(String[] args)`
`13`	`13`	`{`
`14`		`- new TurtleObjects();`
	`14`	`+ new SuperTurtles();`
`15`	`15`	`}`
`16`	`16`	`private void showSomeTurtles()`
`17`	`17`	`{`
`@@ -27,7 +27,7 @@ private void showSomeTurtles()`
`27`	`27`	`// Create a new slowTurtle instance`
`28`	`28`	`// Add your slowTurtle to your MultiTurtleWindow`
`29`	`29`	`// Have your slowTurtle draw a upside down triangle with 50 pixel sides`
`30`		`- // ------------- End of makeSlowTurtle --#2.2`
	`30`	`+ // ------------- End of makeSlowTurtle --#3.1`
`31`	`31`	`// makeCrazyTurtle (recipe below) --#6.0`
`32`	`32`	`// ------------- Recipe for makeCrazyTurtle --#5.1`
`33`	`33`	`// Create a new crazyTurtle instance`