Skip to content

Commit fa0254c

Browse files
PorenutakMailaender
authored andcommitted
Add missing husk and visual improvements
- adjust husk color overlay - engineer can capture husk - balance changes to husk HP
1 parent d91d1f5 commit fa0254c

File tree

103 files changed

+198
-19
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+198
-19
lines changed
111 Bytes
422 Bytes
130 Bytes
112 Bytes
5.18 KB
1.42 KB
1.43 KB
1.41 KB
1.41 KB
1.44 KB
1.45 KB
1.43 KB
1.44 KB
1.45 KB
1.42 KB
1.42 KB
1.42 KB
1.41 KB

mods/d2k/rules/defaults.yaml

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278
Inherits@1: ^SpriteActor
279279
Interactable:
280280
Health:
281-
HP: 750
281+
HP: 10000
282282
Armor:
283283
Type: light
284284
HiddenUnderFog:
@@ -302,19 +302,42 @@
302302
Targetable:
303303
TargetTypes: Ground, Vehicle
304304
RequiresForceFire: true
305-
WithColoredOverlay@IDISABLE:
306-
Color: 000000B4
305+
WithColoredOverlay@husk:
306+
Color: 00000060
307307
Explodes:
308308
Weapon: UnitExplodeMed
309309
EmptyWeapon: UnitExplodeMed
310+
CaptureManager:
311+
Capturable:
312+
Types: husk
310313
WithIdleOverlay@Burns:
311314
Image: fire
312315
Sequence: 1
313316
IsDecoration: True
317+
RequiresCondition: decoration1 || decoration3
318+
FloatingSpriteEmitter@SMOKE:
319+
Image: smoke3
320+
Lifetime: 10, 20
321+
Speed: 7
322+
Gravity: 50
323+
SpawnFrequency: 2, 10
324+
RandomFacing: true
325+
RandomRate: 4
326+
Offset: 0, 0, 200
327+
TurnRate: 3
328+
Duration: 1500
329+
RequiresCondition: decoration2 || decoration3
314330
ChangesHealth:
315-
Step: -10
331+
Step: -30
316332
StartIfBelow: 101
317333
Delay: 4
334+
GrantRandomCondition:
335+
Conditions: decoration1, decoration2, decoration3
336+
TransformOnCapture:
337+
ForceHealthPercentage: 20
338+
InfiltrateForTransform:
339+
Types: husk
340+
ForceHealthPercentage: 20
318341

319342
^AircraftHusk:
320343
Inherits: ^Husk

mods/d2k/rules/husks.yaml

Lines changed: 59 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
mcv.husk:
22
Inherits: ^VehicleHusk
33
Health:
4-
HP: 1750
4+
HP: 13000
55
Tooltip:
66
Name: actor-mcv-husk-name
7+
TransformOnCapture:
8+
IntoActor: mcv
9+
InfiltrateForTransform:
10+
IntoActor: mcv
711

812
harvester.husk:
913
Inherits: ^VehicleHusk
10-
Health:
11-
HP: 1500
1214
Tooltip:
1315
Name: actor-harvester-husk-name
1416
TransformOnCapture:
1517
IntoActor: harvester
18+
InfiltrateForTransform:
19+
IntoActor: harvester
1620

1721
siege_tank.husk:
1822
Inherits: ^VehicleHusk
@@ -22,45 +26,88 @@ siege_tank.husk:
2226
Anim: turret
2327
TransformOnCapture:
2428
IntoActor: siege_tank
29+
InfiltrateForTransform:
30+
IntoActor: siege_tank
2531

2632
missile_tank.husk:
2733
Inherits: ^VehicleHusk
2834
Tooltip:
2935
Name: actor-missile-tank-husk-name
36+
ThrowsParticle@turret:
37+
Anim: turret
38+
ThrowsParticle@debris01:
39+
Anim: tankdebris01
40+
ThrowsParticle@debris02:
41+
Anim: tankdebris02
42+
ThrowsParticle@debris03:
43+
Anim: tankdebris03
44+
ThrowsParticle@debris04:
45+
Anim: tankdebris04
3046
TransformOnCapture:
3147
IntoActor: missile_tank
48+
InfiltrateForTransform:
49+
IntoActor: missile_tank
3250

3351
sonic_tank.husk:
3452
Inherits: ^VehicleHusk
3553
Husk:
3654
Locomotor: vehicle
55+
Health:
56+
HP: 11000
3757
Tooltip:
3858
Name: actor-sonic-tank-husk-name
59+
ThrowsParticle@turret:
60+
Anim: turret
61+
ThrowsParticle@debris01:
62+
Anim: tankdebris01
63+
ThrowsParticle@debris02:
64+
Anim: tankdebris02
65+
ThrowsParticle@debris03:
66+
Anim: tankdebris03
67+
ThrowsParticle@debris04:
68+
Anim: tankdebris04
3969
TransformOnCapture:
4070
IntoActor: sonic_tank
71+
InfiltrateForTransform:
72+
IntoActor: sonic_tank
4173

