Merge pull request #7776 from pchote/ts-buildables

Remove bogus buildable actors from TS.
This commit is contained in:
reaperrr
2015-03-31 21:05:15 +02:00
13 changed files with 250 additions and 410 deletions

View File

@@ -64,6 +64,7 @@ Rules:
./mods/ts/rules/misc.yaml
./mods/ts/rules/ai.yaml
./mods/ts/rules/civilian.yaml
./mods/ts/rules/civilian-vehicles.yaml
./mods/ts/rules/player.yaml
./mods/ts/rules/world.yaml
./mods/ts/rules/aircraft.yaml

View File

@@ -4,10 +4,6 @@ DPOD:
Cost: 10
Tooltip:
Name: Drop Pod
Buildable:
Queue: Air
BuildPaletteOrder: 10
Prerequisites: ~gahpad
Helicopter:
LandWhenIdle: yes
ROT: 5
@@ -43,10 +39,6 @@ DSHP:
Cost: 1000
Tooltip:
Name: Dropship
Buildable:
Queue: Air
BuildPaletteOrder: 10
Prerequisites: ~gahpad, gaweap
Helicopter:
LandWhenIdle: yes
ROT: 5
@@ -149,10 +141,6 @@ ORCATRAN:
Cost: 1200
Tooltip:
Name: Orca Transport
Buildable:
Queue: Air
BuildPaletteOrder: 10
Prerequisites: ~gahpad
Helicopter:
LandWhenIdle: yes
ROT: 5

View File

@@ -0,0 +1,172 @@
4TNK:
Inherits: ^Tank
Valued:
Cost: 1700
Tooltip:
Name: Mammoth Tank
Mobile:
Speed: 56
ROT: 5
Crushes: wall, crate, infantry
Health:
HP: 600
Armor:
Type: Heavy
RevealsShroud:
Range: 6c0
Turreted:
ROT: 3
Armament@PRIMARY:
Weapon: 120mmx
LocalOffset: 640,85,384, 640,-85,384
MuzzleSequence: muzzle
Armament@SECONDARY:
Weapon: MammothTusk
LocalOffset: 0,256,426, 0,-256,426
AttackTurreted:
AutoTarget:
SelfHealing:
Ticks: 10
HealIfBelow: 50%
DamageCooldown: 200
RenderSprites:
RenderVoxels:
WithVoxelBody:
WithVoxelTurret:
WithVoxelBarrel:
WithMuzzleFlash:
TRUCKB:
Inherits: ^Vehicle
Valued:
Cost: 500
Tooltip:
Name: Truck
Health:
HP: 2000
Armor:
Type: Light
Mobile:
Speed: 56
RevealsShroud:
Range: 5c0
RenderSprites:
RenderVoxels:
WithVoxelBody:
ICBM:
Inherits: ^Vehicle
Valued:
Cost: 1400
Tooltip:
Name: Ballistic Missile Launcher
Health:
HP: 500
Armor:
Type: Light
Mobile:
Speed: 85
ROT: 5
RevealsShroud:
Range: 7c0
RenderSprites:
RenderVoxels:
WithVoxelBody:
Transforms:
IntoActor: gaicbm
Offset: -1,-1
Facing: 96
TransformSounds:
NoTransformSounds:
BUS:
Inherits: ^Vehicle
Valued:
Cost: 800
Tooltip:
Name: School Bus
Mobile:
ROT: 5
Speed: 113
Health:
HP: 100
Armor:
Type: Light
RevealsShroud:
Range: 5c0
Cargo:
Types: Infantry
MaxWeight: 20
PipCount: 5
RenderSprites:
RenderVoxels:
WithVoxelBody:
PICK:
Inherits: ^Vehicle
Valued:
Cost: 800
Tooltip:
Name: Pickup
Mobile:
ROT: 5
Speed: 113
Health:
HP: 100
Armor:
Type: Light
RevealsShroud:
Range: 5c0
Cargo:
Types: Infantry
MaxWeight: 2
PipCount: 5
RenderSprites:
RenderVoxels:
WithVoxelBody:
CAR:
Inherits: ^Vehicle
Valued:
Cost: 800
Tooltip:
Name: Automobile
Mobile:
ROT: 5
Speed: 113
Health:
HP: 100
Armor:
Type: Light
RevealsShroud:
Range: 5c0
Cargo:
Types: Infantry
MaxWeight: 4
PipCount: 5
RenderSprites:
RenderVoxels:
WithVoxelBody:
WINI:
Inherits: ^Vehicle
Valued:
Cost: 800
Tooltip:
Name: Recreational Vehicle
Mobile:
ROT: 5
Speed: 113
Health:
HP: 200
Armor:
Type: Light
RevealsShroud:
Range: 5c0
Cargo:
Types: Infantry
MaxWeight: 5
PipCount: 5
RenderSprites:
RenderVoxels:
WithVoxelBody:

