EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Spout overlay support is missing for the new relation coloring. Otherwise done.

Browse Source
This commit is contained in:
Olof Larsson
2011-10-21 20:08:54 +02:00
parent 89b53a577a
commit e6d45a6aa2
9 changed files with 63 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/massivecraft/factions/Board.java
View File

@ -212,7 +212,7 @@ public class Board
if (factionHere.isNone()) {
row += ChatColor.GRAY+"-";
} else if (factionHere.isSafeZone()) {
row += ChatColor.GOLD+"+";
row += Conf.colorPeaceful+"+";
} else if (factionHere.isWarZone()) {
row += ChatColor.DARK_RED+"+";
} else if (
@ -225,7 +225,7 @@ public class Board
if (!fList.containsKey(factionHere.getTag()))
fList.put(factionHere.getTag(), Conf.mapKeyChrs[chrIdx++]);
char tag = fList.get(factionHere.getTag());
row += factionHere.getRelationTo(faction).getColor() + "" + tag;
row += factionHere.getColorTo(faction) + "" + tag;
} else {
row += ChatColor.GRAY+"-";
}
@ -243,9 +243,11 @@ public class Board
ret.set(3, asciiCompass.get(2)+ret.get(3).substring(3*3));
// Add the faction key
if (Conf.showMapFactionKey) {
if (Conf.showMapFactionKey)
{
String fRow = "";
for(String key : fList.keySet()) {
for(String key : fList.keySet())
{
fRow += String.format("%s%s: %s ", ChatColor.GRAY, fList.get(key), key);
}
ret.add(fRow);