Mirrors/WarsmashModEngine
1
0
Fork 0
mirror of https://github.com/Retera/WarsmashModEngine.git synced 2022-07-31 17:38:59 +02:00
Code Issues Projects Releases Wiki Activity

Change smart ordering

Browse Source
This commit is contained in:
Retera 2021-06-29 00:25:22 -04:00
parent 08fd06a882
commit 72c5294412
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java
View File

@ -2634,22 +2634,26 @@ public class MeleeUI implements CUnitStateListener, CommandButtonListener, Comma
boolean rallied = false;
boolean attacked = false;
for (final RenderUnit unit : this.selectedUnits) {
CAbility abilityToUse = null;
CWidget targetToUse = null;
for (final CAbility ability : unit.getSimulationUnit().getAbilities()) {
ability.checkCanTarget(this.war3MapViewer.simulation, unit.getSimulationUnit(),
OrderIds.smart, rayPickUnit.getSimulationWidget(),
CWidgetAbilityTargetCheckReceiver.INSTANCE);
final CWidget targetWidget = CWidgetAbilityTargetCheckReceiver.INSTANCE.getTarget();
if (targetWidget != null) {
this.unitOrderListener.issueTargetOrder(unit.getSimulationUnit().getHandleId(),
ability.getHandleId(), OrderIds.smart, targetWidget.getHandleId(),
isShiftDown());
rallied |= ability instanceof CAbilityRally;
attacked |= ability instanceof CAbilityAttack;
ordered = true;
break;
abilityToUse = ability;
targetToUse = targetWidget;
}
}
if(abilityToUse != null) {
this.unitOrderListener.issueTargetOrder(unit.getSimulationUnit().getHandleId(),
abilityToUse.getHandleId(), OrderIds.smart, targetToUse.getHandleId(),
isShiftDown());
rallied |= abilityToUse instanceof CAbilityRally;
attacked |= abilityToUse instanceof CAbilityAttack;
ordered = true;
}
}
if (ordered) {
final UnitSound yesSound = attacked ? getSelectedUnit().soundset.yesAttack