Add ^Submarine and make submarines inherit it

This commit is contained in:
Gustas
2023-03-25 13:57:27 +02:00
committed by Smittytron
parent e28f45f785
commit f90dba2c6b
2 changed files with 24 additions and 38 deletions

View File

@@ -544,6 +544,28 @@
WithFacingSpriteBody: WithFacingSpriteBody:
HitShape: HitShape:
^Submarine:
Inherits: ^Ship
Targetable:
TargetTypes: WaterActor, Ship, Submarine, Repair
RequiresCondition: !underwater
Targetable@UNDERWATER:
TargetTypes: Underwater, Submarine
RequiresCondition: underwater
Cloak:
DetectionTypes: Underwater
InitialDelay: 0
CloakDelay: 50
CloakSound: subshow1.aud
UncloakSound: subshow1.aud
CloakedCondition: underwater
Palette: submerged
PauseOnCondition: cloak-force-disabled
GrantConditionOnDamageState@UNCLOAK:
Condition: cloak-force-disabled
ValidDamageStates: Critical
-MustBeDestroyed:
^NeutralPlane: ^NeutralPlane:
Inherits@1: ^ExistsInWorld Inherits@1: ^ExistsInWorld
Inherits@4: ^SpriteActor Inherits@4: ^SpriteActor

View File

@@ -1,5 +1,5 @@
SS: SS:
Inherits: ^Ship Inherits: ^Submarine
Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Ship Queue: Ship
@@ -26,24 +26,6 @@ SS:
RevealGeneratedShroud: False RevealGeneratedShroud: False
RevealsShroud@GAPGEN: RevealsShroud@GAPGEN:
Range: 5c0 Range: 5c0
Targetable:
TargetTypes: WaterActor, Ship, Submarine, Repair
RequiresCondition: !underwater
Targetable@UNDERWATER:
TargetTypes: Underwater, Submarine
RequiresCondition: underwater
Cloak:
DetectionTypes: Underwater
InitialDelay: 0
CloakDelay: 50
CloakSound: subshow1.aud
UncloakSound: subshow1.aud
CloakedCondition: underwater
Palette: submerged
PauseOnCondition: cloak-force-disabled
GrantConditionOnDamageState@UNCLOAK:
Condition: cloak-force-disabled
ValidDamageStates: Critical
Armament: Armament:
Weapon: TorpTube Weapon: TorpTube
LocalOffset: 0,-171,0, 0,171,0 LocalOffset: 0,-171,0, 0,171,0
@@ -62,12 +44,11 @@ SS:
Explodes: Explodes:
Weapon: UnitExplodeSubmarine Weapon: UnitExplodeSubmarine
EmptyWeapon: UnitExplodeSubmarine EmptyWeapon: UnitExplodeSubmarine
-MustBeDestroyed:
Selectable: Selectable:
DecorationBounds: 1621, 1621 DecorationBounds: 1621, 1621
MSUB: MSUB:
Inherits: ^Ship Inherits: ^Submarine
Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
Buildable: Buildable:
Queue: Ship Queue: Ship
@@ -94,24 +75,8 @@ MSUB:
RevealGeneratedShroud: False RevealGeneratedShroud: False
RevealsShroud@GAPGEN: RevealsShroud@GAPGEN:
Range: 5c0 Range: 5c0
Targetable:
TargetTypes: WaterActor, Ship, Submarine, Repair
RequiresCondition: !underwater
Targetable@UNDERWATER:
TargetTypes: Underwater, Submarine
RequiresCondition: underwater
Cloak: Cloak:
DetectionTypes: Underwater
InitialDelay: 0
CloakDelay: 100 CloakDelay: 100
CloakSound: subshow1.aud
UncloakSound: subshow1.aud
CloakedCondition: underwater
Palette: submerged
PauseOnCondition: cloak-force-disabled
GrantConditionOnDamageState@UNCLOAK:
Condition: cloak-force-disabled
ValidDamageStates: Critical
Armament@PRIMARY: Armament@PRIMARY:
Weapon: SubMissile Weapon: SubMissile
LocalOffset: 0,-171,0, 0,171,0 LocalOffset: 0,-171,0, 0,171,0
@@ -134,7 +99,6 @@ MSUB:
Explodes: Explodes:
Weapon: UnitExplodeSubmarine Weapon: UnitExplodeSubmarine
EmptyWeapon: UnitExplodeSubmarine EmptyWeapon: UnitExplodeSubmarine
-MustBeDestroyed:
Selectable: Selectable:
DecorationBounds: 1877, 1877 DecorationBounds: 1877, 1877