Make TS use Locomotor

This commit is contained in:
reaperrr
2018-03-09 18:08:52 +01:00
committed by abcdefg30
parent 1ee815fe3f
commit 079570190c
9 changed files with 207 additions and 131 deletions

View File

@@ -10,7 +10,6 @@
Mobile: Mobile:
Speed: 56 Speed: 56
TurnSpeed: 5 TurnSpeed: 5
Crushes: wall, crate, infantry
Health: Health:
HP: 60000 HP: 60000
Armor: Armor:

View File

@@ -69,7 +69,7 @@ VISC_SML:
RenderSprites: RenderSprites:
Image: vissml Image: vissml
Mobile: Mobile:
Crushes: visceroid-fusing Locomotor: smallvisc
Crushable: Crushable:
CrushClasses: visceroid-fusing CrushClasses: visceroid-fusing
WarnProbability: 0 WarnProbability: 0
@@ -103,8 +103,6 @@ VISC_LRG:
MaxMoveDelay: 50 MaxMoveDelay: 50
WithAttackAnimation: WithAttackAnimation:
AttackSequence: attack AttackSequence: attack
Mobile:
Crushes: crate, infantry
RenderSprites: RenderSprites:
Image: vislrg Image: vislrg
@@ -120,13 +118,7 @@ JFISH:
Range: 5c0 Range: 5c0
Mobile: Mobile:
Speed: 72 Speed: 72
Crushes: crate Locomotor: hover
TerrainSpeeds:
Clear: 100
Rail: 100
DirtRoad: 100
Rough: 100
Water: 100
Armament: Armament:
Weapon: Tentacle Weapon: Tentacle
FireDelay: 10 FireDelay: 10

View File

@@ -512,21 +512,7 @@
Mobile: Mobile:
Voice: Move Voice: Move
Speed: 71 Speed: 71
Crushes: crate Locomotor: foot
SharesCell: true
TerrainSpeeds:
Clear: 90
Road: 100
Bridge: 100
Rail: 90
DirtRoad: 100
Rough: 80
Tiberium: 90
PathingCost: 90
BlueTiberium: 90
PathingCost: 90
Veins: 50
TunnelCondition: inside-tunnel
WithTextControlGroupDecoration: WithTextControlGroupDecoration:
SelectionDecorations: SelectionDecorations:
Palette: pips Palette: pips
@@ -580,6 +566,8 @@
Radius: 128 Radius: 128
EditorTilesetFilter: EditorTilesetFilter:
Categories: Infantry Categories: Infantry
GrantConditionOnTunnelLayer:
Condition: inside-tunnel
^RegularInfantryDeath: ^RegularInfantryDeath:
WithDeathAnimation@normal: WithDeathAnimation@normal:
@@ -697,22 +685,10 @@
Huntable: Huntable:
DrawLineToTarget: DrawLineToTarget:
Mobile: Mobile:
Crushes: crate
TerrainSpeeds:
Clear: 70
Road: 100
Bridge: 100
Rail: 50
DirtRoad: 90
Rough: 40
Tiberium: 50
BlueTiberium: 50
Veins: 50
PathingCost: 90
TurnSpeed: 5 TurnSpeed: 5
Voice: Move Voice: Move
RequiresCondition: !empdisable RequiresCondition: !empdisable
TunnelCondition: inside-tunnel Locomotor: wheeled
Selectable: Selectable:
Bounds: 40,24 Bounds: 40,24
WithTextControlGroupDecoration: WithTextControlGroupDecoration:
@@ -771,21 +747,13 @@
HitShape: HitShape:
EditorTilesetFilter: EditorTilesetFilter:
Categories: Vehicle Categories: Vehicle
GrantConditionOnTunnelLayer:
Condition: inside-tunnel
^Tank: ^Tank:
Inherits: ^Vehicle Inherits: ^Vehicle
Mobile: Mobile:
Crushes: wall, crate, infantry Locomotor: tracked
TerrainSpeeds:
Clear: 70
Road: 100
Bridge: 100
Rail: 100
DirtRoad: 90
Rough: 60
Tiberium: 70
BlueTiberium: 70
Veins: 70
^VoxelActor: ^VoxelActor:
BodyOrientation: BodyOrientation:
@@ -801,7 +769,7 @@
^CivilianVoxelCrusher: ^CivilianVoxelCrusher:
Inherits: ^CivilianVoxelVehicle Inherits: ^CivilianVoxelVehicle
Mobile: Mobile:
Crushes: wall, crate, infantry Locomotor: heavywheeled
^Aircraft: ^Aircraft:
Inherits@2: ^ExistsInWorld Inherits@2: ^ExistsInWorld
@@ -901,18 +869,7 @@
Mobile: Mobile:
Speed: 113 Speed: 113
TurnSpeed: 16 TurnSpeed: 16
SharesCell: no Locomotor: visceroid
TerrainSpeeds:
Clear: 90
Road: 100
Bridge: 100
Rail: 80
DirtRoad: 90
Rough: 70
Tiberium: 100
BlueTiberium: 100
Veins: 100
TunnelCondition: inside-tunnel
WithTextControlGroupDecoration: WithTextControlGroupDecoration:
SelectionDecorations: SelectionDecorations:
Palette: pips Palette: pips
@@ -933,6 +890,8 @@
VerticalTopOffset: 512 VerticalTopOffset: 512
EditorTilesetFilter: EditorTilesetFilter:
Categories: Critter Categories: Critter
GrantConditionOnTunnelLayer:
Condition: inside-tunnel
^BlossomTree: ^BlossomTree:
Inherits@1: ^SpriteActor Inherits@1: ^SpriteActor
@@ -1046,14 +1005,11 @@
WithVoxelBody: WithVoxelBody:
DrawLineToTarget: DrawLineToTarget:
Mobile: Mobile:
TerrainSpeeds:
Rail: 100
Crushes: wall, crate, infantry
TurnSpeed: 5 TurnSpeed: 5
Voice: Move Voice: Move
Speed: 113 Speed: 113
RequiresCondition: !empdisable RequiresCondition: !empdisable
TunnelCondition: inside-tunnel Locomotor: train
Cargo: Cargo:
Types: Infantry Types: Infantry
UnloadVoice: Unload UnloadVoice: Unload
@@ -1091,6 +1047,8 @@
HitShape: HitShape:
EditorTilesetFilter: EditorTilesetFilter:
Categories: Railway Categories: Railway
GrantConditionOnTunnelLayer:
Condition: inside-tunnel
^TerrainOverlay: ^TerrainOverlay:
AlwaysVisible: AlwaysVisible:

