From 4fd4089e54aa5638145d0ef780650e74446fdebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 24 Aug 2014 11:26:16 +0200 Subject: [PATCH 1/7] self-document and un-hardcode the prone sequence prefix --- OpenRA.Mods.RA/TakeCover.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/TakeCover.cs b/OpenRA.Mods.RA/TakeCover.cs index 0b33983b5b..ef1097c79f 100644 --- a/OpenRA.Mods.RA/TakeCover.cs +++ b/OpenRA.Mods.RA/TakeCover.cs @@ -24,6 +24,8 @@ namespace OpenRA.Mods.RA public readonly WVec ProneOffset = new WVec(85, 0, -171); + public readonly string ProneSequencePrefix = "prone-"; + public override object Create(ActorInitializer init) { return new TakeCover(init, this); } } @@ -34,7 +36,7 @@ namespace OpenRA.Mods.RA bool isProne { get { return remainingProneTime > 0; } } public bool IsModifyingSequence { get { return isProne; } } - public string SequencePrefix { get { return "prone-"; } } + public string SequencePrefix { get { return info.ProneSequencePrefix ; } } public TakeCover(ActorInitializer init, TakeCoverInfo info) : base(init, info) From 44441bf20e9b3cf5db811f4991585c314219d9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 24 Aug 2014 11:35:04 +0200 Subject: [PATCH 2/7] remove unused duplicate stand sequences --- mods/d2k/sequences/infantry.yaml | 35 -------------------------------- 1 file changed, 35 deletions(-) diff --git a/mods/d2k/sequences/infantry.yaml b/mods/d2k/sequences/infantry.yaml index 4f29a6ff90..654ffeee4b 100644 --- a/mods/d2k/sequences/infantry.yaml +++ b/mods/d2k/sequences/infantry.yaml @@ -3,14 +3,6 @@ rifle: Start: 206 Facings: -8 Transpose: true - stand2: DATA - Start: 206 - Facings: -8 - Transpose: true - stand3: DATA - Start: 206 - Facings: -8 - Transpose: true run: DATA Start: 214 Length: 6 @@ -145,10 +137,6 @@ engineer: Start: 1166 Facings: -8 Transpose: true - stand2: DATA - Start: 1166 - Facings: -8 - Transpose: true run: DATA Start: 1174 Length: 6 @@ -186,10 +174,6 @@ medic: # actually thumper Start: 1402 Facings: -8 Transpose: true - stand2: DATA - Start: 1402 - Facings: -8 - Transpose: true run: DATA Start: 1410 Length: 6 @@ -247,10 +231,6 @@ fremen: Start: 694 Facings: -8 Transpose: true - stand2: DATA - Start: 694 - Facings: -8 - Transpose: true run: DATA Start: 702 Length: 6 @@ -315,14 +295,6 @@ saboteur: Start: 2149 Facings: -8 Transpose: true - stand2: DATA - Start: 2149 - Facings: -8 - Transpose: true - stand3: DATA - Start: 2149 - Facings: -8 - Transpose: true run: DATA Start: 2157 Length: 6 @@ -377,10 +349,6 @@ sardaukar: Start: 930 Facings: -8 Transpose: true - stand2: DATA - Start: 930 - Facings: -8 - Transpose: true run: DATA Start: 938 Length: 6 @@ -444,9 +412,6 @@ grenadier: # 2502 - 2749 in 1.06 DATA.R8 stand: Start: 0 Facings: 8 - stand2: - Start: 8 - Facings: 8 idle: Start: 203 Length: 16 From 52de40f2526b2eac8813f3ce2971325d85519bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 24 Aug 2014 11:35:27 +0200 Subject: [PATCH 3/7] remove bogus tab --- OpenRA.Mods.RA/Render/RenderInfantry.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/Render/RenderInfantry.cs b/OpenRA.Mods.RA/Render/RenderInfantry.cs index 93188c293c..01262856a3 100644 --- a/OpenRA.Mods.RA/Render/RenderInfantry.cs +++ b/OpenRA.Mods.RA/Render/RenderInfantry.cs @@ -161,7 +161,7 @@ namespace OpenRA.Mods.RA.Render if (info.SpawnsCorpse) { SpawnCorpse(self, info.DeathAnimationPrefix + (e.Warhead.DeathType)); - } + } } public void SpawnCorpse(Actor self, string sequence) From 1c65b29a30de725b3e177822070fd8be4d1822ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 24 Aug 2014 11:53:19 +0200 Subject: [PATCH 4/7] fix infantry without idle anim staying in fire animation state closes #5884 --- OpenRA.Mods.RA/Render/RenderInfantry.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OpenRA.Mods.RA/Render/RenderInfantry.cs b/OpenRA.Mods.RA/Render/RenderInfantry.cs index 01262856a3..2f6c58deeb 100644 --- a/OpenRA.Mods.RA/Render/RenderInfantry.cs +++ b/OpenRA.Mods.RA/Render/RenderInfantry.cs @@ -149,6 +149,11 @@ namespace OpenRA.Mods.RA.Render }); } } + else + { + DefaultAnimation.PlayRepeating(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom))); + state = AnimationState.Waiting; + } } // TODO: Possibly move this into a separate trait From 981fff95e169b4bf32e7ea5c5dc214c0d319519f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 24 Aug 2014 13:31:41 +0200 Subject: [PATCH 5/7] add missing TakeCover trait --- mods/d2k/rules/defaults.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index a56bd7177d..6cfab742c0 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -171,6 +171,7 @@ TargetableUnit: TargetTypes: Ground RenderInfantry: + TakeCover: AutoTarget: AttackMove: Passenger: From a81ce5f318ff3f993b5c67806c4667e8d58df095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 31 Aug 2014 09:21:39 +0200 Subject: [PATCH 6/7] replace bogus tab with space --- OpenRA.Mods.RA/Render/RenderInfantry.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/Render/RenderInfantry.cs b/OpenRA.Mods.RA/Render/RenderInfantry.cs index 2f6c58deeb..094e941d2e 100644 --- a/OpenRA.Mods.RA/Render/RenderInfantry.cs +++ b/OpenRA.Mods.RA/Render/RenderInfantry.cs @@ -142,7 +142,7 @@ namespace OpenRA.Mods.RA.Render if (DefaultAnimation.HasSequence(idleSequence)) { state = AnimationState.IdleAnimating; - DefaultAnimation.PlayThen(idleSequence, () => + DefaultAnimation.PlayThen(idleSequence, () => { DefaultAnimation.PlayRepeating(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom))); state = AnimationState.Waiting; From 60d31e643eefefcab3d19f711d43307fd95fa5c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 5 Sep 2014 15:29:43 +0200 Subject: [PATCH 7/7] remove reference to non-existing idle sequences --- mods/d2k/rules/atreides.yaml | 4 ++-- mods/d2k/rules/harkonnen.yaml | 2 +- mods/d2k/rules/infantry.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml index 73169bea4c..dfbfcd77e9 100644 --- a/mods/d2k/rules/atreides.yaml +++ b/mods/d2k/rules/atreides.yaml @@ -233,7 +233,7 @@ FREMEN: Weapon: Slung AttackFrontal: RenderInfantry: - IdleAnimations: stand,stand2 + IdleAnimations: stand TakeCover: Cloak: InitialDelay: 250 @@ -265,7 +265,7 @@ GRENADIER: AttackFrontal: TakeCover: RenderInfantry: - IdleAnimations: stand,stand2 + IdleAnimations: stand Explodes: Weapon: UnitExplodeSmall Chance: 100 diff --git a/mods/d2k/rules/harkonnen.yaml b/mods/d2k/rules/harkonnen.yaml index 8868a6ef8e..97ef554b7d 100644 --- a/mods/d2k/rules/harkonnen.yaml +++ b/mods/d2k/rules/harkonnen.yaml @@ -231,7 +231,7 @@ SARDAUKAR: Range: 6c0 TakeCover: RenderInfantry: - IdleAnimations: stand,stand2 + IdleAnimations: stand Armament@PRIMARY: Weapon: Vulcan Armament@SECONDARY: diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index bce9013c4d..94811b3da7 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -20,7 +20,7 @@ RIFLE: AttackFrontal: TakeCover: RenderInfantry: - IdleAnimations: stand,stand2 + IdleAnimations: stand ENGINEER: Inherits: ^Infantry @@ -72,7 +72,7 @@ BAZOOKA: AttackFrontal: TakeCover: RenderInfantry: - IdleAnimations: stand,stand2 + IdleAnimations: stand MEDIC: Inherits: ^Infantry