Add a Power to the Cannon skill.

GitOrigin-RevId: 8e2582d19a76be27a15d8f5b7df66eecd2e75a12
nkzw-tech · Oct 28, 2024 · ddb51f3 · ddb51f3
1 parent 3551338
commit ddb51f3
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/apollo/actions/applyPower.tsx b/apollo/actions/applyPower.tsx
@@ -73,7 +73,10 @@ export function getUnitsToDamage(
 }
 
 export function onPowerUnitUpgrade(skill: Skill, unit: Unit) {
-  if (skill === Skill.RecoverAirUnits) {
+  if (
+    skill === Skill.RecoverAirUnits ||
+    (skill === Skill.BuyUnitCannon && unit.isUnfolded() && unit.isCompleted())
+  ) {
     return unit.recover();
   }
 
@@ -152,6 +155,18 @@ export default function applyPower(skill: Skill, map: MapData) {
     });
   }
 
+  if (skill === Skill.BuyUnitCannon) {
+    map = map.copy({
+      units: map.units.map((unit) =>
+        unit.isUnfolded() &&
+        unit.isCompleted() &&
+        map.matchesPlayer(player, unit)
+          ? unit.recover()
+          : unit,
+      ),
+    });
+  }
+
   if (skill === Skill.Shield) {
     map = map.copy({
       units: map.units.map((unit) =>

diff --git a/athena/info/Skill.tsx b/athena/info/Skill.tsx
@@ -131,7 +131,7 @@ const skillConfig: Record<
     cost: 800,
     group: SkillGroup.Attack,
   },
-  [Skill.BuyUnitCannon]: { cost: 1000, group: SkillGroup.Unlock },
+  [Skill.BuyUnitCannon]: { charges: 4, cost: 1000, group: SkillGroup.Unlock },
   [Skill.BuyUnitBrute]: { charges: 5, cost: 1000, group: SkillGroup.Unlock },
   [Skill.DecreaseUnitCostAttackAndDefenseDecreaseMinor]: {
     charges: 3,
@@ -1127,6 +1127,18 @@ const getSkillActiveUnitTypes = (
 
   const list = [];
 
+  if (skill === Skill.BuyUnitCannon) {
+    for (const [vector, unit] of map.units) {
+      if (
+        unit.isUnfolded() &&
+        unit.isCompleted() &&
+        map.matchesPlayer(unit, player)
+      ) {
+        list.push(vector);
+      }
+    }
+  }
+
   for (const [vector, unit] of map.units) {
     if (
       map.matchesPlayer(unit, player) &&

diff --git a/hera/behavior/activatePower/activatePowerAction.tsx b/hera/behavior/activatePower/activatePowerAction.tsx
@@ -124,6 +124,7 @@ export default async function activatePowerAction(
                 skill === Skill.RecoverAirUnits ||
                 skill === Skill.SpawnUnitInfernoJetpack ||
                 skill === Skill.UnlockZombie ||
+                skill === Skill.BuyUnitCannon ||
                 skill === Skill.Shield) &&
               state.map.matchesPlayer(unit, player) &&
               matchesActiveType(unitTypes, unit, vector),

diff --git a/hera/ui/SkillDescription.tsx b/hera/ui/SkillDescription.tsx
@@ -709,6 +709,12 @@ const getExtraDescription = (skill: Skill, color: BaseColor) => {
 
 const getExtraPowerDescription = (skill: Skill, color: BaseColor) => {
   switch (skill) {
+    case Skill.BuyUnitCannon:
+      return (
+        <fbt desc="Additional skill description">
+          All unfolded units recover and can act again.
+        </fbt>
+      );
     case Skill.UnitBattleShipMoveAndAct:
       return (
         <fbt desc="Additional skill description">