More reformatting

This commit is contained in:
drtshock
2014-07-01 14:52:40 -05:00
parent dc54f78cc1
commit 5066934a95
109 changed files with 1288 additions and 2883 deletions

View File

@@ -14,8 +14,7 @@ public enum Relation {
public final String nicename;
private Relation(final int value, final String nicename) {
this.value = value;
this.nicename = nicename;
this.value = value; this.nicename = nicename;
}
@Override
@@ -48,10 +47,9 @@ public enum Relation {
}
public ChatColor getColor() {
if (this == MEMBER) { return Conf.colorMember; }
else if (this == ALLY) { return Conf.colorAlly; }
else if (this == NEUTRAL) { return Conf.colorNeutral; }
else { return Conf.colorEnemy; }
if (this == MEMBER) { return Conf.colorMember; } else if (this == ALLY) {
return Conf.colorAlly;
} else if (this == NEUTRAL) { return Conf.colorNeutral; } else { return Conf.colorEnemy; }
}
// return appropriate Conf setting for DenyBuild based on this relation and their online status
@@ -59,14 +57,13 @@ public enum Relation {
if (isMember()) { return false; }
if (online) {
if (isEnemy()) { return Conf.territoryEnemyDenyBuild; }
else if (isAlly()) { return Conf.territoryAllyDenyBuild; }
else { return Conf.territoryDenyBuild; }
}
else {
if (isEnemy()) { return Conf.territoryEnemyDenyBuildWhenOffline; }
else if (isAlly()) { return Conf.territoryAllyDenyBuildWhenOffline; }
else { return Conf.territoryDenyBuildWhenOffline; }
if (isEnemy()) { return Conf.territoryEnemyDenyBuild; } else if (isAlly()) {
return Conf.territoryAllyDenyBuild;
} else { return Conf.territoryDenyBuild; }
} else {
if (isEnemy()) { return Conf.territoryEnemyDenyBuildWhenOffline; } else if (isAlly()) {
return Conf.territoryAllyDenyBuildWhenOffline;
} else { return Conf.territoryDenyBuildWhenOffline; }
}
}
@@ -75,28 +72,26 @@ public enum Relation {
if (isMember()) { return false; }
if (online) {
if (isEnemy()) { return Conf.territoryEnemyPainBuild; }
else if (isAlly()) { return Conf.territoryAllyPainBuild; }
else { return Conf.territoryPainBuild; }
}
else {
if (isEnemy()) { return Conf.territoryEnemyPainBuildWhenOffline; }
else if (isAlly()) { return Conf.territoryAllyPainBuildWhenOffline; }
else { return Conf.territoryPainBuildWhenOffline; }
if (isEnemy()) { return Conf.territoryEnemyPainBuild; } else if (isAlly()) {
return Conf.territoryAllyPainBuild;
} else { return Conf.territoryPainBuild; }
} else {
if (isEnemy()) { return Conf.territoryEnemyPainBuildWhenOffline; } else if (isAlly()) {
return Conf.territoryAllyPainBuildWhenOffline;
} else { return Conf.territoryPainBuildWhenOffline; }
}
}
// return appropriate Conf setting for DenyUseage based on this relation
public boolean confDenyUseage() {
if (isMember()) { return false; }
else if (isEnemy()) { return Conf.territoryEnemyDenyUseage; }
else if (isAlly()) { return Conf.territoryAllyDenyUseage; }
else { return Conf.territoryDenyUseage; }
if (isMember()) { return false; } else if (isEnemy()) {
return Conf.territoryEnemyDenyUseage;
} else if (isAlly()) { return Conf.territoryAllyDenyUseage; } else { return Conf.territoryDenyUseage; }
}
public double getRelationCost() {
if (isEnemy()) { return Conf.econCostEnemy; }
else if (isAlly()) { return Conf.econCostAlly; }
else { return Conf.econCostNeutral; }
if (isEnemy()) { return Conf.econCostEnemy; } else if (isAlly()) { return Conf.econCostAlly; } else {
return Conf.econCostNeutral;
}
}
}