Project cleanup pre merge.

This commit is contained in:
2023-07-15 09:23:48 -04:00
parent 134b651df8
commit 9bbdef224d
747 changed files with 99704 additions and 101200 deletions
@@ -20,45 +20,49 @@ import java.sql.SQLException;
public class DamageShieldEffectModifier extends AbstractEffectModifier {
public DamageShieldEffectModifier(ResultSet rs) throws SQLException {
super(rs);
}
public DamageShieldEffectModifier(ResultSet rs) throws SQLException {
super(rs);
}
@Override
protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
@Override
protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
}
}
@Override
public void applyBonus(AbstractCharacter ac, int trains) {
float amount; boolean usePercent;
if (this.percentMod != 0) {
amount = this.percentMod;
usePercent = true;
} else {
amount = this.minMod;
usePercent = false;
}
@Override
public void applyBonus(AbstractCharacter ac, int trains) {
float amount;
boolean usePercent;
if (this.percentMod != 0) {
amount = this.percentMod;
usePercent = true;
} else {
amount = this.minMod;
usePercent = false;
}
if (this.ramp > 0f) {
float mod = this.ramp * trains;
if (this.useRampAdd)
amount += mod;
else
amount *= (1 + mod);
}
if (this.ramp > 0f) {
float mod = this.ramp * trains;
if (this.useRampAdd)
amount += mod;
else
amount *= (1 + mod);
}
DamageType dt = DamageType.valueOf(this.type);
if (dt != null) {
DamageShield ds = new DamageShield(dt, amount, usePercent);
PlayerBonuses bonus = ac.getBonuses();
if (bonus != null)
bonus.addDamageShield(this, ds);
}
}
DamageType dt = DamageType.valueOf(this.type);
if (dt != null) {
DamageShield ds = new DamageShield(dt, amount, usePercent);
PlayerBonuses bonus = ac.getBonuses();
if (bonus != null)
bonus.addDamageShield(this, ds);
}
}
@Override
public void applyBonus(Item item, int trains) {}
@Override
public void applyBonus(Building building, int trains) {}
@Override
public void applyBonus(Item item, int trains) {
}
@Override
public void applyBonus(Building building, int trains) {
}
}