Merge pull request #8686 from Mailaender/ts-debris

Added debris to Tiberian Sun

OpenRA.Mods.Common/OpenRA.Mods.Common.csproj

@@ -693,6 +693,7 @@
     <Compile Include="Traits\CreatesShroud.cs" />
     <Compile Include="Traits\RevealsShroud.cs" />
     <Compile Include="Lint\CheckRevealFootprint.cs" />
+    <Compile Include="Traits\ThrowsShrapnel.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

OpenRA.Mods.Common/Traits/ThrowsShrapnel.cs

@@ -12,7 +12,7 @@ using System.Linq;
 using OpenRA.GameRules;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Throws particles when the actor is destroyed that do damage on impact.")]
 	public class ThrowsShrapnelInfo : ITraitInfo

OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj

@@ -93,7 +93,6 @@
     <Compile Include="Traits\Render\WithDeliveryOverlay.cs" />
     <Compile Include="Traits\Sandworm.cs" />
     <Compile Include="Traits\TemporaryOwnerManager.cs" />
-    <Compile Include="Traits\ThrowsShrapnel.cs" />
     <Compile Include="Traits\World\BuildableTerrainLayer.cs" />
     <Compile Include="Traits\World\D2kResourceLayer.cs" />
     <Compile Include="Traits\World\FogPaletteFromR8.cs" />

mods/ts/rules/defaults.yaml

@@ -90,6 +90,10 @@
 		SellSounds: cashturn.aud
 	GivesBounty:
 	WithMakeAnimation:
+	ThrowsShrapnel:
+		Weapons: LargeDebris
+		Pieces: 3, 7
+		Range: 2c0, 5c0
 
 ^CivBuilding:
 	Inherits: ^BasicBuilding
@@ -375,6 +379,10 @@
 		CloakDelay: 90
 	MustBeDestroyed:
 	RenderSprites:
+	ThrowsShrapnel:
+		Weapons: SmallDebris
+		Pieces: 3, 7
+		Range: 2c0, 5c0
 
 ^Tank:
 	Inherits: ^Vehicle

mods/ts/sequences/misc.yaml

@@ -406,3 +406,83 @@ srock05:
 		ShadowStart: 1
 		UseTilesetExtension: true
 		Offset: 0, -12
+
+dbris1sm:
+	idle:
+		Length:*
+
+dbris2sm:
+	idle:
+		Length:*
+
+dbris3sm:
+	idle:
+		Length:*
+
+dbris4sm:
+	idle:
+		Length:*
+
+dbris5sm:
+	idle:
+		Length:*
+
+dbris6sm:
+	idle:
+		Length:*
+
+dbris7sm:
+	idle:
+		Length:*
+
+dbris8sm:
+	idle:
+		Length:*
+
+dbris9sm:
+	idle:
+		Length:*
+
+dbris10sm:
+	idle:
+		Length:*
+
+dbris1lg:
+	idle:
+		Length:*
+
+dbris2lg:
+	idle:
+		Length:*
+
+dbris3lg:
+	idle:
+		Length:*
+
+dbris4lg:
+	idle:
+		Length:*
+
+dbris5lg:
+	idle:
+		Length:*
+
+dbris6lg:
+	idle:
+		Length:*
+
+dbris7lg:
+	idle:
+		Length:*
+
+dbris8lg:
+	idle:
+		Length:*
+
+dbris9lg:
+	idle:
+		Length:*
+
+dbris10lg:
+	idle:
+		Length:*

mods/ts/weapons/explosions.yaml

@@ -44,3 +44,24 @@ TiberiumExplosion:
 		Explosion: large_explosion
 		ImpactSound: expnew09.aud
 
+SmallDebris:
+	ReloadDelay: 60
+	Range: 4c0
+	Report:
+	Projectile: Bullet
+		Speed: 50, 125
+		Blockable: false
+		Angle: 91, 264
+		Inaccuracy: 416
+		Image: dbris1sm # TODO: add some variation
+
+LargeDebris:
+	ReloadDelay: 60
+	Range: 4c0
+	Report:
+	Projectile: Bullet
+		Speed: 50, 125
+		Blockable: false
+		Angle: 91, 264
+		Inaccuracy: 416
+		Image: dbris1lg # TODO: add some variation