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
@@ -25,69 +25,69 @@ import java.util.HashMap;
public class DirectDamagePowerAction extends AbstractPowerAction {
private String effectID;
private EffectsBase effect;
private String effectID;
private EffectsBase effect;
public DirectDamagePowerAction(ResultSet rs, HashMap<String, EffectsBase> effects) throws SQLException {
super(rs);
public DirectDamagePowerAction(ResultSet rs, HashMap<String, EffectsBase> effects) throws SQLException {
super(rs);
this.effectID = rs.getString("effectID");
this.effect = effects.get(this.effectID);
}
this.effectID = rs.getString("effectID");
this.effect = effects.get(this.effectID);
}
public String getEffectID() {
return this.effectID;
}
public String getEffectID() {
return this.effectID;
}
public EffectsBase getEffect() {
return this.effect;
}
public EffectsBase getEffect() {
return this.effect;
}
@Override
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
if (this.effect == null || pb == null || ab == null) {
//TODO log error here
return;
}
@Override
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
if (this.effect == null || pb == null || ab == null) {
//TODO log error here
return;
}
//add schedule job to end it if needed and add effect to pc
int duration = ab.getDuration(trains);
String stackType = ab.getStackType();
FinishEffectTimeJob eff = new FinishEffectTimeJob(source, awo, stackType, trains, ab, pb, this.effect);
eff.setSkipSendEffect(true);
if (duration > 0) {
if (stackType.equals("IgnoreStack"))
awo.addEffect(Integer.toString(ab.getUUID()), duration, eff, this.effect, trains);
else
awo.addEffect(stackType, duration, eff, this.effect, trains);
}
//add schedule job to end it if needed and add effect to pc
int duration = ab.getDuration(trains);
String stackType = ab.getStackType();
FinishEffectTimeJob eff = new FinishEffectTimeJob(source, awo, stackType, trains, ab, pb, this.effect);
eff.setSkipSendEffect(true);
if (duration > 0) {
if (stackType.equals("IgnoreStack"))
awo.addEffect(Integer.toString(ab.getUUID()), duration, eff, this.effect, trains);
else
awo.addEffect(stackType, duration, eff, this.effect, trains);
}
// //if chant, start cycle
// if (pb.isChant() && targetLoc.x != 0f && targetLoc.z != 0f) {
// PersistentAoeJob paoe = new PersistentAoeJob(source, stackType, trains, ab, pb, effect, eff, targetLoc);
// source.addPersistantAoe(stackType, (int)(pb.getChantDuration() * 1000), paoe, effect, trains);
// eff.setChant(true);
// }
// //if chant, start cycle
// if (pb.isChant() && targetLoc.x != 0f && targetLoc.z != 0f) {
// PersistentAoeJob paoe = new PersistentAoeJob(source, stackType, trains, ab, pb, effect, eff, targetLoc);
// source.addPersistantAoe(stackType, (int)(pb.getChantDuration() * 1000), paoe, effect, trains);
// eff.setChant(true);
// }
this.effect.startEffect(source, awo, trains, eff);
}
this.effect.startEffect(source, awo, trains, eff);
}
@Override
protected void _handleChant(AbstractCharacter source, AbstractWorldObject target, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
String stackType = ab.getStackType();
stackType = stackType.equals("IgnoreStack") ? Integer.toString(ab.getUUID()) : stackType;
FinishEffectTimeJob eff = new FinishEffectTimeJob(source, target, stackType, trains, ab, pb, this.effect);
if (targetLoc.x != 0f && targetLoc.z != 0f) {
PersistentAoeJob paoe = new PersistentAoeJob(source,target, stackType, trains, ab, pb, effect, eff, targetLoc);
source.addPersistantAoe(stackType, (int)(pb.getChantDuration() * 1000), paoe, effect, trains);
eff.setChant(true);
}
}
@Override
protected void _handleChant(AbstractCharacter source, AbstractWorldObject target, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
String stackType = ab.getStackType();
stackType = stackType.equals("IgnoreStack") ? Integer.toString(ab.getUUID()) : stackType;
FinishEffectTimeJob eff = new FinishEffectTimeJob(source, target, stackType, trains, ab, pb, this.effect);
if (targetLoc.x != 0f && targetLoc.z != 0f) {
PersistentAoeJob paoe = new PersistentAoeJob(source, target, stackType, trains, ab, pb, effect, eff, targetLoc);
source.addPersistantAoe(stackType, (int) (pb.getChantDuration() * 1000), paoe, effect, trains);
eff.setChant(true);
}
}
@Override
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc,
int numTrains, ActionsBase ab, PowersBase pb, int duration) {
// TODO Auto-generated method stub
@Override
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc,
int numTrains, ActionsBase ab, PowersBase pb, int duration) {
// TODO Auto-generated method stub
}
}
}