diff --git a/fighter/Lebensanzeige.class b/fighter/Lebensanzeige.class new file mode 100644 index 0000000..7fb4844 Binary files /dev/null and b/fighter/Lebensanzeige.class differ diff --git a/fighter/Lebensanzeige.ctxt b/fighter/Lebensanzeige.ctxt new file mode 100644 index 0000000..14db61a --- /dev/null +++ b/fighter/Lebensanzeige.ctxt @@ -0,0 +1,11 @@ +#BlueJ class context +comment0.target=Lebensanzeige +comment0.text=\r\n\ Write\ a\ description\ of\ class\ LebensanzeigeP1\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n +comment1.params= +comment1.target=Lebensanzeige() +comment1.text=\r\n\ Act\ -\ do\ whatever\ the\ LebensanzeigeP1\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n +comment2.params= +comment2.target=void\ act() +comment3.params=pLeben +comment3.target=void\ leben(double) +numComments=4 diff --git a/fighter/Lebensanzeige.java b/fighter/Lebensanzeige.java new file mode 100644 index 0000000..ad47de4 --- /dev/null +++ b/fighter/Lebensanzeige.java @@ -0,0 +1,35 @@ +import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo) + +/** + * Write a description of class LebensanzeigeP1 here. + * + * @author (your name) + * @version (a version number or a date) + */ +public class Lebensanzeige extends Actor +{ + /** + * Act - do whatever the LebensanzeigeP1 wants to do. This method is called whenever + * the 'Act' or 'Run' button gets pressed in the environment. + */ + Lebensanzeige(){ + setImage("green.png"); + GreenfootImage image = getImage(); + image.scale(200,40); + setImage(image); + } + + public void act() + { + + } + + public void leben(double pLeben){ + if(pLeben != 0){ + setImage("green.png"); + GreenfootImage image = getImage(); + image.scale((int)(200 * (pLeben/100)),40); + setImage(image); + } + } +} diff --git a/fighter/MyWorld.class b/fighter/MyWorld.class index 1b7e548..45b4f94 100644 Binary files a/fighter/MyWorld.class and b/fighter/MyWorld.class differ diff --git a/fighter/MyWorld.ctxt b/fighter/MyWorld.ctxt index 59c44c9..3aefa1c 100644 --- a/fighter/MyWorld.ctxt +++ b/fighter/MyWorld.ctxt @@ -11,4 +11,6 @@ comment3.params= comment3.target=void\ act() comment4.params= comment4.target=void\ gameEnd() -numComments=5 +comment5.params= +comment5.target=void\ lebensAnzeige() +numComments=6 diff --git a/fighter/MyWorld.java b/fighter/MyWorld.java index 9f04694..5fe9cd8 100644 --- a/fighter/MyWorld.java +++ b/fighter/MyWorld.java @@ -12,6 +12,8 @@ public class MyWorld extends World Player2 player2; int charakterP1; int charakterP2; + Lebensanzeige l1; + Lebensanzeige l2; /** * Constructor for objects of class MyWorld. * @@ -20,9 +22,10 @@ public class MyWorld extends World { // Create a new world with 600x400 cells with a cell size of 1x1 pixels. super(600, 400, 1); - prepare(); charakterP1 = pCharakterP1; charakterP2 = pCharakterP2; + prepare(); + } /** @@ -31,10 +34,14 @@ public class MyWorld extends World */ private void prepare() { - player1 = new Player1(); + player1 = new Player1(charakterP1); addObject(player1,125,153); - player2 = new Player2(); + player2 = new Player2(charakterP2); addObject(player2,429,152); + l1 = new Lebensanzeige(); + addObject(l1,150,50); + l2 = new Lebensanzeige(); + addObject(l2,450,50); } public void act(){ @@ -48,7 +55,12 @@ public class MyWorld extends World player1.leben = player1.leben -10; } } - showText(String.valueOf(player2.leben),300,300); + showText(String.valueOf(player2.leben),450,50); + showText(String.valueOf(player1.leben),150,50); + l1.leben(player1.leben); + l2.leben(player2.leben); + l1.setLocation(150 - (100 - player1.leben), 50); + l2.setLocation(450 - (100 - player2.leben), 50); gameEnd(); } @@ -60,4 +72,8 @@ public class MyWorld extends World Greenfoot.setWorld(new EndWorld("Player One")); } } + + public void lebensAnzeige(){ + + } } diff --git a/fighter/images/1Combo1.png b/fighter/images/1Combo1.png index b0c7581..da06f55 100644 Binary files a/fighter/images/1Combo1.png and b/fighter/images/1Combo1.png differ diff --git a/fighter/images/1Combo2.png b/fighter/images/1Combo2.png index ab9e4d0..f9ace84 100644 Binary files a/fighter/images/1Combo2.png and b/fighter/images/1Combo2.png differ diff --git a/fighter/images/2Combo1.png b/fighter/images/2Combo1.png index 327d111..0ca2840 100644 Binary files a/fighter/images/2Combo1.png and b/fighter/images/2Combo1.png differ diff --git a/fighter/images/2Combo2.png b/fighter/images/2Combo2.png index 0443039..c1cb4e1 100644 Binary files a/fighter/images/2Combo2.png and b/fighter/images/2Combo2.png differ diff --git a/fighter/images/38571146-49AB-4B98-BED0-820D79111A09.png b/fighter/images/38571146-49AB-4B98-BED0-820D79111A09.png new file mode 100644 index 0000000..3840afc Binary files /dev/null and b/fighter/images/38571146-49AB-4B98-BED0-820D79111A09.png differ diff --git a/fighter/images/3Combo1.png b/fighter/images/3Combo1.png index 168e0f7..a16b43a 100644 Binary files a/fighter/images/3Combo1.png and b/fighter/images/3Combo1.png differ diff --git a/fighter/images/3Combo2.png b/fighter/images/3Combo2.png index 4b9e6d7..530d7e1 100644 Binary files a/fighter/images/3Combo2.png and b/fighter/images/3Combo2.png differ diff --git a/fighter/images/470F6C76-F684-42A5-8730-8EB8EEBEA490.png b/fighter/images/470F6C76-F684-42A5-8730-8EB8EEBEA490.png new file mode 100644 index 0000000..bdfd4f9 Binary files /dev/null and b/fighter/images/470F6C76-F684-42A5-8730-8EB8EEBEA490.png differ diff --git a/fighter/images/610F917A-2AAA-44DD-BE4B-365724BC4669.png b/fighter/images/610F917A-2AAA-44DD-BE4B-365724BC4669.png new file mode 100644 index 0000000..b525aa7 Binary files /dev/null and b/fighter/images/610F917A-2AAA-44DD-BE4B-365724BC4669.png differ diff --git a/fighter/images/9011CA92-81E6-4AE3-80DA-55F5C14B95F2.png b/fighter/images/9011CA92-81E6-4AE3-80DA-55F5C14B95F2.png new file mode 100644 index 0000000..093b53d Binary files /dev/null and b/fighter/images/9011CA92-81E6-4AE3-80DA-55F5C14B95F2.png differ diff --git a/fighter/images/9967F36B-53DC-430C-9312-56368A44F937.png b/fighter/images/9967F36B-53DC-430C-9312-56368A44F937.png new file mode 100644 index 0000000..01e6756 Binary files /dev/null and b/fighter/images/9967F36B-53DC-430C-9312-56368A44F937.png differ diff --git a/fighter/images/99A58614-07C8-48DE-BFA1-78B1B6F10871.png b/fighter/images/99A58614-07C8-48DE-BFA1-78B1B6F10871.png new file mode 100644 index 0000000..9b6d8f6 Binary files /dev/null and b/fighter/images/99A58614-07C8-48DE-BFA1-78B1B6F10871.png differ diff --git a/fighter/images/DBE25AB1-15A9-4AC7-86B9-D61578F4CC18.png b/fighter/images/DBE25AB1-15A9-4AC7-86B9-D61578F4CC18.png new file mode 100644 index 0000000..ba24d5b Binary files /dev/null and b/fighter/images/DBE25AB1-15A9-4AC7-86B9-D61578F4CC18.png differ diff --git a/fighter/images/Dashbackward.png b/fighter/images/Dashbackward.png new file mode 100644 index 0000000..6a86271 Binary files /dev/null and b/fighter/images/Dashbackward.png differ diff --git a/fighter/images/IMG_7841.png b/fighter/images/IMG_7841.png new file mode 100644 index 0000000..51e6b04 Binary files /dev/null and b/fighter/images/IMG_7841.png differ diff --git a/fighter/images/IMG_7842.png b/fighter/images/IMG_7842.png new file mode 100644 index 0000000..6b9d0af Binary files /dev/null and b/fighter/images/IMG_7842.png differ diff --git a/fighter/images/IMG_7844.png b/fighter/images/IMG_7844.png new file mode 100644 index 0000000..ba7f020 Binary files /dev/null and b/fighter/images/IMG_7844.png differ diff --git a/fighter/images/IMG_7845.png b/fighter/images/IMG_7845.png new file mode 100644 index 0000000..0f8a4cd Binary files /dev/null and b/fighter/images/IMG_7845.png differ diff --git a/fighter/images/IMG_7846.png b/fighter/images/IMG_7846.png new file mode 100644 index 0000000..c87019a Binary files /dev/null and b/fighter/images/IMG_7846.png differ diff --git a/fighter/images/Jump1.png b/fighter/images/Jump1.png new file mode 100644 index 0000000..8e4ed60 Binary files /dev/null and b/fighter/images/Jump1.png differ diff --git a/fighter/images/Jump2.png b/fighter/images/Jump2.png new file mode 100644 index 0000000..c8cb164 Binary files /dev/null and b/fighter/images/Jump2.png differ diff --git a/fighter/images/JumpattackDash.png b/fighter/images/JumpattackDash.png new file mode 100644 index 0000000..7de8a01 Binary files /dev/null and b/fighter/images/JumpattackDash.png differ diff --git a/fighter/images/Lebensanzeige.png b/fighter/images/Lebensanzeige.png new file mode 100644 index 0000000..438ea90 Binary files /dev/null and b/fighter/images/Lebensanzeige.png differ diff --git a/fighter/images/RenProjectile.png b/fighter/images/RenProjectile.png new file mode 100644 index 0000000..c4dbbca Binary files /dev/null and b/fighter/images/RenProjectile.png differ diff --git a/fighter/images/RenRun1.png b/fighter/images/RenRun1.png index 8123737..05c8eb6 100644 Binary files a/fighter/images/RenRun1.png and b/fighter/images/RenRun1.png differ diff --git a/fighter/images/RenRun2.png b/fighter/images/RenRun2.png index 00920d6..f3b7b31 100644 Binary files a/fighter/images/RenRun2.png and b/fighter/images/RenRun2.png differ diff --git a/fighter/images/RenRun3.png b/fighter/images/RenRun3.png index 3f350c1..ac97139 100644 Binary files a/fighter/images/RenRun3.png and b/fighter/images/RenRun3.png differ diff --git a/fighter/images/RenRun4.png b/fighter/images/RenRun4.png index ab93022..1703cb4 100644 Binary files a/fighter/images/RenRun4.png and b/fighter/images/RenRun4.png differ diff --git a/fighter/images/RenShoot1.png b/fighter/images/RenShoot1.png new file mode 100644 index 0000000..c516672 Binary files /dev/null and b/fighter/images/RenShoot1.png differ diff --git a/fighter/images/RenShoot2.png b/fighter/images/RenShoot2.png new file mode 100644 index 0000000..db6d78e Binary files /dev/null and b/fighter/images/RenShoot2.png differ diff --git a/fighter/images/RenStance.png b/fighter/images/RenStance.png new file mode 100644 index 0000000..25011f6 Binary files /dev/null and b/fighter/images/RenStance.png differ diff --git a/fighter/images/RenUlti1.png b/fighter/images/RenUlti1.png new file mode 100644 index 0000000..0f10f1d Binary files /dev/null and b/fighter/images/RenUlti1.png differ diff --git a/fighter/images/RenUlti2.png b/fighter/images/RenUlti2.png new file mode 100644 index 0000000..44b9997 Binary files /dev/null and b/fighter/images/RenUlti2.png differ diff --git a/fighter/images/RenUlti3.png b/fighter/images/RenUlti3.png new file mode 100644 index 0000000..bf9376e Binary files /dev/null and b/fighter/images/RenUlti3.png differ diff --git a/fighter/images/RenUlti4.png b/fighter/images/RenUlti4.png new file mode 100644 index 0000000..eb32c1a Binary files /dev/null and b/fighter/images/RenUlti4.png differ diff --git a/fighter/images/RenUltiProjectile1.png b/fighter/images/RenUltiProjectile1.png new file mode 100644 index 0000000..c69e439 Binary files /dev/null and b/fighter/images/RenUltiProjectile1.png differ diff --git a/fighter/images/RenUltiProjectile2.png b/fighter/images/RenUltiProjectile2.png new file mode 100644 index 0000000..9509ccf Binary files /dev/null and b/fighter/images/RenUltiProjectile2.png differ diff --git a/fighter/images/green.png b/fighter/images/green.png new file mode 100644 index 0000000..068f514 Binary files /dev/null and b/fighter/images/green.png differ diff --git a/fighter/project.greenfoot b/fighter/project.greenfoot index 1541dbe..cc449e0 100644 --- a/fighter/project.greenfoot +++ b/fighter/project.greenfoot @@ -1,26 +1,36 @@ #Greenfoot project file -class.MyWorld.image=crumpled-paper.jpg +class.Lebensanzeige.image=Lebensanzeige.png +class.MyWorld.image=IMG_7841.png class.Player1.image=man01.png class.Player2.image=man01.png -dependency1.from=StartWorld -dependency1.to=Pfeil +dependency1.from=EndWorld +dependency1.to=StartWorld dependency1.type=UsesDependency dependency2.from=StartWorld -dependency2.to=MyWorld +dependency2.to=Pfeil dependency2.type=UsesDependency -dependency3.from=MyWorld -dependency3.to=Player1 +dependency3.from=StartWorld +dependency3.to=MyWorld dependency3.type=UsesDependency dependency4.from=MyWorld -dependency4.to=Player2 +dependency4.to=Player1 dependency4.type=UsesDependency -editor.fx.0.height=737 -editor.fx.0.width=814 -editor.fx.0.x=168 -editor.fx.0.y=39 +dependency5.from=MyWorld +dependency5.to=Player2 +dependency5.type=UsesDependency +dependency6.from=MyWorld +dependency6.to=Lebensanzeige +dependency6.type=UsesDependency +dependency7.from=MyWorld +dependency7.to=EndWorld +dependency7.type=UsesDependency +editor.fx.0.height=686 +editor.fx.0.width=1294 +editor.fx.0.x=-7 +editor.fx.0.y=-7 height=686 -package.numDependencies=4 -package.numTargets=5 +package.numDependencies=7 +package.numTargets=7 project.charset=UTF-8 publish.hasSource=false publish.locked=true @@ -43,33 +53,47 @@ target1.width=120 target1.x=0 target1.y=0 target2.height=70 -target2.name=StartWorld +target2.name=EndWorld target2.showInterface=false target2.type=ClassTarget target2.width=120 target2.x=0 target2.y=0 target3.height=70 -target3.name=Player2 +target3.name=Lebensanzeige target3.showInterface=false target3.type=ClassTarget target3.width=120 target3.x=0 target3.y=0 target4.height=70 -target4.name=Player1 +target4.name=StartWorld target4.showInterface=false target4.type=ClassTarget target4.width=120 target4.x=0 target4.y=0 target5.height=70 -target5.name=MyWorld +target5.name=Player2 target5.showInterface=false target5.type=ClassTarget target5.width=120 target5.x=0 target5.y=0 +target6.height=70 +target6.name=Player1 +target6.showInterface=false +target6.type=ClassTarget +target6.width=120 +target6.x=0 +target6.y=0 +target7.height=70 +target7.name=MyWorld +target7.showInterface=false +target7.type=ClassTarget +target7.width=120 +target7.x=0 +target7.y=0 version=3.1.0 width=1294 world.lastInstantiated=StartWorld