View File

@@ -1220,6 +1220,8 @@ GASPOT:
Building:
Footprint: x
Dimensions: 1, 1
Selectable:
Bounds: 48, 82, 0, -25
Power:
Amount: -10
Armor:
@@ -1228,6 +1230,31 @@ GASPOT:
HP: 400
RenderBuilding:
Palette: player
WithIdleOverlay@LIGHTS:
Sequence: idle-lights
GALITE:
Inherits: ^Building
Valued:
Cost: 200
Tooltip:
Name: Light Post
RenderBuilding:
Palette: terrain
-WithMakeAnimation:
-WithDeathAnimation:
Health:
HP: 600
Armor:
Type: Wood
RevealsShroud:
Range: 2c0
Power:
Amount: 0
# WithIdleOverlay@LIGHTING:
# Sequence: lighting
Selectable:
Bounds: 25, 35, 0, -12
NAMNTK:
Inherits: ^CivBuilding

View File

@@ -234,10 +234,6 @@
Cost: 10
Tooltip:
Name: Civilian
Buildable:
Queue: Infantry
BuildPaletteOrder: 1000
Owner: gdi, nod
Health:
HP: 50
Mobile:
@@ -300,6 +296,10 @@
ActorLostNotification:
ProximityCaptor:
Types: Vehicle
Capturable:
Type: Vehicle
CaptureThreshold: 1
CancelActivity: True
GivesBounty:
UpdatesPlayerStatistics:
CombatDebugOverlay:
@@ -380,6 +380,10 @@
ActorLostNotification:
ProximityCaptor:
Types: Vehicle
Capturable:
Type: Vehicle
CaptureThreshold: 1
CancelActivity: True
GivesBounty:
UpdatesPlayerStatistics:
CombatDebugOverlay:

View File

