Permalink
Browse files

Merge branch 'master' of github.com:Project42/HelikopterGame

  • Loading branch information...
2 parents 907f175 + 71cdfad commit de12a20a46ca5495192f89b941c6eaa8fdafd608 @aardvarrk aardvarrk committed Jan 25, 2013
Showing with 22 additions and 42 deletions.
  1. +0 −10 src/Kaboom.java
  2. +0 −10 src/PowerUps.java
  3. +22 −22 src/project.greenfoot
View
@@ -14,18 +14,8 @@
import java.util.List;
import java.util.ArrayList;
-/**
- * Write a description of class Kaboom here.
- *
- * @author (your name)
- * @version (a version number or a date)
- */
public class Kaboom extends Actor
{
- /**
- * Act - do whatever the Kaboom wants to do. This method is called whenever
- * the 'Act' or 'Run' button gets pressed in the environment.
- */
public void addedToWorld(World world)
{
setImage("ontploffing.gif");
View
@@ -1,17 +1,7 @@
import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
-/**
- * Write a description of class PowerUps here.
- *
- * @author (your name)
- * @version (a version number or a date)
- */
public class PowerUps extends Actor
{
- /**
- * Act - do whatever the PowerUps wants to do. This method is called whenever
- * the 'Act' or 'Run' button gets pressed in the environment.
- */
public void act()
{
Actor wallcheck = getOneObjectAtOffset(0, 0, Wall.class);
View
@@ -290,10 +290,10 @@ dependency8.type=UsesDependency
dependency9.from=Helicopter
dependency9.to=Kaboom
dependency9.type=UsesDependency
-mainWindow.height=1040
-mainWindow.width=960
-mainWindow.x=960
-mainWindow.y=0
+mainWindow.height=744
+mainWindow.width=1382
+mainWindow.x=-8
+mainWindow.y=-8
package.numDependencies=70
package.numTargets=44
project.charset=x-MacRoman
@@ -312,8 +312,8 @@ target1.x=100
target1.y=970
target10.editor.height=700
target10.editor.width=900
-target10.editor.x=543
-target10.editor.y=246
+target10.editor.x=223
+target10.editor.y=182
target10.height=50
target10.name=Water
target10.naviview.expanded=false
@@ -324,8 +324,8 @@ target10.x=10
target10.y=550
target11.editor.height=703
target11.editor.width=1015
-target11.editor.x=358
-target11.editor.y=177
+target11.editor.x=78
+target11.editor.y=102
target11.height=50
target11.name=Helicopter
target11.naviview.expanded=true
@@ -528,8 +528,8 @@ target26.x=190
target26.y=790
target27.editor.height=700
target27.editor.width=900
-target27.editor.x=729
-target27.editor.y=287
+target27.editor.x=276
+target27.editor.y=251
target27.height=50
target27.name=Rope
target27.naviview.expanded=true
@@ -564,8 +564,8 @@ target29.x=200
target29.y=610
target3.editor.height=700
target3.editor.width=900
-target3.editor.x=831
-target3.editor.y=262
+target3.editor.x=268
+target3.editor.y=102
target3.height=50
target3.name=HelicopterWorldMenu
target3.naviview.expanded=true
@@ -660,8 +660,8 @@ target36.x=190
target36.y=910
target37.editor.height=686
target37.editor.width=907
-target37.editor.x=497
-target37.editor.y=222
+target37.editor.x=185
+target37.editor.y=12
target37.height=50
target37.name=HelicopterWorld
target37.naviview.expanded=true
@@ -780,8 +780,8 @@ target45.x=10
target45.y=490
target5.editor.height=686
target5.editor.width=900
-target5.editor.x=858
-target5.editor.y=224
+target5.editor.x=318
+target5.editor.y=195
target5.height=50
target5.name=Victim
target5.naviview.expanded=false
@@ -804,8 +804,8 @@ target6.x=70
target6.y=70
target7.editor.height=700
target7.editor.width=900
-target7.editor.x=685
-target7.editor.y=292
+target7.editor.x=132
+target7.editor.y=148
target7.height=50
target7.name=HP
target7.naviview.expanded=true
@@ -816,8 +816,8 @@ target7.x=190
target7.y=550
target8.editor.height=700
target8.editor.width=900
-target8.editor.x=523
-target8.editor.y=194
+target8.editor.x=191
+target8.editor.y=195
target8.height=50
target8.name=Health
target8.naviview.expanded=true
@@ -828,8 +828,8 @@ target8.x=100
target8.y=550
target9.editor.height=700
target9.editor.width=900
-target9.editor.x=605
-target9.editor.y=313
+target9.editor.x=97
+target9.editor.y=285
target9.height=50
target9.name=Direction
target9.naviview.expanded=true

0 comments on commit de12a20

Please sign in to comment.