View File

@@ -87,11 +87,7 @@ JUMPJET:
VoiceSet: JumpJet VoiceSet: JumpJet
Mobile: Mobile:
Speed: 71 Speed: 71
Jumpjet: True Locomotor: jumpjet
JumpjetTransitionCost: 100
JumpjetCondition: airborne
TerrainSpeeds:
Jumpjet: 110
Health: Health:
HP: 12000 HP: 12000
Armor: Armor:
@@ -152,6 +148,8 @@ JUMPJET:
RequiresCondition: !airborne RequiresCondition: !airborne
WithShadow@airborne: WithShadow@airborne:
RequiresCondition: airborne RequiresCondition: airborne
GrantConditionOnJumpjetLayer:
Condition: airborne
JUMPJET.Husk: JUMPJET.Husk:
RenderSprites: RenderSprites:

View File

@@ -13,9 +13,8 @@ APC:
Mobile: Mobile:
TurnSpeed: 5 TurnSpeed: 5
Speed: 113 Speed: 113
TerrainSpeeds:
Water: 80
RequiresCondition: !empdisable && !loading RequiresCondition: !empdisable && !loading
Locomotor: amphibious
Health: Health:
HP: 20000 HP: 20000
Armor: Armor:
@@ -63,17 +62,8 @@ HVR:
Description: Hovering vehicle armed with\nlong range missiles.\n Strong vs Vehicles, Aircraft\n Weak vs Infantry Description: Hovering vehicle armed with\nlong range missiles.\n Strong vs Vehicles, Aircraft\n Weak vs Infantry
Mobile: Mobile:
Speed: 99 Speed: 99
TerrainSpeeds: Locomotor: hover
Clear: 100 RequiresCondition: !empdisable
Road: 100
Bridge: 100
Rail: 100
DirtRoad: 100
Rough: 100
Water: 100
Tiberium: 100
BlueTiberium: 100
Veins: 100
Health: Health:
HP: 23000 HP: 23000
Armor: Armor:
@@ -164,7 +154,6 @@ MMCH:
Mobile: Mobile:
TurnSpeed: 5 TurnSpeed: 5
Speed: 56 Speed: 56
Crushes: wall, crate, infantry
Health: Health:
HP: 40000 HP: 40000
Armor: Armor:
@@ -225,7 +214,6 @@ HMEC:
Mobile: Mobile:
TurnSpeed: 3 TurnSpeed: 3
Speed: 42 Speed: 42
Crushes: wall, crate, infantry
Health: Health:
HP: 80000 HP: 80000
SelfHealing: SelfHealing:
@@ -272,7 +260,6 @@ SONIC:
Mobile: Mobile:
TurnSpeed: 4 TurnSpeed: 4
Speed: 56 Speed: 56
Crushes: wall, crate, infantry
Health: Health:
HP: 50000 HP: 50000
Armor: Armor:

