From e721bb9602194bba26f1be462cd7dd4bba355708 Mon Sep 17 00:00:00 2001 From: teees Date: Tue, 26 Jan 2016 13:30:58 +0100 Subject: [PATCH 1/4] Use correct crushing behavior --- mods/ts/rules/civilian-vehicles.yaml | 4 ++-- mods/ts/rules/defaults.yaml | 6 ++++++ mods/ts/rules/gdi-vehicles.yaml | 4 ++-- mods/ts/rules/shared-vehicles.yaml | 5 ++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/mods/ts/rules/civilian-vehicles.yaml b/mods/ts/rules/civilian-vehicles.yaml index 25a13bd3e4..e42bfce9d4 100644 --- a/mods/ts/rules/civilian-vehicles.yaml +++ b/mods/ts/rules/civilian-vehicles.yaml @@ -56,7 +56,7 @@ TRUCKB: Inherits: ^TRUCK ICBM: - Inherits: ^CivilianVoxelVehicle + Inherits: ^CivilianVoxelCrusher Valued: Cost: 1400 Tooltip: @@ -79,7 +79,7 @@ ICBM: Voice: Move BUS: - Inherits: ^CivilianVoxelVehicle + Inherits: ^CivilianVoxelCrusher Valued: Cost: 800 Tooltip: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 9b7522a03d..00e3beb1f4 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -450,6 +450,11 @@ Inherits: ^VoxelVehicle -MustBeDestroyed: +^CivilianVoxelCrusher: + Inherits: ^CivilianVoxelVehicle + Mobile: + Crushes: wall, crate, infantry + ^Aircraft: Inherits@1: ^GainsExperience Inherits@2: ^ExistsInWorld @@ -694,6 +699,7 @@ Mobile: TerrainSpeeds: Rail: 100 + Crushes: wall, crate, infantry ROT: 5 Voice: Move Speed: 113 diff --git a/mods/ts/rules/gdi-vehicles.yaml b/mods/ts/rules/gdi-vehicles.yaml index db2f20a599..22733ee690 100644 --- a/mods/ts/rules/gdi-vehicles.yaml +++ b/mods/ts/rules/gdi-vehicles.yaml @@ -1,5 +1,5 @@ APC: - Inherits: ^VoxelVehicle + Inherits: ^VoxelTank Valued: Cost: 600 Tooltip: @@ -87,7 +87,7 @@ HVR: MovingInterval: 6 SMECH: - Inherits: ^Tank + Inherits: ^Vehicle Valued: Cost: 500 Tooltip: diff --git a/mods/ts/rules/shared-vehicles.yaml b/mods/ts/rules/shared-vehicles.yaml index 05330c460a..e78a89b488 100644 --- a/mods/ts/rules/shared-vehicles.yaml +++ b/mods/ts/rules/shared-vehicles.yaml @@ -1,5 +1,5 @@ MCV: - Inherits: ^VoxelVehicle + Inherits: ^VoxelTank Buildable: Queue: Vehicle BuildPaletteOrder: 110 @@ -17,7 +17,6 @@ MCV: Type: Light Mobile: Speed: 85 - Crushes: wall, crate, infantry RevealsShroud: Range: 4c0 MustBeDestroyed: @@ -100,7 +99,7 @@ HARV: nod: harv.nod LPST: - Inherits: ^VoxelVehicle + Inherits: ^VoxelTank -AppearsOnRadar: -GainsExperience: Buildable: From 55fd75edce63e203bbb12d178e137641a1039887 Mon Sep 17 00:00:00 2001 From: teees Date: Tue, 26 Jan 2016 13:31:43 +0100 Subject: [PATCH 2/4] Use correct armor type --- mods/ts/rules/gdi-vehicles.yaml | 2 +- mods/ts/rules/nod-vehicles.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ts/rules/gdi-vehicles.yaml b/mods/ts/rules/gdi-vehicles.yaml index 22733ee690..445430acc1 100644 --- a/mods/ts/rules/gdi-vehicles.yaml +++ b/mods/ts/rules/gdi-vehicles.yaml @@ -64,7 +64,7 @@ HVR: Health: HP: 230 Armor: - Type: Light + Type: Wood RevealsShroud: Range: 7c0 Armament: diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml index 122a5541c1..0effe4bcb3 100644 --- a/mods/ts/rules/nod-vehicles.yaml +++ b/mods/ts/rules/nod-vehicles.yaml @@ -45,7 +45,7 @@ BIKE: Health: HP: 150 Armor: - Type: Light + Type: Wood RevealsShroud: Range: 5c0 Armament@PRIMARY: From 3088230c296f73a7eb2dd17da4d6063a3cc29424 Mon Sep 17 00:00:00 2001 From: teees Date: Wed, 27 Jan 2016 14:14:13 +0100 Subject: [PATCH 3/4] Add EjectOnDeath for civilian transport vehicles --- mods/ts/rules/civilian-vehicles.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mods/ts/rules/civilian-vehicles.yaml b/mods/ts/rules/civilian-vehicles.yaml index e42bfce9d4..517bf7467e 100644 --- a/mods/ts/rules/civilian-vehicles.yaml +++ b/mods/ts/rules/civilian-vehicles.yaml @@ -99,6 +99,7 @@ BUS: PipCount: 5 UnloadVoice: Unload LoadingUpgrades: notmobile + EjectOnDeath: true PICK: Inherits: ^CivilianVoxelVehicle @@ -121,6 +122,7 @@ PICK: PipCount: 5 UnloadVoice: Unload LoadingUpgrades: notmobile + EjectOnDeath: true CAR: Inherits: ^CivilianVoxelVehicle @@ -143,6 +145,7 @@ CAR: PipCount: 5 UnloadVoice: Unload LoadingUpgrades: notmobile + EjectOnDeath: true WINI: Inherits: ^CivilianVoxelVehicle @@ -165,6 +168,7 @@ WINI: PipCount: 5 UnloadVoice: Unload LoadingUpgrades: notmobile + EjectOnDeath: true LOCOMOTIVE: Inherits: ^Train @@ -175,6 +179,7 @@ LOCOMOTIVE: Cargo: MaxWeight: 2 PipCount: 2 + EjectOnDeath: true TRAINCAR: Inherits: ^Train @@ -185,6 +190,7 @@ TRAINCAR: Cargo: MaxWeight: 10 PipCount: 5 + EjectOnDeath: true CARGOCAR: Inherits: ^Train @@ -195,3 +201,4 @@ CARGOCAR: Cargo: MaxWeight: 10 PipCount: 5 + EjectOnDeath: true From c5da3623acd10a7c90a7c129ff5ca18b5e6bef5f Mon Sep 17 00:00:00 2001 From: teees Date: Wed, 27 Jan 2016 15:08:09 +0100 Subject: [PATCH 4/4] fix spelling mistake --- mods/ts/rules/civilian-infantry.yaml | 4 ++-- mods/ts/rules/defaults.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index 2bf89b579c..f520765adf 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -237,7 +237,7 @@ DOGGIE: MaxMoveDelayInTicks: 45 VISC_SML: - Inherits: ^Viceroid + Inherits: ^Visceroid Tooltip: Name: Baby Visceroid Description: infantry transmorgifies into this @@ -251,7 +251,7 @@ VISC_SML: Image: vissml VISC_LRG: - Inherits: ^Viceroid + Inherits: ^Visceroid Tooltip: Name: Adult Visceroid Description: 2 small visceroids combine into this diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 00e3beb1f4..e799041c16 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -540,7 +540,7 @@ Moves: true Velocity: 86 -^Viceroid: +^Visceroid: Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor DrawLineToTarget: