From 883d141d5bddb8d878bbdcfc13fd21a74bd05260 Mon Sep 17 00:00:00 2001 From: Samed Bektas Date: Thu, 10 Apr 2014 17:00:14 +0200 Subject: [PATCH 1/8] Arbeite an der Methode: ProcessCallenge und ProcessDragon --- src/Parser.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Parser.cs b/src/Parser.cs index 80aeec2..7cf581b 100644 --- a/src/Parser.cs +++ b/src/Parser.cs @@ -210,7 +210,7 @@ namespace WorldOfPeacecraft private void ProcessChallenge (Block block) { - + //TODO -> Samed } private void ProcessPlayer (Block playerBlock) @@ -255,6 +255,7 @@ namespace WorldOfPeacecraft private void ProcessDragon (Block block) { + //TODO -> Samed } private Dragon MapDragon (Block dragonBlock) From c96ec4db44ffc55b7d29546710ffe7259ea44e4f Mon Sep 17 00:00:00 2001 From: Samed Bektas Date: Thu, 10 Apr 2014 17:21:05 +0200 Subject: [PATCH 2/8] Methoden ProcessCallenge und ProcessDragon fertiggestellt --- src/Parser.cs | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/Parser.cs b/src/Parser.cs index 7cf581b..e60ce59 100644 --- a/src/Parser.cs +++ b/src/Parser.cs @@ -208,9 +208,25 @@ namespace WorldOfPeacecraft //TODO -> Wafa } - private void ProcessChallenge (Block block) + private void ProcessChallenge (Block challengeBlock) { //TODO -> Samed + int id = challengeBlock.GetIntValue("id"); + String type; + switch (challengeBlock.GetType().ToString()) + { + case "DRAGON": + type = "Dragon"; + break; + case "STAGHUNT": + type = "Staghunt"; + break; + case "SKIRMISCH": + type = "Skirmisch"; + break; + } + bool accepted = challengeBlock.GetBoolValue("accepted"); + //CHALLENGE: "begin:challenge","id:",INT,"type:",("DRAGON"|"STAGHUNT"|"SKIRMISH"),"accepted:",BOOLEAN,"end:challenge" } private void ProcessPlayer (Block playerBlock) @@ -253,9 +269,15 @@ namespace WorldOfPeacecraft // TODO -> Manu } - private void ProcessDragon (Block block) + private void ProcessDragon (Block dragonBlock) { //TODO -> Samed + int id = dragonBlock.GetIntValue("id"); + bool busy = dragonBlock.GetBoolValue("busy"); + string desc = dragonBlock.GetStringValue("desc"); + int x = dragonBlock.GetIntValue("x"); + int y = dragonBlock.GetIntValue("y"); + //DRAGON: "begin:dragon", "id:",INT,"type:Dragon","busy:"BOOLEAN,"desc:"STRING,"x:",INT,"y:",INT,"end:dragon" } private Dragon MapDragon (Block dragonBlock) From a67d5a4b3df8ffb5fe30e007eaa004fdde99e023 Mon Sep 17 00:00:00 2001 From: Samed Bektas Date: Thu, 10 Apr 2014 18:03:46 +0200 Subject: [PATCH 3/8] Methoden ProcessCallenge und ProcessDragon fertiggestellt v2 --- src/Parser.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Parser.cs b/src/Parser.cs index e60ce59..7b8d830 100644 --- a/src/Parser.cs +++ b/src/Parser.cs @@ -213,7 +213,7 @@ namespace WorldOfPeacecraft //TODO -> Samed int id = challengeBlock.GetIntValue("id"); String type; - switch (challengeBlock.GetType().ToString()) + switch (challengeBlock.GetStringValue()) { case "DRAGON": type = "Dragon"; @@ -226,6 +226,7 @@ namespace WorldOfPeacecraft 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" } @@ -277,6 +278,7 @@ namespace WorldOfPeacecraft string desc = dragonBlock.GetStringValue("desc"); int x = dragonBlock.GetIntValue("x"); int y = dragonBlock.GetIntValue("y"); + //Dragon d p = new Dragon(id, busy, desc, x, y); //DRAGON: "begin:dragon", "id:",INT,"type:Dragon","busy:"BOOLEAN,"desc:"STRING,"x:",INT,"y:",INT,"end:dragon" } From a316b0072abff8beb0cc8ecc207bb2c6aa7dbf92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=B6gele?= Date: Thu, 10 Apr 2014 18:15:01 +0200 Subject: [PATCH 4/8] clear()-methoden im Backend --- src/Backend.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Backend.cs b/src/Backend.cs index cae9716..f78799a 100644 --- a/src/Backend.cs +++ b/src/Backend.cs @@ -41,6 +41,16 @@ namespace Frontend { Players.Remove (player.GetId ()); } + + public void clearPlayers () + { + Players.Clear (); + } + + public void clearDragons () + { + Dragons.Clear (); + } public Player getPlayer (int playerId) { From 2a28de556b997d3203582ad1942a829a953080aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=B6gele?= Date: Thu, 10 Apr 2014 21:07:52 +0200 Subject: [PATCH 5/8] ProcessEntities und ProcessPlayers fertiggestellt --- src/Parser.cs | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/Parser.cs b/src/Parser.cs index 7b8d830..e3c903d 100644 --- a/src/Parser.cs +++ b/src/Parser.cs @@ -260,14 +260,31 @@ namespace WorldOfPeacecraft //TODO -> Wafa } - private void ProcessEntities (Block block) + private void ProcessEntities (Block entitiesBlock) { - // TODO -> Manu + backend.clearDragons (); + backend.clearPlayers (); + foreach (Block entityBlock in entitiesBlock) { + 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) { + backend.SetPlayer(MapPlayer(playerBlock)); + } } private void ProcessDragon (Block dragonBlock) From 06e0af9ec30143aa038d62c7eb0effa91f932324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=B6gele?= Date: Thu, 10 Apr 2014 21:10:24 +0200 Subject: [PATCH 6/8] ProcessDragon ruft nun MapDragon auf --- src/Parser.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/Parser.cs b/src/Parser.cs index e3c903d..ed1b30b 100644 --- a/src/Parser.cs +++ b/src/Parser.cs @@ -289,14 +289,7 @@ namespace WorldOfPeacecraft private void ProcessDragon (Block dragonBlock) { - //TODO -> Samed - int id = dragonBlock.GetIntValue("id"); - bool busy = dragonBlock.GetBoolValue("busy"); - string desc = dragonBlock.GetStringValue("desc"); - int x = dragonBlock.GetIntValue("x"); - int y = dragonBlock.GetIntValue("y"); - //Dragon d p = new Dragon(id, busy, desc, x, y); - //DRAGON: "begin:dragon", "id:",INT,"type:Dragon","busy:"BOOLEAN,"desc:"STRING,"x:",INT,"y:",INT,"end:dragon" + backend.SetDragon(MapDragon(dragonBlock)); } private Dragon MapDragon (Block dragonBlock) From c6d1303d171c9fa1dcd72b64c406097d218639bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=B6gele?= Date: Thu, 10 Apr 2014 21:12:47 +0200 Subject: [PATCH 7/8] ProcessMapcell implementiert --- src/Parser.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Parser.cs b/src/Parser.cs index ed1b30b..5d7da08 100644 --- a/src/Parser.cs +++ b/src/Parser.cs @@ -240,6 +240,11 @@ namespace WorldOfPeacecraft int y = playerBlock.GetIntValue ("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) { From 30fe600a822b10c9edf2402c863880ee202ff3f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=B6gele?= Date: Thu, 10 Apr 2014 21:14:20 +0200 Subject: [PATCH 8/8] =?UTF-8?q?Ich=20sollte=20mir=20echt=20angew=C3=B6hnen?= =?UTF-8?q?=20auf=20compilefehler=20zu=20checken=20bevor=20ich=20code=20ei?= =?UTF-8?q?nchecke=20-.-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Parser.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Parser.cs b/src/Parser.cs index 5d7da08..a23dedf 100644 --- a/src/Parser.cs +++ b/src/Parser.cs @@ -269,7 +269,7 @@ namespace WorldOfPeacecraft { backend.clearDragons (); backend.clearPlayers (); - foreach (Block entityBlock in entitiesBlock) { + foreach (Block entityBlock in entitiesBlock.GetBlocks ()) { switch (entityBlock.GetName()) { case MessPlayer: backend.SetPlayer(MapPlayer(entityBlock)); @@ -287,7 +287,7 @@ namespace WorldOfPeacecraft private void ProcessPlayers (Block playersBlock) { backend.clearPlayers (); - foreach (Block playerBlock in playersBlock) { + foreach (Block playerBlock in playersBlock.GetBlocks ()) { backend.SetPlayer(MapPlayer(playerBlock)); } }