From 64fb38bd3ebbbd90745cf5543069baffb6b1de5d Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 1 May 2015 14:27:48 +0200 Subject: [PATCH] Cleaned and fixed D2k infantry rules a little Moved Selectable Bounds to infantry default, fixed vertical offset. Removed some TakeCover duplication. Added engineer and medic/thumper prone sequences. Made sure that TakeCover/WithInfantryBody sequence modifiers are applied properly. Fixed d2k grenadier sequences offset to match other infantry. --- mods/d2k/rules/defaults.yaml | 1 + mods/d2k/rules/infantry.yaml | 40 +++++++------------------------- mods/d2k/sequences/infantry.yaml | 33 ++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 31 deletions(-) diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index 0e1f9362e5..2de2213aec 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -202,6 +202,7 @@ Rough: 70 SelectionDecorations: Selectable: + Bounds: 12,18,0,-6 TargetableUnit: TargetTypes: Ground RenderSprites: diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index e96d63e7be..3b8124d976 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -8,8 +8,6 @@ rifle: Tooltip: Name: Rifleman Description: General-purpose infantry\n Strong vs Infantry\n Weak vs Vehicles, Artillery - Selectable: - Bounds: 12,17,0,0 Health: HP: 50 Mobile: @@ -18,9 +16,7 @@ rifle: Weapon: LMG AttackFrontal: TakeCover: - DamageModifiers: - Prone50Percent: 50 - DamageTriggers: TriggerProne + WithInfantryBody: AttractsWorms: Intensity: 120 @@ -35,8 +31,6 @@ engineer: Tooltip: Name: Engineer Description: Infiltrates and captures enemy structures\n Strong vs Buildings\n Weak vs Everything - Selectable: - Bounds: 12,17,0,0 Health: HP: 25 Mobile: @@ -44,6 +38,8 @@ engineer: Passenger: PipType: Yellow EngineerRepair: + TakeCover: + WithInfantryBody: ExternalCaptures: Type: building Captures: @@ -65,8 +61,6 @@ bazooka: Tooltip: Name: Trooper Description: Anti-tank/Anti-aircraft infantry\n Strong vs Tanks, Aircraft\n Weak vs Infantry, Artillery - Selectable: - Bounds: 12,17,0,0 Health: HP: 45 Mobile: @@ -76,9 +70,7 @@ bazooka: LocalOffset: 0,0,555 AttackFrontal: TakeCover: - DamageModifiers: - Prone50Percent: 50 - DamageTriggers: TriggerProne + WithInfantryBody: AttractsWorms: Intensity: 180 @@ -93,8 +85,6 @@ medic: Tooltip: Name: Medic Description: Heals nearby infantry\n Strong vs Nothing\n Weak vs Everything - Selectable: - Bounds: 12,17,0,0 Health: HP: 60 Mobile: @@ -105,6 +95,7 @@ medic: AttackMedic: Cursor: ability OutsideRangeCursor: ability + TakeCover: WithInfantryBody: AttackSequence: heal Passenger: @@ -126,8 +117,6 @@ fremen: Queue: Infantry BuildPaletteOrder: 100 Prerequisites: ~barracks.atreides, palace, ~techlevel.high - Selectable: - Bounds: 12,17,0,0 Mobile: Speed: 53 Health: @@ -143,9 +132,7 @@ fremen: Weapon: Slung AttackFrontal: TakeCover: - DamageModifiers: - Prone50Percent: 50 - DamageTriggers: TriggerProne + WithInfantryBody: Cloak: InitialDelay: 250 CloakDelay: 250 @@ -166,8 +153,6 @@ grenadier: Tooltip: Name: Grenadier Description: Infantry armed with grenades. \n Strong vs Buildings, Infantry\n Weak vs Vehicles - Selectable: - Bounds: 12,17,0,0 Health: HP: 50 Mobile: @@ -178,9 +163,6 @@ grenadier: FireDelay: 15 AttackFrontal: TakeCover: - DamageModifiers: - Prone50Percent: 50 - DamageTriggers: TriggerProne WithInfantryBody: IdleSequences: idle Explodes: @@ -200,8 +182,6 @@ sardaukar: Tooltip: Name: Sardaukar Description: Elite asssault infantry\n Strong vs Infantry, Vehicles\n Weak vs Artillery - Selectable: - Bounds: 12,17,0,0 Health: HP: 100 Mobile: @@ -209,9 +189,7 @@ sardaukar: RevealsShroud: Range: 6c0 TakeCover: - DamageModifiers: - Prone50Percent: 50 - DamageTriggers: TriggerProne + WithInfantryBody: Armament@PRIMARY: Weapon: Vulcan Armament@SECONDARY: @@ -233,14 +211,14 @@ saboteur: Tooltip: Name: Saboteur Description: Sneaky infantry, armed with explosives\n Strong vs Buildings\n Weak vs Everything\n Special Ability: destroy buildings - Selectable: - Bounds: 12,17,0,0 Health: HP: 100 Mobile: Speed: 64 RevealsShroud: Range: 7c0 + TakeCover: + WithInfantryBody: C4Demolition: C4Delay: 45 -AutoTarget: diff --git a/mods/d2k/sequences/infantry.yaml b/mods/d2k/sequences/infantry.yaml index c22241e2cf..ae052c362f 100644 --- a/mods/d2k/sequences/infantry.yaml +++ b/mods/d2k/sequences/infantry.yaml @@ -130,6 +130,21 @@ engineer: Facings: -8 Transpose: true Tick: 120 + standup-0: DATA.R8 + Start: 1262 + Facings: -8 + Transpose: true + Tick: 120 + prone-stand: DATA.R8 + Start: 1270 + Facings: -8 + Transpose: true + prone-run: DATA.R8 + Start: 1278 + Length: 3 + Facings: -8 + Transpose: true + Tick: 120 die1: DATA.R8 Frames: 1342, 1349, 1356, 1363, 1370, 1377, 1384, 1391, 1398, 1399, 1400, 1401 Length: 12 @@ -166,6 +181,21 @@ medic: # actually thumper Facings: -8 Transpose: true Tick: 120 + standup-0: DATA.R8 + Start: 1462 + Facings: -8 + Transpose: true + Tick: 120 + prone-stand: DATA.R8 + Start: 1470 + Facings: -8 + Transpose: true + prone-run: DATA.R8 + Start: 1478 + Length: 3 + Facings: -8 + Transpose: true + Tick: 120 heal: DATA.R8 Start: 1458 Length: 5 @@ -385,6 +415,8 @@ sardaukar: Offset: -30,-24 grenadier: # 2502 - 2749 in 1.06 DATA.R8 + Defaults: + Offset: 1,-4 stand: grenadier.shp Facings: 8 idle: grenadier.shp @@ -432,6 +464,7 @@ grenadier: # 2502 - 2749 in 1.06 DATA.R8 Facings: 8 Tick: 120 icon: grenadiericon.shp # 4281 in 1.06 DATA.R8 + Offset: 0,0 sandworm: mouth: DATA.R8