@@ -87,12 +87,6 @@ WEEDGUY:
Cost: 300
Tooltip:
Name: Chem Spray Infantry
Description: Advanced Anti-infantry unit.\n Strong vs Infantry\n Weak vs Vehicles
Buildable:
Queue: Infantry
BuildPaletteOrder: 50
Prerequisites: ~nahand
Hothey: c
Selectable:
Bounds: 12,17,0,-6
Voice: Weed
@@ -176,11 +170,6 @@ UMAGON:
Cost: 400
Tooltip:
Name: Umagon
Description: Elite sniper infantry unit.\n Strong vs Infantry, Buildings\n Weak vs Vehicles
Buildable:
Queue: Infantry
BuildPaletteOrder: 50
Prerequisites: ~gapile, gatech
Selectable:
Bounds: 12,17,0,-6
Voice: Umagon
@@ -268,15 +257,10 @@ JUMPJET:
CHAMSPY:
Inherits: ^Infantry
Buildable:
Queue: Infantry
BuildPaletteOrder: 60
Prerequisites: ~nahand, natech
Valued:
Cost: 700
DisguiseToolTip:
Name: Chameleon Spy
Description: Infiltrates enemy structures to gather \nintelligence. Exact effect depends on the \nbuilding infiltrated.\n Strong vs Nothing\n Weak vs Everything\n Special Ability: Disguised
Selectable:
Voice: Spy
Bounds: 12,17,0,-9
@@ -365,14 +349,10 @@ CYC2:
MUTANT:
Inherits: ^Infantry
Buildable:
Queue: Infantry
BuildPaletteOrder: 10
Valued:
Cost: 100
Tooltip:
Name: Mutant
Description: General-purpose infantry.\n Strong vs Infantry\n Weak vs Vehicles
Selectable:
Bounds: 12,17,0,-9
Voice: Mutant
@@ -393,14 +373,10 @@ MUTANT:
MWMN:
Inherits: ^Infantry
Buildable:
Queue: Infantry
BuildPaletteOrder: 10
Valued:
Cost: 100
Tooltip:
Name: Mutant Soldier
Description: General-purpose infantry.\n Strong vs Infantry\n Weak vs Vehicles
Selectable:
Bounds: 12,17,0,-9
Voice: CivilianFemale
@@ -421,14 +397,10 @@ MWMN:
MUTANT3:
Inherits: ^Infantry
Buildable:
Queue: Infantry
BuildPaletteOrder: 10
Valued:
Cost: 100
Tooltip:
Name: Mutant Sergeant
Description: General-purpose infantry.\n Strong vs Infantry\n Weak vs Vehicles
Selectable:
Bounds: 12,17,0,-9
Voice: Mutant
@@ -457,7 +429,7 @@ MHIJACK:
Cost: 100
Tooltip:
Name: Mutant Hijacker
Description: General-purpose infantry.\n Strong vs Infantry\n Weak vs Vehicles
Description: Hijacks enemy vehicles. Unarmed\n Strong vs Tanks\n Weak vs Infantry, Aircraft
Selectable:
Bounds: 12,17,0,-9
Voice: Hijacker
@@ -467,6 +439,8 @@ MHIJACK:
Weapon: TiberiumHeal
Mobile:
Speed: 99
Captures:
CaptureTypes: Vehicle
RevealsShroud:
Range: 6c0
-AutoTarget:
@@ -476,9 +450,6 @@ MHIJACK:
TRATOS:
Inherits: ^Infantry
Buildable:
Queue: Infantry
BuildPaletteOrder: 10
Valued:
Cost: 100
Tooltip:
@@ -501,9 +472,6 @@ TRATOS:
OXANNA:
Inherits: ^Infantry
Buildable:
Queue: Infantry
BuildPaletteOrder: 10
Valued:
Cost: 100
Tooltip:
@@ -524,9 +492,6 @@ OXANNA:
SLAV:
Inherits: ^Infantry
Buildable:
Queue: Infantry
BuildPaletteOrder: 10
Valued:
Cost: 100
Tooltip:
@@ -549,9 +514,6 @@ DOGGIE:
Inherits: ^Infantry
Tooltip:
Name: Tiberian Fiend
Buildable:
Queue: Infantry
BuildPaletteOrder: 100
Health:
Radius: 213
HP: 250
@@ -581,9 +543,6 @@ VISSML:
Inherits: ^Infantry
Tooltip:
Name: Baby Visceroid
Buildable:
Queue: Infantry
BuildPaletteOrder: 100
Health:
HP: 200
PoisonedByTiberium:
@@ -612,9 +571,6 @@ VISLRG:
Inherits: ^Infantry
Tooltip:
Name: Adult Visceroid
Buildable:
Queue: Infantry
BuildPaletteOrder: 100
Health:
HP: 500
PoisonedByTiberium:

View File

@@ -618,62 +618,6 @@ GAARTY:
WithMuzzleFlash:
-WithDeathAnimation:
GASPOT:
Inherits: ^Building
Buildable:
Queue: Defense
BuildPaletteOrder: 10
Prerequisites: anypower
Valued:
Cost: 300
Tooltip:
Name: Light Tower
Building:
Footprint: x
Dimensions: 1,1
Selectable:
Bounds: 48, 82, 0, -25
Health:
HP: 400
Armor:
Type: Wood
RevealsShroud:
Range: 4c0
RenderDetectionCircle:
DetectCloaked:
Range: 3
WithIdleOverlay@LIGHTS:
Sequence: idle-lights
Power:
Amount: -10
GALITE:
Inherits: ^Building
Buildable:
Queue: Defense
BuildPaletteOrder: 10
Prerequisites: anypower
Valued:
Cost: 200
Tooltip:
Name: Light Post
RenderBuilding:
Palette: terrain
-WithMakeAnimation:
-WithDeathAnimation:
Health:
HP: 600
Armor:
Type: Wood
RevealsShroud:
Range: 2c0
Power:
Amount: 0
# WithIdleOverlay@LIGHTING:
# Sequence: lighting
Selectable:
Bounds: 25, 35, 0, -12
GARADR:
Inherits: ^Building
Buildable:

View File

