Skip to content

Commit

Permalink
Add missing husk and visual improvements
Browse files Browse the repository at this point in the history
- adjust husk color overlay
- engineer can capture husk
- balance changes to husk HP
  • Loading branch information
Porenutak authored and Mailaender committed May 4, 2024
1 parent d91d1f5 commit fa0254c
Show file tree
Hide file tree
Showing 103 changed files with 198 additions and 19 deletions.
Binary file added mods/d2k/bits/deviatorhusk/deviatordebris-0000.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatordebris-0001.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatordebris-0002.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatordebris-0003.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatorhusk-0000.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatorhusk-0001.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatorhusk-0002.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatorhusk-0003.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatorhusk-0004.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatorhusk-0005.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatorhusk-0006.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatorhusk-0007.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatorhusk-0008.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatorhusk-0009.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatorhusk-0010.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatorhusk-0011.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatorhusk-0012.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatorhusk-0013.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatorhusk-0014.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/d2k/bits/deviatorhusk/deviatorhusk-0015.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 27 additions & 4 deletions mods/d2k/rules/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
Inherits@1: ^SpriteActor
Interactable:
Health:
HP: 750
HP: 10000
Armor:
Type: light
HiddenUnderFog:
Expand All @@ -302,19 +302,42 @@
Targetable:
TargetTypes: Ground, Vehicle
RequiresForceFire: true
WithColoredOverlay@IDISABLE:
Color: 000000B4
WithColoredOverlay@husk:
Color: 00000060
Explodes:
Weapon: UnitExplodeMed
EmptyWeapon: UnitExplodeMed
CaptureManager:
Capturable:
Types: husk
WithIdleOverlay@Burns:
Image: fire
Sequence: 1
IsDecoration: True
RequiresCondition: decoration1 || decoration3
FloatingSpriteEmitter@SMOKE:
Image: smoke3
Lifetime: 10, 20
Speed: 7
Gravity: 50
SpawnFrequency: 2, 10
RandomFacing: true
RandomRate: 4
Offset: 0, 0, 200
TurnRate: 3
Duration: 1500
RequiresCondition: decoration2 || decoration3
ChangesHealth:
Step: -10
Step: -30
StartIfBelow: 101
Delay: 4
GrantRandomCondition:
Conditions: decoration1, decoration2, decoration3
TransformOnCapture:
ForceHealthPercentage: 20
InfiltrateForTransform:
Types: husk
ForceHealthPercentage: 20

^AircraftHusk:
Inherits: ^Husk
Expand Down
65 changes: 59 additions & 6 deletions mods/d2k/rules/husks.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
mcv.husk:
Inherits: ^VehicleHusk
Health:
HP: 1750
HP: 13000
Tooltip:
Name: actor-mcv-husk-name
TransformOnCapture:
IntoActor: mcv
InfiltrateForTransform:
IntoActor: mcv

harvester.husk:
Inherits: ^VehicleHusk
Health:
HP: 1500
Tooltip:
Name: actor-harvester-husk-name
TransformOnCapture:
IntoActor: harvester
InfiltrateForTransform:
IntoActor: harvester

siege_tank.husk:
Inherits: ^VehicleHusk
Expand All @@ -22,45 +26,88 @@ siege_tank.husk:
Anim: turret
TransformOnCapture:
IntoActor: siege_tank
InfiltrateForTransform:
IntoActor: siege_tank

missile_tank.husk:
Inherits: ^VehicleHusk
Tooltip:
Name: actor-missile-tank-husk-name
ThrowsParticle@turret:
Anim: turret
ThrowsParticle@debris01:
Anim: tankdebris01
ThrowsParticle@debris02:
Anim: tankdebris02
ThrowsParticle@debris03:
Anim: tankdebris03
ThrowsParticle@debris04:
Anim: tankdebris04
TransformOnCapture:
IntoActor: missile_tank
InfiltrateForTransform:
IntoActor: missile_tank

