Merge pull request #93 from rowan04/final_branch

Final branch

maze-game/project.greenfoot

@@ -11,7 +11,7 @@ class.Ghost3.image=ghost3.png
 class.Ghost4.image=ghost4.png
 class.Ghost_buster_icon.image=zapper.png
 class.Intro.image=Intro.png
-class.Magnet.image=magnet.png
+class.Magnet.image=newMagnet.png
 class.MyWorld.image=greyBackground.png
 class.Player.image=man01.png
 class.Quit.image=button-red.png
@@ -22,8 +22,8 @@ class.Start.image=start.png
 class.Tele_option_3.image=teleporter.png
 class.Teleport.image=teleporter.png
 class.TimeFilter.image=granite-light.jpg
-class.TimePotion.image=timeFreeze.png
-class.Time_option_1.image=timeFreeze.png
+class.TimePotion.image=time_freeze_icon.jpeg
+class.Time_option_1.image=1_time_freeze_icon.jpeg
 class.Treasure.image=treasure.png
 class.Trophy.image=trophy.png
 class.Wall1.image=newWall.png
@@ -227,13 +227,13 @@ dependency8.type=UsesDependency
 dependency9.from=MyWorld
 dependency9.to=TimePotion
 dependency9.type=UsesDependency
-editor.fx.0.height=838
-editor.fx.0.width=1550
-editor.fx.0.x=-7
-editor.fx.0.y=-7
+editor.fx.0.height=1056
+editor.fx.0.width=1936
+editor.fx.0.x=-1928
+editor.fx.0.y=-338
 height=1056
 package.numDependencies=66
-package.numTargets=32
+package.numTargets=30
 project.charset=UTF-8
 publish.hasSource=false
 publish.locked=true
@@ -244,7 +244,7 @@ publish.title=
 publish.url=
 readme.height=60
 readme.name=@README
-readme.width=49
+readme.width=48
 readme.x=10
 readme.y=10
 simulation.speed=50
@@ -277,49 +277,49 @@ target12.width=120
 target12.x=0
 target12.y=0
 target13.height=70
-target13.name=Puzzel_world_1_tp
+target13.name=Ghost_buster_icon
 target13.showInterface=false
 target13.type=ClassTarget
 target13.width=120
 target13.x=0
 target13.y=0
 target14.height=70
-target14.name=Ghost_buster_icon
+target14.name=Time_option_1
 target14.showInterface=false
 target14.type=ClassTarget
-target14.width=120
+target14.width=130
 target14.x=0
 target14.y=0
 target15.height=70
-target15.name=Time_option_1
+target15.name=MyWorld
 target15.showInterface=false
 target15.type=ClassTarget
-target15.width=130
+target15.width=120
 target15.x=0
 target15.y=0
 target16.height=70
-target16.name=MyWorld
+target16.name=Player
 target16.showInterface=false
 target16.type=ClassTarget
 target16.width=120
 target16.x=0
 target16.y=0
 target17.height=70
-target17.name=Player
+target17.name=Magnet
 target17.showInterface=false
 target17.type=ClassTarget
 target17.width=120
 target17.x=0
 target17.y=0
 target18.height=70
-target18.name=Magnet
+target18.name=WallBreaker
 target18.showInterface=false
 target18.type=ClassTarget
 target18.width=120
 target18.x=0
 target18.y=0
 target19.height=70
-target19.name=WallBreaker
+target19.name=Zapper
 target19.showInterface=false
 target19.type=ClassTarget
 target19.width=120
@@ -333,70 +333,70 @@ target2.width=120
 target2.x=0
 target2.y=0
 target20.height=70
-target20.name=Zapper
+target20.name=Breakable
 target20.showInterface=false
 target20.type=ClassTarget
 target20.width=120
 target20.x=0
 target20.y=0
 target21.height=70
-target21.name=Moveable
+target21.name=Wall1
 target21.showInterface=false
 target21.type=ClassTarget
 target21.width=120
 target21.x=0
 target21.y=0
 target22.height=70
-target22.name=Breakable
+target22.name=Ghost4
 target22.showInterface=false
 target22.type=ClassTarget
 target22.width=120
 target22.x=0
 target22.y=0
 target23.height=70
-target23.name=Ghost4
+target23.name=Ghost3
 target23.showInterface=false
 target23.type=ClassTarget
 target23.width=120
 target23.x=0
 target23.y=0
 target24.height=70
-target24.name=Wall1
+target24.name=Intro
 target24.showInterface=false
 target24.type=ClassTarget
 target24.width=120
 target24.x=0
 target24.y=0
 target25.height=70
-target25.name=Ghost3
+target25.name=Ghost2
 target25.showInterface=false
 target25.type=ClassTarget
 target25.width=120
 target25.x=0
 target25.y=0
 target26.height=70
-target26.name=Intro
+target26.name=Ghost1
 target26.showInterface=false
 target26.type=ClassTarget
 target26.width=120
 target26.x=0
 target26.y=0
 target27.height=70
-target27.name=Ghost2
+target27.name=Skull
 target27.showInterface=false
 target27.type=ClassTarget
 target27.width=120
 target27.x=0
 target27.y=0
 target28.height=70
-target28.name=Ghost1
+target28.name=SpeedPotion
 target28.showInterface=false
 target28.type=ClassTarget
 target28.width=120
 target28.x=0
 target28.y=0
 target29.height=70
-target29.name=Skull
+target29.name=End
 target29.showInterface=false
 target29.type=ClassTarget
 target29.width=120
@@ -410,26 +410,12 @@ target3.width=140
 target3.x=0
 target3.y=0
 target30.height=70
-target30.name=SpeedPotion
+target30.name=Breaker_icon
 target30.showInterface=false
 target30.type=ClassTarget
 target30.width=120
 target30.x=0
 target30.y=0
-target31.height=70
-target31.name=End
-target31.showInterface=false
-target31.type=ClassTarget
-target31.width=120
-target31.x=0
-target31.y=0
-target32.height=70
-target32.name=Breaker_icon
-target32.showInterface=false
-target32.type=ClassTarget
-target32.width=120
-target32.x=0
-target32.y=0
 target4.height=70
 target4.name=Again
 target4.showInterface=false
@@ -473,7 +459,7 @@ target9.width=120
 target9.x=0
 target9.y=0
 version=3.0.0
-width=1936
+width=1491
 world.lastInstantiated=MyWorld
-xPosition=0
-yPosition=0
+xPosition=2246
+yPosition=189