Parser gefixed

This commit is contained in:
2014-06-05 11:47:51 +02:00
parent e53f2657aa
commit addfbcaa1a

View File

@@ -26,10 +26,17 @@ namespace WorldOfPeacecraft
public const string ValueY = "y"; public const string ValueY = "y";
public const string ValueCol = "col"; public const string ValueCol = "col";
public const string ValueRow = "row"; public const string ValueRow = "row";
public const string EValueDragon = "DRAGON"; public const string EValueFight = "FIGHT";
public const string EValueStagunt = "STAGHUNT"; public const string EValueRest = "REST";
public const string EValueSkirmish = "SKIRMISH"; public const string EValueStag = "STAG";
public const string EValueBunny = "BUNNY";
public const string EValueSword = "SWORD";
public const string EValueMagic = "MAGIC";
public const string EValueAlchemy = "ALCHEMY";
public const string EValueWalkable = "WALKABLE"; public const string EValueWalkable = "WALKABLE";
public const string EValueSkirmish = "SKIRMISH";
public const string EValueStaghunt = "STAGHUNT";
public const string EValueDragon = "DRAGON";
public const string EValueWall = "WALL"; public const string EValueWall = "WALL";
public const string EValueForest = "FOREST"; public const string EValueForest = "FOREST";
public const string EValueWater = "WATER"; public const string EValueWater = "WATER";
@@ -247,14 +254,31 @@ namespace WorldOfPeacecraft
LinkedList <string> unnamedValue = oppBlock.GetUnnamedValues (); LinkedList <string> unnamedValue = oppBlock.GetUnnamedValues ();
string stringValue = unnamedValue.First.Value; string stringValue = unnamedValue.First.Value;
Decision d; Decision d;
if (stringValue == EValueDragon) switch (stringValue) {
d = Decision.DRAGON; case EValueAlchemy:
else if (stringValue == EValueStagunt) d = Decision.ALCHEMY;
d = Decision.STAGHUNT; break;
else if (stringValue == EValueSkirmish) case EValueBunny:
d = Decision.SKIRMISH; d = Decision.BUNNY;
else break;
case EValueFight:
d = Decision.FIGHT;
break;
case EValueMagic:
d = Decision.MAGIC;
break;
case EValueRest:
d = Decision.REST;
break;
case EValueStag:
d = Decision.STAG;
break;
case EValueSword:
d = Decision.SWORD;
break;
default:
throw new ParsingException("Wrong param"); // TODO Better message throw new ParsingException("Wrong param"); // TODO Better message
}
Opponent o = new Opponent (id, points, total, d); Opponent o = new Opponent (id, points, total, d);
} }
@@ -275,7 +299,7 @@ namespace WorldOfPeacecraft
case EValueDragon: case EValueDragon:
type = "Dragon"; type = "Dragon";
break; break;
case EValueStagunt: case EValueStaghunt:
type = "Staghunt"; type = "Staghunt";
break; break;
case EValueSkirmish: case EValueSkirmish: