Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor touches to player defaults.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-24 14:31:10 +02:00
parent 0eb121c444
commit 6846c426c4
4 changed files with 30 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/com/massivecraft/factions/entity/UConf.java
View File

@@ -36,13 +36,24 @@ public class UConf extends Entity<UConf>
// DEFAULTS
// -------------------------------------------- //
public String defaultPlayerFactionId = this.factionIdNone;
public double defaultPlayerPower = 0.0;
public String defaultPlayerFactionId = factionIdNone;
public Rel defaultPlayerRole = Rel.RECRUIT;
public double defaultPlayerPower = 0.0;
public boolean defaultFactionOpen = false;
public Map<FFlag, Boolean> defaultFactionFlags = FFlag.getDefaultDefaults();
public Map<FPerm, Set<Rel>> defaultFactionPerms = FPerm.getDefaultDefaults();
// -------------------------------------------- //
// POWER
// -------------------------------------------- //
public double powerMax = 10.0;
public double powerMin = 0.0;
public double powerPerHour = 2.0;
public double powerPerDeath = -2.0;
public boolean canLeaveWithNegativePower = true;
// -------------------------------------------- //
// CORE
@@ -55,32 +66,6 @@ public class UConf extends Entity<UConf>
public int factionTagLengthMax = 10;
public boolean factionTagForceUpperCase = false;
// -------------------------------------------- //
// ASSORTED
// -------------------------------------------- //
public boolean permanentFactionsDisableLeaderPromotion = false;
public int actionDeniedPainAmount = 2;
public boolean disablePVPForFactionlessPlayers = false;
public boolean enablePVPAgainstFactionlessInAttackersLand = false;
public double territoryShieldFactor = 0.3;
// -------------------------------------------- //
// POWER
// -------------------------------------------- //
public double powerMax = 10.0;
public double powerMin = 0.0;
public double powerPerHour = 2.0;
public double powerPerDeath = -2.0;
public boolean canLeaveWithNegativePower = true;
// -------------------------------------------- //
// CLAIMS
// -------------------------------------------- //
@@ -106,6 +91,16 @@ public class UConf extends Entity<UConf>
public double homesTeleportAllowedEnemyDistance = 32.0;
public boolean homesTeleportIgnoreEnemiesIfInOwnTerritory = true;
// -------------------------------------------- //
// ASSORTED
// -------------------------------------------- //
public boolean permanentFactionsDisableLeaderPromotion = false;
public int actionDeniedPainAmount = 2;
public boolean disablePVPForFactionlessPlayers = false;
public boolean enablePVPAgainstFactionlessInAttackersLand = false;
public double territoryShieldFactor = 0.3;
// -------------------------------------------- //
// DENY COMMANDS
// -------------------------------------------- //
@@ -121,12 +116,6 @@ public class UConf extends Entity<UConf>
Rel.ALLY, new ArrayList<String>(),
Rel.MEMBER, new ArrayList<String>()
);
// -------------------------------------------- //
// INTEGRATION: WORLD GUARD
// -------------------------------------------- //
public boolean worldGuardChecking = false;
// -------------------------------------------- //
// INTEGRATION: LWC