4274
devastator.husk:
4375
Inherits: ^VehicleHusk
4476
Husk:
4577
Locomotor: devastator
4678
Health:
47-
HP: 1250
79+
HP: 12500
4880
Tooltip:
4981
Name: actor-devastator-husk-name
5082
TransformOnCapture:
5183
IntoActor: devastator
84+
InfiltrateForTransform:
85+
IntoActor: devastator
5286

5387
deviator.husk:
5488
Inherits: ^VehicleHusk
89+
Health:
90+
HP: 11000
5591
Tooltip:
5692
Name: actor-deviator-husk-name
93+
ThrowsParticle@turret:
94+
Anim: turret
95+
TurnSpeed: 150
96+
ThrowsParticle@debris01:
97+
Anim: tankdebris01
98+
ThrowsParticle@debris02:
99+
Anim: tankdebris02
100+
ThrowsParticle@debris03:
101+
Anim: tankdebris03
102+
ThrowsParticle@debris04:
103+
Anim: tankdebris04
57104
TransformOnCapture:
58105
IntoActor: deviator
106+
InfiltrateForTransform:
107+
IntoActor: deviator
59108

60109
^combat_tank.husk:
61110
Inherits: ^VehicleHusk
62-
Health:
63-
HP: 1000
64111
Tooltip:
65112
Name: meta-combat-tank-husk-name
66113
ThrowsParticle@turret:
@@ -70,13 +117,19 @@ combat_tank_a.husk:
70117
Inherits: ^combat_tank.husk
71118
TransformOnCapture:
72119
IntoActor: combat_tank_a
120+
InfiltrateForTransform:
121+
IntoActor: combat_tank_a
73122

74123
combat_tank_h.husk:
75124
Inherits: ^combat_tank.husk
76125
TransformOnCapture:
77126
IntoActor: combat_tank_h
127+
InfiltrateForTransform:
128+
IntoActor: combat_tank_h
78129

79130
combat_tank_o.husk:
80131
Inherits: ^combat_tank.husk
81132
TransformOnCapture:
82133
IntoActor: combat_tank_o
134+
InfiltrateForTransform:
135+
IntoActor: combat_tank_o

mods/d2k/rules/infantry.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ engineer:
5252
Captures:
5353
CaptureTypes: building
5454
PlayerExperience: 10
55+
Captures@caturesHusk:
56+
CaptureTypes: husk
57+
PlayerExperience: 10
58+
Infiltrates:
59+
Types: husk
60+
ValidRelationships: Ally
5561
Encyclopedia:
5662
Description: actor-engineer.encyclopedia
5763
Order: 30

mods/d2k/rules/vehicles.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ harvester:
7575
BaleUnloadDelay: 5
7676
SearchFromProcRadius: 30
7777
SearchFromHarvesterRadius: 15
78+
EmptyCondition: harvester-empty
7879
StoresResources:
7980
Capacity: 28
8081
Resources: Spice
@@ -99,6 +100,7 @@ harvester:
99100
Actor: harvester.Husk
100101
OwnerType: InternalName
101102
EffectiveOwnerFromOwner: true
103+
RequiresCondition: harvester-empty
102104
WithHarvestOverlay:
103105
WithDockingAnimation:
104106
AttractsWorms:
@@ -114,6 +116,16 @@ harvester:
114116
RequiresSelection: true
115117
PipCount: 7
116118
-SpeedMultiplier@HEAVYDAMAGE:
119+
ThrowsShrapnel@ShrapnelNotEmpty:
120+
Weapons: Debris, Debris2, Debris3, Debris4
121+
Pieces: 3, 5
122+
Range: 1c0, 6c0
123+
RequiresCondition: !harvester-empty
124+
ThrowsShrapnel@throwSpice:
125+
Weapons: SpiceExplosion
126+
Pieces: 1, 3
127+
Range: 1c0, 5c0
128+
RequiresCondition: !harvester-empty
117129

118130
trike:
119131
Inherits: ^Vehicle
@@ -311,6 +323,14 @@ missile_tank:
311323
EffectiveOwnerFromOwner: true
312324
AttractsWorms:
313325
Intensity: 600
326+
ThrowsShrapnel@02:
327+
Weapons: Debris3, Debris
328+
Pieces: 0,2
329+
Range: 2c0, 3c0
330+
ThrowsShrapnel@03:
331+
Weapons: DebrisMissile
332+
Pieces: 0,2
333+
Range: 4c0, 6c0
314334

315335
sonic_tank:
316336
Inherits: ^Vehicle
@@ -603,6 +623,10 @@ deviator:
603623
SpawnActorOnDeath:
604624
OwnerType: InternalName
605625
EffectiveOwnerFromOwner: true
626+
ThrowsShrapnel:
627+
Weapons: Debris, Debris2, Debris3
628+
Pieces: 0, 2
629+
Range: 2c0, 4c0
606630