sonic_tank.husk:
Inherits: ^VehicleHusk
Husk:
Locomotor: vehicle
Health:
HP: 11000
Tooltip:
Name: actor-sonic-tank-husk-name
ThrowsParticle@turret:
Anim: turret
ThrowsParticle@debris01:
Anim: tankdebris01
ThrowsParticle@debris02:
Anim: tankdebris02
ThrowsParticle@debris03:
Anim: tankdebris03
ThrowsParticle@debris04:
Anim: tankdebris04
TransformOnCapture:
IntoActor: sonic_tank
InfiltrateForTransform:
IntoActor: sonic_tank

devastator.husk:
Inherits: ^VehicleHusk
Husk:
Locomotor: devastator
Health:
HP: 1250
HP: 12500
Tooltip:
Name: actor-devastator-husk-name
TransformOnCapture:
IntoActor: devastator
InfiltrateForTransform:
IntoActor: devastator

deviator.husk:
Inherits: ^VehicleHusk
Health:
HP: 11000
Tooltip:
Name: actor-deviator-husk-name
ThrowsParticle@turret:
Anim: turret
TurnSpeed: 150
ThrowsParticle@debris01:
Anim: tankdebris01
ThrowsParticle@debris02:
Anim: tankdebris02
ThrowsParticle@debris03:
Anim: tankdebris03
ThrowsParticle@debris04:
Anim: tankdebris04
TransformOnCapture:
IntoActor: deviator
InfiltrateForTransform:
IntoActor: deviator

^combat_tank.husk:
Inherits: ^VehicleHusk
Health:
HP: 1000
Tooltip:
Name: meta-combat-tank-husk-name
ThrowsParticle@turret:
Expand All @@ -70,13 +117,19 @@ combat_tank_a.husk:
Inherits: ^combat_tank.husk
TransformOnCapture:
IntoActor: combat_tank_a
InfiltrateForTransform:
IntoActor: combat_tank_a

combat_tank_h.husk:
Inherits: ^combat_tank.husk
TransformOnCapture:
IntoActor: combat_tank_h
InfiltrateForTransform:
IntoActor: combat_tank_h

combat_tank_o.husk:
Inherits: ^combat_tank.husk
TransformOnCapture:
IntoActor: combat_tank_o
InfiltrateForTransform:
IntoActor: combat_tank_o
6 changes: 6 additions & 0 deletions mods/d2k/rules/infantry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ engineer:
Captures:
CaptureTypes: building
PlayerExperience: 10
Captures@caturesHusk:
CaptureTypes: husk
PlayerExperience: 10
Infiltrates:
Types: husk
ValidRelationships: Ally
Encyclopedia:
Description: actor-engineer.encyclopedia
Order: 30
Expand Down
24 changes: 24 additions & 0 deletions mods/d2k/rules/vehicles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ harvester:
BaleUnloadDelay: 5
SearchFromProcRadius: 30
SearchFromHarvesterRadius: 15
EmptyCondition: harvester-empty
StoresResources:
Capacity: 28
Resources: Spice
Expand All @@ -99,6 +100,7 @@ harvester:
Actor: harvester.Husk
OwnerType: InternalName
EffectiveOwnerFromOwner: true
RequiresCondition: harvester-empty
WithHarvestOverlay:
WithDockingAnimation:
AttractsWorms:
Expand All @@ -114,6 +116,16 @@ harvester:
RequiresSelection: true
PipCount: 7
-SpeedMultiplier@HEAVYDAMAGE:
ThrowsShrapnel@ShrapnelNotEmpty:
Weapons: Debris, Debris2, Debris3, Debris4
Pieces: 3, 5
Range: 1c0, 6c0
RequiresCondition: !harvester-empty
ThrowsShrapnel@throwSpice:
Weapons: SpiceExplosion
Pieces: 1, 3
Range: 1c0, 5c0
RequiresCondition: !harvester-empty

trike:
Inherits: ^Vehicle
Expand Down Expand Up @@ -311,6 +323,14 @@ missile_tank:
EffectiveOwnerFromOwner: true
AttractsWorms:
Intensity: 600
ThrowsShrapnel@02:
Weapons: Debris3, Debris
Pieces: 0,2
Range: 2c0, 3c0
ThrowsShrapnel@03:
Weapons: DebrisMissile
Pieces: 0,2
Range: 4c0, 6c0

