MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

More cleanup in statTransferAction

Browse Source
This commit is contained in:
MagicBot
2024-09-13 12:20:33 -04:00
parent f0875a6093
commit 92db9e1086
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/powers/poweractions/TransferStatOTPowerAction.java
+4 -5
View File
@@ -17,9 +17,8 @@ import engine.objects.AbstractWorldObject;
import engine.powers.ActionsBase; import engine.powers.ActionsBase;
import engine.powers.EffectsBase; import engine.powers.EffectsBase;
import engine.powers.PowersBase; import engine.powers.PowersBase;
import engine.wpak.data.PowerAction;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap; import java.util.HashMap;
@@ -27,10 +26,10 @@ public class TransferStatOTPowerAction extends TransferStatPowerAction {
private int numIterations; private int numIterations;
public TransferStatOTPowerAction(ResultSet rs, HashMap<String, EffectsBase> effects) throws SQLException { public TransferStatOTPowerAction(PowerAction powerAction, HashMap<String, EffectsBase> effects) {
super(rs, effects); super(powerAction, effects);
this.numIterations = rs.getInt("numIterations"); this.numIterations = powerAction.statTransfer.transfer_ticks;
} }
public int getNumIterations() { public int getNumIterations() {
src/engine/powers/poweractions/TransferStatPowerAction.java
+1 -9
View File
@@ -32,11 +32,7 @@ public class TransferStatPowerAction extends AbstractPowerAction {
protected String effectID; protected String effectID;
public PowerAction powerAction; public PowerAction powerAction;
protected float transferAmount;
protected float transferRamp;
protected boolean transferRampAdd; protected boolean transferRampAdd;
protected float transferEfficiency;
protected float transferEfficiencyRamp;
protected boolean transferEfficiencyRampAdd; protected boolean transferEfficiencyRampAdd;
protected boolean targetToCaster; protected boolean targetToCaster;
protected mbEnums.DamageType damageType; protected mbEnums.DamageType damageType;
@@ -48,10 +44,6 @@ public class TransferStatPowerAction extends AbstractPowerAction {
this.powerAction = powerAction; this.powerAction = powerAction;
this.effectID = powerAction.effects.get(0).effect_id; this.effectID = powerAction.effects.get(0).effect_id;
this.transferAmount = powerAction.getFloat("transferAmount");
this.transferRamp = powerAction.getFloat("transferRamp");
this.transferEfficiency = powerAction.getFloat("transferEfficiency");
this.transferEfficiencyRamp = powerAction.getFloat("transferEfficiencyRamp");
int flags = powerAction.getInt("flags"); int flags = powerAction.getInt("flags");
this.transferRampAdd = ((flags & 4096) != 0) ? true : false; this.transferRampAdd = ((flags & 4096) != 0) ? true : false;
this.transferEfficiencyRampAdd = ((flags & 8192) != 0) ? true : false; this.transferEfficiencyRampAdd = ((flags & 8192) != 0) ? true : false;
@@ -79,7 +71,7 @@ public class TransferStatPowerAction extends AbstractPowerAction {
public float getTransferAmount(float trains) { public float getTransferAmount(float trains) {
// if (this.transferRampAdd) // if (this.transferRampAdd)
return this.transferAmount + (this.transferRamp * trains); return this.powerAction.statTransfer.fromStatValue + (this.transferRamp * trains);
// else // else
// return this.transferAmount * (1 + (this.transferRamp * trains)); // return this.transferAmount * (1 + (this.transferRamp * trains));
} }