View File

@@ -98,7 +98,6 @@ TTNK:
Mobile: Mobile:
TurnSpeed: 5 TurnSpeed: 5
Speed: 85 Speed: 85
Crushes: wall, crate, infantry
RequiresCondition: !empdisable && undeployed RequiresCondition: !empdisable && undeployed
Health: Health:
HP: 35000 HP: 35000
@@ -366,15 +365,7 @@ SAPC:
TurnSpeed: 5 TurnSpeed: 5
Speed: 71 Speed: 71
RequiresCondition: !empdisable && !loading RequiresCondition: !empdisable && !loading
Subterranean: true Locomotor: subterranean
SubterraneanCondition: submerged
SubterraneanTransitionTerrainTypes: Clear, Rough
SubterraneanTransitionCost: 120
SubterraneanTransitionSound: subdril1.aud
SubterraneanTransitionImage: dig
SubterraneanTransitionSequence: idle
TerrainSpeeds:
Subterranean: 120
Health: Health:
HP: 17500 HP: 17500
Armor: Armor:
@@ -394,6 +385,11 @@ SAPC:
RequiresCondition: !submerged RequiresCondition: !submerged
Targetable: Targetable:
RequiresCondition: !inside-tunnel && !submerged RequiresCondition: !inside-tunnel && !submerged
GrantConditionOnSubterraneanLayer:
Condition: submerged
SubterraneanTransitionImage: dig
SubterraneanTransitionSequence: idle
SubterraneanTransitionSound: subdril1.aud
SUBTANK: SUBTANK:
Inherits: ^Tank Inherits: ^Tank
@@ -412,16 +408,7 @@ SUBTANK:
Mobile: Mobile:
TurnSpeed: 6 TurnSpeed: 6
Speed: 71 Speed: 71
Crushes: wall, crate, infantry Locomotor: subterranean
Subterranean: true
SubterraneanCondition: submerged
SubterraneanTransitionTerrainTypes: Clear, Rough
SubterraneanTransitionCost: 120
SubterraneanTransitionSound: subdril1.aud
SubterraneanTransitionImage: dig
SubterraneanTransitionSequence: idle
TerrainSpeeds:
Subterranean: 120
Health: Health:
HP: 30000 HP: 30000
Armor: Armor:
@@ -439,6 +426,11 @@ SUBTANK:
RequiresCondition: !submerged RequiresCondition: !submerged
Targetable: Targetable:
RequiresCondition: !inside-tunnel && !submerged RequiresCondition: !inside-tunnel && !submerged
GrantConditionOnSubterraneanLayer:
Condition: submerged
SubterraneanTransitionImage: dig
SubterraneanTransitionSequence: idle
SubterraneanTransitionSound: subdril1.aud
STNK: STNK:
Inherits: ^Tank Inherits: ^Tank
@@ -457,7 +449,6 @@ STNK:
Mobile: Mobile:
TurnSpeed: 5 TurnSpeed: 5
Speed: 85 Speed: 85
Crushes: wall, crate, infantry
Health: Health:
HP: 18000 HP: 18000
Armor: Armor:

View File

@@ -72,18 +72,8 @@ FLAMEGUY:
Inherits@1: ^ExistsInWorld Inherits@1: ^ExistsInWorld
Inherits@2: ^SpriteActor Inherits@2: ^SpriteActor
Mobile: Mobile:
Speed: 71 Speed: 36
SharesCell: true Locomotor: flameguy
TerrainSpeeds:
Clear: 45
Road: 50
Bridge: 50
Rail: 45
DirtRoad: 50
Rough: 40
Tiberium: 45
BlueTiberium: 45
Veins: 25
HiddenUnderFog: HiddenUnderFog:
WithInfantryBody: WithInfantryBody:
IdleSequences: run IdleSequences: run

View File

@@ -69,16 +69,6 @@ HARV:
DeliverVoice: Move DeliverVoice: Move
Mobile: Mobile:
Speed: 71 Speed: 71
Crushes: wall, crate
TerrainSpeeds:
Clear: 90
Rough: 70
Road: 100
Bridge: 100
Beach: 70
Tiberium: 80
BlueTiberium: 80
Veins: 80
Health: Health:
HP: 100000 HP: 100000
SelfHealing: SelfHealing:

