zocker
/
zweiundvierzig
mirror of https://github.com/HGE-IT-Course-2016/zweiundvierzig
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge ddca90be60 into fdffef5047

Browse Source
pull/87/merge
SariusRu 10 years ago committed by GitHub
parent fdffef5047 ddca90be60
commit f2375c0a06
2 changed files with 331 additions and 321 deletions
Show Stats Download Patch File Download Diff File

24
GeneralMap.java
Unescape Escape View File

@ -69,9 +69,9 @@ public abstract class GeneralMap extends World implements ButtonEvent
createPlayerObjects(playerList.length);
}
public int currentPlayer()
public void currentPlayer()
{
return currentPlayer;
}
public void redrawGameStates()
@ -83,7 +83,7 @@ public abstract class GeneralMap extends World implements ButtonEvent
if(status == GameStates.KAMPF)
{
GreenfootImage GameStatesEmpty = new GreenfootImage(750,textSize);
GreenfootImage GameStates = new GreenfootImage("KAMPF!!! Wähle die Provinz aus, die du angreifen möchtest!",textSize,new Color(255,255,255),new Color(0,0,0));
GreenfootImage GameStates = new GreenfootImage("KAMPF!!! Wähle die Provinz aus, die du angreifen möchtest, Spieler " + currentPlayer,textSize,new Color(255,255,255),new Color(0,0,0));
GameStatesEmpty.drawImage(GameStates,0,0);
GreenfootImage States = new GreenfootImage("MapWorldFight.png");
States.drawImage(GameStatesEmpty,X,Y);
@ -92,7 +92,7 @@ public abstract class GeneralMap extends World implements ButtonEvent
if(status == GameStates.VERSCHIEBEN)
{
GreenfootImage GameStatesEmpty = new GreenfootImage(500,textSize);
GreenfootImage GameStates = new GreenfootImage("VERSCHIEBEN! Wähle die Provinz aus!",textSize,new Color(255,255,255),new Color(0,0,0));
GreenfootImage GameStates = new GreenfootImage("VERSCHIEBEN! Wähle die Provinz aus, Spieler " + currentPlayer,textSize,new Color(255,255,255),new Color(0,0,0));
GameStatesEmpty.drawImage(GameStates,0,0);
GreenfootImage States = new GreenfootImage("MapWorldMove.png");
States.drawImage(GameStatesEmpty,X,Y);
@ -101,7 +101,7 @@ public abstract class GeneralMap extends World implements ButtonEvent
if(status == GameStates.SETZEN)
{
GreenfootImage GameStatesEmpty = new GreenfootImage(500,textSize);
GreenfootImage GameStates = new GreenfootImage("Setzten! Wähle die Provinz aus!",textSize,new Color(255,255,255),new Color(0,0,0));
GreenfootImage GameStates = new GreenfootImage("Setzten! Wähle die Provinz aus, Spieler " + currentPlayer,textSize,new Color(255,255,255),new Color(0,0,0));
GameStatesEmpty.drawImage(GameStates,0,0);
GreenfootImage States = new GreenfootImage("MapWorld.png");
States.drawImage(GameStatesEmpty,X,Y);
@ -349,8 +349,9 @@ public abstract class GeneralMap extends World implements ButtonEvent
{
if (provinces[i].hasClicked() == true)
{
offenderProvince = provinces[i];
provinces[i].redrawProvince(2);
offenderProvince = provinces[i];
// System.out.println("Die Provinz " + provinces[i].getDisplayName() + " wurde als angreifende Provinz ausgewählt! Sie gehört Spieler" + provinces[i].getOwner());
}
}
@ -363,8 +364,9 @@ public abstract class GeneralMap extends World implements ButtonEvent
{
if (provinces[i].hasClicked() == true)//&& defenderProvince != offenderProvince)
{
defenderProvince = provinces[i];
provinces[i].redrawProvince(3);
defenderProvince = provinces[i];
// System.out.println("Die Provinz " + provinces[i].getDisplayName() + " wurde als verteidigende Provinz ausgewählt! Sie gehört Spieler" + provinces[i].getOwner());
chooser();
break;
@ -375,7 +377,8 @@ public abstract class GeneralMap extends World implements ButtonEvent
private void chooser()
{
System.out.println("Es wird gewürfelt!");
// System.out.println("Es wird gewürfelt!");
defenderProvince.redrawProvince(3);
Dice_Offender diceOffender = new Dice_Offender();
// System.out.println("Der Angreifer ereichte folgende Würfelzahlen:");
int[] maxDiceOffenderArray = diceOffender.dice_offender(offenderProvince.getEntityCount());
@ -409,6 +412,8 @@ public abstract class GeneralMap extends World implements ButtonEvent
}
JOptionPane.showMessageDialog(null,"Es wurde gewürfelt. Der Angreifer erreichte folgende Würfelzahlen: " + maxDiceOffender + "\n Der Verteidiger erreichte diese Würfelzahlen: " + maxDiceDefender);
offenderProvince.redrawProvince(1);
defenderProvince.redrawProvince(1);
diceOffender = null;
diceDefender = null;
decider(maxDiceOffenderArray, maxDiceDefenderArray);
@ -447,7 +452,8 @@ public abstract class GeneralMap extends World implements ButtonEvent
if (maxOffender>maxDefender && defenderProvince.getEntityCount()==1)
{
defenderProvince.setOwner(offenderProvince.getOwner());
defenderProvince.setEntityCount(0);
defenderProvince.setEntityCount(1);
offenderProvince.setEntityCount(offenderProvince.getEntityCount() -1);
JOptionPane.showMessageDialog(null,"Somit gewinnt der Angreifer (Spieler " + offenderProvince.getOwner() + "). Die Provinz gehört fortan dem Angreifer (" + offenderProvince.getOwner() + ")");
}
offenderProvince = null;

628
project.greenfoot
Unescape Escape View File

@ -1,338 +1,342 @@
#Greenfoot project file
class.ArmyPlacer.superclass=Map_World
class.ArmySchubser.superclass=Map_World
#Greenfoot properties
#Mon Jul 04 22:50:43 CEST 2016
target16.name=Button
editor.swing.0.y=-8
editor.swing.0.x=-8
target2.name=Debug5
target9.name=DicesList
class.Weltenauswahl.superclass=Spieloptionen
target23.name=Map
dependency11.type=UsesDependency
target23.y=610
target23.x=190
dependency18.type=UsesDependency
dependency15.from=Start_Load
target21.showInterface=false
target19.width=80
dependency8.to=Utils
target14.type=AbstractTarget
dependency25.type=UsesDependency
dependency22.from=Start_Load
target15.width=90
class.Button.superclass=GUI_Interface
class.ButtonEvent.superclass=
class.Colours.superclass=greenfoot.World
dependency29.from=Map
target15.height=50
target7.type=ClassTarget
target15.typeParameters=
class.CurrentPlayerArrow.superclass=GUI_Interface
class.Debug3.superclass=Map_World
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.DicesList.superclass=greenfoot.Actor
class.Fight.superclass=Map_World
class.GUI_Interface.superclass=greenfoot.Actor
target11.width=110
target21.type=ClassTarget
dependency25.to=Dice_Offender
dependency32.type=UsesDependency
target1.typeParameters=
target20.showInterface=false
dependency2.to=Menue_Button
class.ArmySchubser.superclass=Map_World
class.GeneralMap.superclass=greenfoot.World
class.Label.superclass=GUI_Interface
class.Map.superclass=greenfoot.World
class.Map_World.superclass=GeneralMap
class.Menue_Button.superclass=Button
class.OffenderDices.superclass=DicesList
class.Player.superclass=greenfoot.Actor
class.Province.superclass=greenfoot.Actor
class.Roll_Button.superclass=Button
class.Spieleranzahl.superclass=Spieloptionen
class.Spieloptionen.superclass=greenfoot.World
class.Start_Load.superclass=greenfoot.World
class.Utils.superclass=
class.Weltenauswahl.superclass=Spieloptionen
dependency1.from=Province
dependency1.to=Utils
dependency1.type=UsesDependency
dependency10.from=GeneralMap
dependency10.to=Player
target16.y=130
target16.x=10
dependency8.type=UsesDependency
dependency5.from=Player
target24.height=50
target12.y=490
target12.x=10
target18.width=110
editor.fx.0.height=700
project.charset=UTF-8
target12.typeParameters=
dependency15.to=Button
target5.height=50
target15.name=Map_World
target1.name=Player
version=2.8.0
target8.name=Label
target22.name=Roll_Button
dependency10.type=UsesDependency
dependency11.from=Button
dependency11.to=ButtonEvent
dependency11.type=UsesDependency
dependency12.from=Button
dependency12.to=Utils
dependency12.type=UsesDependency
dependency13.from=ButtonEvent
dependency13.to=Button
dependency13.type=UsesDependency
dependency17.type=UsesDependency
dependency14.from=Roll_Button
dependency14.to=ButtonEvent
dependency14.type=UsesDependency
dependency15.from=Start_Load
dependency15.to=Button
dependency15.type=UsesDependency
dependency16.from=Start_Load
package.numTargets=23
class.Player.superclass=greenfoot.Actor
target13.type=ClassTarget
dependency24.type=UsesDependency
dependency21.from=Colours
dependency28.from=Utils
dependency9.to=GeneralMap
target24.typeParameters=
target6.type=AbstractTarget
target19.height=50
dependency30.to=Label
target7.y=250
target7.x=120
target20.type=ClassTarget
dependency31.type=UsesDependency
target3.y=370
target3.x=190
target7.typeParameters=
target8.height=50
dependency26.to=Dice_Defender
class.Dice_Offender.superclass=Dice
mainWindow.y=-8
mainWindow.x=-8
target12.showInterface=false
target3.showInterface=false
target17.typeParameters=
dependency3.to=Roll_Button
target1.width=80
dependency7.type=UsesDependency
dependency4.from=Map_World
dependency20.to=GeneralMap
target22.y=190
target22.x=190
target14.name=GeneralMap
target9.height=50
target11.showInterface=false
target2.showInterface=false
target7.name=Menue_Button
dependency16.to=ButtonEvent
target21.name=Start_Load
dependency13.from=ButtonEvent
dependency16.type=UsesDependency
dependency17.from=Colours
dependency17.to=Button
dependency17.type=UsesDependency
dependency18.from=Colours
dependency18.to=Map
dependency18.type=UsesDependency
dependency19.from=Map
dependency19.to=Button
dependency19.type=UsesDependency
dependency2.from=GeneralMap
dependency2.to=Menue_Button
dependency2.type=UsesDependency
dependency20.from=Map
dependency20.to=GeneralMap
dependency20.type=UsesDependency
dependency21.from=Colours
dependency21.to=Map_World
dependency21.type=UsesDependency
dependency22.from=Start_Load
dependency22.to=Colours
dependency22.type=UsesDependency
dependency23.from=ArmyPlacer
dependency23.to=Province
target14.typeParameters=
target8.width=80
class.DicesList.superclass=greenfoot.Actor
target22.width=90
target12.type=ClassTarget
target21.height=50
target13.height=50
dependency23.type=UsesDependency
dependency24.from=ArmyPlacer
dependency24.to=Utils
dependency24.type=UsesDependency
dependency25.from=GeneralMap
dependency25.to=Button
dependency25.type=UsesDependency
dependency26.from=GeneralMap
dependency26.to=Province
dependency26.type=UsesDependency
dependency20.from=Map
target19.type=ClassTarget
target4.width=80
target9.showInterface=false
dependency27.from=GeneralMap
dependency27.to=Dice_Offender
dependency27.type=UsesDependency
dependency28.from=GeneralMap
dependency28.to=Dice_Defender
dependency28.type=UsesDependency
dependency29.from=GeneralMap
dependency29.to=Utils
dependency29.type=UsesDependency
dependency3.from=GeneralMap
dependency3.to=Roll_Button
dependency3.type=UsesDependency
dependency30.from=Utils
dependency30.to=Province
target18.showInterface=false
target10.showInterface=false
target1.showInterface=false
target5.type=ClassTarget
class.Debug4.superclass=Map_World
dependency10.to=Player
target19.y=190
target19.x=10
dependency30.type=UsesDependency
dependency31.from=Map
dependency31.to=Map_World
dependency31.type=UsesDependency
dependency4.from=Map_World
dependency4.to=Province
dependency4.type=UsesDependency
dependency5.from=Player
dependency5.to=GeneralMap
dependency5.type=UsesDependency
dependency6.from=Menue_Button
dependency6.to=ButtonEvent
dependency6.type=UsesDependency
dependency7.from=DicesList
dependency7.to=Dice
dependency7.type=UsesDependency
dependency8.from=DicesList
dependency8.to=Utils
dependency8.type=UsesDependency
dependency9.from=Province
dependency9.to=GeneralMap
dependency9.type=UsesDependency
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
mainWindow.x=-8
mainWindow.y=-8
package.numDependencies=31
package.numTargets=24
project.charset=UTF-8
target2.height=50
target15.y=70
target15.x=170
dependency31.to=Start_Load
class.Province.superclass=greenfoot.Actor
target11.y=310
target11.x=10
readme.height=58
readme.name=@README
readme.width=47
readme.x=10
readme.y=10
target1.height=50
target1.name=GUI_Interface
target1.showInterface=false
target1.type=AbstractTarget
target1.typeParameters=
target1.width=100
target1.x=10
target1.y=250
target10.height=50
target10.name=Roll_Button
target10.showInterface=false
target10.type=ClassTarget
target10.typeParameters=
target10.width=90
target10.x=190
target10.y=190
target11.height=50
target11.name=ArmyPlacer
target11.showInterface=false
target11.type=ClassTarget
target8.showInterface=false
target17.showInterface=false
dependency27.to=Utils
class.Colours.superclass=greenfoot.World
class.OffenderDices.superclass=DicesList
dependency3.from=GeneralMap
target11.typeParameters=
target11.width=90
target11.x=10
target11.y=670
target12.height=50
target12.name=Player
target12.showInterface=false
target12.type=ClassTarget
target12.typeParameters=
target12.width=80
target12.x=120
target12.y=10
target13.height=50
target13.name=Debug5
target13.showInterface=false
target13.type=ClassTarget
target13.typeParameters=
target13.width=80
target13.x=100
target13.y=370
target14.height=50
target14.name=Debug4
target14.showInterface=false
target14.type=ClassTarget
target14.typeParameters=
target14.width=80
target14.x=190
target14.y=370
target15.height=50
target15.name=Debug3
target15.showInterface=false
target15.type=ClassTarget
target15.typeParameters=
target15.width=80
target15.x=110
target15.y=550
dependency6.type=UsesDependency
dependency4.to=Province
target9.typeParameters=
class.Map.superclass=greenfoot.World
target16.height=50
target16.name=Dice
target7.width=110
target13.name=Province
target21.width=90
dependency21.to=Map_World
target6.name=GUI_Interface
target16.showInterface=false
target16.type=ClassTarget
target16.typeParameters=
target16.width=80
target16.x=100
target16.y=190
target17.height=50
target17.name=Menue_Button
target17.showInterface=false
target17.type=ClassTarget
target17.typeParameters=
target17.width=110
target17.x=120
target17.y=250
target18.height=50
target18.name=DicesList
target18.showInterface=false
target18.type=AbstractTarget
target18.typeParameters=
target18.width=80
target18.x=10
target18.y=430
target19.height=50
target19.name=OffenderDices
target19.showInterface=false
target19.type=ClassTarget
target19.typeParameters=
target19.width=110
target19.x=100
target19.y=430
target2.height=50
target2.name=Label
target2.showInterface=false
target2.type=ClassTarget
target2.typeParameters=
target2.width=80
target2.x=10
target20.name=Colours
dependency15.type=UsesDependency
dependency12.from=Button
target14.width=90
target23.typeParameters=
dependency17.to=Button
target6.y=250
dependency19.from=Map
target6.x=10
target10.width=110
target2.y=370
target20.height=50
target20.name=Province
target20.showInterface=false
target20.type=ClassTarget
target11.type=ClassTarget
target2.x=100
dependency22.type=UsesDependency
target18.type=ClassTarget
target17.height=50
target6.typeParameters=
dependency29.type=UsesDependency
dependency26.from=GeneralMap
target4.type=ClassTarget
editor.fx.0.y=0
editor.fx.0.x=0
dependency11.to=ButtonEvent
target6.height=50
editor.fx.0.width=700
target24.width=80
class.Menue_Button.superclass=Button
dependency32.to=Start_Load
target21.y=550
target21.x=10
target20.typeParameters=
target20.width=80
target20.x=130
target20.y=310
target21.height=50
target21.name=GeneralMap
target21.showInterface=false
target21.type=AbstractTarget
target21.typeParameters=
target21.width=90
target21.x=70
target21.y=70
target22.height=50
target22.name=ButtonEvent
dependency5.type=UsesDependency
dependency2.from=GeneralMap
target17.width=90
dependency9.from=Province
target10.height=50
dependency28.to=Province
target3.typeParameters=
target13.width=80
dependency5.to=GeneralMap
target12.name=DefenderDices
target19.name=Utils
target13.typeParameters=
target5.name=Dice
target24.showInterface=false
class.Start_Load.superclass=greenfoot.World
dependency22.to=Colours
class.Label.superclass=GUI_Interface
dependency14.type=UsesDependency
dependency11.from=Button
target18.y=130
dependency18.from=Colours
target18.x=100
target14.y=70
target14.x=70
target10.type=ClassTarget
dependency18.to=Map
dependency21.type=UsesDependency
package.numDependencies=32
target17.type=InterfaceTarget
dependency28.type=UsesDependency
dependency25.from=GeneralMap
target10.y=430
target3.type=ClassTarget
target10.x=100
target23.showInterface=false
readme.name=@README
target24.type=ClassTarget
dependency32.from=Map
target16.width=80
target10.typeParameters=
target8.typeParameters=
dependency12.to=Utils
dependency4.type=UsesDependency
dependency1.from=Province
target22.showInterface=false
target22.type=InterfaceTarget
dependency8.from=DicesList
target22.height=50
target14.height=50
target9.y=430
target9.x=10
dependency29.to=Map_World
target11.name=Dice_Defender
target5.y=190
class.Spieleranzahl.superclass=Spieloptionen
target5.x=100
target18.name=Dice_Offender
target22.typeParameters=
target22.width=90
target22.x=130
target22.y=490
target3.height=50
dependency6.to=ButtonEvent
target4.name=Debug3
target1.y=10
target1.x=120
target19.typeParameters=
class.Fight.superclass=Map_World
target5.typeParameters=
dependency13.type=UsesDependency
dependency10.from=GeneralMap
target7.showInterface=false
class.ButtonEvent.superclass=
target3.width=80
dependency17.from=Colours
class.Debug5.superclass=Map_World
dependency23.to=Button
class.Spieloptionen.superclass=greenfoot.World
target23.height=50
target23.name=Utils
target23.showInterface=false
target23.type=ClassTarget
target23.typeParameters=
target23.width=80
target23.x=10
target23.y=190
target24.height=50
target24.name=Map
target24.showInterface=false
target24.type=ClassTarget
target24.typeParameters=
target24.width=80
target24.x=190
dependency20.type=UsesDependency
class.GUI_Interface.superclass=greenfoot.Actor
target16.type=ClassTarget
dependency27.type=UsesDependency
dependency24.from=GeneralMap
target2.type=ClassTarget
target24.y=610
target3.height=50
target3.name=Dice_Defender
target3.showInterface=false
target3.type=ClassTarget
target3.typeParameters=
target3.width=110
target3.x=10
target3.y=310
target9.type=AbstractTarget
target24.x=190
dependency19.to=Button
target4.height=50
target4.name=DefenderDices
target4.showInterface=false
target4.type=ClassTarget
target4.typeParameters=
target4.width=110
target4.x=10
target4.y=490
target5.height=50
target5.name=Map_World
target5.showInterface=false
target5.type=ClassTarget
target5.typeParameters=
target5.width=90
target5.x=170
target5.y=70
target6.height=50
target6.name=Button
target23.type=ClassTarget
target20.y=610
target20.x=10
dependency31.from=Colours
editor.swing.0.height=744
target6.showInterface=false
target6.type=ClassTarget
target6.typeParameters=
target6.width=80
target6.x=10
target6.y=130
target15.showInterface=false
readme.y=10
readme.x=10
target16.typeParameters=
target2.typeParameters=
dependency13.to=Button
dependency3.type=UsesDependency
dependency7.from=DicesList
target6.width=100
readme.width=47
target20.width=80
mainWindow.height=744
editor.swing.0.width=1383
target5.showInterface=false
target14.showInterface=false
target18.height=50
target2.width=80
class.ArmyPlacer.superclass=Map_World
target10.name=OffenderDices
target17.y=490
target17.x=130
target17.name=ButtonEvent
target3.name=Debug4
target7.height=50
target7.name=Dice_Offender
target7.showInterface=false
target7.type=ClassTarget
target7.typeParameters=
target7.width=110
target7.x=100
target7.y=130
target8.height=50
target8.name=Colours
target8.showInterface=false
target13.y=310
target13.x=130
target24.name=Map
dependency7.to=Dice
dependency12.type=UsesDependency
dependency19.type=UsesDependency
dependency16.from=Start_Load
target4.showInterface=false
target13.showInterface=false
target15.type=ClassTarget
class.DefenderDices.superclass=DicesList
dependency23.from=GeneralMap
dependency26.type=UsesDependency
target11.height=50
dependency24.to=Province
target1.type=ClassTarget
target9.width=80
target8.type=ClassTarget
target8.typeParameters=
target8.width=80
target23.width=80
target22.type=ClassTarget
dependency1.to=Utils
dependency30.from=Colours
target5.width=80
class.Dice_Defender.superclass=Dice
class.Utils.superclass=
class.Debug3.superclass=Map_World
target8.y=370
target8.x=10
target8.y=610
target9.height=50
target9.name=Start_Load
target9.showInterface=false
target9.type=ClassTarget
target9.typeParameters=
target9.width=90
target9.x=10
target9.y=550
version=2.8.0
world.lastInstantiated=Map_World
target12.width=110
dependency2.type=UsesDependency
target4.y=550
target4.x=110
target20.height=50
dependency9.type=UsesDependency
dependency6.from=Menue_Button
target12.height=50
target21.typeParameters=
class.Dice.superclass=GUI_Interface
world.lastInstantiated=Start_Load
dependency14.to=ButtonEvent
target18.typeParameters=
target19.showInterface=false
class.Roll_Button.superclass=Button
class.Map_World.superclass=GeneralMap
target1.height=50
target4.typeParameters=
mainWindow.width=1382

Write Preview
Loading…
Cancel
Save