sonic_tank:
Inherits: ^Vehicle
Expand Down Expand Up @@ -603,6 +623,10 @@ deviator:
SpawnActorOnDeath:
OwnerType: InternalName
EffectiveOwnerFromOwner: true
ThrowsShrapnel:
Weapons: Debris, Debris2, Debris3
Pieces: 0, 2
Range: 2c0, 4c0

combat_tank_a:
Inherits: ^combat_tank
Expand Down
4 changes: 4 additions & 0 deletions mods/d2k/sequences/misc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -353,27 +353,31 @@ fire:
Length: 10
Offset: 4,-17
ZOffset: 1023
Tick: 100
BlendMode: Additive
2:
Filename: DATA.R16
Start: 3976
Length: 11
Offset: 0,-3
ZOffset: 1023
Tick: 100
BlendMode: Additive
3:
Filename: DATA.R16
Start: 4138
Length: 13
Offset: 0,-3
ZOffset: 1023
Tick: 100
BlendMode: Additive
4:
Filename: DATA.R16
Start: 3965
Length: 10
Offset: 0,-3
ZOffset: 1023
Tick: 100
BlendMode: Additive

smoke_m:
Expand Down
72 changes: 63 additions & 9 deletions mods/d2k/sequences/vehicles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,29 @@ missile_tank:

missile_tank.husk:
idle:
Filename: DATA.R16
Start: 1603
Facings: -32
FilenamePattern: missiletankhusk/missiletankhusk-{0:D4}.png
Count: 16
Facings: -16
ZOffset: -512
Remap: 54F94B
turret:
FilenamePattern: missiletankhusk/missiletankhuskturret-{0:D4}.png
Count: 16
Facings: -16
ZOffset: -512
Remap: 54F94B
tankdebris01:
Filename: missiletankhusk/missiletankhuskdebris-0000.png
ZOffset: -512
tankdebris02:
Filename: missiletankhusk/missiletankhuskdebris-0001.png
ZOffset: -512
tankdebris03:
Filename: missiletankhusk/missiletankhuskdebris-0002.png
ZOffset: -512
tankdebris04:
Filename: missiletankhusk/missiletankhuskdebris-0003.png
ZOffset: -512

sonic_tank:
idle:
Expand All @@ -148,11 +166,29 @@ sonic_tank:

sonic_tank.husk:
idle:
Filename: DATA.R16
Start: 1827
Facings: -32
FilenamePattern: sonictankhusk/sonictankhusk-{0:D4}.png
Count: 16
Facings: -16
ZOffset: -512
Remap: 54F94B
turret:
FilenamePattern: sonictankhusk/sonictankhuskturret-{0:D4}.png
Count: 4
Facings: -4
ZOffset: -512
Remap: 54F94B
tankdebris01:
Filename: sonictankhusk/sonictankhuskdebris-0000.png
ZOffset: -512
tankdebris02:
Filename: sonictankhusk/sonictankhuskdebris-0001.png
ZOffset: -512
tankdebris03:
Filename: sonictankhusk/sonictankhuskdebris-0002.png
ZOffset: -512
tankdebris04:
Filename: sonictankhusk/sonictankhuskdebris-0003.png
ZOffset: -512

combat_tank_a:
idle:
Expand Down Expand Up @@ -346,8 +382,26 @@ deviator:

deviator.husk:
idle:
Filename: DATA.R16
Start: 2389
Facings: -32
FilenamePattern: deviatorhusk/deviatorhusk-{0:D4}.png
Count: 16
Facings: -16
ZOffset: -512
Remap: 54F94B
turret:
FilenamePattern: deviatorhusk/deviatorhuskturret-{0:D4}.png
Count: 16
Facings: -4
ZOffset: -512
Remap: 54F94B
tankdebris01:
Filename: deviatorhusk/deviatordebris-0000.png
ZOffset: -512
tankdebris02:
Filename: deviatorhusk/deviatordebris-0001.png
ZOffset: -512
tankdebris03:
Filename: deviatorhusk/deviatordebris-0002.png
ZOffset: -512
tankdebris04:
Filename: deviatorhusk/deviatordebris-0003.png
ZOffset: -512

0 comments on commit fa0254c

Please sign in to comment.