View File

@@ -11,6 +11,177 @@
UseExtendedIndex: true UseExtendedIndex: true
ShroudPalette: shroud ShroudPalette: shroud
FogPalette: shroud FogPalette: shroud
Locomotor@FOOT:
Name: foot
Crushes: crate
SharesCell: true
TerrainSpeeds:
Clear: 90
Road: 100
Bridge: 100
Rail: 90
DirtRoad: 100
Rough: 80
Tiberium: 90
BlueTiberium: 90
Veins: 50
Locomotor@FLAMEGUY:
Name: flameguy
SharesCell: true
TerrainSpeeds:
Clear: 90
Road: 100
Bridge: 100
Rail: 90
DirtRoad: 100
Rough: 80
Tiberium: 90
BlueTiberium: 90
Veins: 50
JumpjetLocomotor@JUMPJET:
Name: jumpjet
Crushes: crate
SharesCell: true
JumpjetTransitionCost: 100
TerrainSpeeds:
Clear: 90
Road: 100
Bridge: 100
Rail: 90
DirtRoad: 100
Rough: 80
Tiberium: 90
BlueTiberium: 90
Veins: 50
Jumpjet: 110
Locomotor@WHEELED:
Name: wheeled
Crushes: crate
TerrainSpeeds:
Clear: 70
Road: 100
Bridge: 100
Rail: 50
DirtRoad: 90
Rough: 40
Tiberium: 50
BlueTiberium: 50
Veins: 50
PathingCost: 90
Locomotor@HEAVYWHEELED:
Name: heavywheeled
Crushes: wall, crate, infantry
TerrainSpeeds:
Clear: 70
Road: 100
Bridge: 100
Rail: 50
DirtRoad: 90
Rough: 40
Tiberium: 50
BlueTiberium: 50
Veins: 50
PathingCost: 90
Locomotor@TRACKED:
Name: tracked
Crushes: wall, crate, infantry
TerrainSpeeds:
Clear: 70
Road: 100
Bridge: 100
Rail: 100
DirtRoad: 90
Rough: 60
Tiberium: 70
BlueTiberium: 70
Veins: 70
Locomotor@AMPHIBIOUS:
Name: amphibious
Crushes: wall, crate, infantry
TerrainSpeeds:
Clear: 70
Road: 100
Bridge: 100
Rail: 100
DirtRoad: 90
Rough: 60
Tiberium: 70
BlueTiberium: 70
Veins: 70
Water: 80
SubterraneanLocomotor@SUBTERRANEAN:
Name: subterranean
Crushes: wall, crate, infantry
TerrainSpeeds:
Clear: 70
Road: 100
Bridge: 100
Rail: 100
DirtRoad: 90
Rough: 60
Tiberium: 70
BlueTiberium: 70
Veins: 70
Subterranean: 120
SubterraneanTransitionTerrainTypes: Clear, Rough
SubterraneanTransitionCost: 120
Locomotor@HOVER:
Name: hover
Crushes: wall, crate, infantry
TerrainSpeeds:
Clear: 100
Road: 100
Bridge: 100
Rail: 100
DirtRoad: 100
Rough: 100
Water: 100
Tiberium: 100
BlueTiberium: 100
Veins: 100
Locomotor@SMALLVISC:
Name: smallvisc
Crushes: visceroid-fusing
TerrainSpeeds:
Clear: 90
Road: 100
Bridge: 100
Rail: 80
DirtRoad: 90
Rough: 70
Tiberium: 100
BlueTiberium: 100
Veins: 100
Locomotor@VISCEROID:
Name: visceroid
Crushes: crate, infantry
TerrainSpeeds:
Clear: 90
Road: 100
Bridge: 100
Rail: 80
DirtRoad: 90
Rough: 70
Tiberium: 100
BlueTiberium: 100
Veins: 100
Locomotor@CRITTER:
Name: critter
TerrainSpeeds:
Clear: 90
Road: 100
Bridge: 100
Rail: 80
DirtRoad: 90
Rough: 70
Tiberium: 100
BlueTiberium: 100
Veins: 100
Locomotor@TRAIN:
Name: train
TerrainSpeeds:
Rail: 100
Crushes: wall, crate, infantry
Faction@Random: Faction@Random:
Name: Any Name: Any
InternalName: Random InternalName: Random