diff --git a/AUTHORS b/AUTHORS index 39037f829..8265637e8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -94,9 +94,11 @@ Contributors & special thanks to: * Stingerr (Seahawk) * tom2050 (Zombie/Brute) * god_l1ke1 (SpecOps) + * Lord Kal (Medic) * machine (Jumpjet) * MadHQ (Ion Turret, Mobile Sensor Array) * Damfoos (Mobile Sensor Array) + * taboam (superspy/Hacker) Of course YMCA wouldn't exist today without OpenRA & the hard work of the many OpenRA contributors. diff --git a/mods/ca/bits/allies/armedseahawk.bmp b/mods/ca/bits/allies/armedseahawk.bmp deleted file mode 100644 index dd5dc4173..000000000 Binary files a/mods/ca/bits/allies/armedseahawk.bmp and /dev/null differ diff --git a/mods/ca/bits/allies/chronotank.bmp b/mods/ca/bits/allies/chronotank.bmp deleted file mode 100644 index 0a60d3efe..000000000 Binary files a/mods/ca/bits/allies/chronotank.bmp and /dev/null differ diff --git a/mods/ca/bits/allies/prismblaster.bmp b/mods/ca/bits/allies/prismblaster.bmp deleted file mode 100644 index 0c5ace1f9..000000000 Binary files a/mods/ca/bits/allies/prismblaster.bmp and /dev/null differ diff --git a/mods/ca/bits/allies/prismblastericon.shp b/mods/ca/bits/allies/prismblastericon.shp new file mode 100644 index 000000000..71b89c033 Binary files /dev/null and b/mods/ca/bits/allies/prismblastericon.shp differ diff --git a/mods/ca/bits/allies/prismblastertur.bmp b/mods/ca/bits/allies/prismblastertur.bmp deleted file mode 100644 index f00a4d120..000000000 Binary files a/mods/ca/bits/allies/prismblastertur.bmp and /dev/null differ diff --git a/mods/ca/bits/allies/prismcannon.bmp b/mods/ca/bits/allies/prismcannon.bmp deleted file mode 100644 index 9d55081a3..000000000 Binary files a/mods/ca/bits/allies/prismcannon.bmp and /dev/null differ diff --git a/mods/ca/bits/allies/prismcannonicon.shp b/mods/ca/bits/allies/prismcannonicon.shp new file mode 100644 index 000000000..5529702e3 Binary files /dev/null and b/mods/ca/bits/allies/prismcannonicon.shp differ diff --git a/mods/ca/bits/allies/prismcannontur.bmp b/mods/ca/bits/allies/prismcannontur.bmp deleted file mode 100644 index 89ec84192..000000000 Binary files a/mods/ca/bits/allies/prismcannontur.bmp and /dev/null differ diff --git a/mods/ca/bits/allies/prismtank.bmp b/mods/ca/bits/allies/prismtank.bmp deleted file mode 100644 index 36596a6e0..000000000 Binary files a/mods/ca/bits/allies/prismtank.bmp and /dev/null differ diff --git a/mods/ca/bits/allies/prismtankicon.shp b/mods/ca/bits/allies/prismtankicon.shp new file mode 100644 index 000000000..03050d9b7 Binary files /dev/null and b/mods/ca/bits/allies/prismtankicon.shp differ diff --git a/mods/ca/bits/allies/prismtanktur.bmp b/mods/ca/bits/allies/prismtanktur.bmp deleted file mode 100644 index 93fee137c..000000000 Binary files a/mods/ca/bits/allies/prismtanktur.bmp and /dev/null differ diff --git a/mods/ca/bits/allies/seahawk.bmp b/mods/ca/bits/allies/seahawk.bmp deleted file mode 100644 index 5f31b91c6..000000000 Binary files a/mods/ca/bits/allies/seahawk.bmp and /dev/null differ diff --git a/mods/ca/bits/allies/seahawkrotor.bmp b/mods/ca/bits/allies/seahawkrotor.bmp deleted file mode 100644 index 3d8174985..000000000 Binary files a/mods/ca/bits/allies/seahawkrotor.bmp and /dev/null differ diff --git a/mods/ca/bits/allies/tiger.bmp b/mods/ca/bits/allies/tiger.bmp deleted file mode 100644 index 5d2b0e041..000000000 Binary files a/mods/ca/bits/allies/tiger.bmp and /dev/null differ diff --git a/mods/ca/bits/gtnk.shp b/mods/ca/bits/gtnk.shp deleted file mode 100644 index 1f47a101b..000000000 Binary files a/mods/ca/bits/gtnk.shp and /dev/null differ diff --git a/mods/ca/bits/gtnkicon.shp b/mods/ca/bits/gtnkicon.shp deleted file mode 100644 index 91fd46c5f..000000000 Binary files a/mods/ca/bits/gtnkicon.shp and /dev/null differ diff --git a/mods/ca/bits/hack.shp b/mods/ca/bits/hack.shp deleted file mode 100644 index aabb2bb3c..000000000 Binary files a/mods/ca/bits/hack.shp and /dev/null differ diff --git a/mods/ca/bits/medi.shp b/mods/ca/bits/medi.shp deleted file mode 100644 index f1a499f63..000000000 Binary files a/mods/ca/bits/medi.shp and /dev/null differ diff --git a/mods/ca/bits/misc/medic.shp b/mods/ca/bits/misc/medic.shp new file mode 100644 index 000000000..daf7446d0 Binary files /dev/null and b/mods/ca/bits/misc/medic.shp differ diff --git a/mods/ca/bits/nod/hacker.shp b/mods/ca/bits/nod/hacker.shp new file mode 100644 index 000000000..4cbee021b Binary files /dev/null and b/mods/ca/bits/nod/hacker.shp differ diff --git a/mods/ca/bits/nod/hackericon.shp b/mods/ca/bits/nod/hackericon.shp new file mode 100644 index 000000000..e5f78ff3b Binary files /dev/null and b/mods/ca/bits/nod/hackericon.shp differ diff --git a/mods/ca/bits/pcanicnh.shp b/mods/ca/bits/pcanicnh.shp deleted file mode 100644 index 608faeb79..000000000 Binary files a/mods/ca/bits/pcanicnh.shp and /dev/null differ diff --git a/mods/ca/bits/soviet/apoctank.bmp b/mods/ca/bits/soviet/apoctank.bmp deleted file mode 100644 index bbadfa0f2..000000000 Binary files a/mods/ca/bits/soviet/apoctank.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/apoctanktur.bmp b/mods/ca/bits/soviet/apoctanktur.bmp deleted file mode 100644 index 63c71147e..000000000 Binary files a/mods/ca/bits/soviet/apoctanktur.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/chemsprayer.bmp b/mods/ca/bits/soviet/chemsprayer.bmp deleted file mode 100644 index 2b73f0e2b..000000000 Binary files a/mods/ca/bits/soviet/chemsprayer.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/demotruck.bmp b/mods/ca/bits/soviet/demotruck.bmp deleted file mode 100644 index 002061717..000000000 Binary files a/mods/ca/bits/soviet/demotruck.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/fueltruck.bmp b/mods/ca/bits/soviet/fueltruck.bmp deleted file mode 100644 index 27de4d1ed..000000000 Binary files a/mods/ca/bits/soviet/fueltruck.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/heavytank.bmp b/mods/ca/bits/soviet/heavytank.bmp deleted file mode 100644 index ed451bb4c..000000000 Binary files a/mods/ca/bits/soviet/heavytank.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/heavytanktur.bmp b/mods/ca/bits/soviet/heavytanktur.bmp deleted file mode 100644 index 343f8c48f..000000000 Binary files a/mods/ca/bits/soviet/heavytanktur.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/hind.bmp b/mods/ca/bits/soviet/hind.bmp deleted file mode 100644 index 3b8ff0e07..000000000 Binary files a/mods/ca/bits/soviet/hind.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/hq7 tur.bmp b/mods/ca/bits/soviet/hq7 tur.bmp deleted file mode 100644 index 61596dfeb..000000000 Binary files a/mods/ca/bits/soviet/hq7 tur.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/hq7.bmp b/mods/ca/bits/soviet/hq7.bmp deleted file mode 100644 index 1d22e3ab6..000000000 Binary files a/mods/ca/bits/soviet/hq7.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/kimshweel.bmp b/mods/ca/bits/soviet/kimshweel.bmp deleted file mode 100644 index 7ebf28bd0..000000000 Binary files a/mods/ca/bits/soviet/kimshweel.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/peoplestank.bmp b/mods/ca/bits/soviet/peoplestank.bmp deleted file mode 100644 index 90086dff7..000000000 Binary files a/mods/ca/bits/soviet/peoplestank.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/peoplestanktur.bmp b/mods/ca/bits/soviet/peoplestanktur.bmp deleted file mode 100644 index 1cddeb525..000000000 Binary files a/mods/ca/bits/soviet/peoplestanktur.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/sourceofpollution.bmp b/mods/ca/bits/soviet/sourceofpollution.bmp deleted file mode 100644 index 4da330d10..000000000 Binary files a/mods/ca/bits/soviet/sourceofpollution.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/sourceofpollutiontur.bmp b/mods/ca/bits/soviet/sourceofpollutiontur.bmp deleted file mode 100644 index 1cc2bd1fb..000000000 Binary files a/mods/ca/bits/soviet/sourceofpollutiontur.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/sv.bmp b/mods/ca/bits/soviet/sv.bmp deleted file mode 100644 index da0a45d55..000000000 Binary files a/mods/ca/bits/soviet/sv.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/sv2.bmp b/mods/ca/bits/soviet/sv2.bmp deleted file mode 100644 index d93e597e6..000000000 Binary files a/mods/ca/bits/soviet/sv2.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/t34.bmp b/mods/ca/bits/soviet/t34.bmp deleted file mode 100644 index 6fd86bdf5..000000000 Binary files a/mods/ca/bits/soviet/t34.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/t34tur.bmp b/mods/ca/bits/soviet/t34tur.bmp deleted file mode 100644 index 202aba817..000000000 Binary files a/mods/ca/bits/soviet/t34tur.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/teslahalftrack.bmp b/mods/ca/bits/soviet/teslahalftrack.bmp deleted file mode 100644 index 9381d0a13..000000000 Binary files a/mods/ca/bits/soviet/teslahalftrack.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/thedevil.bmp b/mods/ca/bits/soviet/thedevil.bmp deleted file mode 100644 index fa161a7a7..000000000 Binary files a/mods/ca/bits/soviet/thedevil.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/thedeviltur.bmp b/mods/ca/bits/soviet/thedeviltur.bmp deleted file mode 100644 index 4efa144a7..000000000 Binary files a/mods/ca/bits/soviet/thedeviltur.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/tnkkil.bmp b/mods/ca/bits/soviet/tnkkil.bmp deleted file mode 100644 index dfa8d4317..000000000 Binary files a/mods/ca/bits/soviet/tnkkil.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/tsar.bmp b/mods/ca/bits/soviet/tsar.bmp deleted file mode 100644 index 2ab20b0c5..000000000 Binary files a/mods/ca/bits/soviet/tsar.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/tsardeployed.bmp b/mods/ca/bits/soviet/tsardeployed.bmp deleted file mode 100644 index 05fae42d4..000000000 Binary files a/mods/ca/bits/soviet/tsardeployed.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/tsardeployedtur.bmp b/mods/ca/bits/soviet/tsardeployedtur.bmp deleted file mode 100644 index d99c3ef42..000000000 Binary files a/mods/ca/bits/soviet/tsardeployedtur.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/tsartur.bmp b/mods/ca/bits/soviet/tsartur.bmp deleted file mode 100644 index 86a9f88e1..000000000 Binary files a/mods/ca/bits/soviet/tsartur.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/twinf tur.bmp b/mods/ca/bits/soviet/twinf tur.bmp deleted file mode 100644 index da0870e34..000000000 Binary files a/mods/ca/bits/soviet/twinf tur.bmp and /dev/null differ diff --git a/mods/ca/bits/soviet/twinf.bmp b/mods/ca/bits/soviet/twinf.bmp deleted file mode 100644 index 53ecdca07..000000000 Binary files a/mods/ca/bits/soviet/twinf.bmp and /dev/null differ diff --git a/mods/ca/maps/TibLabBrawl/map.yaml b/mods/ca/maps/TibLabBrawl/map.yaml index 8ebf4c8ac..1ae9b0df5 100644 --- a/mods/ca/maps/TibLabBrawl/map.yaml +++ b/mods/ca/maps/TibLabBrawl/map.yaml @@ -1587,25 +1587,25 @@ Actors: Location: 56,69 SubCell: 3 Facing: 92 - Actor649: medi + Actor649: medic Owner: Neutral Location: 69,68 SubCell: 3 Facing: 92 TurretFacing: 92 - Actor654: medi + Actor654: medic Owner: Neutral Location: 60,68 SubCell: 3 Facing: 92 TurretFacing: 92 - Actor658: medi + Actor658: medic Owner: Neutral Location: 60,61 SubCell: 3 Facing: 92 TurretFacing: 92 - Actor663: medi + Actor663: medic Owner: Neutral Location: 69,61 SubCell: 3 @@ -1949,25 +1949,25 @@ Actors: SubCell: 3 Facing: 92 TurretFacing: 92 - Actor715: medi + Actor715: medic Owner: Neutral Location: 73,54 SubCell: 3 Facing: 92 TurretFacing: 92 - Actor716: medi + Actor716: medic Owner: Neutral Location: 56,55 SubCell: 3 Facing: 92 TurretFacing: 92 - Actor717: medi + Actor717: medic Owner: Neutral Location: 55,74 SubCell: 1 Facing: 92 TurretFacing: 92 - Actor718: medi + Actor718: medic Owner: Neutral Location: 73,74 SubCell: 2 diff --git a/mods/ca/maps/delirium-shell/map.yaml b/mods/ca/maps/delirium-shell/map.yaml index fb67da0cc..5f01efaad 100644 --- a/mods/ca/maps/delirium-shell/map.yaml +++ b/mods/ca/maps/delirium-shell/map.yaml @@ -1110,13 +1110,13 @@ Actors: TurretFacing: 384 SubCell: 3 Location: 78,92 - Actor391: medi + Actor391: medic Owner: Multi0 Facing: 384 TurretFacing: 384 Location: 88,82 SubCell: 3 - Actor392: medi + Actor392: medic Owner: Multi0 Facing: 384 TurretFacing: 384 diff --git a/mods/ca/maps/island-wars-ii-shell/map.yaml b/mods/ca/maps/island-wars-ii-shell/map.yaml index ebb9a9401..3d3bd8f90 100644 --- a/mods/ca/maps/island-wars-ii-shell/map.yaml +++ b/mods/ca/maps/island-wars-ii-shell/map.yaml @@ -710,7 +710,7 @@ Actors: SubCell: 3 Facing: 92 TurretFacing: 92 - Actor259: medi + Actor259: medic Owner: Multi0 Location: 53,67 SubCell: 3 diff --git a/mods/ca/rules/ai/easy.yaml b/mods/ca/rules/ai/easy.yaml index d1c01009e..09f359ff6 100644 --- a/mods/ca/rules/ai/easy.yaml +++ b/mods/ca/rules/ai/easy.yaml @@ -222,7 +222,7 @@ Player: s6: 5 rmbc: 15 mort: 15 - medi: 3 + medic: 3 mech: 3 dog: 2 sab: 2 @@ -342,7 +342,7 @@ Player: n6: 1 s6: 1 mech: 1 - medi: 1 + medic: 1 msub: 4 ca: 4 isub: 4 diff --git a/mods/ca/rules/ai/hard.yaml b/mods/ca/rules/ai/hard.yaml index 7a9ad71ec..70d5213e2 100644 --- a/mods/ca/rules/ai/hard.yaml +++ b/mods/ca/rules/ai/hard.yaml @@ -231,7 +231,7 @@ Player: s6: 5 rmbc: 15 mort: 15 - medi: 3 + medic: 3 mech: 3 dog: 2 sab: 2 @@ -351,7 +351,7 @@ Player: n6: 1 s6: 1 mech: 1 - medi: 1 + medic: 1 msub: 4 ca: 4 isub: 4 diff --git a/mods/ca/rules/ai/normal.yaml b/mods/ca/rules/ai/normal.yaml index be89d17d7..15398b25d 100644 --- a/mods/ca/rules/ai/normal.yaml +++ b/mods/ca/rules/ai/normal.yaml @@ -223,7 +223,7 @@ Player: s6: 5 rmbc: 15 mort: 15 - medi: 3 + medic: 3 mech: 3 dog: 2 sab: 2 @@ -343,7 +343,7 @@ Player: n6: 1 s6: 1 mech: 1 - medi: 1 + medic: 1 msub: 4 ca: 4 isub: 4 diff --git a/mods/ca/rules/allies/ai.yaml b/mods/ca/rules/allies/ai.yaml index bff5ab0d2..5f2a574f8 100644 --- a/mods/ca/rules/allies/ai.yaml +++ b/mods/ca/rules/allies/ai.yaml @@ -122,7 +122,7 @@ Player: UnitsToBuild: e7: 15 mech: 3 - medi: 3 + medic: 3 snip: 15 apc: 20 jeep: 30 @@ -144,7 +144,7 @@ Player: jeep: 2 apc: 2 mech: 1 - medi: 1 + medic: 1 SquadManagerBotModuleCA@brutal-vhard: AirSquadTargetTypes: heli: Aircraft, Vehicle diff --git a/mods/ca/rules/allies/commander-tree.yaml b/mods/ca/rules/allies/commander-tree.yaml index 36ee7e815..a4c60b7b6 100644 --- a/mods/ca/rules/allies/commander-tree.yaml +++ b/mods/ca/rules/allies/commander-tree.yaml @@ -1,3 +1,57 @@ +# vehicles + +commander_tree.Prism_Tank: + Inherits: ^default.commander_tree_item + Tooltip: + Name: Prism Tank + RenderSprites: + Image: prismtank + Buildable: + BuildPaletteOrder: 9 + Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_cannon, ~!commander_tree.prism_blaster, ~!vehicles.england + Description: Enables to build the Prism Tank, an energy based weapon with high range.\n Srong versus light vehicles and infantry. + ProvidesPrerequisite@filler: + Prerequisite: filler.prism + +commander_tree.Prism_Cannon: + Inherits: ^default.commander_tree_item + Tooltip: + Name: Prism Cannon + RenderSprites: + Image: prismcannon + Buildable: + BuildPaletteOrder: 10 + Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_blaster, ~!commander_tree.prism_tank, ~!vehicles.france + Description: Enables to build the Prism Cannon. \n Has higher range and more damage than the Prism Tank, but does not split its beam. \n It is stronger vs. base defenses and single units but less effective against large armies. + ProvidesPrerequisite@filler: + Prerequisite: filler.prism + +commander_tree.Prism_Blaster: + Inherits: ^default.commander_tree_item + Tooltip: + Name: Prism Blaster + RenderSprites: + Image: prismblaster + Buildable: + BuildPaletteOrder: 11 + Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_cannon, ~!commander_tree.prism_tank, ~!vehicles.germany + Description: Enables to build the Prism Blaster. \n Has less range than the Prism Tank, but does split its beam to more targets. \n It is stronger vs. large armies and less effective against base defenses and single targets. + ProvidesPrerequisite@filler: + Prerequisite: filler.prism + +hack.cameo_filler.prism: + Inherits: ^default.cameo_filler + Buildable: + BuildPaletteOrder: 12 + Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, disabled + +hack.cameo_filler.prism2: + Inherits: ^default.cameo_filler + Buildable: + BuildPaletteOrder: 12 + Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, disabled, ~filler.prism + + # Aircraft commander_tree.Eurofighter: diff --git a/mods/ca/rules/allies/vehicles.yaml b/mods/ca/rules/allies/vehicles.yaml index 965b228c7..d4bdfec3e 100644 --- a/mods/ca/rules/allies/vehicles.yaml +++ b/mods/ca/rules/allies/vehicles.yaml @@ -12,14 +12,12 @@ Prismtank: Buildable: Queue: Vehicle BuildPaletteOrder: 135 - IconPalette: chrome Prerequisites: radar, ~commander_tree.prism_tank Description: Long-range artillery with Prism Tower derived weapon.\n Strong vs Buildings, Infantry, Light Armor\n Weak vs Tanks, Aircraft Valued: Cost: 1350 Tooltip: Name: Prism Tank - GenericName: Tank Health: HP: 22000 Mobile: @@ -53,7 +51,6 @@ PBLASTER: Tooltip: Name: Prism Blaster Buildable: - IconPalette: chrometd Prerequisites: radar, ~commander_tree.prism_blaster Description: Prism Tower derived weapon hitting many targets on impact.\n Strong vs Buildings, Infantry, Light Armor\n Weak vs Tanks, Aircraft Health: @@ -70,7 +67,6 @@ PCAN: Inherits: ^PrioAntiHeavy Inherits: ^FightingVehicle Buildable: - IconPalette: chrome Prerequisites: radar, ~commander_tree.prism_cannon Description: A prototype long range artillery that fires highly focused beams of light.\n Strong vs Buildings, Vehicles, Infantry\n Weak vs Tanks, Aircraft Valued: @@ -90,12 +86,6 @@ PCAN: FireDelay: 10 LocalOffset: 600,0,300 PauseOnCondition: empdisable || being-warped - SpawnActorOnDeath: - Actor: Prismtank.Husk - RequiresCondition: !being-warped - SelectionDecorations: - Voiced: - VoiceSet: PrismVoice CTNK: Inherits: ^Tank diff --git a/mods/ca/rules/commander-tree.yaml b/mods/ca/rules/commander-tree.yaml index 5009318da..1c67a796b 100644 --- a/mods/ca/rules/commander-tree.yaml +++ b/mods/ca/rules/commander-tree.yaml @@ -152,56 +152,6 @@ commander_tree.Spec_Ops: Prerequisites: prerequisite.has_points, ~infantry.allies, commander_tree.advanced_infantry_training, techcenter Description: Marks Vehicles and Buildings with a laser allowing rocket infantry to shoot at these from great distance.\n Can detect other stealthed units. -commander_tree.Prism_Tank: - Inherits: ^default.commander_tree_item - Tooltip: - Name: Prism Tank - Buildable: - BuildPaletteOrder: 9 - Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_cannon, ~!commander_tree.prism_blaster, ~!vehicles.england - Description: Enables to build the Prism Tank, an energy based weapon with high range.\n Srong versus light vehicles and infantry. - ProvidesPrerequisite@filler: - Prerequisite: filler.prism - -commander_tree.Prism_Cannon: - Inherits: ^default.commander_tree_item - Tooltip: - Name: Prism Cannon - Buildable: - - BuildPaletteOrder: 10 - - Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_blaster, ~!commander_tree.prism_tank, ~!vehicles.france - Description: Enables to build the Prism Cannon. \n Has higher range and more damage than the Prism Tank, but does not split its beam. \n It is stronger vs. base defenses and single units but less effective against large armies. - ProvidesPrerequisite@filler: - Prerequisite: filler.prism - -commander_tree.Prism_Blaster: - Inherits: ^default.commander_tree_item - Tooltip: - Name: Prism Blaster - Buildable: - - IconPalette: chrometd - BuildPaletteOrder: 11 - - Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_cannon, ~!commander_tree.prism_tank, ~!vehicles.germany - Description: Enables to build the Prism Blaster. \n Has less range than the Prism Tank, but does split its beam to more targets. \n It is stronger vs. large armies and less effective against base defenses and single targets. - ProvidesPrerequisite@filler: - Prerequisite: filler.prism - -hack.cameo_filler.5: - Inherits: ^default.cameo_filler - Buildable: - BuildPaletteOrder: 12 - Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, disabled - -hack.cameo_filler.6: - Inherits: ^default.cameo_filler - Buildable: - BuildPaletteOrder: 12 - Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, disabled, ~filler.prism - commander_tree.Scout_Tank_PDL: Inherits: ^default.commander_tree_item Tooltip: diff --git a/mods/ca/rules/defaults.yaml b/mods/ca/rules/defaults.yaml index 53172b03b..33b867306 100644 --- a/mods/ca/rules/defaults.yaml +++ b/mods/ca/rules/defaults.yaml @@ -2473,10 +2473,9 @@ PROC.Dummy: WithInfantryBody: RequiresCondition: !being-warped && !onwater WithInfantryBody@Swim: - IdleSequences: swimidle1, swimidle2, swimcheer - StandSequences: swimidle1, swimidle2 - -AttackSequences: - DefaultAttackSequence: swimattack + IdleSequences: swim-idle1, swim-idle2, swim-cheer + StandSequences: swim-idle1, swim-idle2 + DefaultAttackSequence: swim-attack MoveSequence: swim RequiresCondition: !being-warped && onwater WithDeathAnimation: @@ -2486,7 +2485,8 @@ PROC.Dummy: UseDeathTypeSuffix: False FallbackSequence: splash CrushedSequence: die-crushed - DeathSequence: swimdie1 + DeathSequence: swim-die + DeathSequencePalette: playerra2 ^Ship: Inherits@1: ^ExistsInWorld diff --git a/mods/ca/rules/gdi/vehicles.yaml b/mods/ca/rules/gdi/vehicles.yaml index 256c378f1..cad1d1b41 100644 --- a/mods/ca/rules/gdi/vehicles.yaml +++ b/mods/ca/rules/gdi/vehicles.yaml @@ -268,12 +268,12 @@ MARV: Inherits: ^ThrowsShrapnel Buildable: Queue: Vehicle - BuildPaletteOrder: 0 + BuildPaletteOrder: 190 IconPalette: chrometd Prerequisites: ~vehicles.gdi, ~commander_tree.marv, miss.gdi Description: Enormous slow tank with triple ion blaster cannons. \nMines Tiberium and Ores when driving over. Valued: - Cost: 9000 + Cost: 10000 Tooltip: Name: M.A.R.V. Health: diff --git a/mods/ca/rules/husks.yaml b/mods/ca/rules/husks.yaml index 07174298d..50856a6bf 100644 --- a/mods/ca/rules/husks.yaml +++ b/mods/ca/rules/husks.yaml @@ -1632,19 +1632,6 @@ TTNK.RA2.Husk: RenderSprites: Image: ttnk.ra2.destroyed -GTNK.Husk: - Inherits: ^Husk - Tooltip: - Name: Husk (Grizzly Tank) - ThrowsParticle@turret: - Anim: turret - TransformOnCapture: - IntoActor: gtnk - InfiltrateForTransform: - IntoActor: gtnk - RenderSprites: - Image: gtnk.destroyed - P51.Husk: Inherits: ^PlaneHusk Tooltip: diff --git a/mods/ca/rules/infantry.yaml b/mods/ca/rules/infantry.yaml index 1855f9f34..d3d132d23 100644 --- a/mods/ca/rules/infantry.yaml +++ b/mods/ca/rules/infantry.yaml @@ -256,10 +256,9 @@ E7: TakeCover: SpeedModifier: 70 -MEDI: +MEDIC: Inherits: ^Soldier - RenderSprites: - PlayerPalette: overlayplayer + Inherits: ^InfantryRA2Sprite Inherits: ^InfantrySupportUnit Buildable: Queue: Infantry @@ -295,7 +294,7 @@ MEDI: ValidRelationships: Ally Priority: 2 WithInfantryBody: - IdleSequences: idle + IdleSequences: idle, idle2 StandSequences: stand DefaultAttackSequence: heal AttackSequences: @@ -1501,7 +1500,11 @@ SEAL: Queue: Infantry IconPalette: chrome BuildLimit: -1 - Description: Elite infantry unit. Armed with\na SMG and C4.\n Can detect cloaked units.\n Strong vs Infantry, Buildings\n Weak vs Aircraft\n Special Ability: C4 Explosives + Description: Elite infantry unit. Armed with\na SMG and C4.\n Can detect cloaked units. + TooltipExtras: + Strengths: • Strong vs Infantry, Buildings + Weaknesses: • Weak vs Aircraft, Vehicles + Attributes: • Can swim \n• C4 Explosives Voiced: VoiceSet: SealVoice Mobile: @@ -1560,95 +1563,3 @@ SEAL: WithAmmoPipsDecoration: Position: BottomLeft RequiresSelection: true - -HACK: - Inherits: ^Soldier - Inherits: ^PrioAntiHeavy - Buildable: - Queue: Infantry - Prerequisites: ~disabled - BuildAtProductionType: Soldier - Valued: - Cost: 500 - Tooltip: - Name: Hacker - TooltipExtras: - Strengths: • Strong vs Buildings, Defenses, Drones - Weaknesses: • Cannot attack Infantry, Aircraft, Vehicles (other than Drones) - Attributes: • Can capture enemy structures from range\n• Control lost if the Hacker dies - UpdatesPlayerStatistics: - AddToArmyValue: true - Health: - HP: 5000 - Mobile: - Speed: 56 - Voice: Move - PauseOnCondition: !undeployed && being-warped - RequireForceMoveCondition: !undeployed - RevealsShroud: - Range: 5c0 - Passenger: - CustomPipType: blue - Voice: Move - Armament@PRIMARY: - Weapon: PrepareHack - PauseOnCondition: deployed - Armament@PRIMARYDEPLOYED: - Weapon: Hack - RequiresCondition: deployed - LocalOffset: 0,0,50 - AttackFrontal: - Voice: Action - FacingTolerance: 512 - TargetFrozenActors: true - PauseOnCondition: being-warped - WithInfantryBody: - IdleSequences: idle - StandSequences: stand - RequiresCondition: undeployed - WithSpriteBody@DEPLOYED: - Name: deployed - Sequence: hack - RequiresCondition: !undeployed - WithMakeAnimation: - BodyNames: deployed - Voiced: - VoiceSet: HackerVoice - Targetable: - TargetTypes: Ground, Infantry, Disguise, ChaosImmune - GrantConditionOnDeploy@HACK: - DeployedCondition: deployed - UndeployedCondition: undeployed - UndeployOnMove: true - UndeployOnPickup: true - SmartDeploy: True - DeployOnAttack: - RequiresCondition: undeployed - MindController: - ArmamentNames: primary - Capacity: -1 - TicksToControl: 300 - TicksToRevoke: 25 - InitSounds: hacker-init.aud - InitSoundControllerOnly: true - ControlSounds: hacker-hacked.aud - ControllingCondition: hacked-in - UndeployOnControl: true - WithDecoration@HACKEDIN: - Image: hacking - Sequence: hacking - RequiresCondition: hacked-in - Position: BottomRight - Palette: effect - ValidRelationships: Ally, Neutral, Enemy - WithMindControlArc@HACK: - Color: 1ce312 - Transparency: 65 - Angle: 60 - Width: 86 - Offset: 0,0,50 - AutoTarget: - InitialStance: HoldFire - InitialStanceAI: AttackAnything - RenderRangeCircle: - Color: 00cc00 diff --git a/mods/ca/rules/misc.yaml b/mods/ca/rules/misc.yaml index 4fb5790bb..d921d5967 100644 --- a/mods/ca/rules/misc.yaml +++ b/mods/ca/rules/misc.yaml @@ -606,6 +606,8 @@ powerproxy.paratroopers2: ArrowSequence: arrow ClockSequence: clock CircleSequence: circles + UseDirectionalTarget: True + DirectionArrowAnimation: paradirection powerproxy.airborne.tank: Buildable: @@ -618,11 +620,11 @@ powerproxy.airborne.tank: Icon: airdropicon SquadSize: 1 UnitType: C17 - Name: Airdrop: Grizzly Tanks (Single Use) - Description: A Heavy Transport Plane drops a quad of Grizzly Tanks\nanywhere on the map. + Name: Airdrop: Scout Tanks (Single Use) + Description: A Heavy Transport Plane drops a quad of Scout Tanks\nanywhere on the map. OneShot: true AllowMultiple: true - DropItems: GTNK,GTNK,GTNK,GTNK + DropItems: 1TNK,1TNK,1TNK,1TNK SelectTargetSpeechNotification: SelectTarget EndChargeSpeechNotification: Reinforce LaunchSpeechNotification: ReinforcementsArrived diff --git a/mods/ca/rules/nod/infantry.yaml b/mods/ca/rules/nod/infantry.yaml index f20e4cd33..0eb4a4fcf 100644 --- a/mods/ca/rules/nod/infantry.yaml +++ b/mods/ca/rules/nod/infantry.yaml @@ -9,7 +9,11 @@ Adept: BuildAtProductionType: Soldier BuildPaletteOrder: 10 Prerequisites: ~!bio.nod, infantry.any, ~infantry.nod - Description: General-purpose infantry with good scouting abilities.\n Strong vs Infantry\n Weak vs Vehicles, Aircraft + Description: General-purpose infantry with good scouting abilities. + TooltipExtras: + Strengths: • Strong vs Infantry + Weaknesses: • Weak vs. Vehicles, Aircraft + Attributes: • Equipped with scout equipment Valued: Cost: 100 Tooltip: @@ -36,7 +40,11 @@ Stormtrooper: Queue: Infantry BuildPaletteOrder: 10 Prerequisites: ~bio.nod, ~hand - Description: General-purpose cyborg with good scout abilities.\n Strong vs Infantry\n Weak vs Vehicles, Artillery + Description: General-purpose cyborg with good scout abilities. + TooltipExtras: + Strengths: • Strong vs Infantry + Weaknesses: • Weak vs. Vehicles, Aircraft + Attributes: • Equipped with scout equipment Valued: Cost: 150 Tooltip: @@ -74,7 +82,10 @@ Rocket_Trooper: BuildAtProductionType: Soldier BuildPaletteOrder: 30 Prerequisites: ~!bio.nod, infantry.any, ~infantry.nod - Description: Anti-tank/anti-aircraft infantry.\n Strong vs Tanks, Aircraft\n Weak vs Infantry + Description: Anti-tank/anti-aircraft infantry. + TooltipExtras: + Strengths: • Strong vs Heavy Vehicles, Aircraft + Weaknesses: • Weak vs. Infantry, Aircraft Valued: Cost: 250 Tooltip: @@ -137,7 +148,10 @@ Rocket_Cyborg: Queue: Infantry BuildPaletteOrder: 20 Prerequisites: ~bio.nod, ~hand - Description: Anti-tank cyborg infantry\n Strong vs Tanks, Aircraft\n Weak vs Infantry, Artillery + Description: Anti-tank cyborg infantry + TooltipExtras: + Strengths: • Strong vs Heavy Vehicles, Aircraft + Weaknesses: • Weak vs. Infantry, Aircraft Valued: Cost: 350 Tooltip: @@ -200,7 +214,10 @@ Black_Hand_Trooper: BuildAtProductionType: Soldier BuildPaletteOrder: 150 Prerequisites: radar, ~infantry.blackh - Description: Elite precision flamethrower unit.\n Strong vs Vehicles, Infantry\n Weak vs Aircraft + Description: Elite precision flamethrower unit. + TooltipExtras: + Strengths: • Strong vs Infantry, Light Vehicles, Buildings + Weaknesses: • Weak vs. Heavy Armor, Aircraft Valued: Cost: 500 Tooltip: @@ -259,7 +276,11 @@ SAB: BuildAtProductionType: Soldier BuildPaletteOrder: 90 Prerequisites: hq, ~infantry.nod, ~commander_tree.advanced_infantry_training - Description: Covert infantry. Infiltrates enemy structures and steals technology.\n Can detect spies and cloaked units.\n Special Ability: Infiltrate\n Special Ability: Stealth + Description: Covert infantry. Infiltrates enemy structures and steals technology. + TooltipExtras: + Strengths: • Strong vs Infantry, Light Vehicles + Weaknesses: • Weak vs. Reflector Armor, Aircraft + Attributes: • Cloaked \n• Infiltrates buildings\n•Detects cloaked units Valued: Cost: 800 Tooltip: @@ -292,6 +313,81 @@ SAB: IsPlayerPalette: true Palette: cloakts +HACK: + Inherits: ^Soldier + Inherits: ^InfantryRA2Sprite + Inherits: ^InfantrySwimmer + Inherits: ^PrioAntiHeavy + Inherits: ^CommandoSkull + Buildable: + Queue: Infantry + BuildPaletteOrder: 195 + Prerequisites: ~infantry.legion, techcenter, ~commander_tree.advanced_infantry_training + Description: The Hacker can take control of defenses and buildings. + BuildLimit: 1 + TooltipExtras: + Strengths: • Strong vs Buildings, Defenses + Weaknesses: • Cannot attack Infantry, Aircraft, Vehicles + Attributes: • Can capture enemy structures from range\n• Control lost if the Hacker dies\n• Can swim + Valued: + Cost: 1000 + Tooltip: + Name: Hacker + Health: + HP: 5000 + RevealsShroud: + Range: 15c0 + Passenger: + CustomPipType: blue + Voice: Move + Armament@PRIMARY: + Weapon: Hack + LocalOffset: 0,0,50 + AttackFrontal: + Voice: Action + FacingTolerance: 512 + TargetFrozenActors: true + PauseOnCondition: being-warped + WithInfantryBody: + IdleSequences: idle + DefaultAttackSequence: hacking + WithInfantryBody@Swim: + IdleSequences: swim-idle + StandSequences: swim-stand + DefaultAttackSequence: swim-action + Voiced: + VoiceSet: HackerVoice + Targetable: + TargetTypes: Ground, Infantry, Disguise, ChaosImmune + MindController: + ArmamentNames: primary + Capacity: -1 + TicksToControl: 300 + TicksToRevoke: 25 + InitSounds: hacker-init.aud + InitSoundControllerOnly: true + ControlSounds: hacker-hacked.aud + ControllingCondition: hacked-in + UndeployOnControl: true + WithDecoration@HACKEDIN: + Image: hacking + Sequence: hacking + RequiresCondition: hacked-in + Position: BottomRight + Palette: effect + ValidRelationships: Ally, Neutral, Enemy + WithMindControlArc@HACK: + Color: 1ce312 + Transparency: 65 + Angle: 60 + Width: 86 + Offset: 0,0,50 + AutoTarget: + InitialStance: HoldFire + InitialStanceAI: AttackAnything + RenderRangeCircle: + Color: 00cc00 + Obelisk_Trooper: Inherits: ^Soldier Inherits: ^InfantryRA2Sprite @@ -303,6 +399,10 @@ Obelisk_Trooper: IconPalette: chrome Prerequisites: ~hand, hq, ~infantry.marked, ~commander_tree.advanced_infantry_training Description: Elite infantry with a laser weapon.\n Strong vs Infantry, Light Armor\n Weak vs Aircraft\n + TooltipExtras: + Strengths: • Strong vs Infantry, Light Vehicles + Weaknesses: • Weak vs. Reflector Armor, Aircraft + Attributes: • Pew pew laser gunz! Valued: Cost: 300 Tooltip: @@ -348,18 +448,22 @@ Cyborg_Commando: -TakeCover: -Crushable: Inherits: ^HighResShadow - Inherits@Armor: ^HeavyArmor + Inherits: ^HeavyArmor Inherits: ^PrioEnergyWeapon - Inherits@GAINSEXPERIENCE: ^GainsExperience - Inherits@detect: ^SensorEquipment - Inherits@COMMANDOSKULL: ^CommandoSkull + Inherits: ^GainsExperience + Inherits: ^SensorEquipment + Inherits: ^CommandoSkull Buildable: Queue: Infantry BuildPaletteOrder: 195 IconPalette: chrometd - Prerequisites: ~infantry.nod, techcenter, ~commander_tree.advanced_infantry_training - Description: Tough combat battle-mech.\n Can attack Aircraft.\n Strong vs Infantry, Tanks\n Weak vs Point Laser Defense + Prerequisites: ~infantry.marked, techcenter, ~commander_tree.advanced_infantry_training + Description: Tough combat battle-mech. BuildLimit: 1 + TooltipExtras: + Strengths: • Strong vs Infantry, Vehicles + Weaknesses: • Weak vs. Reflector Armor, Aircraft + Attributes: • Laser sweeps over area Valued: Cost: 3000 Tooltip: diff --git a/mods/ca/rules/nod/weapons.yaml b/mods/ca/rules/nod/weapons.yaml index 55ca591bc..4312e19ac 100644 --- a/mods/ca/rules/nod/weapons.yaml +++ b/mods/ca/rules/nod/weapons.yaml @@ -15,3 +15,35 @@ CommandoLaser: Warhead@1Dam: SpreadDamage Spread: 341 Damage: 2000 + +Hack: + Range: 18c0 + ReloadDelay: 30 + ValidTargets: Hackable + TargetActorCenter: true + Report: hacker-pulse.aud + Projectile: ArcLaserZap + Color: 1ce31270 + Angle: 60 + Width: 86 + Duration: 20 + HitAnim: empty + Warhead@1Dam: TargetDamage + ValidRelationships: Enemy, Neutral + Warhead@CAMERA: SpawnActor + Actors: camera.hacker + Range: 1 + ValidRelationships: Neutral, Enemy + Warhead@green: GrantExternalCondition + Range: 0c511 + Duration: 2 + Condition: greenhighlight + ValidTargets: Structure, Vehicle + ValidRelationships: Neutral, Enemy + +PrepareHack: + Inherits: Hack + -Report: + -Projectile: + Projectile: InstantHit + -Warhead@green: diff --git a/mods/ca/rules/structures.yaml b/mods/ca/rules/structures.yaml index 82a54aa37..4e5eb1a9b 100644 --- a/mods/ca/rules/structures.yaml +++ b/mods/ca/rules/structures.yaml @@ -3256,18 +3256,6 @@ HQ: SelectTargetSpeechNotification: SelectTarget PauseOnCondition: disabled || being-warped EffectSequence: idle - ProduceActorPower@hackercell: - OrderName: hackercell - Prerequisites: infantry.any, ~radar.legion - Icon: hackercell - Type: Infantry - ChargeInterval: 7500 - Name: Hacker Cell - Description: Deploy a squad of hackers that can remotely\ncapture buildings and take control of defenses. - Actors: hack, hack, hack - LaunchSpeechNotification: ReinforcementsArrived - EndChargeSpeechNotification: Reinforce - PauseOnCondition: disabled || being-warped ParatroopersPower@paratroopers: OrderName: LegionParatroopers Prerequisites: structures.blackh, hand diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml index 1d1d3d478..b36d32e03 100644 --- a/mods/ca/rules/vehicles.yaml +++ b/mods/ca/rules/vehicles.yaml @@ -152,68 +152,6 @@ V2RL: Actor: 2TNK.Husk RequiresCondition: !being-warped -GTNK: - Inherits: 2TNK - -Buildable: - Valued: - Cost: 875 - Tooltip: - Name: Grizzly Tank - TooltipExtras: - Strengths: • Strong vs Heavy Armor, Light Armor - Weaknesses: • Weak vs Infantry, Defenses\n• Cannot attack Aircraft - Mobile: - Speed: 90 - Voice: Move - Passenger: - Voice: Move - Health: - HP: 41250 - Armament: - Weapon: 105mm - LocalOffset: 720,0,80 - Turreted: - TurnSpeed: 20 - Offset: 80,0,0 - AttackTurreted: - Voice: Attack - PauseOnCondition: parachute - AttackMove: - Voice: Attack - SpawnActorOnDeath: - Actor: GTNK.Husk - Voiced: - VoiceSet: GrizzlyVoice - WithShadow: - RequiresCondition: parachute - -GTNK.squad: - AlwaysVisible: - Interactable: - ScriptTriggers: - ProvidesPrerequisite@squadname: - Tooltip: - Name: Airdrop: Grizzly Tanks - Buildable: - Queue: Vehicle - BuildAtProductionType: Paradrop - BuildPaletteOrder: 0 - Prerequisites: dome, ~vehicles.england, orep - Description: Prepare a quad of Grizzly Tanks for airdrop. - TooltipExtras: - Strengths: • Strong vs Heavy Armor, Light Armor - Weaknesses: • Weak vs Infantry, Defenses\n• Cannot attack Aircraft - Valued: - Cost: 3500 - RenderSprites: - Image: squad.airborne.tank - ProduceActorPowerCA: - Actors: powerproxy.airborne.tank - Type: Paradrop - OneShot: true - AutoFire: true - AllowMultiple: true - 2TNK.Chrono: Inherits: 2TNK RenderSprites: diff --git a/mods/ca/sequences/allies.yaml b/mods/ca/sequences/allies.yaml index bdae97124..bd4bba9f2 100644 --- a/mods/ca/sequences/allies.yaml +++ b/mods/ca/sequences/allies.yaml @@ -241,24 +241,18 @@ prismtank: icon: prismtankicon prismtank.destroyed: - Inherits: ^VehicleOverlays - idle: invisibleitem - icon: prismtankicon + Inherits: prismtank -pblaster: +prismblaster: Inherits: prismtank - muzzle: lightbluelasermuzzle - Length: 3 icon: prismblastericon -pblaster.destroyed: - Inherits: prismtank.destroyed +prismblaster.destroyed: + Inherits: prismblaster -pcan: +prismcannon: Inherits: prismtank - muzzle: lightbluelasermuzzle - Length: 3 - icon: pcanicnh + icon: prismcannonicon # aircraft diff --git a/mods/ca/sequences/infantry.yaml b/mods/ca/sequences/infantry.yaml index f95282264..d89855ecd 100644 --- a/mods/ca/sequences/infantry.yaml +++ b/mods/ca/sequences/infantry.yaml @@ -212,54 +212,65 @@ e7: Tick: 80 icon: e7icon -medi: +medic: Inherits: ^CommonDeaths - Defaults: - Scale: 0.66 - stand: medi + stand: medic Facings: 8 - run: medi + run: medic Start: 8 Length: 6 Facings: 8 Tick: 100 - heal: medi - Start: 56 - Length: 58 + heal: medic + Start: 164 + Length: 6 + Facings: 8 Tick: 120 - standup: medi - Start: 114 + standup: medic + Start: 228 Length: 2 Facings: 8 - idle: medi - Start: 178 + liedown: medic + Start: 212 + Length: 2 + Facings: 8 + idle: medic + Start: 56 + Length: 16 + Tick: 120 + idle2: medic + Start: 72 Length: 14 Tick: 120 - die1: medi - Start: 193 - Length: 7 - die2: medi - Start: 201 - Length: 8 - die3: medi - Start: 209 + idle3: medic + Start: 245 Length: 8 - die4: medi - Start: 217 - Length: 12 - die5: medi - Start: 229 - Length: 18 - die7: medi - Start: 193 - Length: 7 - prone-stand: medi - Start: 130 - Stride: 4 + Tick: 120 + die1: medic + Start: 134 + Length: 15 + die2: medic + Start: 149 + Length: 15 + die3: medic + Start: 134 + Length: 15 + die4: medic + Start: 149 + Length: 15 + die5: medic + Start: 134 + Length: 15 + die7: medic + Start: 149 + Length: 15 + prone-stand: medic + Start: 86 + Stride: 6 Facings: 8 - prone-run: medi - Start: 130 - Length: 4 + prone-run: medic + Start: 86 + Length: 6 Facings: 8 Tick: 100 chrono-overlay: chronofade_small @@ -328,71 +339,6 @@ mech: Tick: 80 icon: mechicon -hack: - Inherits: ^CommonDeaths - stand: hack - Facings: 8 - run: hack - Start: 8 - Length: 6 - Facings: 8 - Tick: 100 - heal: hack - Start: 56 - Length: 58 - Tick: 120 - standup: hack - Start: 114 - Length: 2 - Facings: 8 - idle: hack - Start: 178 - Length: 14 - Tick: 120 - die1: hack - Start: 193 - Length: 7 - die2: hack - Start: 201 - Length: 8 - die3: hack - Start: 209 - Length: 8 - die4: hack - Start: 217 - Length: 12 - die5: hack - Start: 229 - Length: 18 - die7: hack - Start: 193 - Length: 7 - prone-stand: hack - Start: 130 - Stride: 4 - Facings: 8 - prone-run: hack - Start: 130 - Length: 4 - Facings: 8 - Tick: 100 - make: hack - Start: 247 - Length: 4 - Tick: 100 - hack: hack - Start: 250 - Length: 9 - Tick: 160 - chrono-overlay: chronofade_small - Length: * - BlendMode: Additive - Offset: 0, 0 - UseTilesetCode: false - ZOffset: 512 - Tick: 80 - icon: mediicon - dog: stand: dog Facings: 8 diff --git a/mods/ca/sequences/misc.yaml b/mods/ca/sequences/misc.yaml index da0b3e32b..60fda6965 100644 --- a/mods/ca/sequences/misc.yaml +++ b/mods/ca/sequences/misc.yaml @@ -2052,8 +2052,5 @@ chhorde2: squad.airborne: icon: u3icon -squad.airborne.tank: - icon: gtnkicon - empty: idle: empty diff --git a/mods/ca/sequences/nod.yaml b/mods/ca/sequences/nod.yaml index c90dee1a9..36e86f634 100644 --- a/mods/ca/sequences/nod.yaml +++ b/mods/ca/sequences/nod.yaml @@ -412,6 +412,106 @@ sab: Offset: 0, 0 icon: saboteuricon +hack: + Inherits: ^CommonDeaths + stand: hacker + Facings: 8 + run: hacker + Start: 8 + Length: 6 + Facings: 8 + Tick: 100 + shoot: hacker + Start: 86 + Length: 6 + Facings: 8 + Tick: 100 + standup: hacker + Start: 114 + Length: 2 + Facings: 8 + idle: hacker + Start: 56 + Length: 16 + Tick: 120 + hacking: hacker + Start: 230 + Length: 6 + Facings: 8 + Tick: 200 + die1: hacker + Start: 72 + Length: 14 + die2: hacker + Start: 72 + Length: 14 + die3: hacker + Start: 72 + Length: 14 + die4: hacker + Start: 72 + Length: 14 + die5: hacker + Start: 72 + Length: 14 + die7: hacker + Start: 72 + Length: 14 + prone-stand: hacker + Start: 134 + Stride: 6 + Facings: 8 + prone-run: hacker + Start: 134 + Length: 6 + Facings: 8 + Tick: 100 + prone-shoot: hacker + Start: 182 + Length: 6 + Facings: 8 + Tick: 100 + swim-stand: hacker + Start: 278 + Length: 6 + Facings: 8 + Tick: 180 + swim: hacker + Start: 326 + Length: 6 + Facings: 8 + Tick: 120 + swim-idle: hacker + Start: 422 + Length: 30 + Tick: 120 + swim-attack: hacker + Start: 374 + Length: 6 + Facings: 8 + Tick: 120 + swim-die: hacker + Start: 452 + Length: 20 + Tick: 120 + swim-die2: hacker + Start: 472 + Length: 20 + Tick: 120 + swim-action: hacker + Start: 492 + Length: 6 + Facings: 8 + Tick: 120 + chrono-overlay: chronofade_small + Length: * + BlendMode: Additive + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + Tick: 80 + icon: hackericon + cyborg_commando: Inherits: ^HighRes Inherits: ^InfantryOverlays diff --git a/mods/ca/sequences/soviet.yaml b/mods/ca/sequences/soviet.yaml index f4a1acec3..8bf8398ee 100644 --- a/mods/ca/sequences/soviet.yaml +++ b/mods/ca/sequences/soviet.yaml @@ -356,7 +356,7 @@ ivan: Start: 116 Length: 6 Facings: 8 - swimidle: crazyivan + swim-idle: crazyivan Start: 188 Length: 6 Facings: 8 @@ -366,28 +366,28 @@ ivan: Length: 6 Facings: 8 Tick: 120 - swimidle1: crazyivan + swim-idle1: crazyivan Start: 284 Length: 15 Tick: 120 - swimidle2: crazyivan + swim-idle2: crazyivan Start: 299 Length: 15 Tick: 120 - swimattack: crazyivan + swim-attack: crazyivan Start: 354 Length: 6 Facings: 8 Tick: 120 - swimdie1: crazyivan + swim-die: crazyivan Start: 314 Length: 20 Tick: 120 - swimdie2: crazyivan + swim-die2: crazyivan Start: 334 Length: 20 Tick: 120 - swimcheer: crazyivan + swim-cheer: crazyivan Start: 402 Length: 8 Tick: 120 diff --git a/mods/ca/sequences/vehicles.yaml b/mods/ca/sequences/vehicles.yaml index 35c4fedfd..2f0c5e8c1 100644 --- a/mods/ca/sequences/vehicles.yaml +++ b/mods/ca/sequences/vehicles.yaml @@ -129,19 +129,6 @@ charv.destroyed: Length: 5 icon: 2tnkicon -gtnk: - Inherits: ^VehicleOverlays - idle: gtnk - Facings: 32 - UseClassicFacings: True - turret: 2tnk - Start: 32 - Facings: 32 - UseClassicFacings: True - muzzle: gunfire2 - Length: 5 - icon: gtnkicon - 2tnk.destroyed: Inherits: ^VehicleOverlays idle: 2tnk @@ -154,18 +141,6 @@ gtnk: UseClassicFacings: True ZOffset: -512 -gtnk.destroyed: - Inherits: ^VehicleOverlays - idle: gtnk - Facings: 32 - UseClassicFacings: True - ZOffset: -512 - turret: 2tnk - Start: 32 - Facings: 32 - UseClassicFacings: True - ZOffset: -512 - v2rl: Inherits: ^VehicleOverlays idle: v2rl diff --git a/mods/ca/weapons/other.yaml b/mods/ca/weapons/other.yaml index 83ef25f7b..da9481758 100644 --- a/mods/ca/weapons/other.yaml +++ b/mods/ca/weapons/other.yaml @@ -474,38 +474,6 @@ IvanIFVTargeting: Inherits: DemoTruckTargeting ValidTargets: Ground, DetonateAttack -Hack: - Range: 12c0 - ReloadDelay: 50 - ValidTargets: Hackable - TargetActorCenter: true - Report: hacker-pulse.aud - Projectile: ArcLaserZap - Color: 1ce31270 - Angle: 60 - Width: 86 - Duration: 20 - HitAnim: empty - Warhead@1Dam: TargetDamage - ValidRelationships: Enemy, Neutral - Warhead@CAMERA: SpawnActor - Actors: camera.hacker - Range: 1 - ValidRelationships: Neutral, Enemy - Warhead@green: GrantExternalCondition - Range: 0c511 - Duration: 2 - Condition: greenhighlight - ValidTargets: Structure, Vehicle - ValidRelationships: Neutral, Enemy - -PrepareHack: - Inherits: Hack - -Report: - -Projectile: - Projectile: InstantHit - -Warhead@green: - MADTankThump: InvalidTargets: MADTank, Infantry Warhead@1Dam: HealthPercentageDamage