diff --git a/mods/cnc/maps/gdi01/weapons.yaml b/mods/cnc/maps/gdi01/weapons.yaml index 6b7aa3058f..aa6cbd0d8d 100644 --- a/mods/cnc/maps/gdi01/weapons.yaml +++ b/mods/cnc/maps/gdi01/weapons.yaml @@ -1,6 +1,13 @@ BoatMissile: - Warhead: SpreadDamage + Warhead@Bonus: SpreadDamage + Spread: 128 + Damage: 20 Versus: - Heavy: 50 - Damage: 50 + None: 50 + Wood: 100 + Light: 100 + Heavy: 100 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath + +TurretGun: + ReloadDelay: 40 diff --git a/mods/cnc/maps/shellmap/map.bin b/mods/cnc/maps/shellmap/map.bin index 3b426e662c..91476e7ec0 100644 Binary files a/mods/cnc/maps/shellmap/map.bin and b/mods/cnc/maps/shellmap/map.bin differ diff --git a/mods/cnc/maps/shellmap/map.png b/mods/cnc/maps/shellmap/map.png index c7d3e717cf..0fd2bf9949 100644 Binary files a/mods/cnc/maps/shellmap/map.png and b/mods/cnc/maps/shellmap/map.png differ diff --git a/mods/cnc/maps/shellmap/map.yaml b/mods/cnc/maps/shellmap/map.yaml index e0333afa27..b1d7c6ccbb 100644 --- a/mods/cnc/maps/shellmap/map.yaml +++ b/mods/cnc/maps/shellmap/map.yaml @@ -34,41 +34,11 @@ Players: OwnsWorld: True NonCombatant: True Faction: gdi - PlayerReference@Multi0: - Name: Multi0 - Playable: True - Faction: Random - Enemies: Creeps - PlayerReference@Multi1: - Name: Multi1 - Playable: True - Faction: Random - Enemies: Creeps - PlayerReference@Multi2: - Name: Multi2 - Playable: True - Faction: Random - Enemies: Creeps - PlayerReference@Multi3: - Name: Multi3 - Playable: True - Faction: Random - Enemies: Creeps - PlayerReference@Multi4: - Name: Multi4 - Playable: True - Faction: Random - Enemies: Creeps - PlayerReference@Multi5: - Name: Multi5 - Playable: True - Faction: Random - Enemies: Creeps PlayerReference@Creeps: Name: Creeps NonCombatant: True Faction: Random - Enemies: Nod, GDI, Multi0, Multi1, Multi2, Multi3, Multi4, Multi5 + Enemies: Nod, GDI Actors: Actor4: fix @@ -252,7 +222,7 @@ Actors: Location: 12,14 Owner: Nod Actor68: brik - Location: 11,14 + Location: 12,15 Owner: Nod Actor69: brik Location: 11,15 @@ -323,9 +293,11 @@ Actors: Actor35: gun Location: 20,11 Owner: Nod + TurretFacing: 160 Actor36: gun Location: 16,14 Owner: Nod + TurretFacing: 184 Actor41: brik Location: 32,5 Owner: Nod @@ -338,9 +310,11 @@ Actors: Actor96: gun Location: 33,5 Owner: Nod + TurretFacing: 144 Actor97: gun Location: 39,3 Owner: Nod + TurretFacing: 128 Actor98: nuke Location: 22,1 Owner: Nod @@ -371,9 +345,6 @@ Actors: Actor107: tc05 Location: 67,3 Owner: Neutral - Actor108: split2 - Location: 73,5 - Owner: Neutral Actor109: tc04 Location: 80,0 Owner: Neutral @@ -455,9 +426,11 @@ Actors: Actor131: gun Location: 13,16 Owner: Nod + TurretFacing: 160 Actor132: gun Location: 12,16 Owner: Nod + TurretFacing: 160 Actor133: brik Location: 9,16 Owner: Nod @@ -470,9 +443,6 @@ Actors: Actor136: v07 Location: 8,17 Owner: Neutral - Actor137: split3 - Location: 13,20 - Owner: Neutral Actor138: v01 Location: 36,16 Owner: Neutral @@ -530,6 +500,7 @@ Actors: Actor156: gun Location: 34,23 Owner: Nod + TurretFacing: 96 Actor157: sam Location: 32,22 Owner: Nod @@ -803,15 +774,19 @@ Actors: Actor252: gun Location: 53,27 Owner: Nod + TurretFacing: 128 Actor253: gun Location: 50,27 Owner: Nod + TurretFacing: 128 Actor254: gun Location: 61,27 Owner: Nod + TurretFacing: 128 Actor255: gun Location: 64,27 Owner: Nod + TurretFacing: 128 Actor256: v03 Location: 68,21 Owner: Neutral @@ -976,5 +951,11 @@ Actors: Location: 65,20 Owner: Nod Facing: 192 + Actor300: split3 + Owner: Neutral + Location: 13,21 + Actor299: split3 + Owner: Neutral + Location: 73,6 -Rules: rules.yaml +Rules: cnc|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 008078518e..e4c867ce36 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -196,7 +196,8 @@ WithDeathAnimation: DeathTypes: DefaultDeath: 1 - BulletDeath: 2 + BulletDeath: 1 + RippedApartDeath: 2 SmallExplosionDeath: 3 ExplosionDeath: 4 FireDeath: 5 diff --git a/mods/cnc/rules/ships.yaml b/mods/cnc/rules/ships.yaml index 182b3ef066..b7c3532f2b 100644 --- a/mods/cnc/rules/ships.yaml +++ b/mods/cnc/rules/ships.yaml @@ -10,13 +10,13 @@ BOAT: Type: Heavy Mobile: InitialFacing: 64 - TurnSpeed: 4 + TurnSpeed: 32 Speed: 28 OnRails: true RevealsShroud: Range: 7c0 Turreted: - TurnSpeed: 7 + TurnSpeed: 5 Offset: 0,896,171 Armament: Weapon: BoatMissile diff --git a/mods/cnc/weapons/missiles.yaml b/mods/cnc/weapons/missiles.yaml index 75f5829297..d8d8f5b4e8 100644 --- a/mods/cnc/weapons/missiles.yaml +++ b/mods/cnc/weapons/missiles.yaml @@ -239,14 +239,14 @@ BoatMissile: ReloadDelay: 35 Range: 8c0 Burst: 2 - BurstDelay: 7 + BurstDelay: 10 Report: rocket2.aud Projectile: Missile Arm: 0 Blockable: false - Inaccuracy: 213 + Inaccuracy: 426 Image: DRAGON - HorizontalRateOfTurn: 10 + HorizontalRateOfTurn: 5 TrailImage: smokey ContrailLength: 8 Speed: 170 diff --git a/mods/cnc/weapons/other.yaml b/mods/cnc/weapons/other.yaml index 86a513eae0..025ae304d5 100644 --- a/mods/cnc/weapons/other.yaml +++ b/mods/cnc/weapons/other.yaml @@ -178,7 +178,7 @@ Tail: Wood: 10 Light: 30 Heavy: 10 - DamageTypes: Prone50Percent, TriggerProne, DefaultDeath + DamageTypes: Prone50Percent, TriggerProne, RippedApartDeath Horn: ReloadDelay: 20 @@ -194,7 +194,7 @@ Horn: Wood: 10 Light: 30 Heavy: 10 - DamageTypes: Prone50Percent, TriggerProne, DefaultDeath + DamageTypes: Prone50Percent, TriggerProne, RippedApartDeath Teeth: ReloadDelay: 30 @@ -210,7 +210,7 @@ Teeth: Wood: 10 Light: 30 Heavy: 10 - DamageTypes: Prone50Percent, TriggerProne, DefaultDeath + DamageTypes: Prone50Percent, TriggerProne, RippedApartDeath Claw: ReloadDelay: 10 @@ -226,7 +226,7 @@ Claw: Wood: 10 Light: 30 Heavy: 10 - DamageTypes: Prone50Percent, TriggerProne, DefaultDeath + DamageTypes: Prone50Percent, TriggerProne, RippedApartDeath Demolish: Warhead@1Dam: SpreadDamage