mirror of
https://github.com/Retera/WarsmashModEngine.git
synced 2022-07-31 17:38:59 +02:00
Change smart ordering
This commit is contained in:
parent
08fd06a882
commit
72c5294412
@ -2634,22 +2634,26 @@ public class MeleeUI implements CUnitStateListener, CommandButtonListener, Comma
|
|||||||
boolean rallied = false;
|
boolean rallied = false;
|
||||||
boolean attacked = false;
|
boolean attacked = false;
|
||||||
for (final RenderUnit unit : this.selectedUnits) {
|
for (final RenderUnit unit : this.selectedUnits) {
|
||||||
|
CAbility abilityToUse = null;
|
||||||
|
CWidget targetToUse = null;
|
||||||
for (final CAbility ability : unit.getSimulationUnit().getAbilities()) {
|
for (final CAbility ability : unit.getSimulationUnit().getAbilities()) {
|
||||||
ability.checkCanTarget(this.war3MapViewer.simulation, unit.getSimulationUnit(),
|
ability.checkCanTarget(this.war3MapViewer.simulation, unit.getSimulationUnit(),
|
||||||
OrderIds.smart, rayPickUnit.getSimulationWidget(),
|
OrderIds.smart, rayPickUnit.getSimulationWidget(),
|
||||||
CWidgetAbilityTargetCheckReceiver.INSTANCE);
|
CWidgetAbilityTargetCheckReceiver.INSTANCE);
|
||||||
final CWidget targetWidget = CWidgetAbilityTargetCheckReceiver.INSTANCE.getTarget();
|
final CWidget targetWidget = CWidgetAbilityTargetCheckReceiver.INSTANCE.getTarget();
|
||||||
if (targetWidget != null) {
|
if (targetWidget != null) {
|
||||||
this.unitOrderListener.issueTargetOrder(unit.getSimulationUnit().getHandleId(),
|
abilityToUse = ability;
|
||||||
ability.getHandleId(), OrderIds.smart, targetWidget.getHandleId(),
|
targetToUse = targetWidget;
|
||||||
isShiftDown());
|
|
||||||
rallied |= ability instanceof CAbilityRally;
|
|
||||||
attacked |= ability instanceof CAbilityAttack;
|
|
||||||
ordered = true;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
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) {
|
if (ordered) {
|
||||||
final UnitSound yesSound = attacked ? getSelectedUnit().soundset.yesAttack
|
final UnitSound yesSound = attacked ? getSelectedUnit().soundset.yesAttack
|
||||||
|
Loading…
Reference in New Issue
Block a user