diff --git a/mods/ss/chrome/ingame.yaml b/mods/ss/chrome/ingame.yaml index 8ca0380..9fd0f9a 100644 --- a/mods/ss/chrome/ingame.yaml +++ b/mods/ss/chrome/ingame.yaml @@ -825,7 +825,7 @@ Container@PLAYER_WIDGETS: Bar: progressbar-thumb-green Label@STAT_SPEED: Y: 125 - Text: label-actor-statsspeed + Text: label-actor-stats-speed Children: ProgressBar@STAT_SPEED_BAR: X: 1 @@ -872,21 +872,21 @@ Container@PLAYER_WIDGETS: Y: 1 Width: 90 Height: 25 - Text: Player + Text: label-stats-name Font: Bold Label@FACTION: X: 91 Y: 1 Width: 32 Height: 25 - Text: Class + Text: label-stats-faction Font: Bold Label@SCORE: X: PARENT_RIGHT - 27 Y: 1 Width: 25 Height: 25 - Text: Score + Text: label-stats-score Font: Bold Align: Right ScrollPanel@PLAYER_LIST: @@ -896,6 +896,7 @@ Container@PLAYER_WIDGETS: ItemSpacing: 5 Children: ScrollItem@TEAM_TEMPLATE: + Background: scrollheader Width: PARENT_RIGHT - 27 Height: 20 X: 2 diff --git a/mods/ss/maps/test.oramap b/mods/ss/maps/test.oramap deleted file mode 100644 index 6503319..0000000 Binary files a/mods/ss/maps/test.oramap and /dev/null differ diff --git a/mods/ss/rules/civilian.yaml b/mods/ss/rules/civilian.yaml index 07dbd25..6a3d689 100644 --- a/mods/ss/rules/civilian.yaml +++ b/mods/ss/rules/civilian.yaml @@ -244,36 +244,20 @@ V11.Husk: Name: Ludwig's House (Destroyed) V12: - Inherits: ^CivField + Inherits: ^CivHaystackOrIgloo SpawnActorOnDeath: Actor: V12.Husk - MapEditorData: - ExcludeTilesets: DESERT - Tooltip: - Name: Haystacks V12.Husk: - Inherits: ^CivBuildingHusk - MapEditorData: - ExcludeTilesets: DESERT - Tooltip: - Name: Haystacks (Destroyed) + Inherits: ^CivHaystackOrIglooHusk V13: - Inherits: ^CivField + Inherits: ^CivHaystackOrIgloo SpawnActorOnDeath: Actor: V13.Husk - MapEditorData: - ExcludeTilesets: DESERT - Tooltip: - Name: Haystacks V13.Husk: - Inherits: ^CivBuildingHusk - MapEditorData: - ExcludeTilesets: DESERT - Tooltip: - Name: Haystacks (Destroyed) + Inherits: ^CivHaystackOrIglooHusk V14: Inherits: ^CivField diff --git a/mods/ss/rules/defaults.yaml b/mods/ss/rules/defaults.yaml index 2a949f3..f924d44 100644 --- a/mods/ss/rules/defaults.yaml +++ b/mods/ss/rules/defaults.yaml @@ -10,6 +10,11 @@ QuantizeFacingsFromSequence: RenderSprites: +^ClassicFacingSpriteActor: + ClassicFacingBodyOrientation: + QuantizeFacingsFromSequence: + RenderSprites: + ^1x1Shape: HitShape: UseTargetableCellsOffsets: true @@ -47,7 +52,7 @@ ^GainsExperience: GainsExperience: LevelUpNotification: LevelUp - LevelUpTextNotification: Unit promoted. + LevelUpTextNotification: notification-unit-promoted Conditions: 250: rank-veteran 500: rank-veteran @@ -294,7 +299,7 @@ red: pip-red ^StoresResources: - StoresResources: + StoresPlayerResources: WithResourceStoragePipsDecoration: Position: BottomLeft Margin: 4, 3 @@ -326,7 +331,7 @@ Passenger: CargoType: Vehicle ActorLostNotification: - TextNotification: Unit lost. + TextNotification: notification-unit-lost HiddenUnderFog: AttackMove: DrawLineToTarget: @@ -363,7 +368,7 @@ ^Helicopter: Inherits@1: ^ExistsInWorld - Inherits@3: ^SpriteActor + Inherits@3: ^ClassicFacingSpriteActor Inherits@4: ^AcceptsCratePowerups Inherits@5: ^AcceptsCloakCrate Inherits@6: ^GivesExperience @@ -399,7 +404,7 @@ HiddenUnderFog: Type: GroundPosition ActorLostNotification: - TextNotification: Unit lost. + TextNotification: notification-unit-lost Explodes: Weapon: HeliExplode EmptyWeapon: HeliExplode @@ -492,7 +497,7 @@ Margin: 5, 6 RequiresCondition: hazmatsuits ActorLostNotification: - TextNotification: Unit lost. + TextNotification: notification-unit-lost SpawnActorOnDeath: Probability: 5 Actor: vice @@ -588,6 +593,7 @@ Passenger: CustomPipType: gray ScaredyCat: + AvoidTerrainTypes: Tiberium, BlueTiberium Crushable: CrushSound: squish2.aud Voiced: @@ -595,6 +601,7 @@ Wanders: MinMoveDelay: 150 MaxMoveDelay: 750 + AvoidTerrainTypes: Tiberium, BlueTiberium MapEditorData: Categories: Civilian infantry @@ -762,7 +769,7 @@ Type: GroundPosition AlwaysVisibleRelationships: None ActorLostNotification: - TextNotification: Unit lost. + TextNotification: notification-unit-lost AttackMove: WithShadow: Offset: 43, 128, 0 @@ -788,7 +795,7 @@ TargetTypes: Ground, Water HiddenUnderFog: ActorLostNotification: - TextNotification: Unit lost. + TextNotification: notification-unit-lost AttackMove: DrawLineToTarget: WithDamageOverlay: @@ -828,8 +835,8 @@ ActorPreviewPlaceBuildingPreview: PreviewAlpha: 0.65 SoundOnDamageTransition: - DamagedSounds: xplos.aud - DestroyedSounds: crumble.aud + DamagedSounds: xplobig4.aud + DestroyedSounds: crumble.aud, xplobig4.aud WithSpriteBody: Explodes: Type: Footprint @@ -837,11 +844,11 @@ EmptyWeapon: BuildingExplode CaptureNotification: Notification: BuildingCaptured - TextNotification: Building captured. + TextNotification: notification-building-captured. NewOwnerVoice: false ActorLostNotification: Notification: BuildingLost - TextNotification: Structure lost. + TextNotification: notification-structure-lost ShakeOnDeath: Guardable: Range: 3c0 @@ -883,8 +890,10 @@ Sellable: RequiresCondition: !build-incomplete && !being-demolished SellSounds: cashturn.aud + CaptureManager: Capturable: - Types: building + RequiresCondition: !build-incomplete + Types: building-sabotage WithMakeAnimation: Condition: build-incomplete WithBuildingRepairDecoration: @@ -893,7 +902,6 @@ Position: Center Palette: player IsPlayerPalette: True - CaptureManager: ^CivBuilding: Inherits: ^Building @@ -931,7 +939,7 @@ Types: building CaptureNotification: Notification: CivilianBuildingCaptured - TextNotification: Civilian building captured. + TextNotification: notification-civilian-building-captured RepairableBuilding: RepairPercent: 40 RepairStep: 1400 @@ -965,6 +973,25 @@ RenderSprites: Palette: terrain +^CivHaystackOrIgloo: + Inherits: ^CivField + MapEditorData: + ExcludeTilesets: DESERT + -Tooltip: + GrantConditionOnTileSet@WINTER: + Condition: winter + TileSets: SNOW, WINTER + Tooltip@WINTER: + Name: Igloo + RequiresCondition: winter + GenericVisibility: None + ShowOwnerRow: false + Tooltip@SUMMER: + Name: Haystacks + RequiresCondition: !winter + GenericVisibility: None + ShowOwnerRow: false + ^CivFieldHusk: Inherits@1: ^SpriteActor Interactable: @@ -984,6 +1011,25 @@ MapEditorData: Categories: Husk +^CivHaystackOrIglooHusk: + Inherits: ^CivField + MapEditorData: + ExcludeTilesets: DESERT + -Tooltip: + GrantConditionOnTileSet@WINTER: + Condition: winter + TileSets: SNOW, WINTER + Tooltip@WINTER: + Name: Igloo (Destroyed) + RequiresCondition: winter + GenericVisibility: None + ShowOwnerRow: false + Tooltip@SUMMER: + Name: Haystacks (Destroyed) + RequiresCondition: !winter + GenericVisibility: None + ShowOwnerRow: false + ^Wall: Inherits@1: ^SpriteActor Inherits@shape: ^1x1Shape @@ -1023,6 +1069,10 @@ ScriptTriggers: Health: HP: 10000 + AppearsOnMapPreview: + Terrain: Wall + RadarColorFromTerrain: + Terrain: Wall MapEditorData: Categories: Wall @@ -1041,6 +1091,8 @@ AppearsOnRadar: RadarColorFromTerrain: Terrain: Tree + AppearsOnMapPreview: + Terrain: Tree Health: HP: 50000 Armor: @@ -1067,6 +1119,8 @@ HitShape: MapEditorData: Categories: Tree + RequiresSpecificOwners: + ValidOwnerNames: Neutral ^TreeHusk: Inherits@1: ^SpriteActor @@ -1074,6 +1128,8 @@ AppearsOnRadar: RadarColorFromTerrain: Terrain: Tree + AppearsOnMapPreview: + Terrain: Tree Building: Footprint: __ x_ Dimensions: 2,2 @@ -1081,10 +1137,12 @@ Tooltip: Name: Tree (Burnt) ShowOwnerRow: false - FrozenUnderFog: + HiddenUnderShroud: ScriptTriggers: MapEditorData: Categories: Tree + RequiresSpecificOwners: + ValidOwnerNames: Neutral ^TibTree: Inherits@1: ^SpriteActor @@ -1101,10 +1159,14 @@ AppearsOnRadar: RadarColorFromTerrain: Terrain: Tiberium + AppearsOnMapPreview: + Terrain: Tiberium HiddenUnderShroud: WithMakeAnimation: MapEditorData: Categories: Resource spawn + RequiresSpecificOwners: + ValidOwnerNames: Neutral ^Rock: Inherits@1: ^SpriteActor @@ -1121,6 +1183,8 @@ AppearsOnRadar: RadarColorFromTerrain: Terrain: Tree + AppearsOnMapPreview: + Terrain: Tree HiddenUnderShroud: ScriptTriggers: MapEditorData: @@ -1128,31 +1192,34 @@ Categories: Decoration ^CommonHuskDefaults: - Inherits@1: ^SpriteActor + Inherits@1: ^ClassicFacingSpriteActor Interactable: Health: - HP: 14000 + HP: 28000 Armor: - Type: Light + Type: Heavy HiddenUnderFog: Type: CenterPosition + AlwaysVisibleRelationships: None TeamLeaderColorModifier: WithFacingSpriteBody: HitShape: MapEditorData: Categories: Husk + RequiresSpecificOwners: + ValidOwnerNames: Neutral ^Husk: Inherits: ^CommonHuskDefaults Husk: AllowedTerrain: Clear, Rough, Road, Tiberium, BlueTiberium, Beach + Locomotor: tracked Targetable: RequiresForceFire: true TargetTypes: Ground, Husk CaptureManager: Capturable: Types: husk - ValidRelationships: Enemy, Neutral, Ally TransformOnCapture: ForceHealthPercentage: 25 Tooltip: @@ -1168,14 +1235,16 @@ Sequence: 1 IsDecoration: True ChangesHealth: - Step: -100 + Step: -200 StartIfBelow: 101 Delay: 6 ^LightHusk: Inherits: ^Husk + Husk: + Locomotor: wheeled Health: - HP: 2000 + HP: 4000 ^HelicopterHusk: Inherits: ^CommonHuskDefaults @@ -1185,6 +1254,7 @@ Aircraft: CanHover: True VTOL: true + CanSlide: True FallsToEarth: Moves: False Explosion: HeliCrash @@ -1214,6 +1284,8 @@ ShakeOnDeath: Duration: 15 Intensity: 6 + RequiresSpecificOwners: + ValidOwnerNames: Neutral ^Crate: Inherits@1: ^SpriteActor diff --git a/mods/ss/rules/infantry.yaml b/mods/ss/rules/infantry.yaml index f1f5268..c0a4c53 100644 --- a/mods/ss/rules/infantry.yaml +++ b/mods/ss/rules/infantry.yaml @@ -27,7 +27,10 @@ E1: Condition: antiair Prerequisites: global-moreaa AttackFrontal: + Voice: Attack FacingTolerance: 0 + AttackMove: + Voice: Attack WithInfantryBody: IdleSequences: idle1,idle2,idle3,idle4 DefaultAttackSequence: shoot @@ -58,10 +61,13 @@ E2: Weapon: Grenade LocalOffset: 0,0,427 FireDelay: 15 - TakeCover: - ProneOffset: 300,0,-227 AttackFrontal: + Voice: Attack FacingTolerance: 0 + AttackMove: + Voice: Attack + TakeCover: + ProneOffset: 300,0,-227 WithInfantryBody: DefaultAttackSequence: throw Explodes: @@ -95,10 +101,13 @@ E3: Weapon: Rockets LocalOffset: 256,43,341 FireDelay: 5 - TakeCover: - ProneOffset: 180,0,-200 AttackFrontal: + Voice: Attack FacingTolerance: 0 + AttackMove: + Voice: Attack + TakeCover: + ProneOffset: 180,0,-200 WithInfantryBody: DefaultAttackSequence: shoot UnitStatValues: @@ -129,10 +138,13 @@ E4: LocalOffset: 341,0,256 FireDelay: 3 MuzzleSequence: muzzle - TakeCover: - ProneOffset: 190,0,-198 AttackFrontal: + Voice: Attack FacingTolerance: 0 + AttackMove: + Voice: Attack + TakeCover: + ProneOffset: 190,0,-198 WithMuzzleOverlay: WithInfantryBody: DefaultAttackSequence: shoot @@ -165,10 +177,13 @@ E5: LocalOffset: 341,0,256 FireDelay: 3 MuzzleSequence: muzzle - TakeCover: - ProneOffset: 190,0,-190 AttackFrontal: + Voice: Attack FacingTolerance: 0 + AttackMove: + Voice: Attack + TakeCover: + ProneOffset: 190,0,-190 WithMuzzleOverlay: -DamagedByTerrain: WithInfantryBody: @@ -262,7 +277,7 @@ PVICE: Description: Mutated abomination that spits liquid Tiberium.\n Strong vs Infantry, Buildings\n Weak vs Aircraft Tooltip: ActorLostNotification: - TextNotification: Unit lost. + TextNotification: notification-unit-lost UnitStatValues: Damage: 8000 diff --git a/mods/ss/rules/structures.yaml b/mods/ss/rules/structures.yaml index b5ecae5..4277ffe 100644 --- a/mods/ss/rules/structures.yaml +++ b/mods/ss/rules/structures.yaml @@ -4,7 +4,7 @@ FACT: Selectable: Bounds: 3072, 2048 Valued: - Cost: 3500 + Cost: 3000 Tooltip: Name: Construction Yard Building: @@ -17,22 +17,35 @@ FACT: Type: Wood RevealsShroud: Range: 10c0 - WithBuildingBib: Production: Produces: Building Transforms: + PauseOnCondition: being-demolished || build-incomplete IntoActor: mcv Offset: 1,1 Facing: 432 + TransformsIntoMobile: + Locomotor: heavywheeled + RequiresForceMove: true + TransformsIntoPassenger: + CargoType: Vehicle + RequiresForceMove: true + TransformsIntoRepairable: + RepairActors: fix + RequiresForceMove: true + TransformsIntoTransforms: + RequiresCondition: build-incomplete ProductionQueue@Building: Type: Building + DisplayOrder: 0 Group: Building + LowPowerModifier: 150 ReadyAudio: ConstructionComplete - ReadyTextNotification: Construction complete. + ReadyTextNotification: notification-construction-complete BlockedAudio: NoBuild - BlockedTextNotification: Unable to build more. + BlockedTextNotification: notification-unable-to-build-more LimitedAudio: BuildingInProgress - LimitedTextNotification: Unable to comply. Building in progress. + LimitedTextNotification: notification-unable-to-comply-building-in-progress QueuedAudio: Building OnHoldAudio: OnHold CancelledAudio: Cancelled @@ -40,9 +53,10 @@ FACT: ProductionBar@Building: ProductionType: Building BaseProvider: - Cooldown: 75 Range: 14c0 + WithBuildingBib: WithBuildingPlacedAnimation: + RequiresCondition: !build-incomplete ProvidesPrerequisite@buildingname: MustBeDestroyed: @@ -62,7 +76,6 @@ NUKE: Buildable: BuildPaletteOrder: 10 Queue: Building.GDI, Building.Nod - BuildDuration: 330 Prerequisites: fact Description: Generates power Building: @@ -124,22 +137,23 @@ PROC: Queue: Building.GDI, Building.Nod Description: Processes raw Tiberium\ninto useable resources Building: - Footprint: _x_ xxx === === + Footprint: _x_ xxx +++ === Dimensions: 3,4 LocalCenterOffset: 0,-512,0 Health: HP: 100000 RevealsShroud: Range: 6c0 - WithBuildingBib: Refinery: + TickRate: 15 + DockHost: + Type: Unload DockAngle: 448 - DockOffset: 0,2 + DockOffset: -1c0, 1c0, 0 IsDragRequired: True DragOffset: -554,512,0 DragLength: 12 - TickRate: 15 - StoresResources: + StoresPlayerResources: Capacity: 1000 Selectable: Bounds: 3072, 2389 @@ -150,16 +164,17 @@ PROC: Actor: HARV SpawnOffset: 1,2 Facing: 256 + WithBuildingBib: WithResourceLevelOverlay: + RequiresCondition: !build-incomplete ProvidesPrerequisite@buildingname: - SelectionDecorations: SILO: Inherits: ^BaseBuilding Inherits@shape: ^2x1Shape Inherits@RESOURCES: ^StoresResources Valued: - Cost: 300 + Cost: 100 Tooltip: Name: Tiberium Silo Buildable: @@ -180,14 +195,13 @@ SILO: -WithSpriteBody: WithResourceLevelSpriteBody: Sequence: stages - StoresResources: + StoresPlayerResources: Capacity: 3000 -SpawnActorsOnSell: Power: Amount: -10 MustBeDestroyed: RequiredForShortGame: false - SelectionDecorations: -AcceptsDeliveredCash: Selectable: Bounds: 2048, 1024 @@ -234,14 +248,15 @@ PYLE: Produces: Infantry.GDI ProductionQueue: Type: Infantry.GDI + DisplayOrder: 2 Group: Infantry - LowPowerModifier: 300 + LowPowerModifier: 150 ReadyAudio: UnitReady - ReadyTextNotification: Unit ready. + ReadyTextNotification: notification-unit-ready BlockedAudio: NoBuild - BlockedTextNotification: Unable to build more. + BlockedTextNotification: notification-unable-to-build-more LimitedAudio: BuildingInProgress - LimitedTextNotification: Unable to comply. Building in progress. + LimitedTextNotification: notification-unable-to-comply-building-in-progress QueuedAudio: Training OnHoldAudio: OnHold CancelledAudio: Cancelled @@ -281,20 +296,25 @@ HAND: CommandBarBlacklist: DisableStop: false Exit@1: + Priority: 2 SpawnOffset: 512,1024,0 ExitCell: 1,2 + Exit@fallback1: + SpawnOffset: -1024,256,0 + ExitCell: -1,1 Production: Produces: Infantry.Nod ProductionQueue: Type: Infantry.Nod + DisplayOrder: 2 Group: Infantry - LowPowerModifier: 300 + LowPowerModifier: 150 ReadyAudio: UnitReady - ReadyTextNotification: Unit ready. + ReadyTextNotification: notification-unit-ready BlockedAudio: NoBuild - BlockedTextNotification: Unable to build more. + BlockedTextNotification: notification-unable-to-build-more LimitedAudio: BuildingInProgress - LimitedTextNotification: Unable to comply. Building in progress. + LimitedTextNotification: notification-unable-to-comply-building-in-progress QueuedAudio: Training OnHoldAudio: OnHold CancelledAudio: Cancelled @@ -304,7 +324,6 @@ HAND: Selectable: Bounds: 2048, 2048 DecorationBounds: 2048, 2901, 0, -426 - SelectionDecorations: AFLD: Inherits: ^BaseBuilding @@ -334,9 +353,6 @@ AFLD: HP: 110000 RevealsShroud: Range: 7c0 - WithBuildingBib: - WithIdleOverlay@DISH: - Sequence: idle-dish RallyPoint: CommandBarBlacklist: DisableStop: false @@ -344,18 +360,25 @@ AFLD: SpawnOffset: -1024,0,0 ExitCell: 3,1 ProductionAirdrop: - ActorType: c17 Produces: Vehicle.Nod - ReadyTextNotification: Reinforcements have arrived. + ActorType: c17 + LandOffset: -1024,0,0 + ReadyTextNotification: notification-reinforcements-have-arrived + WithBuildingBib: + WithIdleOverlay@DISH: + RequiresCondition: !build-incomplete + Sequence: idle-dish WithDeliveryAnimation: + RequiresCondition: !build-incomplete ProductionQueue: Type: Vehicle.Nod + DisplayOrder: 3 Group: Vehicle - LowPowerModifier: 300 + LowPowerModifier: 150 BlockedAudio: NoBuild - BlockedTextNotification: Unable to build more. + BlockedTextNotification: notification-unable-to-build-more LimitedAudio: BuildingInProgress - LimitedTextNotification: Unable to comply. Building in progress. + LimitedTextNotification: notification-unable-to-comply-building-in-progress QueuedAudio: Training OnHoldAudio: OnHold CancelledAudio: Cancelled @@ -383,19 +406,19 @@ WEAP: Queue: Building.GDI Description: Produces vehicles Building: - Footprint: xxx === === + Footprint: xxx +++ === Dimensions: 3,3 LocalCenterOffset: 0,-512,0 Selectable: Bounds: 3072, 2048 DecorationBounds: 3072, 2730, 0, -682 - SelectionDecorations: Health: HP: 110000 RevealsShroud: Range: 4c0 WithBuildingBib: WithProductionDoorOverlay: + RequiresCondition: !build-incomplete Sequence: build-top RallyPoint: CommandBarBlacklist: @@ -408,14 +431,15 @@ WEAP: Produces: Vehicle.GDI ProductionQueue: Type: Vehicle.GDI + DisplayOrder: 3 Group: Vehicle - LowPowerModifier: 300 + LowPowerModifier: 150 ReadyAudio: UnitReady - ReadyTextNotification: Unit ready. + ReadyTextNotification: notification-unit-ready BlockedAudio: NoBuild - BlockedTextNotification: Unable to build more. + BlockedTextNotification: notification-unable-to-build-more LimitedAudio: BuildingInProgress - LimitedTextNotification: Unable to comply. Building in progress. + LimitedTextNotification: notification-unable-to-comply-building-in-progress QueuedAudio: Training OnHoldAudio: OnHold CancelledAudio: Cancelled @@ -443,7 +467,7 @@ HPAD: BuildPaletteOrder: 50 Prerequisites: proc Queue: Building.GDI, Building.Nod - Description: Produces, rearms and\nrepairs helicopters + Description: Produces and repairs helicopters Building: Footprint: xx xx Dimensions: 2,2 @@ -460,36 +484,39 @@ HPAD: HpPerStep: 1000 PlayerExperience: 5 StartRepairingNotification: Repairing - StartRepairingTextNotification: Repairing. + StartRepairingTextNotification: notification-repairing WithResupplyAnimation: + RequiresCondition: !build-incomplete RallyPoint: CommandBarBlacklist: DisableStop: false ProductionQueue@GDI: Type: Aircraft.GDI + DisplayOrder: 4 Factions: gdi Group: Aircraft - LowPowerModifier: 300 + LowPowerModifier: 150 ReadyAudio: UnitReady - ReadyTextNotification: Unit ready. + ReadyTextNotification: notification-unit-ready BlockedAudio: NoBuild - BlockedTextNotification: Unable to build more. + BlockedTextNotification: notification-unable-to-build-more LimitedAudio: BuildingInProgress - LimitedTextNotification: Unable to comply. Building in progress. + LimitedTextNotification: notification-unable-to-comply-building-in-progress QueuedAudio: Training OnHoldAudio: OnHold CancelledAudio: Cancelled ProductionQueue@Nod: Type: Aircraft.Nod + DisplayOrder: 4 Factions: nod Group: Aircraft - LowPowerModifier: 300 + LowPowerModifier: 150 ReadyAudio: UnitReady - ReadyTextNotification: Unit ready. + ReadyTextNotification: notification-unit-ready BlockedAudio: NoBuild - BlockedTextNotification: Unable to build more. + BlockedTextNotification: notification-unable-to-build-more LimitedAudio: BuildingInProgress - LimitedTextNotification: Unable to comply. Building in progress. + LimitedTextNotification: notification-unable-to-comply-building-in-progress QueuedAudio: Training OnHoldAudio: OnHold CancelledAudio: Cancelled @@ -524,7 +551,6 @@ HQ: Selectable: Bounds: 2048, 1706, 0, 384 DecorationBounds: 2048, 2261, 0, -170 - SelectionDecorations: WithSpriteBody: Health: HP: 80000 @@ -537,7 +563,7 @@ HQ: Range: 5c0 AirstrikePower: Icon: airstrike - ChargeInterval: 6000 + ChargeInterval: 7500 SquadSize: 3 QuantizedFacings: 8 Name: Air Strike @@ -546,10 +572,10 @@ HQ: SelectTargetSpeechNotification: SelectTarget InsufficientPowerSpeechNotification: InsufficientPower IncomingSpeechNotification: EnemyPlanesApproaching - EndChargeTextNotification: Airstrike ready. - SelectTargetTextNotification: Select target. - InsufficientPowerTextNotification: Insufficient power. - IncomingTextNotification: Enemy planes approaching. + EndChargeTextNotification: notification-airstrike-ready + SelectTargetTextNotification: notification-select-target + InsufficientPowerTextNotification: notification-insufficient-power + IncomingTextNotification: notification-enemy-planes-approaching UnitType: a10 DisplayBeacon: True BeaconPoster: airstrike @@ -559,6 +585,9 @@ HQ: ArrowSequence: arrow ClockSequence: clock CircleSequence: circles + UseDirectionalTarget: True + DirectionArrowAnimation: airstrikedirection + SupportPowerPaletteOrder: 10 SupportPowerChargeBar: FIX: @@ -577,29 +606,29 @@ FIX: Queue: Building.GDI, Building.Nod Description: Repairs vehicles Building: - Footprint: _X_ xxx _X_ + Footprint: _+_ +++ _+_ Dimensions: 3,3 Selectable: Bounds: 2730, 1450, 0, 128 DecorationBounds: 3072, 2048 - SelectionDecorations: Health: HP: 80000 RevealsShroud: Range: 5c0 WithBuildingBib: HasMinibib: true + WithResupplyAnimation: + RequiresCondition: !build-incomplete Reservable: RepairsUnits: HpPerStep: 1000 Interval: 15 PlayerExperience: 5 StartRepairingNotification: Repairing - StartRepairingTextNotification: Repairing. + StartRepairingTextNotification: notification-repairing RallyPoint: CommandBarBlacklist: DisableStop: false - WithResupplyAnimation: ProvidesPrerequisite@buildingname: EYE: @@ -627,7 +656,6 @@ EYE: Selectable: Bounds: 2048, 1706, 0, 384 DecorationBounds: 2048, 2261, 0, -170 - SelectionDecorations: WithSpriteBody: Health: HP: 130000 @@ -641,16 +669,21 @@ EYE: IonCannonPower: Icon: ioncannon Cursor: ioncannon - ChargeInterval: 6750 + ChargeInterval: 9000 Name: Ion Cannon Description: Initiate an Ion Cannon strike.\nApplies instant damage to a small area. BeginChargeSpeechNotification: IonCannonCharging EndChargeSpeechNotification: IonCannonReady SelectTargetSpeechNotification: SelectTarget InsufficientPowerSpeechNotification: InsufficientPower + BeginChargeTextNotification: notification-ion-cannon-charging + EndChargeTextNotification: notification-ion-cannon-ready + SelectTargetTextNotification: notification-select-target + InsufficientPowerTextNotification: notification-insufficient-power OnFireSound: ion1.aud DisplayRadarPing: True CameraActor: camera.small + SupportPowerPaletteOrder: 20 SupportPowerChargeBar: ProvidesPrerequisite@buildingname: @@ -678,19 +711,17 @@ TMPL: Selectable: Bounds: 3072, 2048 DecorationBounds: 3072, 2901, 0, -512 - SelectionDecorations: Health: HP: 210000 RevealsShroud: Range: 6c0 - WithBuildingBib: RenderDetectionCircle: DetectCloaked: Range: 5c0 NukePower: Icon: abomb Cursor: nuke - ChargeInterval: 9000 + ChargeInterval: 11250 Name: Nuclear Strike Description: Launch a tactical nuclear warhead.\nApplies heavy damage over a large area. EndChargeSpeechNotification: NuclearWeaponAvailable @@ -698,11 +729,11 @@ TMPL: InsufficientPowerSpeechNotification: InsufficientPower LaunchSpeechNotification: NuclearWeaponLaunched IncomingSpeechNotification: NuclearWarheadApproaching - SelectTargetTextNotification: Select target. - EndChargeTextNotification: Nuclear weapon available. - InsufficientPowerTextNotification: Insufficient power. - LaunchTextNotification: Nuclear weapon launched. - IncomingTextNotification: Nuclear warhead approaching. + SelectTargetTextNotification: notification-select-target + EndChargeTextNotification: notification-nuclear-weapon-available + InsufficientPowerTextNotification: notification-insufficient-power + LaunchTextNotification: notification-nuclear-weapon-launched + IncomingTextNotification: notification-nuclear-warhead-approaching MissileWeapon: atomic MissileImage: atomic MissileDelay: 11 @@ -715,8 +746,11 @@ TMPL: ArrowSequence: arrow ClockSequence: clock CircleSequence: circles + WithBuildingBib: WithSupportPowerActivationAnimation: + RequiresCondition: !build-incomplete WithSupportPowerActivationOverlay: + RequiresCondition: !build-incomplete Sequence: smoke SupportPowerChargeBar: ProvidesPrerequisite@buildingname: @@ -766,6 +800,8 @@ GUN: RequiresCondition: !deployed WithMuzzleOverlay: -WithDeathAnimation: + -BodyOrientation: + ClassicFacingBodyOrientation: -SpawnActorsOnSell: SpawnActorOnDeath@HUSK: Actor: GUN.husk @@ -823,8 +859,7 @@ SAM: BuildPaletteOrder: 50 Prerequisites: hand Queue: Defence.Nod - BuildDuration: 1700 - BuildDurationModifier: 40 + BuildDuration: 1130 Description: Anti-Aircraft base defense.\n Strong vs Aircraft\n Cannot target Ground units. Building: Footprint: xx @@ -834,19 +869,22 @@ SAM: Armor: Type: Heavy RevealsShroud: - Range: 6c0 + Range: 8c0 Turreted: TurnSpeed: 40 InitialFacing: 0 RealignDelay: -1 -WithSpriteBody: WithEmbeddedTurretSpriteBody: + QuantizedFacings: 32 Armament: Weapon: Dragon MuzzleSequence: muzzle AttackPopupTurreted: PauseOnCondition: build-incomplete WithMuzzleOverlay: + -BodyOrientation: + ClassicFacingBodyOrientation: -ActorPreviewPlaceBuildingPreview: SequencePlaceBuildingPreview: Sequence: place @@ -864,8 +902,7 @@ OBLI: BuildPaletteOrder: 60 Prerequisites: tmpl Queue: Defence.Nod - BuildDuration: 3120 - BuildDurationModifier: 40 + BuildDuration: 2080 Description: Advanced base defense.\nRequires power to operate.\n Strong vs all Ground units\n Cannot target Aircraft Selectable: Bounds: 1024, 1024 @@ -989,13 +1026,11 @@ ATWR: BuildPaletteOrder: 60 Prerequisites: anyhq Queue: Defence.GDI - BuildDuration: 2880 - BuildDurationModifier: 40 + BuildDuration: 1920 Description: All-purpose defensive structure.\n Strong vs Aircraft, Tanks\n Weak vs Infantry Selectable: Bounds: 1024, 1024 DecorationBounds: 938, 2048, 0, -512 - SelectionDecorations: Health: HP: 55000 Armor: @@ -1076,11 +1111,10 @@ BRIK: BuildPaletteOrder: 30 Prerequisites: vehicleproduction Queue: Defence.GDI, Defence.Nod - BuildDuration: 500 - BuildDurationModifier: 40 + BuildDuration: 230 Description: Stops infantry and most tanks.\nBlocks some projectiles. Health: - HP: 25000 + HP: 20000 Armor: Type: Heavy BlocksProjectiles: diff --git a/mods/ss/rules/vehicles.yaml b/mods/ss/rules/vehicles.yaml index b868aca..e1d7a52 100644 --- a/mods/ss/rules/vehicles.yaml +++ b/mods/ss/rules/vehicles.yaml @@ -3,7 +3,7 @@ MCV: Inherits@AUTOREPAIR: ^AcceptsAutoRepairCrate Inherits@CLOAK: ^AcceptsCloakCrate Valued: - Cost: 3500 + Cost: 3000 Tooltip: Name: Mobile Construction Vehicle Buildable: @@ -22,8 +22,7 @@ MCV: Health: HP: 60000 Repairable: - HpPerStep: 2182 - RepairActors: fix + HpPerStep: 1819 Armor: Type: Heavy RevealsShroud: @@ -34,12 +33,11 @@ MCV: Facing: 432 TransformSounds: constru2.aud, hvydoor1.aud NoTransformNotification: BuildingCannotPlaceAudio - NoTransformTextNotification: Cannot deploy here. + NoTransformTextNotification: notification-cannot-deploy-here Voice: Unload MustBeDestroyed: RequiredForShortGame: true BaseBuilding: - SelectionDecorations: UnitStatValues: HARV: @@ -57,8 +55,6 @@ HARV: BuildPaletteOrder: 10 Prerequisites: proc Queue: Vehicle.GDI, Vehicle.Nod - BuildDuration: 1680 - BuildDurationModifier: 40 Description: Collects Tiberium for processing.\n Unarmed Selectable: Priority: 7 @@ -77,8 +73,7 @@ HARV: Health: HP: 60000 Repairable: - HpPerStep: 2537 - RepairActors: fix + HpPerStep: 2584 Armor: Type: Heavy RevealsShroud: @@ -104,8 +99,6 @@ APC: BuildPaletteOrder: 30 Prerequisites: pyle Queue: Vehicle.GDI - BuildDuration: 938 - BuildDurationModifier: 40 Description: Armed infantry transport.\nCan attack Aircraft.\n Strong vs Vehicles\n Weak vs Infantry Mobile: TurnSpeed: 40 @@ -115,7 +108,6 @@ APC: HP: 40000 Repairable: HpPerStep: 1440 - RepairActors: fix Armor: Type: Heavy RevealsShroud: @@ -160,6 +152,9 @@ APC: MaxWeight: 5 UnloadVoice: Unload LoadingCondition: notmobile + Explodes: + Weapon: UnitExplodeBig + EmptyWeapon: UnitExplodeBig UnitStatValues: Damage: 2000 @@ -184,8 +179,7 @@ ARTY: Health: HP: 35000 Repairable: - HpPerStep: 569 - RepairActors: fix + HpPerStep: 568 Armor: Type: Light RevealsShroud: @@ -204,8 +198,7 @@ ARTY: InitialStanceAI: Defend Explodes: Weapon: ArtilleryShell - EmptyWeapon: UnitExplode - LoadedChance: 75 + EmptyWeapon: ArtilleryShell UnitStatValues: Damage: 10000 @@ -231,7 +224,6 @@ FTNK: HP: 45000 Repairable: HpPerStep: 2046 - RepairActors: fix Armor: Type: Heavy RevealsShroud: @@ -274,7 +266,6 @@ BGGY: HP: 23000 Repairable: HpPerStep: 1819 - RepairActors: fix Armor: Type: Light RevealsShroud: @@ -326,7 +317,6 @@ BIKE: HP: 21000 Repairable: HpPerStep: 1000 - RepairActors: fix Armor: Type: Wood RevealsShroud: @@ -365,7 +355,6 @@ JEEP: HP: 31000 Repairable: HpPerStep: 1819 - RepairActors: fix Armor: Type: Light RevealsShroud: @@ -418,7 +407,6 @@ LTNK: HP: 35000 Repairable: HpPerStep: 2273 - RepairActors: fix Armor: Type: Heavy RevealsShroud: @@ -471,7 +459,6 @@ MTNK: HP: 45000 Repairable: HpPerStep: 2557 - RepairActors: fix Armor: Type: Heavy RevealsShroud: @@ -528,8 +515,7 @@ HTNK: Health: HP: 75000 Repairable: - HpPerStep: 2637 - RepairActors: fix + HpPerStep: 2198 Armor: Type: Heavy RevealsShroud: @@ -582,8 +568,7 @@ MSAM: Health: HP: 40000 Repairable: - HpPerStep: 546 - RepairActors: fix + HpPerStep: 606 Armor: Type: Light RevealsShroud: @@ -631,7 +616,6 @@ MLRS: HP: 30000 Repairable: HpPerStep: 1364 - RepairActors: fix Armor: Type: Light RevealsShroud: @@ -699,7 +683,6 @@ STNK: HP: 25000 Repairable: HpPerStep: 758 - RepairActors: fix Armor: Type: Light RevealsShroud: @@ -745,8 +728,8 @@ MHQ: Description: Reveals an area of the map\nand cloaked enemy units. SelectTargetSpeechNotification: SelectTarget EndChargeSpeechNotification: AirstrikeReady - SelectTargetTextNotification: Select target. - EndChargeTextNotification: Airstrike ready. + SelectTargetTextNotification: notification-select-target + EndChargeTextNotification: notification-airstrike-ready CameraActor: CAMERA.spyplane CameraRemoveDelay: 150 UnitType: u2 @@ -766,8 +749,8 @@ MHQ: Description: Deploy an aerial napalm strike. EndChargeSpeechNotification: AirstrikeReady SelectTargetSpeechNotification: SelectTarget - EndChargeTextNotification: Airstrike ready. - SelectTargetTextNotification: Select target. + EndChargeTextNotification: notification-airstrike-ready + SelectTargetTextNotification: notification-select-target UnitType: a10 DisplayBeacon: True BeaconPoster: airstrike diff --git a/mods/ss/weapons/explosions.yaml b/mods/ss/weapons/explosions.yaml index cbcc8d1..e55c0d6 100644 --- a/mods/ss/weapons/explosions.yaml +++ b/mods/ss/weapons/explosions.yaml @@ -74,6 +74,12 @@ UnitExplodeSmall: Explosions: big_frag ImpactSounds: xplobig4.aud +UnitExplodeBig: + Inherits: ^DamagingExplosionHE + Warhead@2Eff: CreateEffect + Explosions: big_frag + ImpactSounds: xplobig6.aud + GrenadierExplode: Inherits: ^DamagingExplosionHE Warhead@1Dam: SpreadDamage