diff --git a/Render.class b/Render.class index c8c8d66..88a12ff 100644 Binary files a/Render.class and b/Render.class differ diff --git a/Render.java b/Render.java index 3d086c3..7d4b04f 100644 --- a/Render.java +++ b/Render.java @@ -17,10 +17,27 @@ public class Render { public void drawGhost(int x, int y, int r, int g, int b, boolean visible){ - game.fill(255); + game.fill(r,g,b); + game.strokeWeight(0); + game.stroke(r,g,b); + visible = false; if(visible){ game.circle(x,y,game.cellSize*0.8f); - game.rect(x-game.cellSize*0.4f, y-game.cellSize*0.4f, game.cellSize*0.8f,game.cellSize*0.8f); + game.rect(x-game.cellSize*0.4f, y, game.cellSize*0.8f,game.cellSize*0.4f); + game.fill(255); + game.circle(x-game.cellSize*0.2f,y,game.cellSize*0.2f); + game.circle(x+game.cellSize*0.2f,y,game.cellSize*0.2f); + } + else + { + game.circle(x,y,game.cellSize*0.9f); + game.rect(x-game.cellSize*0.45f, y, game.cellSize*0.9f,game.cellSize*0.45f); + game.fill(0); + game.circle(x,y,game.cellSize*0.8f); + game.rect(x-game.cellSize*0.4f, y, game.cellSize*0.8f,game.cellSize*0.4f); + game.fill(255); + game.circle(x-game.cellSize*0.2f,y,game.cellSize*0.2f); + game.circle(x+game.cellSize*0.2f,y,game.cellSize*0.2f); } } diff --git a/package.bluej b/package.bluej index 9247d3c..b8ba49d 100644 --- a/package.bluej +++ b/package.bluej @@ -1,23 +1,32 @@ #BlueJ package file -dependency1.from=game -dependency1.to=Render +dependency1.from=Pacman +dependency1.to=Game dependency1.type=UsesDependency +dependency2.from=Game +dependency2.to=Render +dependency2.type=UsesDependency +dependency3.from=Game +dependency3.to=Pacman +dependency3.type=UsesDependency +dependency4.from=Render +dependency4.to=Game +dependency4.type=UsesDependency editor.fx.0.height=739 editor.fx.0.width=816 -editor.fx.0.x=552 -editor.fx.0.y=98 -objectbench.height=183 -objectbench.width=1896 +editor.fx.0.x=0 +editor.fx.0.y=10 +objectbench.height=93 +objectbench.width=760 package.divider.horizontal=0.6 -package.divider.vertical=0.79957805907173 -package.editor.height=751 -package.editor.width=1785 -package.editor.x=0 -package.editor.y=0 -package.frame.height=1048 -package.frame.width=1936 -package.numDependencies=1 -package.numTargets=2 +package.divider.vertical=0.8 +package.editor.height=393 +package.editor.width=649 +package.editor.x=1068 +package.editor.y=40 +package.frame.height=600 +package.frame.width=800 +package.numDependencies=4 +package.numTargets=3 package.showExtends=true package.showUses=true project.charset=UTF-8 @@ -27,16 +36,23 @@ readme.width=49 readme.x=10 readme.y=10 target1.height=70 -target1.name=game +target1.name=Pacman target1.showInterface=false target1.type=ClassTarget target1.width=120 -target1.x=130 +target1.x=70 target1.y=10 target2.height=70 -target2.name=Render +target2.name=Game target2.showInterface=false target2.type=ClassTarget target2.width=120 -target2.x=10 -target2.y=90 +target2.x=290 +target2.y=40 +target3.height=70 +target3.name=Render +target3.showInterface=false +target3.type=ClassTarget +target3.width=120 +target3.x=80 +target3.y=200