Prevent vitality points exceeding max value.

This commit is contained in:
MobiusDev
2017-12-02 00:13:59 +00:00
parent 643d9c2d10
commit 4c75bd316a
5 changed files with 25 additions and 25 deletions

View File

@@ -458,14 +458,14 @@ public class PcStat extends PlayableStat
{ {
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints(); return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints());
} }
return _vitalityPoints; return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
} }
public int getBaseVitalityPoints() public int getBaseVitalityPoints()
{ {
return _vitalityPoints; return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
} }
public double getVitalityExpBonus() public double getVitalityExpBonus()
@@ -477,10 +477,10 @@ public class PcStat extends PlayableStat
{ {
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(value); getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(Math.min(MAX_VITALITY_POINTS, value));
return; return;
} }
_vitalityPoints = value; _vitalityPoints = Math.min(MAX_VITALITY_POINTS, value);
} }
/* /*

View File

@@ -460,14 +460,14 @@ public class PcStat extends PlayableStat
{ {
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints(); return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints());
} }
return _vitalityPoints; return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
} }
public int getBaseVitalityPoints() public int getBaseVitalityPoints()
{ {
return _vitalityPoints; return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
} }
public double getVitalityExpBonus() public double getVitalityExpBonus()
@@ -479,10 +479,10 @@ public class PcStat extends PlayableStat
{ {
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(value); getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(Math.min(MAX_VITALITY_POINTS, value));
return; return;
} }
_vitalityPoints = value; _vitalityPoints = Math.min(MAX_VITALITY_POINTS, value);
} }
/* /*

View File

@@ -460,14 +460,14 @@ public class PcStat extends PlayableStat
{ {
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints(); return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints());
} }
return _vitalityPoints; return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
} }
public int getBaseVitalityPoints() public int getBaseVitalityPoints()
{ {
return _vitalityPoints; return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
} }
public double getVitalityExpBonus() public double getVitalityExpBonus()
@@ -479,10 +479,10 @@ public class PcStat extends PlayableStat
{ {
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(value); getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(Math.min(MAX_VITALITY_POINTS, value));
return; return;
} }
_vitalityPoints = value; _vitalityPoints = Math.min(MAX_VITALITY_POINTS, value);
} }
/* /*

View File

@@ -455,14 +455,14 @@ public class PcStat extends PlayableStat
{ {
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints(); return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints());
} }
return _vitalityPoints; return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
} }
public int getBaseVitalityPoints() public int getBaseVitalityPoints()
{ {
return _vitalityPoints; return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
} }
public double getVitalityExpBonus() public double getVitalityExpBonus()
@@ -474,10 +474,10 @@ public class PcStat extends PlayableStat
{ {
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(value); getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(Math.min(MAX_VITALITY_POINTS, value));
return; return;
} }
_vitalityPoints = value; _vitalityPoints = Math.min(MAX_VITALITY_POINTS, value);
} }
/* /*

View File

@@ -460,14 +460,14 @@ public class PcStat extends PlayableStat
{ {
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints(); return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints());
} }
return _vitalityPoints; return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
} }
public int getBaseVitalityPoints() public int getBaseVitalityPoints()
{ {
return _vitalityPoints; return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
} }
public double getVitalityExpBonus() public double getVitalityExpBonus()
@@ -479,10 +479,10 @@ public class PcStat extends PlayableStat
{ {
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(value); getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(Math.min(MAX_VITALITY_POINTS, value));
return; return;
} }
_vitalityPoints = value; _vitalityPoints = Math.min(MAX_VITALITY_POINTS, value);
} }
/* /*