From ec9f0a463404a39d8820d7955110811de3e2e517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 9 Jul 2015 09:22:48 +0200 Subject: [PATCH 1/2] move ThrowsShrapnel to Mods.Commons --- OpenRA.Mods.Common/OpenRA.Mods.Common.csproj | 1 + .../Traits/ThrowsShrapnel.cs | 2 +- OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) rename {OpenRA.Mods.D2k => OpenRA.Mods.Common}/Traits/ThrowsShrapnel.cs (98%) diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index 85172ae35e..f2feebe28c 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -693,6 +693,7 @@ + diff --git a/OpenRA.Mods.D2k/Traits/ThrowsShrapnel.cs b/OpenRA.Mods.Common/Traits/ThrowsShrapnel.cs similarity index 98% rename from OpenRA.Mods.D2k/Traits/ThrowsShrapnel.cs rename to OpenRA.Mods.Common/Traits/ThrowsShrapnel.cs index 4b85b6ee38..aea6878568 100644 --- a/OpenRA.Mods.D2k/Traits/ThrowsShrapnel.cs +++ b/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 diff --git a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj index 16fd7b25d3..39acd08bc9 100644 --- a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj +++ b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj @@ -93,7 +93,6 @@ - From 95b7da904cdfbb6a58e6159a8417260ed01d369e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Wed, 8 Jul 2015 21:27:01 +0200 Subject: [PATCH 2/2] add debris to Tiberian Sun --- mods/ts/rules/defaults.yaml | 8 ++++ mods/ts/sequences/misc.yaml | 80 +++++++++++++++++++++++++++++++++ mods/ts/weapons/explosions.yaml | 21 +++++++++ 3 files changed, 109 insertions(+) diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index cf8a2e92c6..93463b5910 100644 --- a/mods/ts/rules/defaults.yaml +++ b/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 diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index 154544c066..0de2244b63 100644 --- a/mods/ts/sequences/misc.yaml +++ b/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:* \ No newline at end of file diff --git a/mods/ts/weapons/explosions.yaml b/mods/ts/weapons/explosions.yaml index 9eb1efefcb..38bba9332e 100644 --- a/mods/ts/weapons/explosions.yaml +++ b/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 \ No newline at end of file