Implemented Ability Requirements!

* AB: Implemented requirement checks * AB: Added ability actions for adding and removing when the ability is disabled (used primarily for transformations) * Core: Added hooks for ability requirement checks * Core: Added callbacks to enable and disabled abilities as techtree requirements change * Core: Updated ability tooltips to list requirements * Core: Updated ability disable methods to track different sources of disabling * AB: Fixed issues with morph flags not working on takeoff * Core: Fixed issue with flying height changing unexpectedly on unit type change
Retera · Nov 5, 2023 · 257dfe7 · 257dfe7
1 parent 389f540
commit 257dfe7
Show file tree

Hide file tree

Showing 30 changed files with 494 additions and 164 deletions.
diff --git a/core/assets/abilityBehaviors/Transformations.json b/core/assets/abilityBehaviors/Transformations.json
@@ -219,7 +219,7 @@
 				}
 			}
 		},
-		"onAddAbility": [{
+		"onAddDisabledAbility": [{
 			"type": "if",
 			"condition": {
 				"type": "isToggleAbilityActive"
@@ -301,7 +301,7 @@
 			}],
 				"elseActions": []
 		}],
-		"onRemoveAbility": [{
+		"onRemoveDisabledAbility": [{
 			"type": "transformedUnitAbilityRemove",
 			"unit": {
 				"type": "getCastingUnit"
@@ -657,7 +657,7 @@
 				}
 			}
 		},
-		"onAddAbility": [{
+		"onAddDisabledAbility": [{
 			"type": "if",
 			"condition": {
 				"type": "isToggleAbilityActive"
@@ -745,7 +745,7 @@
 			}],
 				"elseActions": []
 		}],
-		"onRemoveAbility": [{
+		"onRemoveDisabledAbility": [{
 			"type": "transformedUnitAbilityRemove",
 			"unit": {
 				"type": "getCastingUnit"
@@ -1110,7 +1110,7 @@
 				}
 			}
 		},
-		"onAddAbility": [{
+		"onAddDisabledAbility": [{
 				"type": "createNonStackingStatBuff",
 				"buffType": {
 					"type": "getNonStackingStatBuffTypeFromString",
@@ -1226,7 +1226,7 @@
 				}],
 					"elseActions": []
 		}],
-		"onRemoveAbility": [{
+		"onRemoveDisabledAbility": [{
 			"type": "transformedUnitAbilityRemove",
 			"unit": {
 				"type": "getCastingUnit"
@@ -1621,7 +1621,7 @@
 				}
 			}
 		},
-		"onAddAbility": [{
+		"onAddDisabledAbility": [{
 				"type": "createStateModBuff",
 				"buffType": "ETHEREAL"
 			},{
@@ -1732,7 +1732,7 @@
 					}
 				}]
 		}],
-		"onRemoveAbility": [{
+		"onRemoveDisabledAbility": [{
 			"type": "transformedUnitAbilityRemove",
 			"unit": {
 				"type": "getCastingUnit"
@@ -2108,7 +2108,7 @@
 				}
 			}
 		},
-		"onAddAbility": [{
+		"onAddDisabledAbility": [{
 				"type": "createStateModBuff",
 				"buffType": "ETHEREAL"
 			},{
@@ -2211,7 +2211,7 @@
 				}],
 					"elseActions": []
 		}],
-		"onRemoveAbility": [{
+		"onRemoveDisabledAbility": [{
 			"type": "transformedUnitAbilityRemove",
 			"unit": {
 				"type": "getCastingUnit"
@@ -2596,7 +2596,7 @@
 				}
 			}
 		},
-		"onAddAbility": [{
+		"onAddDisabledAbility": [{
 			"type": "if",
 			"condition": {
 				"type": "isToggleAbilityActive"
@@ -2678,7 +2678,7 @@
 			}],
 				"elseActions": []
 		}],
-		"onRemoveAbility": [{
+		"onRemoveDisabledAbility": [{
 			"type": "transformedUnitAbilityRemove",
 			"unit": {
 				"type": "getCastingUnit"
@@ -3038,7 +3038,7 @@
 				}
 			}
 		},
-		"onAddAbility": [{
+		"onAddDisabledAbility": [{
 				"type": "createNonStackingStatBuff",
 				"buffType": {
 					"type": "getNonStackingStatBuffTypeFromString",
@@ -3055,7 +3055,7 @@
 					"dataField": "E"
 				}
 		}],
-		"onRemoveAbility": [{
+		"onRemoveDisabledAbility": [{
 			"type": "transformedUnitAbilityRemove",
 			"unit": {
 				"type": "getCastingUnit"

diff --git a/core/assets/abilityBehaviors/humanUnitActives.json b/core/assets/abilityBehaviors/humanUnitActives.json
@@ -569,7 +569,7 @@
 				}
 			}
 		}],
-		"onAddAbility": [{
+		"onAddDisabledAbility": [{
 			"type": "if",
 			"condition": {
 				"type": "isToggleAbilityActive"

diff --git a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java
@@ -2330,7 +2330,7 @@ public JassValue call(final List<JassValue> arguments, final GlobalScope globalS
 						final double facing = arguments.get(3).visit(RealJassValueVisitor.getInstance());
 						final War3ID blightedMineRawcode = War3ID.fromString("ugol");
 						final War3ID goldMineRawcode = War3ID.fromString("ngol");
-						player.addTechtreeUnlocked(blightedMineRawcode);
+						player.addTechtreeUnlocked(simulation, blightedMineRawcode);
 						final CUnit blightedMine = CommonEnvironment.this.simulation.createUnitSimple(
 								blightedMineRawcode, player.getId(), (float) x, (float) y, (float) facing);
 						final CUnit goldMine = CommonEnvironment.this.simulation.createUnitSimple(goldMineRawcode,

diff --git a/...5/handlers/w3x/rendersim/commandbuttons/CommandCardActivationReceiverPreviewCallback.java b/...5/handlers/w3x/rendersim/commandbuttons/CommandCardActivationReceiverPreviewCallback.java
@@ -56,7 +56,7 @@ public void missingRequirement(final War3ID type, final int level) {
         final CUnitType unitType = unitData.getUnitType(type);
         String requirementString;
         if (unitType != null) {
-            requirementString = unitType.getName();
+            requirementString = level + " " + unitType.getName() + (level > 1 ? "s" : "");
         } else {
             final CUpgradeType upgradeType = upgradeData
                     .getType(type);

diff --git a/...sh/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java b/...sh/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java
@@ -459,7 +459,7 @@ private void addCommandButton(final CAbility ability, final IconUI iconUI, final
 	private void addCommandButton(final CAbility ability, final Texture icon, final Texture iconDisabled,
 			final String toolTip, String uberTip, final int buttonPosX, final int buttonPosY, final int handleId,
 			final int orderId, final int autoCastOrderId, final boolean autoCastActive, final boolean menuButton,
-			int goldCost, int lumberCost, int foodCost, final int manaCost, final int numberOverlay,
+			int goldCost, int lumberCost, int foodCost, int manaCost, final int numberOverlay,
 			final char hotkey) {
 		boolean requiresPatron = false;
 		if (this.unit.getPlayerIndex() != this.localPlayerIndex) {
@@ -496,6 +496,7 @@ private void addCommandButton(final CAbility ability, final Texture icon, final
 				goldCost = 0;
 				lumberCost = 0;
 				foodCost = 0;
+				manaCost = 0;
 			}
 			if (this.previewCallback.isShowingRequirements()) {
 				uberTip = this.previewCallback.getRequirementsText() + "|r" + uberTip;

diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java
@@ -303,7 +303,7 @@ public CUnit createUnitSimple(final War3ID typeId, final int playerIndex, final
 		if (newUnitType.getFoodMade() != 0) {
 			player.setFoodCap(player.getFoodCap() + newUnitType.getFoodMade());
 		}
-		player.addTechtreeUnlocked(typeId);
+		player.addTechtreeUnlocked(this, typeId);
 		// nudge unit
 		newUnit.setPointAndCheckUnstuck(x, y, this);
 		if (!newUnit.isBuilding()) {
@@ -677,7 +677,7 @@ public void unitsLoaded() {
 			final CPlayer player = this.players.get(unit.getPlayerIndex());
 			player.setUnitFoodUsed(unit, unit.getUnitType().getFoodUsed());
 			player.setUnitFoodMade(unit, unit.getUnitType().getFoodMade());
-			player.addTechtreeUnlocked(unit.getTypeId());
+			player.addTechtreeUnlocked(this, unit.getTypeId());
 		}
 	}