@@ -158,74 +158,6 @@ HVR:
WithVoxelTurret:
Hovers:
4TNK:
Inherits: ^Tank
Valued:
Cost: 1700
Tooltip:
Name: Mammoth Tank
Description: Heavily armored GDI Tank.\n Strong vs Everything
Buildable:
Queue: Vehicle
BuildPaletteOrder: 60
Prerequisites: ~gaweap
Mobile:
Speed: 56
ROT: 5
Crushes: wall, crate, infantry
Health:
HP: 600
Armor:
Type: Heavy
RevealsShroud:
Range: 6c0
Turreted:
ROT: 3
Armament@PRIMARY:
Weapon: 120mmx
LocalOffset: 640,85,384, 640,-85,384
MuzzleSequence: muzzle
Armament@SECONDARY:
Weapon: MammothTusk
LocalOffset: 0,256,426, 0,-256,426
AttackTurreted:
AutoTarget:
SelfHealing:
Ticks: 10
HealIfBelow: 50%
DamageCooldown: 200
RenderSprites:
RenderVoxels:
WithVoxelBody:
WithVoxelTurret:
WithVoxelBarrel:
WithMuzzleFlash:
TRUCKB:
Inherits: ^Vehicle
Buildable:
Queue: Vehicle
BuildPaletteOrder: 120
Prerequisites: factory
Valued:
Cost: 500
Tooltip:
Name: Truck
Description: Transports cash to other players.\n Unarmed
Health:
HP: 2000
Armor:
Type: Light
Mobile:
Speed: 56
RevealsShroud:
Range: 5c0
SupplyTruck:
Payload: 500
RenderSprites:
RenderVoxels:
WithVoxelBody:
LPST:
Inherits: ^Vehicle
Valued:
@@ -255,35 +187,6 @@ LPST:
TransformSounds:
NoTransformSounds:
ICBM:
Inherits: ^Vehicle
Valued:
Cost: 1400
Tooltip:
Name: Ballistic Missile Launcher
Buildable:
Queue: Vehicle
BuildPaletteOrder: 100
Prerequisites: ~gaweap
Health:
HP: 500
Armor:
Type: Light
Mobile:
Speed: 85
ROT: 5
RevealsShroud:
Range: 7c0
RenderSprites:
RenderVoxels:
WithVoxelBody:
Transforms:
IntoActor: gaicbm
Offset: -1,-1
Facing: 96
TransformSounds:
NoTransformSounds:
REPAIR:
Inherits: ^Tank
Buildable:
@@ -365,97 +268,12 @@ WEED:
RenderVoxels:
WithVoxelBody:
BUS:
Inherits: ^Vehicle
Valued:
Cost: 800
Tooltip:
Name: School Bus
Buildable:
Queue: Vehicle
BuildPaletteOrder: 300
Prerequisites: ~gaweap
Mobile:
ROT: 5
Speed: 113
Health:
HP: 100
Armor:
Type: Light
RevealsShroud:
Range: 5c0
Cargo:
Types: Infantry
MaxWeight: 20
PipCount: 5
RenderSprites:
RenderVoxels:
WithVoxelBody:
PICK:
Inherits: ^Vehicle
Valued:
Cost: 800
Tooltip:
Name: Pickup
Buildable:
Queue: Vehicle
BuildPaletteOrder: 300
Prerequisites: ~gaweap
Mobile:
ROT: 5
Speed: 113
Health:
HP: 100
Armor:
Type: Light
RevealsShroud:
Range: 5c0
Cargo:
Types: Infantry
MaxWeight: 2
PipCount: 5
RenderSprites:
RenderVoxels:
WithVoxelBody:
CAR:
Inherits: ^Vehicle
Valued:
Cost: 800
Tooltip:
Name: Automobile
Buildable:
Queue: Vehicle
BuildPaletteOrder: 300
Prerequisites: ~gaweap
Mobile:
ROT: 5
Speed: 113
Health:
HP: 100
Armor:
Type: Light
RevealsShroud:
Range: 5c0
Cargo:
Types: Infantry
MaxWeight: 4
PipCount: 5
RenderSprites:
RenderVoxels:
WithVoxelBody:
GGHUNT:
Inherits: ^Vehicle
Valued:
Cost: 1000
Tooltip:
Name: Hunter-Seeker Droid
Buildable:
BuildPaletteOrder: 20
Prerequisites: factory
Queue: Vehicle
Mobile:
ROT: 16
Speed: 355
@@ -471,33 +289,6 @@ GGHUNT:
Weapon: SuicideBomb
EmptyWeapon: SuicideBomb
WINI:
Inherits: ^Vehicle
Valued:
Cost: 800
Tooltip:
Name: Recreational Vehicle
Buildable:
Queue: Vehicle
BuildPaletteOrder: 300
Prerequisites: ~gaweap
Mobile:
ROT: 5
Speed: 113
Health:
HP: 200
Armor:
Type: Light
RevealsShroud:
Range: 5c0
Cargo:
Types: Infantry
MaxWeight: 5
PipCount: 5
RenderSprites:
RenderVoxels:
WithVoxelBody:
MMCH:
Inherits: ^Tank
Valued:
@@ -839,4 +630,3 @@ STNK:
RenderVoxels:
WithVoxelBody:
-MustBeDestroyed:

View File

@@ -1,18 +1,9 @@
dpod:
icon: podsicon
dshp:
icon: xxicon
orca:
icon: orcaicon
orcab:
icon: obmbicon
orcatran:
icon: crryicon
trnsport:
icon: otrnicon

View File

@@ -658,6 +658,43 @@ gakodk:
Start: 2
ShadowStart: 5
gaspot:
Defaults:
Offset: 0, -12
UseTilesetCode: true
idle:
ShadowStart: 3
damaged-idle:
Start: 1
ShadowStart: 4
dead:
Start: 2
ShadowStart: 5
Tick: 400
idle-lights: gaspot_a
Length: 8
Tick: 200
damaged-idle-lights: gaspot_a
Start: 8
Length: 8
Tick: 200
make: gaspotmk
Length: 14
ShadowStart: 14
galite:
Defaults:
Offset: 0, -12
UseTilesetCode: true
idle: gtlite
ShadowStart: 2
damaged-idle: gtlite
Start: 1
ShadowStart: 3
# lighting: alphatst
# ZOffset: -1c511
# BlendMode: Alpha
namntk:
idle: ntmntk
ShadowStart: 3

View File

@@ -300,7 +300,6 @@ weedguy:
Length: 3
ShadowStart: 376
Tick: 1000
icon: weaticon
medic:
stand:
@@ -768,7 +767,7 @@ mhijack:
die6: electro
Length: *
Tick: 80
icon: mutcicon
icon: chamicon
chamspy:
stand:
@@ -1523,13 +1522,11 @@ doggie: # TODO: not sure what frame 88 and following is
Length: 10
ShadowStart: 228
Tick: 80
icon: xxicon
vissml:
idle:
Length: 90
ShadowStart: 90
icon: xxicon
vislrg:
idle:
@@ -1539,7 +1536,6 @@ vislrg:
Length: 5
Facings: 8
ShadowStart: 40
icon: xxicon
civ1:
stand:
@@ -1598,7 +1594,6 @@ civ1:
die6: electro
Length: *
Tick: 80
icon: xxicon
civ2:
stand:
@@ -1657,7 +1652,6 @@ civ2:
die6: electro
Length: *
Tick: 80
icon: xxicon
civ3:
stand:
@@ -1716,4 +1710,3 @@ civ3:
die6: electro
Length: *
Tick: 80
icon: xxicon

View File

@@ -623,7 +623,7 @@ napuls:
make: ntpulsmk
Length: 20
ShadowStart: 20
icon: pulsicon
icon: empicon
Offset: 0, 0
UseTilesetCode: false
@@ -762,33 +762,6 @@ gacsam:
Offset: 0, 0
UseTilesetCode: false
gaspot:
Defaults:
Offset: 0, -12
UseTilesetCode: true
idle:
ShadowStart: 3
damaged-idle:
Start: 1
ShadowStart: 4
dead:
Start: 2
ShadowStart: 5
Tick: 400
idle-lights: gaspot_a
Length: 8
Tick: 200
damaged-idle-lights: gaspot_a
Start: 8
Length: 8
Tick: 200
make: gaspotmk
Length: 14
ShadowStart: 14
icon: spoticon
Offset: 0, 0
UseTilesetCode: false
gahpad:
Defaults:
Offset: 0, -24
@@ -944,22 +917,6 @@ gasilo:
Offset: 0, 0
UseTilesetCode: false
galite:
Defaults:
Offset: 0, -12
UseTilesetCode: true
idle: gtlite
ShadowStart: 2
damaged-idle: gtlite
Start: 1
ShadowStart: 3
# lighting: alphatst
# ZOffset: -1c511
# BlendMode: Alpha
icon: liteicon
Offset: 0, 0
UseTilesetCode: false
gadept:
Defaults:
Offset: 0, -36

View File

@@ -15,17 +15,10 @@ hvr:
4tnk:
muzzle: gunfire
Length: *
icon: xxicon
truckb:
icon: xxicon
lpst:
icon: lpsticon
icbm:
icon: xxicon
repair:
icon: rboticon
@@ -35,18 +28,6 @@ art2:
weed:
icon: weedicon
bus:
icon: xxicon
pick:
icon: xxicon
car:
icon: xxicon
wini:
icon: xxicon
hmec:
icon: hmecicon
@@ -104,7 +85,6 @@ gghunt:
Facings: 1
Length: 8
ShadowStart: 8
icon: seekicon
smech:
stand: