fhrt/inf3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of manuel-voegele.de:inf3

Browse Source 
overnight merge, hatte vergessen zu commiten als ich fertig war gestern :D
This commit is contained in:
Wafa Sadri
2014-04-11 08:47:39 +02:00
parent d5363bad1d 30fe600a82
commit 476badf8c1
2 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Backend.cs
View File

@@ -41,6 +41,16 @@ namespace Frontend
{ {
Players.Remove (player.GetId ()); Players.Remove (player.GetId ());
} }
public void clearPlayers ()
{
Players.Clear ();
}
public void clearDragons ()
{
Dragons.Clear ();
}
public Player getPlayer (int playerId) public Player getPlayer (int playerId)
{ {

54
src/Parser.cs
View File

@@ -214,9 +214,26 @@ namespace WorldOfPeacecraft
//OK das ist hier so'n bissle der gleiche scheiß wie "Answer" wie soll das gehn, ohne Block!? //OK das ist hier so'n bissle der gleiche scheiß wie "Answer" wie soll das gehn, ohne Block!?
} }
private void ProcessChallenge (Block block) private void ProcessChallenge (Block challengeBlock)
{ {
//TODO -> Samed
int id = challengeBlock.GetIntValue("id");
String type;
switch (challengeBlock.GetStringValue())
{
case "DRAGON":
type = "Dragon";
break;
case "STAGHUNT":
type = "Staghunt";
break;
case "SKIRMISCH":
type = "Skirmisch";
break;
}
bool accepted = challengeBlock.GetBoolValue("accepted");
//Challenge c = new Challenge(id, type, accepted);
//CHALLENGE: "begin:challenge","id:",INT,"type:",("DRAGON"|"STAGHUNT"|"SKIRMISH"),"accepted:",BOOLEAN,"end:challenge"
} }
private void ProcessPlayer (Block playerBlock) private void ProcessPlayer (Block playerBlock)
@@ -229,6 +246,11 @@ namespace WorldOfPeacecraft
int y = playerBlock.GetIntValue ("y"); int y = playerBlock.GetIntValue ("y");
//Player p = new Player(points, id, busy, desc, x, y,); //Player p = new Player(points, id, busy, desc, x, y,);
} }
private void ProcessMapcell (Block mapcellBlock)
{
backend.getMapObject().SetTile(MapMapcell(mapcellBlock));
}
private void ProcessYourid (Block yourIdBlock) private void ProcessYourid (Block yourIdBlock)
{ {
@@ -250,18 +272,36 @@ namespace WorldOfPeacecraft
//TODO -> Wafa //TODO -> Wafa
} }
private void ProcessEntities (Block block) private void ProcessEntities (Block entitiesBlock)
{ {
// TODO -> Manu backend.clearDragons ();
backend.clearPlayers ();
foreach (Block entityBlock in entitiesBlock.GetBlocks ()) {
switch (entityBlock.GetName()) {
case MessPlayer:
backend.SetPlayer(MapPlayer(entityBlock));
break;
case MessDragon:
backend.SetDragon(MapDragon(entityBlock));
break;
default:
ThrowUnknownBlockException(entitiesBlock, entityBlock);
break;
}
}
} }
private void ProcessPlayers (Block block) private void ProcessPlayers (Block playersBlock)
{ {
// TODO -> Manu backend.clearPlayers ();
foreach (Block playerBlock in playersBlock.GetBlocks ()) {
backend.SetPlayer(MapPlayer(playerBlock));
}
} }
private void ProcessDragon (Block block) private void ProcessDragon (Block dragonBlock)
{ {
backend.SetDragon(MapDragon(dragonBlock));
} }
private Dragon MapDragon (Block dragonBlock) private Dragon MapDragon (Block dragonBlock)