diff --git a/mods/cnc/bits/stegichn.shp b/mods/cnc/bits/stegicnh.shp similarity index 100% rename from mods/cnc/bits/stegichn.shp rename to mods/cnc/bits/stegicnh.shp diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index 1497ebcbeb..8aa018e6d4 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -49,7 +49,7 @@ Sequences: mods/cnc/sequences/infantry.yaml mods/cnc/sequences/map.yaml mods/cnc/sequences/misc.yaml - # Low priority sequences that break the batch when used + mods/cnc/sequences/funpark.yaml mods/cnc/sequences/civilian.yaml mods/cnc/sequences/campaign.yaml Cursors: diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index 98d683c365..88ae13c4eb 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -146,10 +146,6 @@ C17: Name: Supply Aircraft Description: Drops vehicle reinforcements on Airstrips Icon: c17icnh - Buildable: - Queue: Aircraft - BuildPaletteOrder: 1000 - Owner: None Valued: Cost: 2000 Plane: @@ -177,10 +173,6 @@ A10: Name: A10 Bomber Icon: a10icnh Description: Used to deliver Napalm strikes. - Buildable: - Queue: Aircraft - BuildPaletteOrder: 1000 - Owner: None Valued: Cost: 2000 Plane: diff --git a/mods/cnc/rules/civilian.yaml b/mods/cnc/rules/civilian.yaml index 7981d04c29..b290b99e30 100644 --- a/mods/cnc/rules/civilian.yaml +++ b/mods/cnc/rules/civilian.yaml @@ -426,7 +426,7 @@ VICE: BlueTiberium: 70 Beach: 80 Selectable: - Voice: GenericVoice + Voice: DinoVoice TargetableUnit: TargetTypes: Ground AutoTarget: @@ -445,4 +445,4 @@ VICE: AttackWander: RenderUnit: WithMuzzleFlash: - BodyOrientation: + BodyOrientation: \ No newline at end of file diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 44c5360e2b..f9b9dd77d5 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -190,6 +190,49 @@ JustMove: yes CrushableInfantry: +^DINO: + AppearsOnRadar: + Health: + Radius: 3 + HP: 1000 + Armor: + Type: Wood + Buildable: + Queue: Biolab + BuildPaletteOrder: 50 + Owner: gdi, nod + Valued: + Cost: 1000 + Tooltip: + Name: Dinosaur + RevealsShroud: + Range: 6 + Mobile: + Speed: 8 + TerrainSpeeds: + Clear: 90 + Rough: 80 + Road: 100 + Tiberium: 70 + BlueTiberium: 70 + Beach: 80 + Selectable: + Voice: DinoVoice + TargetableUnit: + TargetTypes: Ground + HiddenUnderFog: + GivesExperience: + RenderInfantry: + Palette: terrain + EditorAppearance: + UseTerrainPalette: true + BodyOrientation: + DrawLineToTarget: + AutoTarget: + ScanRadius: 4 + AttackMove: + AttackFrontal: + ^Plane: AppearsOnRadar: UseLocation: yes diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml index 2e7bcaa96f..4750ba8706 100644 --- a/mods/cnc/rules/infantry.yaml +++ b/mods/cnc/rules/infantry.yaml @@ -214,8 +214,8 @@ RMBO: Range: 2 PVICE: - Inherits:VICE - -AttackWander + Inherits: VICE + -AttackWander: Mobile: Crushes: crate Buildable: @@ -226,7 +226,41 @@ PVICE: Description: Mutated abomination that spits liquid tiberium.\n Strong vs Infantry, Buildings\n Weak vs Aircraft Icon: viceicnh DrawLineToTarget: - Selectable: - Voice: DinoVoice SelectionDecorations: ActorLostNotification: + +STEG: + Inherits: ^DINO + Tooltip: + Name: Stegosaurus + Description: A large, heavily built, herbivorous quadruped + Icon: stegicnh + Armament: + Weapon: tail + +TREX: + Inherits: ^DINO + Tooltip: + Name: Tyrannosaurus rex + Description: Bipedal carnivore with a massive skull + Icon: trexicnh + Armament: + Weapon: teeth + +TRIC: + Inherits: ^DINO + Tooltip: + Name: Triceratops + Description: Quadruped with large bony frill and three horns + Icon: tricicnh + Armament: + Weapon: horn + +RAPT: + Inherits: ^DINO + Tooltip: + Name: Velociraptor + Description: Bipedal with enlarged sickle-shaped claw on each hindfoot + Icon: rapticnh + Armament: + Weapon: claw diff --git a/mods/cnc/sequences/funpark.yaml b/mods/cnc/sequences/funpark.yaml index 081ec7e251..e873e99f79 100644 --- a/mods/cnc/sequences/funpark.yaml +++ b/mods/cnc/sequences/funpark.yaml @@ -1,10 +1,10 @@ steg: stand: Start: 0 - Length: 8 + Facings: 8 stand2: Start: 8 - Length: 8 + Facings: 8 run: Start: 16 Length: 8 @@ -16,14 +16,29 @@ steg: die1: Start: 176 Length: 22 + die2: + Start: 176 + Length: 22 + die3: + Start: 176 + Length: 22 + die4: + Start: 176 + Length: 22 + die5: + Start: 176 + Length: 22 + die6: + Start: 176 + Length: 22 trex: stand: Start: 0 - Length: 8 + Facings: 8 stand2: Start: 8 - Length: 8 + Facings: 8 run: Start: 16 Length: 8 @@ -35,14 +50,29 @@ trex: die1: Start: 144 Length: 40 + die2: + Start: 144 + Length: 40 + die3: + Start: 144 + Length: 40 + die4: + Start: 144 + Length: 40 + die5: + Start: 144 + Length: 40 + die6: + Start: 144 + Length: 40 tric: stand: Start: 0 - Length: 8 + Facings: 8 stand2: Start: 8 - Length: 8 + Facings: 8 run: Start: 16 Length: 8 @@ -54,14 +84,29 @@ tric: die1: Start: 176 Length: 20 + die2: + Start: 176 + Length: 20 + die3: + Start: 176 + Length: 20 + die4: + Start: 176 + Length: 20 + die5: + Start: 176 + Length: 20 + die6: + Start: 176 + Length: 20 rapt: stand: Start: 0 - Length: 8 + Facings: 8 stand2: Start: 8 - Length: 8 + Facings: 8 run: Start: 16 Length: 8 @@ -73,4 +118,18 @@ rapt: die1: Start: 144 Length: 40 - + die2: + Start: 144 + Length: 40 + die3: + Start: 144 + Length: 40 + die4: + Start: 144 + Length: 40 + die5: + Start: 144 + Length: 40 + die6: + Start: 144 + Length: 40 \ No newline at end of file diff --git a/mods/cnc/weapons.yaml b/mods/cnc/weapons.yaml index 156ce7f876..93b16c3a61 100644 --- a/mods/cnc/weapons.yaml +++ b/mods/cnc/weapons.yaml @@ -895,3 +895,63 @@ Patriot: ImpactSound: xplos.aud SmudgeType: Crater Damage: 30 + +Tail: + ROF: 30 + Range: 1 + Projectile: Bullet + Warhead: + Spread: 5 + Versus: + None: 90% + Wood: 10% + Light: 30% + Heavy: 10% + Concrete: 10% + InfDeath: 1 + Damage: 180 + +Horn: + ROF: 20 + Range: 1 + Projectile: Bullet + Warhead: + Spread: 5 + Versus: + None: 90% + Wood: 10% + Light: 30% + Heavy: 10% + Concrete: 10% + InfDeath: 1 + Damage: 120 + +Teeth: + ROF: 30 + Range: 1 + Projectile: Bullet + Warhead: + Spread: 5 + Versus: + None: 90% + Wood: 10% + Light: 30% + Heavy: 10% + Concrete: 10% + InfDeath: 1 + Damage: 180 + +Claw: + ROF: 10 + Range: 1 + Projectile: Bullet + Warhead: + Spread: 5 + Versus: + None: 90% + Wood: 10% + Light: 30% + Heavy: 10% + Concrete: 10% + InfDeath: 1 + Damage: 60 \ No newline at end of file diff --git a/mods/ra/bits/ant.shp b/mods/ra/bits/ant.shp new file mode 100644 index 0000000000..04e5b917b5 Binary files /dev/null and b/mods/ra/bits/ant.shp differ diff --git a/mods/ra/bits/antbite.aud b/mods/ra/bits/antbite.aud new file mode 100644 index 0000000000..c1300f6eee Binary files /dev/null and b/mods/ra/bits/antbite.aud differ diff --git a/mods/ra/bits/antdie.aud b/mods/ra/bits/antdie.aud new file mode 100644 index 0000000000..c310ea0934 Binary files /dev/null and b/mods/ra/bits/antdie.aud differ diff --git a/mods/ra/bits/anticon.shp b/mods/ra/bits/anticon.shp new file mode 100644 index 0000000000..9625b998c1 Binary files /dev/null and b/mods/ra/bits/anticon.shp differ diff --git a/mods/ra/bits/buzzy1.aud b/mods/ra/bits/buzzy1.aud new file mode 100644 index 0000000000..7823163aa2 Binary files /dev/null and b/mods/ra/bits/buzzy1.aud differ diff --git a/mods/ra/bits/hill01.tem b/mods/ra/bits/hill01.tem new file mode 100644 index 0000000000..531e89ffa7 Binary files /dev/null and b/mods/ra/bits/hill01.tem differ diff --git a/mods/ra/bits/lar1.shp b/mods/ra/bits/lar1.shp new file mode 100644 index 0000000000..ffa7825d49 Binary files /dev/null and b/mods/ra/bits/lar1.shp differ diff --git a/mods/ra/bits/lar2.shp b/mods/ra/bits/lar2.shp new file mode 100644 index 0000000000..727ba4aa04 Binary files /dev/null and b/mods/ra/bits/lar2.shp differ diff --git a/mods/ra/bits/quee.shp b/mods/ra/bits/quee.shp new file mode 100644 index 0000000000..1f10c8afcc Binary files /dev/null and b/mods/ra/bits/quee.shp differ diff --git a/mods/ra/bits/stavcmdr.aud b/mods/ra/bits/stavcmdr.aud new file mode 100644 index 0000000000..5bcc0adf12 Binary files /dev/null and b/mods/ra/bits/stavcmdr.aud differ diff --git a/mods/ra/bits/stavcrse.aud b/mods/ra/bits/stavcrse.aud new file mode 100644 index 0000000000..ecc1b28c95 Binary files /dev/null and b/mods/ra/bits/stavcrse.aud differ diff --git a/mods/ra/bits/stavmov.aud b/mods/ra/bits/stavmov.aud new file mode 100644 index 0000000000..05f6d06834 Binary files /dev/null and b/mods/ra/bits/stavmov.aud differ diff --git a/mods/ra/bits/stavyes.aud b/mods/ra/bits/stavyes.aud new file mode 100644 index 0000000000..b853570cac Binary files /dev/null and b/mods/ra/bits/stavyes.aud differ diff --git a/mods/ra/bits/zombicon.shp b/mods/ra/bits/zombicon.shp new file mode 100644 index 0000000000..501542a69c Binary files /dev/null and b/mods/ra/bits/zombicon.shp differ diff --git a/mods/ra/bits/zombie.shp b/mods/ra/bits/zombie.shp new file mode 100644 index 0000000000..5342f572f2 Binary files /dev/null and b/mods/ra/bits/zombie.shp differ diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 2c46dc07da..91f5b90c2f 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -383,6 +383,8 @@ GNRL: Inherits: ^CivInfantry Tooltip: Name: General + Selectable: + Voice: StavrosVoice THF: Inherits: ^Infantry @@ -484,3 +486,57 @@ SNIPER: CaptureTypes: CivilianBuilding Sabotage: no SabotageHPRemoval: 0 + +Zombie: + Inherits: ^Infantry + Valued: + Cost: 100 + Tooltip: + Icon: zombicon + Name: Zombie + Description: Slow undead. Attacks in close combat. + Buildable: + Queue: Infantry + BuildPaletteOrder: 28 + Owner: Umbrella + Prerequisites: bio + Selectable: + Voice: AntVoice + Bounds: 12,17,0,-9 + Health: + HP: 250 + Mobile: + Speed: 3 + AttackWander: + AutoTarget: + ScanRadius: 5 + AttackFrontal: + Armament: + Weapon: claw + +Ant: + Inherits: ^Infantry + Valued: + Cost: 300 + Tooltip: + Icon: anticon + Name: Giant Ant + Description: Irradiated insect that grew oversize. + Buildable: + Queue: Infantry + BuildPaletteOrder: 1954 + Owner: Them + Prerequisites: bio + Selectable: + Voice: AntVoice + Health: + HP: 750 + Mobile: + Speed: 7 + SharesCell: no + AttackWander: + AutoTarget: + ScanRadius: 5 + AttackFrontal: + Armament: + Weapon: mandible \ No newline at end of file diff --git a/mods/ra/rules/trees.yaml b/mods/ra/rules/trees.yaml index 926c8d1b88..43c712d4e2 100644 --- a/mods/ra/rules/trees.yaml +++ b/mods/ra/rules/trees.yaml @@ -357,3 +357,50 @@ TANKTRAP2: Dimensions: 1,1 Tooltip: Name: Tank Trap + +QUEE: + Tooltip: + Name: Queen Ant + Building: + Footprint: xx + Dimensions: 2,1 + RenderBuilding: + AppearsOnRadar: + BodyOrientation: + EditorTilesetFilter: + RequireTilesets: INTERIOR + EditorAppearance: + RelativeToTopLeft: yes + UseTerrainPalette: true + +LAR1: + Tooltip: + Name: Ant Larva + Building: + Footprint: x + Dimensions: 1,1 + RenderBuilding: + Palette: terrain + AppearsOnRadar: + BodyOrientation: + EditorTilesetFilter: + RequireTilesets: INTERIOR + EditorAppearance: + RelativeToTopLeft: yes + UseTerrainPalette: true + +LAR2: + Tooltip: + Name: Ant Larvae + Building: + Footprint: x + Dimensions: 1,1 + RenderBuilding: + Palette: terrain + AppearsOnRadar: + BodyOrientation: + EditorTilesetFilter: + RequireTilesets: INTERIOR + EditorAppearance: + RelativeToTopLeft: yes + UseTerrainPalette: true diff --git a/mods/ra/sequences/infantry.yaml b/mods/ra/sequences/infantry.yaml index 83a164e5b9..042c336c46 100644 --- a/mods/ra/sequences/infantry.yaml +++ b/mods/ra/sequences/infantry.yaml @@ -1038,3 +1038,89 @@ chan: Start: 0 Length: 6 Tick: 1600 + +zombie: + stand: + Start: 0 + Facings: 8 + stand2: + Start: 8 + Length: 8 + run: + Start: 16 + Length: 6 + Facings: 8 + shoot: + Start: 64 + Length: 4 + Facings: 8 + idle1: + Start: 96 + Length: 10 + Tick: 120 + die1: + Start: 106 + Length: 7 + die2: + Start: 106 + Length: 7 + die3: + Start: 106 + Length: 7 + die4: + Start: 106 + Length: 7 + die5: + Start: 114 + Length: 18 + die6: electro + Start: 0 + Length: * + die-crushed: corpse1 + Start: 0 + Length: 6 + Tick: 1600 + +ant: + stand: + Start: 0 + Facings: 8 + stand2: + Start: 8 + Length: 8 + run: + Start: 8 + Length: 8 + Facings: 8 + shoot: + Start: 72 + Length: 4 + Facings: 8 + die1: + Start: 104 + Length: 8 + Tick: 300 + die2: + Start: 104 + Length: 8 + Tick: 300 + die3: + Start: 104 + Length: 8 + Tick: 300 + die4: + Start: 104 + Length: 8 + Tick: 300 + die5: + Start: 104 + Length: 8 + Tick: 300 + die6: + Start: 104 + Length: 8 + Tick: 300 + die-crushed: + Start: 104 + Length: 8 + Tick: 300 \ No newline at end of file diff --git a/mods/ra/sequences/map.yaml b/mods/ra/sequences/map.yaml index 12e722a647..4473810231 100644 --- a/mods/ra/sequences/map.yaml +++ b/mods/ra/sequences/map.yaml @@ -670,4 +670,22 @@ asianhut: idle: Start: 0 damaged-idle: - Start: 1 \ No newline at end of file + Start: 1 + +quee: + idle: + Start: 0 + Length: 10 + damaged-idle: + Start: 10 + Length: 10 + +lar1: + idle: + Start: 0 + Length: * + +lar2: + idle: + Start: 0 + Length: * diff --git a/mods/ra/tilesets/temperat.yaml b/mods/ra/tilesets/temperat.yaml index 17625ef86e..85fac79644 100644 --- a/mods/ra/tilesets/temperat.yaml +++ b/mods/ra/tilesets/temperat.yaml @@ -3586,3 +3586,15 @@ Templates: 0: Rough 1: Rough Category: Bridge + Template@592: + Id: 592 + Image: hill01 + Size: 4,3 + Tiles: + 0: Rough + 1: Rough + 2: Rough + 3: Rough + 4: Rough + 5: Clear + Category: Debris \ No newline at end of file diff --git a/mods/ra/voices.yaml b/mods/ra/voices.yaml index 7b00df9dd4..27b02ec431 100644 --- a/mods/ra/voices.yaml +++ b/mods/ra/voices.yaml @@ -87,4 +87,18 @@ ShokVoice: Select: jchrge1,jjuice1,jjump1,jpower1 Move: jdance1,jyes1 Attack: jburn1,jcrisp1,jshock1,jlight1 + Die: dedman1,dedman2,dedman3,dedman4,dedman5,dedman6,dedman7,dedman8,dedman10 + +AntVoice: + Voices: + Select: antbite + Move: antbite + Attack: antbite + Die: antdie + +StavrosVoice: + Voices: + Select: stavcmdr + Move: stavcrse, stavyes, stavmov + Attack: stavcrse, stavyes Die: dedman1,dedman2,dedman3,dedman4,dedman5,dedman6,dedman7,dedman8,dedman10 \ No newline at end of file diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index e28b1598ae..5858a84859 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -1255,3 +1255,33 @@ ChronoTusk: InfDeath: 4 SmudgeType: Crater Damage: 30 + +Claw: + ROF: 30 + Range: 1 + Projectile: Bullet + Warhead: + Spread: 5 + Versus: + None: 90% + Wood: 10% + Light: 30% + Heavy: 10% + Concrete: 10% + InfDeath: 1 + Damage: 33 + +Mandible: + ROF: 10 + Range: 1 + Projectile: Bullet + Warhead: + Spread: 5 + Versus: + None: 90% + Wood: 10% + Light: 30% + Heavy: 10% + Concrete: 10% + InfDeath: 1 + Damage: 60 \ No newline at end of file