From cef80b6c173afb1deda720ba8810e9c4bc023102 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 11 Jan 2017 22:54:35 +0100 Subject: [PATCH 1/9] Fix Tiberian Fiend selection box --- mods/ts/rules/civilian-infantry.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index 26a89d862f..0c5f61f56c 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -221,6 +221,8 @@ DOGGIE: HP: 250 Shape: Circle Radius: 213 + Selectable: + Bounds: 24,24 Valued: Cost: 100 Armor: From 4206bdf4912f9096d4af2a8a09f7ee2c19cc41c0 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 11 Jan 2017 22:55:14 +0100 Subject: [PATCH 2/9] Slightly tweak default TS infantry selection box --- mods/ts/rules/defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 87ae7ba8f5..017fffa4b0 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -302,7 +302,7 @@ SelectionDecorations: Palette: pips Selectable: - Bounds: 14,23,-1,-9 + Bounds: 15,23,0,-9 Voiced: VoiceSet: Infantry Targetable: From b19d4c0f8049abe4a00752a4c0340924a28a3eca Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 11 Jan 2017 22:58:34 +0100 Subject: [PATCH 3/9] Fix and tweak TS critter wander delays The property name has bit-rotted, and the values of the Tiberian Fiend were too low/short, resulting in too much hectic activity. --- mods/ts/rules/civilian-infantry.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index 0c5f61f56c..bb945bd2d5 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -240,8 +240,8 @@ DOGGIE: Voice: Attack AttackWander: WanderMoveRadius: 2 - MinMoveDelayInTicks: 25 - MaxMoveDelayInTicks: 45 + MinMoveDelay: 200 + MaxMoveDelay: 600 -SpawnActorOnDeath@FLAMEGUY: WithDeathAnimation@fire: DeathSequence: die- @@ -256,8 +256,8 @@ VISC_SML: HP: 200 AttackWander: WanderMoveRadius: 2 - MinMoveDelayInTicks: 30 - MaxMoveDelayInTicks: 60 + MinMoveDelay: 30 + MaxMoveDelay: 60 RenderSprites: Image: vissml Buildable: @@ -277,8 +277,8 @@ VISC_LRG: Voice: Attack AttackWander: WanderMoveRadius: 2 - MinMoveDelayInTicks: 25 - MaxMoveDelayInTicks: 45 + MinMoveDelay: 25 + MaxMoveDelay: 50 Mobile: Crushes: crate, infantry RenderSprites: From 2da1304522d8671265609990c843304d862fe741 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 11 Jan 2017 23:00:46 +0100 Subject: [PATCH 4/9] 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: From 5d410ee72e7afa11ec644f19b9b807518aa93907 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 15 Jan 2017 16:53:54 +0100 Subject: [PATCH 5/9] Fix critter owner on shipping maps --- mods/ts/maps/cliffsin/map.yaml | 18 +++++++++--------- mods/ts/maps/t_garden/map.yaml | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mods/ts/maps/cliffsin/map.yaml b/mods/ts/maps/cliffsin/map.yaml index b9c5fafcf9..4a819e1677 100644 --- a/mods/ts/maps/cliffsin/map.yaml +++ b/mods/ts/maps/cliffsin/map.yaml @@ -66,47 +66,47 @@ Actors: Facing: 96 Actor1: visc_lrg Location: 26,3 - Owner: Neutral + Owner: Creeps Health: 100 Facing: 96 Actor2: visc_lrg Location: 58,39 - Owner: Neutral + Owner: Creeps Health: 100 Facing: 96 Actor3: visc_lrg Location: 159,65 - Owner: Neutral + Owner: Creeps Health: 100 Facing: 96 Actor4: visc_lrg Location: 98,10 - Owner: Neutral + Owner: Creeps Health: 100 Facing: 96 Actor5: visc_lrg Location: 135,-99 - Owner: Neutral + Owner: Creeps Health: 100 Facing: 96 Actor6: visc_lrg Location: 224,2 - Owner: Neutral + Owner: Creeps Health: 100 Facing: 96 Actor7: visc_lrg Location: 160,29 - Owner: Neutral + Owner: Creeps Health: 100 Facing: 96 Actor8: visc_lrg Location: 97,-39 - Owner: Neutral + Owner: Creeps Health: 100 Facing: 96 Actor9: visc_lrg Location: 151,-28 - Owner: Neutral + Owner: Creeps Health: 100 Facing: 96 Actor10: tibtre01 diff --git a/mods/ts/maps/t_garden/map.yaml b/mods/ts/maps/t_garden/map.yaml index 7da5a314ed..2565184918 100644 --- a/mods/ts/maps/t_garden/map.yaml +++ b/mods/ts/maps/t_garden/map.yaml @@ -126,47 +126,47 @@ Actors: Facing: 96 Actor14: visc_lrg Location: 81,22 - Owner: Neutral + Owner: Creeps Health: 62 Facing: 0 Actor15: visc_lrg Location: 102,2 - Owner: Neutral + Owner: Creeps Health: 77 Facing: 128 Actor16: visc_lrg Location: 35,-6 - Owner: Neutral + Owner: Creeps Health: 100 Facing: 0 Actor17: visc_lrg Location: 148,-2 - Owner: Neutral + Owner: Creeps Health: 100 Facing: 128 Actor18: doggie Location: 141,-23 - Owner: Neutral + Owner: Creeps Health: 100 Facing: 100 Actor19: doggie Location: 167,11 - Owner: Neutral + Owner: Creeps Health: 100 Facing: 100 Actor20: doggie Location: 99,81 - Owner: Neutral + Owner: Creeps Health: 100 Facing: 99 Actor21: doggie Location: 70,53 - Owner: Neutral + Owner: Creeps Health: 100 Facing: 99 Actor22: doggie Location: 79,-41 - Owner: Neutral + Owner: Creeps Health: 100 Facing: 99 Actor23: tibtre01 From 13faf5c54c13eaef31f98171c9ce6dfd8bd3e9fd Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 18 Jan 2017 20:26:23 +0100 Subject: [PATCH 6/9] Fix TS Tib Fiend and adult visceroid sight range Otherwise they won't attack with shroud enabled! --- mods/ts/rules/civilian-infantry.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index 4905047654..96fd7e227d 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -227,7 +227,8 @@ DOGGIE: Cost: 100 Armor: Type: Light - -RevealsShroud: + RevealsShroud: + Range: 4c0 Mobile: Speed: 113 Voiced: @@ -270,6 +271,8 @@ VISC_LRG: Name: Adult Visceroid Health: HP: 500 + RevealsShroud: + Range: 4c0 Armament: Weapon: SlimeAttack FireDelay: 10 From 676bb41befe181dddc192e5a2e9d4cc196eefb5f Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 15 Jan 2017 16:54:48 +0100 Subject: [PATCH 7/9] Give adult visceroid a larger target scan radius --- mods/ts/rules/civilian-infantry.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index 96fd7e227d..1126b458d7 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -277,6 +277,7 @@ VISC_LRG: Weapon: SlimeAttack FireDelay: 10 AutoTarget: + ScanRadius: 5 AttackFrontal: Voice: Attack AttackWander: From 36920f227900b09ffe7d2a432c18fdb5903a1d4d Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 18 Jan 2017 20:26:56 +0100 Subject: [PATCH 8/9] Fix adult visceroid armor type As per original rules.ini. --- mods/ts/rules/civilian-infantry.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index 1126b458d7..d2a5b2fd6c 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -271,6 +271,8 @@ VISC_LRG: Name: Adult Visceroid Health: HP: 500 + Armor: + Type: Heavy RevealsShroud: Range: 4c0 Armament: From eec7333f453553d96f158fd8f2b40b63636713a9 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 18 Jan 2017 20:56:00 +0100 Subject: [PATCH 9/9] Remove veterancy from Tiberian Fiend Matches original game as well. --- mods/ts/rules/civilian-infantry.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index d2a5b2fd6c..1e1f70d7d2 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -214,7 +214,6 @@ DOGGIE: Inherits@1: ^Infantry Inherits@2: ^RegularInfantryDeath Inherits@3: ^HealsOnTiberium - Inherits@EXPERIENCE: ^GainsExperience Tooltip: Name: Tiberian Fiend Health: