diff --git a/GeneralMap.java b/GeneralMap.java index 6f2a937..6edac2d 100644 --- a/GeneralMap.java +++ b/GeneralMap.java @@ -82,7 +82,7 @@ public abstract class GeneralMap extends World implements ButtonEvent if(status == GameStates.KAMPF) { - GreenfootImage GameStates = new GreenfootImage("KAMPF!!! Wähle die Provinzen aus, die kämpfen sollen, " + getPlayerName() + ".",textSize,new Color(255,255,255),new Color(0,0,0)) + GreenfootImage GameStates = new GreenfootImage("KAMPF!!! Wähle die Provinzen aus, die kämpfen sollen, " + getPlayerName() + ".",textSize,new Color(255,255,255),new Color(0,0,0)); GreenfootImage GameStatesEmpty = new GreenfootImage(GameStates.getWidth(),textSize); GameStatesEmpty.drawImage(GameStates,0,0); GreenfootImage States = new GreenfootImage("MapWorldFight.png"); @@ -92,7 +92,7 @@ public abstract class GeneralMap extends World implements ButtonEvent if(status == GameStates.VERSCHIEBEN) { GreenfootImage GameStates = new GreenfootImage("VERSCHIEBEN! Wähle die Provinzen aus, bei denen du schubsen möchtest, " + getPlayerName() + ".",textSize,new Color(255,255,255),new Color(0,0,0)); - GreenfootImage GameStatesEmpty = new GreenfootImage(GameStes.getWidth(),textSize); + GreenfootImage GameStatesEmpty = new GreenfootImage(GameStates.getWidth(),textSize); GameStatesEmpty.drawImage(GameStates,0,0); GreenfootImage States = new GreenfootImage("MapWorldMove.png"); diff --git a/project.greenfoot b/project.greenfoot index 969fc07..0472d97 100644 --- a/project.greenfoot +++ b/project.greenfoot @@ -10,8 +10,8 @@ class.Debug4.superclass=Map_World class.Debug5.superclass=Map_World class.DefenderDices.superclass=DicesList class.Dice.superclass=GUI_Interface -class.Dice_Defender.superclass=Dice -class.Dice_Offender.superclass=Dice +class.Dice_Defender.superclass= +class.Dice_Offender.superclass= class.DicesList.superclass=greenfoot.Actor class.Fight.superclass=Map_World class.GUI_Interface.superclass=greenfoot.Actor @@ -24,6 +24,7 @@ class.OffenderDices.superclass=DicesList class.Player.superclass=greenfoot.Actor class.Province.superclass=greenfoot.Actor class.Roll_Button.superclass=Button +class.Spielanleitung.superclass=greenfoot.Actor class.Spieleranzahl.superclass=Spieloptionen class.Spieloptionen.superclass=greenfoot.World class.Start_Load.superclass=greenfoot.World @@ -74,36 +75,42 @@ dependency21.type=UsesDependency dependency22.from=Start_Load dependency22.to=Colours dependency22.type=UsesDependency -dependency23.from=ArmyPlacer -dependency23.to=Province +dependency23.from=GeneralMap +dependency23.to=Button dependency23.type=UsesDependency -dependency24.from=ArmyPlacer -dependency24.to=Utils +dependency24.from=GeneralMap +dependency24.to=Province dependency24.type=UsesDependency dependency25.from=GeneralMap -dependency25.to=Button +dependency25.to=Dice_Offender dependency25.type=UsesDependency dependency26.from=GeneralMap -dependency26.to=Province +dependency26.to=Dice_Defender dependency26.type=UsesDependency dependency27.from=GeneralMap -dependency27.to=Dice_Offender +dependency27.to=Utils dependency27.type=UsesDependency -dependency28.from=GeneralMap -dependency28.to=Dice_Defender +dependency28.from=Utils +dependency28.to=Province dependency28.type=UsesDependency -dependency29.from=GeneralMap -dependency29.to=Utils +dependency29.from=Map +dependency29.to=Map_World dependency29.type=UsesDependency dependency3.from=GeneralMap dependency3.to=Roll_Button dependency3.type=UsesDependency -dependency30.from=Utils -dependency30.to=Province +dependency30.from=Colours +dependency30.to=Label dependency30.type=UsesDependency -dependency31.from=Map -dependency31.to=Map_World +dependency31.from=Colours +dependency31.to=Start_Load dependency31.type=UsesDependency +dependency32.from=Start_Load +dependency32.to=Spielanleitung +dependency32.type=UsesDependency +dependency33.from=Map +dependency33.to=Start_Load +dependency33.type=UsesDependency dependency4.from=Map_World dependency4.to=Province dependency4.type=UsesDependency @@ -126,15 +133,15 @@ editor.fx.0.height=700 editor.fx.0.width=700 editor.fx.0.x=0 editor.fx.0.y=0 -editor.swing.0.height=1056 -editor.swing.0.width=1936 -editor.swing.0.x=-8 -editor.swing.0.y=-8 -mainWindow.height=1056 -mainWindow.width=1936 +editor.swing.0.height=0 +editor.swing.0.width=0 +editor.swing.0.x=0 +editor.swing.0.y=0 +mainWindow.height=735 +mainWindow.width=1377 mainWindow.x=-8 -mainWindow.y=-8 -package.numDependencies=31 +mainWindow.y=0 +package.numDependencies=33 package.numTargets=24 project.charset=UTF-8 readme.height=58 @@ -159,11 +166,11 @@ target10.width=90 target10.x=190 target10.y=190 target11.height=50 -target11.name=ArmyPlacer +target11.name=Spielanleitung target11.showInterface=false target11.type=ClassTarget target11.typeParameters= -target11.width=90 +target11.width=100 target11.x=10 target11.y=670 target12.height=50 @@ -335,4 +342,4 @@ target9.width=90 target9.x=10 target9.y=550 version=2.8.0 -world.lastInstantiated=Map_World +world.lastInstantiated=Start_Load