607631
combat_tank_a:
608632
Inherits: ^combat_tank

mods/d2k/sequences/misc.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,27 +353,31 @@ fire:
353353
Length: 10
354354
Offset: 4,-17
355355
ZOffset: 1023
356+
Tick: 100
356357
BlendMode: Additive
357358
2:
358359
Filename: DATA.R16
359360
Start: 3976
360361
Length: 11
361362
Offset: 0,-3
362363
ZOffset: 1023
364+
Tick: 100
363365
BlendMode: Additive
364366
3:
365367
Filename: DATA.R16
366368
Start: 4138
367369
Length: 13
368370
Offset: 0,-3
369371
ZOffset: 1023
372+
Tick: 100
370373
BlendMode: Additive
371374
4:
372375
Filename: DATA.R16
373376
Start: 3965
374377
Length: 10
375378
Offset: 0,-3
376379
ZOffset: 1023
380+
Tick: 100
377381
BlendMode: Additive
378382

379383
smoke_m:

mods/d2k/sequences/vehicles.yaml

Lines changed: 63 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,29 @@ missile_tank:
129129

130130
missile_tank.husk:
131131
idle:
132-
Filename: DATA.R16
133-
Start: 1603
134-
Facings: -32
132+
FilenamePattern: missiletankhusk/missiletankhusk-{0:D4}.png
133+
Count: 16
134+
Facings: -16
135+
ZOffset: -512
136+
Remap: 54F94B
137+
turret:
138+
FilenamePattern: missiletankhusk/missiletankhuskturret-{0:D4}.png
139+
Count: 16
140+
Facings: -16
135141
ZOffset: -512
136142
Remap: 54F94B
143+
tankdebris01:
144+
Filename: missiletankhusk/missiletankhuskdebris-0000.png
145+
ZOffset: -512
146+
tankdebris02:
147+
Filename: missiletankhusk/missiletankhuskdebris-0001.png
148+
ZOffset: -512
149+
tankdebris03:
150+
Filename: missiletankhusk/missiletankhuskdebris-0002.png
151+
ZOffset: -512
152+
tankdebris04:
153+
Filename: missiletankhusk/missiletankhuskdebris-0003.png
154+
ZOffset: -512
137155

138156
sonic_tank:
139157
idle:
@@ -148,11 +166,29 @@ sonic_tank:
148166

149167
sonic_tank.husk:
150168
idle:
151-
Filename: DATA.R16
152-
Start: 1827
153-
Facings: -32
169+
FilenamePattern: sonictankhusk/sonictankhusk-{0:D4}.png
170+
Count: 16
171+
Facings: -16
172+
ZOffset: -512
173+
Remap: 54F94B
174+
turret:
175+
FilenamePattern: sonictankhusk/sonictankhuskturret-{0:D4}.png
176+
Count: 4
177+
Facings: -4
154178
ZOffset: -512
155179
Remap: 54F94B
180+
tankdebris01:
181+
Filename: sonictankhusk/sonictankhuskdebris-0000.png
182+
ZOffset: -512
183+
tankdebris02:
184+
Filename: sonictankhusk/sonictankhuskdebris-0001.png
185+
ZOffset: -512
186+
tankdebris03:
187+
Filename: sonictankhusk/sonictankhuskdebris-0002.png
188+
ZOffset: -512
189+
tankdebris04:
190+
Filename: sonictankhusk/sonictankhuskdebris-0003.png
191+
ZOffset: -512
156192

157193
combat_tank_a:
158194
idle:
@@ -346,8 +382,26 @@ deviator:
346382

347383
deviator.husk:
348384
idle:
349-
Filename: DATA.R16
350-
Start: 2389
351-
Facings: -32
385+
FilenamePattern: deviatorhusk/deviatorhusk-{0:D4}.png
386+
Count: 16
387+
Facings: -16
352388
ZOffset: -512
353389
Remap: 54F94B
390+
turret:
391+
FilenamePattern: deviatorhusk/deviatorhuskturret-{0:D4}.png
392+
Count: 16
393+
Facings: -4
394+
ZOffset: -512
395+
Remap: 54F94B
396+
tankdebris01:
397+
Filename: deviatorhusk/deviatordebris-0000.png
398+
ZOffset: -512
399+
tankdebris02:
400+
Filename: deviatorhusk/deviatordebris-0001.png
401+
ZOffset: -512
402+
tankdebris03:
403+
Filename: deviatorhusk/deviatordebris-0002.png
404+
ZOffset: -512
405+
tankdebris04:
406+
Filename: deviatorhusk/deviatordebris-0003.png
407+
ZOffset: -512

0 commit comments

Comments
 (0)