diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index bca3509d58..072597fa81 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -67,7 +67,7 @@ HELI: TurnSpeed: 28 Speed: 180 Health: - HP: 12500 + HP: 12000 Armor: Type: Light RevealsShroud: diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 00a3b4f9df..3b22257d68 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -49,65 +49,41 @@ GainsExperience: LevelUpNotification: LevelUp Conditions: - 200: rank-veteran - 400: rank-veteran + 250: rank-veteran + 500: rank-veteran 800: rank-veteran - 1600: rank-veteran LevelUpImage: crate-effects GrantCondition@RANK-ELITE: - RequiresCondition: rank-veteran >= 4 + RequiresCondition: rank-veteran >= 3 Condition: rank-elite - DamageMultiplier@RANK-1: - RequiresCondition: rank-veteran == 1 - Modifier: 95 - DamageMultiplier@RANK-2: - RequiresCondition: rank-veteran == 2 - Modifier: 90 - DamageMultiplier@RANK-3: - RequiresCondition: rank-veteran == 3 - Modifier: 85 - DamageMultiplier@RANK-ELITE: - RequiresCondition: rank-elite - Modifier: 75 FirepowerMultiplier@RANK-1: RequiresCondition: rank-veteran == 1 - Modifier: 105 + Modifier: 125 FirepowerMultiplier@RANK-2: RequiresCondition: rank-veteran == 2 - Modifier: 110 - FirepowerMultiplier@RANK-3: - RequiresCondition: rank-veteran == 3 - Modifier: 120 + Modifier: 125 FirepowerMultiplier@RANK-ELITE: RequiresCondition: rank-elite - Modifier: 130 - SpeedMultiplier@RANK-1: - RequiresCondition: rank-veteran == 1 - Modifier: 105 - SpeedMultiplier@RANK-2: + Modifier: 125 + DamageMultiplier@RANK-2: RequiresCondition: rank-veteran == 2 - Modifier: 110 - SpeedMultiplier@RANK-3: - RequiresCondition: rank-veteran == 3 - Modifier: 120 + Modifier: 80 + DamageMultiplier@RANK-ELITE: + RequiresCondition: rank-elite + Modifier: 80 SpeedMultiplier@RANK-ELITE: RequiresCondition: rank-elite - Modifier: 140 - ReloadDelayMultiplier@RANK-1: - RequiresCondition: rank-veteran == 1 - Modifier: 95 - ReloadDelayMultiplier@RANK-2: - RequiresCondition: rank-veteran == 2 - Modifier: 90 - ReloadDelayMultiplier@RANK-3: - RequiresCondition: rank-veteran == 3 - Modifier: 85 - ReloadDelayMultiplier@RANK-ELITE: + Modifier: 125 + RangeMultiplier@RANK-ELITE: RequiresCondition: rank-elite - Modifier: 75 + Modifier: 125 + RevealsShroudMultiplier@RANK-ELITE: + RequiresCondition: rank-elite + Modifier: 125 ChangesHealth@ELITE: - Step: 200 - Delay: 100 + Step: 0 + PercentageStep: 5 + Delay: 75 StartIfBelow: 100 DamageCooldown: 125 RequiresCondition: rank-elite @@ -127,14 +103,6 @@ Margin: 5, 6 ValidStances: Ally, Enemy, Neutral RequiresCondition: rank-veteran == 2 - WithDecoration@RANK-3: - Image: rank - Sequence: rank-veteran-3 - Palette: effect - Position: BottomRight - Margin: 5, 6 - ValidStances: Ally, Enemy, Neutral - RequiresCondition: rank-veteran == 3 WithDecoration@RANK-ELITE: Image: rank Sequence: rank-elite @@ -155,11 +123,6 @@ BlinkPatterns: hospitalheal && hazmatsuits: On, Off, Off hospitalheal || hazmatsuits: On, Off - WithDecoration@RANK-3: - BlinkInterval: 32 - BlinkPatterns: - hospitalheal && hazmatsuits: On, Off, Off - hospitalheal || hazmatsuits: On, Off WithDecoration@RANK-ELITE: BlinkInterval: 32 BlinkPatterns: @@ -890,7 +853,6 @@ RenderSprites: Palette: staticterrain WithWallSpriteBody: - GivesExperience: Sellable: SellSounds: cashturn.aud Guardable: diff --git a/mods/cnc/rules/husks.yaml b/mods/cnc/rules/husks.yaml index f815a35512..85ba6a3ddf 100644 --- a/mods/cnc/rules/husks.yaml +++ b/mods/cnc/rules/husks.yaml @@ -17,7 +17,7 @@ HARV.Husk: Image: harv.destroyed APC.Husk: - Inherits: ^LightHusk + Inherits: ^Husk Tooltip: Name: APC (Destroyed) TransformOnCapture: @@ -35,7 +35,7 @@ FTNK.Husk: Image: ftnk.destroyed ARTY.Husk: - Inherits: ^Husk + Inherits: ^LightHusk Tooltip: Name: Artillery (Destroyed) TransformOnCapture: @@ -104,7 +104,7 @@ HTNK.Husk: Image: htnk.destroyed MSAM.Husk: - Inherits: ^Husk + Inherits: ^LightHusk Tooltip: Name: Rocket Launcher (Destroyed) ThrowsParticle@turret: @@ -115,7 +115,7 @@ MSAM.Husk: Image: msam.destroyed MLRS.Husk: - Inherits: ^Husk + Inherits: ^LightHusk Tooltip: Name: Mobile S.A.M. (Destroyed) ThrowsParticle@turret: @@ -135,7 +135,7 @@ STNK.Husk: Image: stnk.destroyed TRUCK.Husk: - Inherits: ^Husk + Inherits: ^LightHusk Tooltip: Name: Supply Truck (Destroyed) TransformOnCapture: diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml index 08bf57d5bf..246d364c47 100644 --- a/mods/cnc/rules/infantry.yaml +++ b/mods/cnc/rules/infantry.yaml @@ -198,7 +198,7 @@ RMBO: Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Inherits@DECORATIONS: ^InfantryExperienceHospitalHazmatOverrides Valued: - Cost: 2000 + Cost: 1800 Tooltip: Name: Commando UpdatesPlayerStatistics: @@ -207,8 +207,6 @@ RMBO: BuildPaletteOrder: 50 Prerequisites: eye, ~techlevel.high Queue: Infantry.GDI - BuildDuration: 2000 - BuildDurationModifier: 40 Description: Elite sniper infantry unit.\n Strong vs Infantry, Buildings\n Weak vs Vehicles Mobile: Speed: 71 diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index 29dbc485b4..39730e171f 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -4,7 +4,7 @@ FACT: Selectable: Bounds: 72,48 Valued: - Cost: 3500 + Cost: 3000 Tooltip: Name: Construction Yard Building: @@ -47,7 +47,7 @@ FACT: DisplayOrder: 0 Factions: gdi Group: Building - LowPowerModifier: 200 + LowPowerModifier: 150 ReadyAudio: ConstructionComplete BlockedAudio: NoBuild LimitedAudio: BuildingInProgress @@ -59,7 +59,7 @@ FACT: DisplayOrder: 0 Factions: nod Group: Building - LowPowerModifier: 200 + LowPowerModifier: 150 ReadyAudio: ConstructionComplete BlockedAudio: NoBuild LimitedAudio: BuildingInProgress @@ -71,7 +71,7 @@ FACT: DisplayOrder: 1 Factions: gdi Group: Defence - LowPowerModifier: 300 + LowPowerModifier: 150 ReadyAudio: ConstructionComplete BlockedAudio: NoBuild LimitedAudio: BuildingInProgress @@ -83,7 +83,7 @@ FACT: DisplayOrder: 1 Factions: nod Group: Defence - LowPowerModifier: 300 + LowPowerModifier: 150 ReadyAudio: ConstructionComplete BlockedAudio: NoBuild LimitedAudio: BuildingInProgress @@ -153,7 +153,6 @@ NUKE: BuildPaletteOrder: 10 Prerequisites: fact Queue: Building.GDI, Building.Nod - BuildDuration: 330 Description: Generates power Building: Footprint: xX xx == @@ -240,7 +239,7 @@ PROC: Bounds: 72,56 DecorationBounds: 73,72 CustomSellValue: - Value: 500 + Value: 400 FreeActor: Actor: HARV SpawnOffset: 1,2 @@ -333,7 +332,7 @@ PYLE: Type: Infantry.GDI DisplayOrder: 2 Group: Infantry - LowPowerModifier: 300 + LowPowerModifier: 150 ReadyAudio: UnitReady BlockedAudio: NoBuild LimitedAudio: BuildingInProgress @@ -384,7 +383,7 @@ HAND: Type: Infantry.Nod DisplayOrder: 2 Group: Infantry - LowPowerModifier: 300 + LowPowerModifier: 150 ReadyAudio: UnitReady BlockedAudio: NoBuild LimitedAudio: BuildingInProgress @@ -445,7 +444,7 @@ AFLD: Type: Vehicle.Nod DisplayOrder: 3 Group: Vehicle - LowPowerModifier: 300 + LowPowerModifier: 150 BlockedAudio: NoBuild LimitedAudio: BuildingInProgress QueuedAudio: Training @@ -502,7 +501,7 @@ WEAP: Type: Vehicle.GDI DisplayOrder: 3 Group: Vehicle - LowPowerModifier: 300 + LowPowerModifier: 150 ReadyAudio: UnitReady BlockedAudio: NoBuild LimitedAudio: BuildingInProgress @@ -561,7 +560,7 @@ HPAD: DisplayOrder: 4 Factions: gdi Group: Aircraft - LowPowerModifier: 300 + LowPowerModifier: 150 ReadyAudio: UnitReady BlockedAudio: NoBuild LimitedAudio: BuildingInProgress @@ -573,7 +572,7 @@ HPAD: DisplayOrder: 4 Factions: nod Group: Aircraft - LowPowerModifier: 300 + LowPowerModifier: 150 ReadyAudio: UnitReady BlockedAudio: NoBuild LimitedAudio: BuildingInProgress @@ -585,7 +584,7 @@ HPAD: ProductionBar@Nod: ProductionType: Aircraft.Nod Power: - Amount: -10 + Amount: -20 ProvidesPrerequisite@buildingname: HQ: @@ -631,7 +630,7 @@ HQ: PauseOnCondition: lowpower Prerequisites: ~techlevel.superweapons Icon: airstrike - ChargeInterval: 6000 + ChargeInterval: 7500 SquadSize: 3 QuantizedFacings: 8 Description: Air Strike @@ -740,7 +739,7 @@ EYE: Prerequisites: ~techlevel.superweapons Icon: ioncannon Cursor: ioncannon - ChargeInterval: 6750 + ChargeInterval: 9000 Description: Ion Cannon LongDesc: Initiate an Ion Cannon strike.\nApplies instant damage to a small area. BeginChargeSpeechNotification: IonCannonCharging @@ -794,7 +793,7 @@ TMPL: Prerequisites: ~techlevel.superweapons Icon: abomb Cursor: nuke - ChargeInterval: 9000 + ChargeInterval: 11250 Description: Nuclear Strike LongDesc: Launch a tactical nuclear warhead.\nApplies heavy damage over a large area. EndChargeSpeechNotification: NuclearWeaponAvailable @@ -901,7 +900,7 @@ SAM: Armor: Type: Heavy RevealsShroud: - Range: 6c0 + Range: 8c0 Turreted: TurnSpeed: 40 InitialFacing: 0 @@ -1131,8 +1130,6 @@ BRIK: Crushable: CrushClasses: heavywall -CrushSound: - SoundOnDamageTransition: - DestroyedSounds: crumble.aud LineBuild: NodeTypes: concrete LineBuildNode: diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml index ae215206e3..76015bfba0 100644 --- a/mods/cnc/rules/tech.yaml +++ b/mods/cnc/rules/tech.yaml @@ -3,6 +3,7 @@ V19: Selectable: Bounds: 24,24 CashTrickler: + Amount: 10 Building: Footprint: x Dimensions: 1,1 @@ -83,10 +84,10 @@ BIO: Tooltip: Name: Biological Lab TooltipDescription@ally: - Description: Produces Bio-Lab units. + Description: Provides infantry with Tiberium immunity. Produces Visceroids. ValidStances: Ally TooltipDescription@other: - Description: Capture to produce Bio-Lab units. + Description: Capture to enable Tiberium immunity for infantry. Produces Visceroids. ValidStances: Neutral, Enemy Exit@1: SpawnOffset: 0,-426,0 diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index 5aea613d9e..f5447f1a76 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -2,15 +2,13 @@ MCV: Inherits: ^Vehicle Inherits@selection: ^SelectableSupportUnit Valued: - Cost: 3500 + Cost: 3000 Tooltip: Name: Mobile Construction Vehicle Buildable: BuildPaletteOrder: 100 Prerequisites: anyhq, ~techlevel.medium, fix Queue: Vehicle.GDI, Vehicle.Nod - BuildDuration: 3750 - BuildDurationModifier: 40 Description: Deploys into another Construction Yard.\n Unarmed Selectable: DecorationBounds: 36,36 @@ -44,7 +42,7 @@ HARV: Inherits@CLOAK: ^AcceptsCloakCrate Inherits@selection: ^SelectableEconomicUnit Valued: - Cost: 1000 + Cost: 1100 Tooltip: Name: Harvester GenericName: Harvester @@ -52,8 +50,6 @@ HARV: BuildPaletteOrder: 10 Prerequisites: proc Queue: Vehicle.GDI, Vehicle.Nod - BuildDuration: 1680 - BuildDurationModifier: 40 Description: Collects Tiberium for processing.\n Unarmed Selectable: DecorationBounds: 36,36 @@ -316,8 +312,8 @@ BIKE: Description: Fast scout vehicle, armed with\nrockets.\nCan attack Aircraft.\n Strong vs Vehicles, Tanks\n Weak vs Infantry Mobile: TurnSpeed: 40 - Speed: 213 - Locomotor: bike + Speed: 184 + Locomotor: wheeled Health: HP: 11000 Repairable: @@ -633,7 +629,7 @@ STNK: Inherits@EXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Valued: - Cost: 900 + Cost: 1000 Tooltip: Name: Stealth Tank UpdatesPlayerStatistics: @@ -660,6 +656,7 @@ STNK: CloakDelay: 90 CloakSound: trans1.aud UncloakSound: trans1.aud + UncloakOn: Attack, Unload, Dock, Damage, Heal PauseOnCondition: cloak-force-disabled GrantConditionOnDamageState@UNCLOAK: Condition: cloak-force-disabled @@ -707,9 +704,10 @@ TRUCK: Queue: Vehicle.GDI, Vehicle.Nod BuildPaletteOrder: 35 Prerequisites: vehicleproduction - Description: Transports cash to other players.\n Unarmed + BuildDuration: 500 + Description: Transports cash to other players.\n Builds fast\n Unarmed Valued: - Cost: 500 + Cost: 1000 Tooltip: Name: Supply Truck Health: @@ -721,8 +719,8 @@ TRUCK: RevealsShroud: Range: 4c0 DeliversCash: - Payload: 500 - PlayerExperience: 50 + Payload: 1000 + PlayerExperience: 100 SpawnActorOnDeath: Actor: TRUCK.Husk OwnerType: InternalName diff --git a/mods/cnc/rules/world.yaml b/mods/cnc/rules/world.yaml index 3b862e1ba3..ecbf44433b 100644 --- a/mods/cnc/rules/world.yaml +++ b/mods/cnc/rules/world.yaml @@ -52,17 +52,6 @@ Tiberium: 50 BlueTiberium: 50 Beach: 50 - Locomotor@BIKE: - Name: bike - Crushes: crate - TerrainSpeeds: - Clear: 70 - Rough: 35 - Road: 100 - Bridge: 100 - Tiberium: 35 - BlueTiberium: 35 - Beach: 35 Locomotor@HEAVYWHEELED: Name: heavywheeled Crushes: crate, infantry diff --git a/mods/cnc/weapons/ballistics.yaml b/mods/cnc/weapons/ballistics.yaml index 08529d4758..ccb76ea7f2 100644 --- a/mods/cnc/weapons/ballistics.yaml +++ b/mods/cnc/weapons/ballistics.yaml @@ -34,7 +34,7 @@ Damage: 2500 Versus: None: 24 - Wood: 72 + Wood: 88 Light: 100 Heavy: 88 diff --git a/mods/cnc/weapons/missiles.yaml b/mods/cnc/weapons/missiles.yaml index 8ff2024d9d..1c57364fb6 100644 --- a/mods/cnc/weapons/missiles.yaml +++ b/mods/cnc/weapons/missiles.yaml @@ -160,7 +160,7 @@ MammothMissiles: Versus: None: 24 Wood: 60 - Light: 90 + Light: 100 Heavy: 48 Warhead@3Eff: CreateEffect Explosions: med_frag diff --git a/mods/cnc/weapons/other.yaml b/mods/cnc/weapons/other.yaml index 8b7901925f..8f410d47ff 100644 --- a/mods/cnc/weapons/other.yaml +++ b/mods/cnc/weapons/other.yaml @@ -1,13 +1,13 @@ ^FlameWeapon: ValidTargets: Ground, Water, Trees ReloadDelay: 55 - Range: 2c512 + Range: 3c0 InvalidTargets: Wall Report: flamer2.aud Projectile: Bullet Speed: 1c682 Warhead@1Dam: SpreadDamage - Spread: 468 + Spread: 256 Damage: 4000 ValidTargets: Ground, Water, Trees InvalidTargets: Wall @@ -26,8 +26,6 @@ Flamethrower: Inherits: ^FlameWeapon - Warhead@1Dam: SpreadDamage - Spread: 256 BigFlamer: Inherits: ^FlameWeapon @@ -51,10 +49,8 @@ BigFlamer: Chemspray: Inherits: ^FlameWeapon ReloadDelay: 65 - Range: 3c0 -InvalidTargets: Warhead@1Dam: SpreadDamage - Spread: 256 Damage: 8000 -InvalidTargets: Versus: diff --git a/mods/cnc/weapons/smallcaliber.yaml b/mods/cnc/weapons/smallcaliber.yaml index 017c7cf731..1d0778281b 100644 --- a/mods/cnc/weapons/smallcaliber.yaml +++ b/mods/cnc/weapons/smallcaliber.yaml @@ -48,8 +48,9 @@ Vulcan: Spread: 426 Damage: 10000 Versus: + None: 90 Wood: 15 - Light: 30 + Light: 35 Heavy: 35 HeliAGGun: @@ -63,7 +64,7 @@ HeliAGGun: Projectile: Bullet Blockable: false Warhead@1Dam: SpreadDamage - Spread: 256 + Spread: 128 Damage: 2000 Versus: None: 100 @@ -76,7 +77,6 @@ HeliAAGun: Inherits: HeliAGGun ValidTargets: Air Warhead@1Dam: SpreadDamage - Spread: 128 ValidTargets: Air Versus: Light: 50 @@ -162,7 +162,7 @@ APCGun.AA: Versus: None: 60 Wood: 60 - Light: 125 + Light: 140 Heavy: 60 Warhead@2Eff: CreateEffect Explosions: small_poof