Rx3/Factions
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

52
src/com/massivecraft/factions/Faction.java
View File

@@ -68,14 +68,14 @@ public class Faction extends Entity implements EconomyParticipator
{
return getTag();
}
return this.getTag(otherFaction.getRelationColor(this).toString());
return this.getTag(otherFaction.getColorTo(this).toString());
}
public String getTag(FPlayer otherFplayer) {
if (otherFplayer == null)
{
return getTag();
}
return this.getTag(otherFplayer.getRelationColor(this).toString());
return this.getTag(this.getColorTo(otherFplayer).toString());
}
public void setTag(String str)
{
@@ -216,9 +216,9 @@ public class Faction extends Entity implements EconomyParticipator
}
@Override
public ChatColor getRelationColor(RelationParticipator rp)
public ChatColor getColorTo(RelationParticipator rp)
{
return RelationUtil.getRelationColor(this, rp);
return RelationUtil.getColorOfThatToMe(this, rp);
}
public Relation getRelationWish(Faction otherFaction)
@@ -248,31 +248,38 @@ public class Faction extends Entity implements EconomyParticipator
public double getPower()
{
double ret = 0;
for (FPlayer fplayer : this.getFPlayers()) {
for (FPlayer fplayer : this.getFPlayers())
{
ret += fplayer.getPower();
}
if (Conf.powerFactionMax > 0 && ret > Conf.powerFactionMax) {
if (Conf.powerFactionMax > 0 && ret > Conf.powerFactionMax)
{
ret = Conf.powerFactionMax;
}
return ret;
}
public double getPowerMax() {
public double getPowerMax()
{
double ret = 0;
for (FPlayer fplayer : this.getFPlayers()) {
for (FPlayer fplayer : this.getFPlayers())
{
ret += fplayer.getPowerMax();
}
if (Conf.powerFactionMax > 0 && ret > Conf.powerFactionMax) {
if (Conf.powerFactionMax > 0 && ret > Conf.powerFactionMax)
{
ret = Conf.powerFactionMax;
}
return ret;
}
public int getPowerRounded() {
public int getPowerRounded()
{
return (int) Math.round(this.getPower());
}
public int getPowerMaxRounded() {
public int getPowerMaxRounded()
{
return (int) Math.round(this.getPowerMax());
}
@@ -280,11 +287,13 @@ public class Faction extends Entity implements EconomyParticipator
return Board.getFactionCoordCount(this);
}
public int getLandRoundedInWorld(String worldName) {
public int getLandRoundedInWorld(String worldName)
{
return Board.getFactionCoordCountInWorld(this, worldName);
}
public boolean hasLandInflation() {
public boolean hasLandInflation()
{
return this.getLandRounded() > this.getPowerRounded();
}
@@ -430,20 +439,6 @@ public class Faction extends Entity implements EconomyParticipator
}
}
//----------------------------------------------//
// Mudd TODO
//----------------------------------------------//
public ChatColor getRelationColor(Faction otherFaction)
{
return this.getRelationTo(otherFaction).getColor();
}
public ChatColor getRelationColor(FPlayer fplayer)
{
return this.getRelationTo(fplayer).getColor();
}
//----------------------------------------------//
// Ownership of specific claims
//----------------------------------------------//
@@ -539,7 +534,8 @@ public class Faction extends Entity implements EconomyParticipator
public void removePlayerAsOwner(String playerName, FLocation loc)
{
Set<String> ownerData = claimOwnership.get(loc);
if (ownerData == null) {
if (ownerData == null)
{
return;
}
ownerData.remove(playerName.toLowerCase());