Add "Sabotage" skill.

GitOrigin-RevId: 5c978a7dec6a57138a46f75d94a60289c8669b2e

athena/info/Skill.tsx

@@ -41,6 +41,7 @@ export enum Skill {
   BuyUnitSuperTank = 27,
   BuyUnitAcidBomber = 28,
   BuyUnitDinosaur = 29,
+  Sabotage = 30,
 }
 
 export const Skills = new Set<Skill>([
@@ -57,6 +58,7 @@ export const Skills = new Set<Skill>([
   Skill.UnitAbilitySniperImmediateAction,
   Skill.UnitInfantryForestDefenseIncrease,
   Skill.UnitRailDefenseIncreasePowerAttackIncrease,
+  Skill.Sabotage,
   Skill.RecoverAirUnits,
   Skill.BuyUnitBrute,
   Skill.BuyUnitSuperAPU,
@@ -114,6 +116,7 @@ const skillConfig: Record<
   [Skill.BuyUnitSuperTank]: { cost: 1500 },
   [Skill.BuyUnitAcidBomber]: { cost: 1500 },
   [Skill.BuyUnitDinosaur]: { cost: 1500 },
+  [Skill.Sabotage]: { charges: 5, cost: 1500 },
 };
 
 export const AIOnlySkills: ReadonlySet<Skill> = new Set(
@@ -124,7 +127,8 @@ type ID = number;
 type Modifier = number;
 
 type SkillMap = ReadonlyMap<Skill, Modifier>;
-type UnitSkillMap = ReadonlyMap<Skill, ReadonlyMap<ID, Modifier>>;
+type UnitModifierMap = ReadonlyMap<ID, Modifier>;
+type UnitSkillMap = ReadonlyMap<Skill, UnitModifierMap>;
 type MovementSkillMap = ReadonlyMap<Skill, ReadonlyMap<MovementType, Modifier>>;
 
 type TileMovementSkillMap = ReadonlyMap<
@@ -154,7 +158,7 @@ const attackStatusEffects: SkillMap = new Map([
   [Skill.AttackAndDefenseDecreaseEasy, -0.1],
 ]);
 
-const attackUnitStatusEffects: UnitSkillMap = new Map([
+const attackUnitStatusEffects = new Map<Skill, UnitModifierMap>([
   [
     Skill.ArtilleryRangeIncrease,
     new Map([
@@ -163,6 +167,7 @@ const attackUnitStatusEffects: UnitSkillMap = new Map([
       [UnitID.Cannon, 0.1],
     ]),
   ],
+  [Skill.Sabotage, new Map([[UnitID.Saboteur, 0.2]])],
 ]);
 
 const attackPowerStatusEffects: SkillMap = new Map([
@@ -866,6 +871,15 @@ const getSkillActiveUnitTypes = (
     }
   }
 
+  if (skill === Skill.Sabotage) {
+    for (const [vector, unit] of map.units) {
+      if (unit.id === UnitID.Saboteur && map.matchesPlayer(unit, player)) {
+        list.push(vector);
+      }
+    }
+    return list;
+  }
+
   if (skill === Skill.BuyUnitCommander) {
     for (const [vector, unit] of map.units) {
       if (unit.isLeader() && map.matchesPlayer(unit, player)) {

athena/info/Unit.tsx

@@ -2295,7 +2295,7 @@ export const Flamethrower = new UnitInfo(
 );
 
 export const Saboteur = new UnitInfo(
-  16,
+  UnitID.Saboteur,
   'Saboteur',
   'Arvid',
   'male',

athena/info/UnitID.tsx

@@ -5,6 +5,7 @@ export default {
   Artillery: 7,
   HeavyArtillery: 12,
   Sniper: 14,
+  Saboteur: 16,
   AcidBomber: 22,
   Medic: 26,
   Dinosaur: 36,

athena/lib/maybeConvertPlayer.tsx

@@ -1,5 +1,4 @@
 import ImmutableMap from '@nkzw/immutable-map';
-import { Ability } from '../info/Unit.tsx';
 import Unit from '../map/Unit.tsx';
 import Vector from '../map/Vector.tsx';
 import MapData from '../MapData.tsx';
@@ -12,7 +11,7 @@ export default function maybeConvertPlayer(
   attackingUnit: Unit | null | undefined,
   state: 'recover' | 'complete',
 ) {
-  if (!attackingUnit?.info.hasAbility(Ability.Convert)) {
+  if (!attackingUnit?.canConvert(map.getPlayer(attackingUnit.player))) {
     return unit;
   }
 

athena/map/Unit.tsx

@@ -4,6 +4,7 @@ import { Skill } from '../info/Skill.tsx';
 import {
   Ability,
   getUnitInfo,
+  Saboteur,
   Sniper,
   Supply,
   UnitInfo,
@@ -475,6 +476,13 @@ export default class Unit extends Entity {
     );
   }
 
+  canConvert(player: Player) {
+    return (
+      this.info.hasAbility(Ability.Convert) ||
+      (this.info === Saboteur && player.activeSkills.has(Skill.Sabotage))
+    );
+  }
+
   getAttackWeapon(entity: Entity) {
     const { primaryWeapon, weapons } = this.info.attack;
     if (weapons) {

dionysus/lib/getPossibleAttacks.tsx

@@ -192,7 +192,7 @@ export default function getPossibleAttacks(
           counterDamage &&
           counterDamage > 0 &&
           (counterDamage * 0.75 > damage || counterDamage > unitA.health) &&
-          !unitA.info.hasAbility(Ability.Convert)
+          !unitA.canConvert(map.getPlayer(unitA))
         ) {
           return;
         }

dionysus/lib/shouldActivatePower.tsx

@@ -53,6 +53,7 @@ const shouldConsiderUnitRatio = (skill: Skill) => {
     case Skill.MovementIncreaseGroundUnitDefenseDecrease:
     case Skill.NoUnitRestrictions:
     case Skill.RecoverAirUnits:
+    case Skill.Sabotage:
     case Skill.UnitAbilitySniperImmediateAction:
     case Skill.UnitBattleShipMoveAndAct:
     case Skill.UnitInfantryForestDefenseIncrease:

hera/lib/getSkillBasedPortrait.tsx

@@ -3,12 +3,15 @@ import {
   AcidBomber,
   AIU,
   Alien,
+  Battleship,
   BazookaBear,
   Brute,
   Cannon,
   Commander,
   Dinosaur,
   Octopus,
+  Saboteur,
+  Sniper,
   SuperAPU,
   SuperTank,
   Zombie,
@@ -41,6 +44,12 @@ export default function getSkillBasedPortrait(skill: Skill) {
       return SuperAPU;
     case Skill.BuyUnitZombieDefenseDecreaseMajor:
       return Zombie;
+    case Skill.Sabotage:
+      return Saboteur;
+    case Skill.UnitAbilitySniperImmediateAction:
+      return Sniper;
+    case Skill.UnitBattleShipMoveAndAct:
+      return Battleship;
 
     case Skill.DecreaseUnitCostAttackAndDefenseDecreaseMinor:
     case Skill.ArtilleryRangeIncrease:
@@ -55,8 +64,6 @@ export default function getSkillBasedPortrait(skill: Skill) {
     case Skill.MovementIncreaseGroundUnitDefenseDecrease:
     case Skill.NoUnitRestrictions:
     case Skill.RecoverAirUnits:
-    case Skill.UnitAbilitySniperImmediateAction:
-    case Skill.UnitBattleShipMoveAndAct:
     case Skill.UnitInfantryForestDefenseIncrease:
     case Skill.UnitRailDefenseIncreasePowerAttackIncrease:
       return null;

hera/lib/getSkillConfigForDisplay.tsx

@@ -268,6 +268,14 @@ export default function getSkillConfigForDisplay(skill: Skill): SkillConfig {
         icon: Dinosaur,
         name: fbt('Dino Rampage', 'Skill name'),
       };
+    case Skill.Sabotage:
+      return {
+        alpha: 0.3,
+        borderStyle: 'coin',
+        colors: 'purple',
+        icon: Repeat,
+        name: fbt('Sneaky Sabotage', 'Skill name'),
+      };
     default: {
       skill satisfies never;
       throw new UnknownTypeError('getSkillConfig', skill);

hera/ui/SkillDescription.tsx

@@ -27,6 +27,7 @@ import {
   Battleship,
   BazookaBear,
   getUnitInfoOrThrow,
+  Saboteur,
   Sniper,
   SpecialUnits,
   UnitInfo,
@@ -670,7 +671,6 @@ const getExtraPowerDescription = (skill: Skill, color: BaseColor) => {
           </fbt:param>.
         </fbt>
       );
-
     case Skill.BuyUnitOctopus:
       return (
         <fbt desc="Additional skill description">
@@ -679,6 +679,15 @@ const getExtraPowerDescription = (skill: Skill, color: BaseColor) => {
           points.
         </fbt>
       );
+    case Skill.Sabotage:
+      return (
+        <fbt desc="Additional skill description">
+          <fbt:param name="unitName">
+            <UnitName color={color} unit={Saboteur} />
+          </fbt:param>{' '}
+          convert opponents after attacking.
+        </fbt>
+      );
   }
 
   return null;