Method inlined
This commit is contained in:
1 parent
3af6cab92e
commit
d5b787430e
5 files changed
+45
-30
No files matched your search
@@ -23,7 +23,10 @@ import engine.mbEnums.PowerFailCondition;
|
||||
import engine.net.Dispatch;
|
||||
import engine.net.client.ClientConnection;
|
||||
import engine.net.client.msg.ApplyEffectMsg;
|
||||
import engine.objects.*;
|
||||
import engine.objects.AbstractCharacter;
|
||||
import engine.objects.AbstractWorldObject;
|
||||
import engine.objects.Item;
|
||||
import engine.objects.PlayerCharacter;
|
||||
import engine.powers.effectmodifiers.*;
|
||||
import engine.server.MBServerStatics;
|
||||
import engine.util.Hasher;
|
||||
@@ -31,6 +34,7 @@ import engine.wpak.data.ConditionEntry;
|
||||
import engine.wpak.data.Effect;
|
||||
import engine.wpak.data.ModifierEntry;
|
||||
import org.pmw.tinylog.Logger;
|
||||
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.HashSet;
|
||||
@@ -148,8 +152,8 @@ public class EffectsBase {
|
||||
|
||||
|
||||
eb.amount = entry.arg;
|
||||
eb.amountRamp = (float) entry.curveType.getValue();
|
||||
eb.useRampAdd = (float) entry.curveType.getValue() != 0;
|
||||
eb.amountRamp = (float) entry.curveType.value;
|
||||
eb.useRampAdd = (float) entry.curveType.value != 0;
|
||||
break;
|
||||
case Attack:
|
||||
eb.cancelOnAttack = true;
|
||||
|
||||
@@ -52,8 +52,8 @@ public abstract class AbstractEffectModifier {
|
||||
this.minMod = mod.min;
|
||||
this.maxMod = mod.max;
|
||||
this.percentMod = mod.percentage;
|
||||
this.ramp = (float)mod.compoundCurveType.getValue();
|
||||
this.useRampAdd = (float)mod.compoundCurveType.getValue() != 0;
|
||||
this.ramp = (float) mod.compoundCurveType.value;
|
||||
this.useRampAdd = (float) mod.compoundCurveType.value != 0;
|
||||
|
||||
this.string1 = mod.arg1;
|
||||
this.string2 = mod.arg2;
|
||||
|
||||
@@ -67,13 +67,13 @@ public class TransferStatPowerAction extends AbstractPowerAction {
|
||||
|
||||
public float getTransferAmount(float trains) {
|
||||
// if (this.transferRampAdd)
|
||||
return (float) (this.powerAction.statTransfer.ramp + (this.powerAction.statTransfer.rampCurve.getValue() * trains));
|
||||
return (float) (this.powerAction.statTransfer.ramp + (this.powerAction.statTransfer.rampCurve.value * trains));
|
||||
// else
|
||||
// return this.transferAmount * (1 + (this.transferRamp * trains));
|
||||
}
|
||||
|
||||
public float getTransferEfficiency(float trains) {
|
||||
return (float) (this.powerAction.statTransfer.efficiency + (this.powerAction.statTransfer.efficiencyCurve.getValue() * trains));
|
||||
return (float) (this.powerAction.statTransfer.efficiency + (this.powerAction.statTransfer.efficiencyCurve.value * trains));
|
||||
}
|
||||
|
||||
public boolean targetToCaster() {
|
||||
|
||||
Reference in new issue
Block a user