Skip to content

Commit 5a22d8c

Browse files
GlasislundrGlasislundr
committed
Major Ability Code Refactor
* AB/Core: Refactored all abilities to store both code and alias
1 parent 22bc4fd commit 5a22d8c

143 files changed

Lines changed: 252 additions & 251 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/AbstractCAbility.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities;
22

3+
import com.etheller.warsmash.util.War3ID;
34
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation;
45
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit;
56
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver;
@@ -9,15 +10,27 @@ public abstract class AbstractCAbility implements CAbility {
910
private boolean disabled = false;
1011
private boolean iconShowing = true;
1112
private boolean permanent = false;
13+
14+
private War3ID code;
1215

13-
public AbstractCAbility(final int handleId) {
16+
public AbstractCAbility(final int handleId, final War3ID code) {
1417
this.handleId = handleId;
18+
this.code = code;
1519
}
1620

1721
@Override
1822
public final int getHandleId() {
1923
return this.handleId;
2024
}
25+
26+
public War3ID getCode() {
27+
return this.code;
28+
}
29+
30+
@Override
31+
public War3ID getAlias() {
32+
return this.getCode();
33+
}
2134

2235
@Override
2336
public final boolean isDisabled() {

‎core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityAttack.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities;
22

3+
import com.etheller.warsmash.util.War3ID;
34
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable;
45
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation;
56
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit;
@@ -15,14 +16,12 @@
1516
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType;
1617
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver;
1718
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver;
18-
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver.TargetType;
19-
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver;
2019
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeys;
2120

2221
public class CAbilityAttack extends AbstractCAbility {
2322

2423
public CAbilityAttack(final int handleId) {
25-
super(handleId);
24+
super(handleId, War3ID.fromString("Aatk"));
2625
}
2726

2827
@Override

‎core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityGenericDoNothing.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
public class CAbilityGenericDoNothing extends AbstractGenericAliasedAbility {
1818

19-
public CAbilityGenericDoNothing(final War3ID rawcode, final int handleId) {
20-
super(handleId, rawcode);
19+
public CAbilityGenericDoNothing(final War3ID code, final War3ID alias, final int handleId) {
20+
super(handleId, code, alias);
2121
}
2222

2323
@Override

‎core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityMove.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities;
22

3+
import com.etheller.warsmash.util.War3ID;
34
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation;
45
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit;
56
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget;
@@ -10,12 +11,11 @@
1011
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.*;
1112
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds;
1213
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.*;
13-
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver.TargetType;
1414

1515
public class CAbilityMove extends AbstractCAbility {
1616

1717
public CAbilityMove(final int handleId) {
18-
super(handleId);
18+
super(handleId, War3ID.fromString("AMov"));
1919
}
2020

2121
@Override

‎core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities;
22

33
import com.etheller.interpreter.ast.util.CHandle;
4+
import com.etheller.warsmash.util.War3ID;
45
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation;
56
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit;
67
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget;
@@ -21,6 +22,10 @@ void checkCanTarget(CSimulation game, CUnit unit, int orderId, AbilityPointTarge
2122

2223
@Override
2324
int getHandleId();
25+
26+
War3ID getAlias();
27+
28+
War3ID getCode();
2429

2530
boolean isDisabled();
2631

‎core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/blight/CAbilityBlight.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ public class CAbilityBlight extends AbstractGenericNoIconAbility {
2121
private float currentArea;
2222
private int lastExpansionTick;
2323

24-
public CAbilityBlight(final int handleId, final War3ID alias, final boolean createsBlight,
24+
public CAbilityBlight(final int handleId, final War3ID code, final War3ID alias, final boolean createsBlight,
2525
final float expansionAmount, final float areaOfEffect, final float gameSecondsPerBlightExpansion) {
26-
super(handleId, alias);
26+
super(handleId, code, alias);
2727
this.createsBlight = createsBlight;
2828
this.expansionAmount = expansionAmount;
2929
this.areaOfEffect = areaOfEffect;

‎core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/AbstractCAbilityBuild.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@
2020
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver;
2121
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver;
2222
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeys;
23-
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.ResourceType;
2423

2524
public abstract class AbstractCAbilityBuild extends AbstractCAbility implements CAbilityMenu {
2625
private static boolean REFUND_ON_ORDER_CANCEL = false;
2726
private final Set<War3ID> structuresBuilt;
2827

29-
public AbstractCAbilityBuild(final int handleId, final List<War3ID> structuresBuilt) {
30-
super(handleId);
28+
public AbstractCAbilityBuild(final int handleId, final War3ID code, final List<War3ID> structuresBuilt) {
29+
super(handleId, code);
3130
this.structuresBuilt = new LinkedHashSet<>(structuresBuilt);
3231
}
3332

‎core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityBuildInProgress.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.build;
22

3+
import com.etheller.warsmash.util.War3ID;
34
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation;
45
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit;
56
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType;
@@ -17,7 +18,7 @@
1718
public class CAbilityBuildInProgress extends AbstractCAbility {
1819

1920
public CAbilityBuildInProgress(final int handleId) {
20-
super(handleId);
21+
super(handleId, War3ID.fromString("ABnP"));
2122
}
2223

2324
@Override

‎core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanBuild.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.build;
22

3-
import java.awt.image.BufferedImage;
43
import java.util.List;
54

65
import com.etheller.warsmash.util.War3ID;
@@ -20,7 +19,7 @@ public class CAbilityHumanBuild extends AbstractCAbilityBuild {
2019
private CBehaviorHumanBuild buildBehavior;
2120

2221
public CAbilityHumanBuild(final int handleId, final List<War3ID> structuresBuilt) {
23-
super(handleId, structuresBuilt);
22+
super(handleId, War3ID.fromString("AHbu"), structuresBuilt);
2423
}
2524

2625
@Override

‎core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanRepair.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ public class CAbilityHumanRepair extends AbstractGenericSingleIconActiveAbility
2626
private float castRange;
2727
private CBehaviorHumanRepair behaviorRepair;
2828

29-
public CAbilityHumanRepair(final int handleId, final War3ID alias, final EnumSet<CTargetType> targetsAllowed,
29+
public CAbilityHumanRepair(final int handleId, final War3ID code, final War3ID alias, final EnumSet<CTargetType> targetsAllowed,
3030
final float navalRangeBonus, final float repairCostRatio, final float repairTimeRatio,
3131
final float castRange) {
32-
super(handleId, alias);
32+
super(handleId, code, alias);
3333
this.targetsAllowed = targetsAllowed;
3434
this.navalRangeBonus = navalRangeBonus;
3535
this.repairCostRatio = repairCostRatio;

0 commit comments

Comments
 (0)