diff --git a/mods/ra/bits/litningupg.shp b/mods/ra/bits/litningupg.shp deleted file mode 100644 index c57e2cc7cf..0000000000 Binary files a/mods/ra/bits/litningupg.shp and /dev/null differ diff --git a/mods/ra/bits/teslacharge.aud b/mods/ra/bits/teslacharge.aud deleted file mode 100644 index f46ad675b1..0000000000 Binary files a/mods/ra/bits/teslacharge.aud and /dev/null differ diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index d5c46404d3..027931bb68 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -475,17 +475,6 @@ SHOK: Armament@GARRISONED: Name: garrisoned Weapon: PortaTesla - Armament@CHARGE: - Weapon: PortaCharge - LocalOffset: 427,0,341 - TargetStances: Ally - ForceTargetStances: None - Cursor: ability - OutsideRangeCursor: ability - AmmoPool: - PipCount: 0 - SelfReloads: true - SelfReloadTicks: 70 AttackFrontal: Voice: Attack AttackMove: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 70fea434a3..c1d50a6128 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -387,9 +387,6 @@ TSLA: Footprint: _ x Dimensions: 1,2 RequiresPower: - UpgradeTypes: tesla - UpgradeMaxEnabledLevel: 2 - UpgradeMaxAcceptedLevel: 3 Selectable: Bounds: 24,24,0,16 SelectionDecorations: @@ -406,17 +403,8 @@ TSLA: HasMinibib: Yes WithChargeAnimation: Armament: - UpgradeTypes: tesla - UpgradeMaxEnabledLevel: 1 - UpgradeMaxAcceptedLevel: 3 Weapon: TeslaZap LocalOffset: 0,0,427 - Armament@Upgraded: - UpgradeTypes: tesla - UpgradeMinEnabledLevel: 2 - UpgradeMaxAcceptedLevel: 3 - Weapon: TeslaZap.Upgraded - LocalOffset: 0,0,427 AttackCharge: ChargeAudio: tslachg2.aud MaxCharges: 3 @@ -426,8 +414,6 @@ TSLA: DetectCloaked: Range: 8c0 ProvidesPrerequisite@buildingname: - Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure, TeslaBoost AGUN: Inherits: ^Defense diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index d2292a8107..d1a24af220 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -563,17 +563,6 @@ TTNK: Armament: Weapon: TTankZap LocalOffset: 0,0,213 - Armament@charge: - Weapon: TTankCharge - LocalOffset: 0,0,213 - TargetStances: Ally - ForceTargetStances: None - Cursor: ability - OutsideRangeCursor: ability - AmmoPool: - PipCount: 0 - SelfReloads: true - SelfReloadTicks: 120 AttackFrontal: WithIdleOverlay@SPINNER: Sequence: spinner diff --git a/mods/ra/sequences/misc.yaml b/mods/ra/sequences/misc.yaml index 593bff19f1..daeca8dd39 100644 --- a/mods/ra/sequences/misc.yaml +++ b/mods/ra/sequences/misc.yaml @@ -160,13 +160,6 @@ litning: Start: 4 Length: 4 -litningupg: - bright: - Length: 4 - dim: litning - Start: 4 - Length: 4 - fb1: idle: Length: * diff --git a/mods/ra/weapons/other.yaml b/mods/ra/weapons/other.yaml index 53ef56c678..69f05d3dc8 100644 --- a/mods/ra/weapons/other.yaml +++ b/mods/ra/weapons/other.yaml @@ -151,21 +151,6 @@ TeslaZap: Wood: 60 DamageTypes: Prone50Percent, TriggerProne, ElectricityDeath -TeslaZap.Upgraded: - ReloadDelay: 3 - Charges: true - Range: 9c512 - Report: TESLA1.AUD - Projectile: TeslaZap - Image: litningupg - Warhead@1Dam: SpreadDamage - Spread: 42 - Damage: 120 - Versus: - None: 1000 - Wood: 60 - DamageTypes: Prone50Percent, TriggerProne, ElectricityDeath - PortaTesla: ReloadDelay: 70 Range: 6c0 @@ -179,22 +164,6 @@ PortaTesla: None: 1000 DamageTypes: Prone50Percent, TriggerProne, ElectricityDeath -PortaCharge: - ReloadDelay: 70 - Range: 2c0 - Report: teslacharge.aud - Charges: yes - ValidStances: Ally - ValidTargets: TeslaBoost - Projectile: TeslaZap - Image: litningupg - Warhead@charge: GrantUpgrade - Range: 42 - Duration: 75 - Upgrades: tesla - ValidStances: Ally - ValidTargets: TeslaBoost - TTankZap: ReloadDelay: 120 Range: 7c0 @@ -208,22 +177,6 @@ TTankZap: None: 1000 DamageTypes: Prone50Percent, TriggerProne, ElectricityDeath -TTankCharge: - ReloadDelay: 120 - Range: 2c0 - Report: teslacharge.aud - Charges: yes - ValidStances: Ally - ValidTargets: TeslaBoost - Projectile: TeslaZap - Image: litningupg - Warhead@charge: GrantUpgrade - Range: 42 - Duration: 125 - Upgrades: tesla, tesla, tesla - ValidStances: Ally - ValidTargets: TeslaBoost - DogJaw: ValidTargets: Infantry ReloadDelay: 10