diff --git a/SMIMS-Game/Player.class b/SMIMS-Game/Player.class index 17b5d20..4e85413 100644 Binary files a/SMIMS-Game/Player.class and b/SMIMS-Game/Player.class differ diff --git a/SMIMS-Game/Player.ctxt b/SMIMS-Game/Player.ctxt index c19adf5..2806518 100644 --- a/SMIMS-Game/Player.ctxt +++ b/SMIMS-Game/Player.ctxt @@ -4,7 +4,11 @@ comment0.text=\r\n\ Write\ a\ description\ of\ class\ Player\ here.\r\n\ \r\n\ @ comment1.params= comment1.target=void\ act() comment2.params= -comment2.target=void\ player_movement() +comment2.target=void\ moveLeftAndRight() comment3.params= -comment3.target=boolean\ onGround() -numComments=4 +comment3.target=void\ jump() +comment4.params= +comment4.target=void\ fall() +comment5.params= +comment5.target=boolean\ collision() +numComments=6 diff --git a/SMIMS-Game/Player.java b/SMIMS-Game/Player.java index 9c7c0f4..10df53f 100644 --- a/SMIMS-Game/Player.java +++ b/SMIMS-Game/Player.java @@ -17,7 +17,6 @@ public class Player extends Actor public void act() { - player_movement(); collision(); moveLeftAndRight(); jump(); diff --git a/SMIMS-Game/project.greenfoot b/SMIMS-Game/project.greenfoot index 73e93c0..dbe2520 100644 --- a/SMIMS-Game/project.greenfoot +++ b/SMIMS-Game/project.greenfoot @@ -1,19 +1,25 @@ #Greenfoot project file class.Ground.image=weave.jpg class.Player.image=ppl2.png -dependency1.from=MyWorld -dependency1.to=Player +dependency1.from=PlayerTestWorld +dependency1.to=Ground dependency1.type=UsesDependency -dependency2.from=Player -dependency2.to=Ground +dependency2.from=PlayerTestWorld +dependency2.to=Player dependency2.type=UsesDependency -editor.fx.0.height=0 -editor.fx.0.width=0 -editor.fx.0.x=0 -editor.fx.0.y=0 +dependency3.from=MyWorld +dependency3.to=Player +dependency3.type=UsesDependency +dependency4.from=Player +dependency4.to=Ground +dependency4.type=UsesDependency +editor.fx.0.height=737 +editor.fx.0.width=814 +editor.fx.0.x=332 +editor.fx.0.y=64 height=736 -package.numDependencies=2 -package.numTargets=3 +package.numDependencies=4 +package.numTargets=4 project.charset=UTF-8 publish.hasSource=false publish.locked=true @@ -43,14 +49,21 @@ target2.width=120 target2.x=0 target2.y=0 target3.height=70 -target3.name=MyWorld +target3.name=PlayerTestWorld target3.showInterface=false target3.type=ClassTarget target3.width=120 target3.x=0 target3.y=0 +target4.height=70 +target4.name=MyWorld +target4.showInterface=false +target4.type=ClassTarget +target4.width=120 +target4.x=0 +target4.y=0 version=3.1.0 width=856 -world.lastInstantiated=MyWorld -xPosition=652 -yPosition=76 +world.lastInstantiated=PlayerTestWorld +xPosition=509 +yPosition=133