Wire up Party Config pt 1

This commit is contained in:
nossr50
2019-03-16 22:46:30 -07:00
parent f0455b28dc
commit 70b3ca3094
11 changed files with 64 additions and 49 deletions

View File

@ -696,42 +696,6 @@ public class MainConfig extends ConfigValidated {
}
/* PARTY SETTINGS */
public boolean getPartyFriendlyFire() {
return getBooleanValue(PARTY, FRIENDLY_FIRE);
}
public int getPartyMaxSize() {
return getIntValue(PARTY, MAX_SIZE);
}
public int getAutoPartyKickInterval() {
return getIntValue(PARTY, AUTO_KICK_INTERVAL);
}
public int getAutoPartyKickTime() {
return getIntValue(PARTY, OLD_PARTY_MEMBER_CUTOFF);
}
public double getPartyShareBonusBase() {
return getDoubleValue(PARTY, SHARING, EXP_SHARE_BONUS_BASE);
}
public double getPartyShareBonusIncrease() {
return getDoubleValue(PARTY, SHARING, EXP_SHARE_BONUS_INCREASE);
}
public double getPartyShareBonusCap() {
return getDoubleValue(PARTY, SHARING, EXP_SHARE_BONUS_CAP);
}
public double getPartyShareRange() {
return getDoubleValue(PARTY, SHARING, RANGE);
}
public int getPartyLevelCap() {
int cap = getIntValue(PARTY, LEVELING, LEVEL_CAP);
return (cap <= 0) ? Integer.MAX_VALUE : cap;
}
//TODO: Move this to Experience Config
public int getPartyXpCurveMultiplier() {

View File

@ -49,6 +49,10 @@ public class ConfigParty {
return partyGeneral;
}
public ConfigSectionPartyXP getPartyXP() {
return partyXP;
}
public String getPartyChatPrefixFormat() {
return partyChat.getPartyChatPrefixFormat();
}

View File

@ -8,7 +8,9 @@ public class ConfigSectionPartyCombat {
public static final boolean PARTY_FRIENDLY_FIRE_DEFAULT = false;
@Setting(value = "Friendly-Fire", comment = "When friendly fire is enabled, players in the same party can injure each other.")
@Setting(value = "Friendly-Fire", comment = "When friendly fire is enabled, players in the same party can injure each other." +
"\nThis also allows Party alliances to hurt each other." +
"\nDefault value: "+PARTY_FRIENDLY_FIRE_DEFAULT)
private boolean partyFriendlyFire = PARTY_FRIENDLY_FIRE_DEFAULT;
public boolean isPartyFriendlyFire() {

View File

@ -33,4 +33,23 @@ public class ConfigSectionPartyLevel {
@Setting(value = "Party-Feature-Unlock-Level-Requirements")
private Map<PartyFeature, Integer> partyFeatureUnlockMap = PARTY_FEATURE_MAP_DEFAULT;
public static HashMap<PartyFeature, Integer> getPartyFeatureMapDefault() {
return PARTY_FEATURE_MAP_DEFAULT;
}
public int getPartyXpCurveMultiplier() {
return partyXpCurveMultiplier;
}
public boolean isPartyLevelingNeedsNearbyMembers() {
return partyLevelingNeedsNearbyMembers;
}
public boolean isInformPartyMembersOnLevelup() {
return informPartyMembersOnLevelup;
}
public Map<PartyFeature, Integer> getPartyFeatureUnlockMap() {
return partyFeatureUnlockMap;
}
}

View File

@ -23,4 +23,12 @@ public class ConfigSectionPartyXP {
@Setting(value = "Party-Level", comment = "Parties in mcMMO gain levels just like skills" +
"\nSettings related to that can be found here!.")
private ConfigSectionPartyLevel partyLevel = new ConfigSectionPartyLevel();
public ConfigSectionPartyExperienceSharing getPartyExperienceSharing() {
return partyExperienceSharing;
}
public ConfigSectionPartyLevel getPartyLevel() {
return partyLevel;
}
}