From 2da1304522d8671265609990c843304d862fe741 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 11 Jan 2017 23:00:46 +0100 Subject: [PATCH] Fix large TS visceroid attack and enable attack animation Unfortunately the animation sprite starts at an unusual facing, so we have to work around that by manually fixing the order. Using Combine is easier than listing a whopping 40 frames in the correct order. --- mods/ts/rules/civilian-infantry.yaml | 3 +++ mods/ts/rules/defaults.yaml | 2 +- mods/ts/sequences/infantry.yaml | 13 ++++++++++--- mods/ts/weapons/otherweapons.yaml | 5 ++--- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index bb945bd2d5..4905047654 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -272,6 +272,7 @@ VISC_LRG: HP: 500 Armament: Weapon: SlimeAttack + FireDelay: 10 AutoTarget: AttackFrontal: Voice: Attack @@ -279,6 +280,8 @@ VISC_LRG: WanderMoveRadius: 2 MinMoveDelay: 25 MaxMoveDelay: 50 + WithAttackAnimation: + AttackSequence: attack Mobile: Crushes: crate, infantry RenderSprites: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 017fffa4b0..e9d301bb1e 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -664,7 +664,7 @@ AttackMove: HiddenUnderFog: Guardable: - WithSpriteBody: + WithFacingSpriteBody: RevealOnFire: ^BlossomTree: diff --git a/mods/ts/sequences/infantry.yaml b/mods/ts/sequences/infantry.yaml index 53bf3cbe0b..ae5f6e5197 100644 --- a/mods/ts/sequences/infantry.yaml +++ b/mods/ts/sequences/infantry.yaml @@ -526,12 +526,19 @@ vislrg: ShadowStart: 90 Tick: 80 Offset: 0, 0, 16 - muzzle: vislgatk # TODO: unused + attack: + Combine: + vislgatk: + Start: 5 + Length: 35 + vislgatk: + Start: 0 + Length: 5 + Facings: -8 Length: 5 - Facings: 8 - ShadowStart: 40 Tick: 80 Offset: 0, 0, 16 +# ShadowStart: 40 # TODO: enable shadow frames flameguy: Defaults: diff --git a/mods/ts/weapons/otherweapons.yaml b/mods/ts/weapons/otherweapons.yaml index e2edaacea2..bed9e5adfc 100644 --- a/mods/ts/weapons/otherweapons.yaml +++ b/mods/ts/weapons/otherweapons.yaml @@ -49,10 +49,9 @@ FiendShard: SlimeAttack: ReloadDelay: 80 - Range: 5c0 + Range: 1c384 Report: vicer1.aud - Projectile: Bullet - Speed: 426 + Projectile: InstantHit Warhead@1Dam: SpreadDamage Damage: 100 Versus: