Skip to content

Commit

Permalink
Merge pull request #7 from Glasislundr/abilitybuilder
Browse files Browse the repository at this point in the history 
Commented out some unneeded print statements
  • Loading branch information
@Glasislundr
Glasislundr authored Nov 3, 2023
2 parents bb0242e + 389f540 commit f470b0b
Showing 1 changed file with 25 additions and 25 deletions.
50 changes: 25 additions & 25 deletions ...5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,27 +125,27 @@ public void setLevel(CSimulation game, CUnit unit, int level) {

protected boolean innerCheckCanUseSpell(CSimulation game, CUnit unit, int orderId,
AbilityActivationReceiver receiver) {
System.err.println(unit.getUnitType().getName() + " Checking can use order: " + orderId + " (Base: "
+ this.getBaseOrderId() + ", Internal: " + this.getPairOrderId(game, unit) + ")");
// System.err.println(unit.getUnitType().getName() + " Checking can use order: " + orderId + " (Base: "
// + this.getBaseOrderId() + ", Internal: " + this.getPairOrderId(game, unit) + ")");
if (checkNoTargetOrderId(game, unit, orderId)) {
Set<CUnit> partners = this.findPairUnits(game, unit);
if (partners == null || partners.isEmpty()) {
boolean isOffId = orderId == this.getOffOrderId() || orderId == this.getPairOffOrderId(game, unit);
if (!isOffId && this.config.getSpecialFields().getCantPairError() != null) {
System.out.println("Use check failed: no parter, special message");
// System.out.println("Use check failed: no parter, special message");
receiver.activationCheckFailed(this.config.getSpecialFields().getCantPairError().getKey());
return false;
} else if (isOffId && this.config.getSpecialFields().getCantPairOffError() != null) {
System.out.println("Use check failed: no parter, special message");
// System.out.println("Use check failed: no parter, special message");
receiver.activationCheckFailed(this.config.getSpecialFields().getCantPairOffError().getKey());
return false;
} else {
System.out.println("Use check failed: no parter");
// System.out.println("Use check failed: no parter");
receiver.activationCheckFailed(CommandStringErrorKeysEnum.UNABLE_TO_FIND_COUPLE_TARGET.getKey());
return false;
}
}
System.err.println("Check use: Partner found");
// System.err.println("Check use: Partner found");
}
return true;
}
Expand Down Expand Up @@ -185,33 +185,33 @@ private boolean offOrderId(final int orderId) {
public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId) {
if (checkNoTargetOrderId(game, caster, orderId)) {

System.err.println(caster.getUnitType().getName() + " Beginning NoTarget: " + orderId);
// System.err.println(caster.getUnitType().getName() + " Beginning NoTarget: " + orderId);
boolean isOffId = orderId == this.getOffOrderId();
Set<CUnit> partners = this.findPairUnits(game, caster);
CUnit finalPartner = null;
if (partners != null) {
System.err.println(caster.getUnitType().getName() + " Found Partners");
// System.err.println(caster.getUnitType().getName() + " Found Partners");
int sendOrderId = isOffId ? this.orderPairedUnitOffOrderId(game, caster)
: this.orderPairedUnitOrderId(game, caster);
System.err.println(caster.getUnitType().getName() + " isOffId = " + isOffId + " so picking between " + this.orderPairedUnitOrderId(game, caster) + " and " + this.orderPairedUnitOffOrderId(game, caster));
// System.err.println(caster.getUnitType().getName() + " isOffId = " + isOffId + " so picking between " + this.orderPairedUnitOrderId(game, caster) + " and " + this.orderPairedUnitOffOrderId(game, caster));
boolean ordered = sendOrderId < 0;
for (CUnit partner : partners) {
if (sendOrderId >= 0) {
ordered |= partner.order(game, sendOrderId, caster);
System.err.println(caster.getUnitType().getName() + " Sending order to " + partner.getUnitType().getName() + " (" + sendOrderId + ")");
// System.err.println(caster.getUnitType().getName() + " Sending order to " + partner.getUnitType().getName() + " (" + sendOrderId + ")");
}
if ((isOffId ? this.getPairOffOrderId(game, caster) : this.getPairOrderId(game, caster)) >= 0) {
System.err.println(caster.getUnitType().getName() + " Saved last partner for self-order: "
+ partner.getUnitType().getName());
// System.err.println(caster.getUnitType().getName() + " Saved last partner for self-order: "
// + partner.getUnitType().getName());
finalPartner = partner;
}
}
if (!ordered) {
// Failed to order any partners despite wanting to
System.err.println(
caster.getUnitType().getName() + " Attempted to order parter(s) but failed to order any: "
+ (isOffId ? this.orderPairedUnitOffOrderId(game, caster)
: this.orderPairedUnitOrderId(game, caster)));
// System.err.println(
// caster.getUnitType().getName() + " Attempted to order parter(s) but failed to order any: "
// + (isOffId ? this.orderPairedUnitOffOrderId(game, caster)
// : this.orderPairedUnitOrderId(game, caster)));
if (!isOffId && this.config.getSpecialFields().getCantPairError() != null) {
game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(),
this.config.getSpecialFields().getCantPairError().getKey());
Expand All @@ -227,7 +227,7 @@ public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId) {
}
if (finalPartner != null
&& (isOffId ? this.getPairOffOrderId(game, caster) : this.getPairOrderId(game, caster)) >= 0) {
System.err.println(caster.getUnitType().getName() + " Have final partner, issuing self order behavior");
// System.err.println(caster.getUnitType().getName() + " Have final partner, issuing self order behavior");
if (isOffId) {
return new CBehaviorSendOrder(caster, this, this.getPairOffOrderId(game, caster),
this.getBaseOrderId(), finalPartner);
Expand Down Expand Up @@ -257,12 +257,12 @@ protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int ord
@Override
public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget target) {
this.castId++;
System.err.println(caster.getUnitType().getName() + " Received pair target order: " + orderId + " (Base: "
+ this.getBaseOrderId() + ", Internal: " + this.getPairOrderId(game, caster) + ")");
// System.err.println(caster.getUnitType().getName() + " Received pair target order: " + orderId + " (Base: "
// + this.getBaseOrderId() + ", Internal: " + this.getPairOrderId(game, caster) + ")");
if (checkTargetPrimeOrderId(game, caster, orderId)) {
final CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT);
if (this.orderPairedUnit(game, caster) && this.orderPairedUnitOrderId(game, caster) != null) {
System.err.println(caster.getUnitType().getName() + " Sending internal order to paired unit");
// System.err.println(caster.getUnitType().getName() + " Sending internal order to paired unit");
boolean ordered = targetUnit.order(game, this.orderPairedUnitOrderId(game, caster), caster);
if (!ordered) {
if (this.config.getSpecialFields() != null
Expand All @@ -278,17 +278,17 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget targ
}
this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, targetUnit);
this.localStore.put(ABLocalStoreKeys.ABILITYPAIREDUNIT + castId, targetUnit);
System.out.println("Starting targeted behavior");
// System.out.println("Starting targeted behavior");

this.runOnOrderIssuedActions(game, caster, orderId);
this.behavior.setCastId(castId);
return this.behavior.reset(target);
} else if (checkTargetInternalOrderId(game, caster, orderId)) {
System.err.println(caster.getUnitType().getName() + " Got internal order");
// System.err.println(caster.getUnitType().getName() + " Got internal order");
final CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT);
this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, targetUnit);
this.localStore.put(ABLocalStoreKeys.ABILITYPAIREDUNIT + castId, targetUnit);
System.out.println("Starting internal targeted behavior with target: " + targetUnit);
// System.out.println("Starting internal targeted behavior with target: " + targetUnit);

this.runOnOrderIssuedActions(game, caster, orderId);
this.behavior.setCastId(castId);
Expand All @@ -300,8 +300,8 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget targ

protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderId, CWidget target,
AbilityTargetCheckReceiver<CWidget> receiver) {
System.err.println(unit.getUnitType().getName() + " Checking can pair target order: " + orderId + " (Base: "
+ this.getBaseOrderId() + ", Internal: " + this.getPairOrderId(game, unit) + ")");
// System.err.println(unit.getUnitType().getName() + " Checking can pair target order: " + orderId + " (Base: "
// + this.getBaseOrderId() + ", Internal: " + this.getPairOrderId(game, unit) + ")");
if (checkTargetPrimeOrderId(game, unit, orderId)
|| checkTargetInternalOrderId(game, unit, orderId)) {
final CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT);
Expand Down

0 comments on commit f470b0b

Please sign in to comment.