Skip to content

Commit fb37664

Browse files
MailaenderMailaender
committed
Implement terror drone jumping into vehicles.
1 parent 04cfe57 commit fb37664

File tree

7 files changed

+80
-6
lines changed

7 files changed

+80
-6
lines changed

‎mods/ra2/rules/allied-structures.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,7 @@ gadept:
618618
IsPlayerPalette: false
619619
RepairsUnits:
620620
Interval: 50
621+
RepairDamageTypes: KillTerrorDrone
621622
StartRepairingNotification: Repairing
622623
FinishRepairingNotification: UnitRepaired
623624
WithIdleOverlay@side:

‎mods/ra2/rules/defaults.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,7 @@
566566
Inherits@5: ^CrateStatModifiers
567567
Inherits@6: ^DamagedByRadiation
568568
Inherits@handicaps: ^PlayerHandicaps
569+
Inherits@7: ^AffectedByTerrorDrone
569570
Health:
570571
OwnerLostAction:
571572
Action: Kill
@@ -650,6 +651,7 @@
650651
Categories: Infantry
651652

652653
^Parachutable:
654+
Inherits: ^ParachutableAffectedByTerrorDrone
653655
WithSpriteBody@Parachute:
654656
Name: parachute
655657
Sequence: paradrop
@@ -683,6 +685,7 @@
683685
Condition: parachute
684686

685687
^ParachutableVehicle:
688+
Inherits: ^ParachutableAffectedByTerrorDrone
686689
Parachutable:
687690
FallRate: 26
688691
KilledOnImpassableTerrain: true
@@ -702,6 +705,15 @@
702705
Targetable@airborne:
703706
TargetTypes: Air
704707
RequiresCondition: parachute
708+
Targetable@Parasiteable:
709+
TargetTypes: DroneParasiteable
710+
RequiresCondition: !parachute && !infected
711+
Targetable@byTerrorDrone:
712+
TargetTypes: ValidForTerrorDrone
713+
RequiresCondition: !parachute
714+
Targetable@InfectedByTerrorDrone:
715+
TargetTypes: TerrorDroned
716+
RequiresCondition: !parachute && infected
705717
ExternalCondition@PARACHUTE:
706718
Condition: parachute
707719

@@ -824,6 +836,7 @@
824836
Inherits@5: ^CrateStatModifiers
825837
Inherits@6: ^ParachutableVehicle
826838
Inherits@handicaps: ^PlayerHandicaps
839+
Inherits@7: ^AffectedByTerrorDrone
827840
OwnerLostAction:
828841
Action: Kill
829842
DeathTypes: BulletDeath
@@ -1233,3 +1246,32 @@
12331246
MapEditorData:
12341247
Categories: System
12351248
Interactable:
1249+
1250+
^AffectedByTerrorDrone:
1251+
Targetable@Parasiteable:
1252+
TargetTypes: DroneParasiteable
1253+
RequiresCondition: !infected
1254+
Targetable@byTerrorDrone:
1255+
TargetTypes: ValidForTerrorDrone
1256+
Targetable@InfectedByTerrorDrone:
1257+
TargetTypes: TerrorDroned
1258+
RequiresCondition: infected
1259+
Infectable:
1260+
RemoveInfectorDamageTypes: DropTerrorDrone
1261+
KillInfectorDamageTypes: KillTerrorDrone
1262+
BeingInfectedCondition: being-infected
1263+
InfectedCondition: infected
1264+
SpeedMultiplier@Infected:
1265+
Modifier: 0
1266+
RequiresCondition: being-infected
1267+
1268+
^ParachutableAffectedByTerrorDrone:
1269+
Targetable@Parasiteable:
1270+
TargetTypes: DroneParasiteable
1271+
RequiresCondition: !parachute && !infected
1272+
Targetable@byTerrorDrone:
1273+
TargetTypes: ValidForTerrorDrone
1274+
RequiresCondition: !parachute
1275+
Targetable@InfectedByTerrorDrone:
1276+
TargetTypes: TerrorDroned
1277+
RequiresCondition: !parachute && infected

‎mods/ra2/rules/soviet-structures.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,7 @@ nadept:
569569
RepairsUnits:
570570
Interval: 148
571571
HpPerStep: 20
572+
RepairDamageTypes: KillTerrorDrone
572573
StartRepairingNotification: Repairing
573574
FinishRepairingNotification: UnitRepaired
574575
WithIdleOverlay@normal:

‎mods/ra2/rules/soviet-vehicles.yaml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,17 +140,24 @@ dron:
140140
-RenderVoxels:
141141
WithInfantryBody:
142142
StandSequences: stand
143-
DefaultAttackSequence: shoot
143+
DefaultAttackSequence: jump
144+
RequiresCondition: !jumping
145+
WithFacingSpriteBody:
146+
Sequence: shoot
147+
RequiresCondition: jumping
144148
Armament:
145149
Weapon: DroneJump
146-
ReloadingCondition: attack-cooldown
147-
AttackLeap:
150+
AttackInfect:
148151
Voice: Attack
149-
PauseOnCondition: attacking || attack-cooldown
152+
Damage: 25
153+
DamageInterval: 20
154+
DamageTypes: DefaultDeath, BulletDeath, DroneSurvive
155+
SurviveHostDamageTypes: DroneSurvive
156+
JumpRange: 1c768
150157
AutoTarget:
151158
InitialStance: AttackAnything
152159
AutoTargetPriority@DEFAULT:
153-
ValidTargets: Infantry
160+
ValidTargets: DroneParasiteable
154161
Voiced:
155162
VoiceSet: TerrorDroneVoice
156163
HitShape:

‎mods/ra2/rules/tech-structures.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ caoutp:
160160
IsPlayerPalette: false
161161
RepairsUnits:
162162
Interval: 50
163+
RepairDamageTypes: KillTerrorDrone
163164
FinishRepairingNotification: UnitRepaired
164165
WithIdleOverlay@tower:
165166
Sequence: idle-tower

‎mods/ra2/weapons/melee.yaml‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,29 @@ DogJaw:
2323
DamageTypes: BulletDeath
2424

2525
DroneJump:
26-
Inherits: DogJaw
26+
ValidTargets: DroneParasiteable
27+
ReloadDelay: 10
28+
Range: 3c0
2729
Report: vteratta.wav
30+
Projectile: InstantHit
31+
Warhead@1Dam: SpreadDamage
32+
Spread: 64
33+
Falloff: 100, 0
34+
Damage: 10000
35+
ValidTargets: ValidForTerrorDrone
36+
Versus:
37+
None: 100
38+
Flak: 100
39+
Plate: 100
40+
Light: 0
41+
Medium: 0
42+
Heavy: 0
43+
Wood: 0
44+
Steel: 0
45+
Concrete: 0
46+
Drone: 0
47+
Rocket: 0
48+
DamageTypes: AltBulletDeath, DefaultDeath, DroneSurvive
2849

2950
AlligatorBite:
3051
ReloadDelay: 30

‎mods/ra2/weapons/misc.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ RepairBullet:
5353
Spread: 213
5454
Damage: -50
5555
ValidTargets: Repair
56+
DamageTypes: KillTerrorDrone
5657

5758
MindControl:
5859
ReloadDelay: 200

0 commit comments

Comments
 (0)