Merge pull request #5114 from reaperrr/ts-fixes01

Lots of TS mod fixes & additions
This commit is contained in:
Matthias Mailänder
2014-04-17 06:58:49 +02:00
11 changed files with 759 additions and 222 deletions

BIN
mods/ts/bits/infdie.shp Normal file

Binary file not shown.

BIN
mods/ts/bits/infexpl.shp Normal file

Binary file not shown.

View File

@@ -27,7 +27,7 @@ Speech:
Sounds:
Notifications:
RadarUp:
RadarUp:commup1
RadarDown:radardn1
CashTickUp: credup1
CashTickDown: creddwn1
@@ -35,8 +35,8 @@ Sounds:
DisablePower:
EnablePower:
ChatLine:message1
BuildPaletteOpen:
BuildPaletteClose:
BuildPaletteOpen:emblem
BuildPaletteClose:emblem
TabClick:
ClickSound:clicky1
ClickDisabledSound:wrong1

View File

@@ -8,12 +8,13 @@
Building:
Dimensions: 1,1
Footprint: x
BuildSounds: place2.aud
TerrainTypes: Clear,Road
GivesBuildableArea:
Capturable:
SoundOnDamageTransition:
DamagedSound:
DestroyedSound:
DamagedSound: expnew01.aud
DestroyedSound: crmble2.aud
RenderBuilding:
WithBuildingExplosion:
RepairableBuilding:
@@ -38,6 +39,44 @@
LuaScriptEvents:
Demolishable:
^Wall:
AppearsOnRadar:
Building:
Dimensions: 1,1
Footprint: x
BuildSounds: place2.aud
Adjacent: 7
TerrainTypes: Clear,Road
SoundOnDamageTransition:
DamagedSound: expnew01.aud
DestroyedSound: crmble2.aud
Wall:
CrushClasses: wall
LineBuild:
Range: 8
NodeTypes: wall
LineBuildNode:
Types: wall
SelectionDecorations:
Selectable:
Priority: 1
TargetableBuilding:
TargetTypes: Ground, C4
RenderBuildingWall:
HasMakeAnimation: no
GivesExperience:
EditorAppearance:
RelativeToTopLeft: yes
UseTerrainPalette: yes
AutoTargetIgnore:
ProximityCaptor:
Types: Wall
Sellable:
UpdatesPlayerStatistics:
BodyOrientation:
LuaScriptEvents:
Demolishable:
^Infantry:
AppearsOnRadar:
Health:
@@ -147,41 +186,6 @@
Huntable:
LuaScriptEvents:
^Wall:
AppearsOnRadar:
Building:
Dimensions: 1,1
Footprint: x
BuildSounds: placbldg.aud
Adjacent: 7
TerrainTypes: Clear,Road
Wall:
CrushClasses: wall
LineBuild:
Range: 8
NodeTypes: wall
LineBuildNode:
Types: wall
SelectionDecorations:
Selectable:
Priority: 1
TargetableBuilding:
TargetTypes: Ground, C4
RenderBuildingWall:
HasMakeAnimation: no
GivesExperience:
EditorAppearance:
RelativeToTopLeft: yes
UseTerrainPalette: yes
AutoTargetIgnore:
ProximityCaptor:
Types: Wall
Sellable:
UpdatesPlayerStatistics:
BodyOrientation:
LuaScriptEvents:
Demolishable:
^Helicopter:
AppearsOnRadar:
UseLocation: yes

View File

@@ -298,7 +298,7 @@ CHAMSPY:
CYBORG:
Inherits: ^Infantry
Armor:
Type: Heavy
Type: Light
Valued:
Cost: 650
Tooltip:

View File

@@ -3,6 +3,7 @@ GACNST:
Building:
Power: 0
Footprint: xxx xxx xxx
BuildSounds: facbld1.aud
Dimensions: 3,3
Buildable:
Queue: Building
@@ -79,6 +80,8 @@ GAPILE:
Tooltip:
Name: GDI Barracks
Description: Produces infantry
ProvidesCustomPrerequisite:
Prerequisite: barracks
Building:
Power: -20
Footprint: xx xx
@@ -111,6 +114,8 @@ GAWEAP:
Tooltip:
Name: GDI War Factory
Description: Assembly point for\nvehicle reinforcements
ProvidesCustomPrerequisite:
Prerequisite: factory
Buildable:
Queue: Building
BuildPaletteOrder: 50
@@ -133,6 +138,12 @@ GAWEAP:
Production:
Produces: Vehicle
ProductionBar:
WithIdleOverlay@LIGHTS1:
Sequence: idle-lights1
WithIdleOverlay@LIGHTS2:
Sequence: idle-lights2
WithIdleOverlay@TURBINES:
Sequence: idle-turbines
NAPOWR:
Inherits: ^Building
@@ -174,6 +185,8 @@ NAHAND:
Tooltip:
Name: Hand of Nod
Description: Produces infantry
ProvidesCustomPrerequisite:
Prerequisite: barracks
Building:
Power: -20
Footprint: xxx xxx
@@ -204,6 +217,8 @@ NAWEAP:
Tooltip:
Name: Nod War Factory
Description: Assembly point for\nvehicle reinforcements
ProvidesCustomPrerequisite:
Prerequisite: factory
Buildable:
Queue: Building
BuildPaletteOrder: 50
@@ -226,6 +241,8 @@ NAWEAP:
Production:
Produces: Vehicle
ProductionBar:
WithIdleOverlay@LIGHTS:
Sequence: idle-lights
GASAND:
Inherits: ^Wall
@@ -250,6 +267,52 @@ GASAND:
Armor:
Type: Light
GAWALL:
Inherits: ^Wall
Buildable:
Queue: Defense
BuildPaletteOrder: 1001
Prerequisites: gacnst
Owner: gdi
Hotkey: b
SoundOnDamageTransition:
DamagedSound:
DestroyedSound:
Valued:
Cost: 50
CustomSellValue:
Value: 0
Tooltip:
Name: Concrete Wall
Description: Stops infantry and blocks enemy fire.\nCan NOT be crushed by tanks.
Health:
HP: 300
Armor:
Type: Concrete
NAWALL:
Inherits: ^Wall
Buildable:
Queue: Defense
BuildPaletteOrder: 1001
Prerequisites: gacnst
Owner: nod
Hotkey: b
SoundOnDamageTransition:
DamagedSound:
DestroyedSound:
Valued:
Cost: 50
CustomSellValue:
Value: 0
Tooltip:
Name: Concrete Wall
Description: Stops infantry and blocks enemy fire.\nCan NOT be crushed by tanks.
Health:
HP: 300
Armor:
Type: Concrete
GATICK:
Inherits: ^Building
Valued:
@@ -405,6 +468,132 @@ GASPOT:
WithIdleOverlay@LIGHTS:
Sequence: idle-lights
GARADR:
Inherits: ^Building
Buildable:
Queue: Building
BuildPaletteOrder: 90
Owner: gdi
Prerequisites: anypower, factory
Valued:
Cost: 1000
Tooltip:
Name: GDI Radar
Description: Provides radar screen
ProvidesCustomPrerequisite:
Prerequisite: radar
Building:
Power: -50
Footprint: ___ xxx xxx
Dimensions: 3,3
Health:
HP: 800
Armor:
Type: Wood
RequiresPower:
CanPowerDown:
ProvidesRadar:
Infiltratable:
Type: Exploration
InfiltrateForExploration:
DetectCloaked:
Range: 10
RenderDetectionCircle:
RevealsShroud:
Range: 10c0
WithIdleOverlay@DISH:
Sequence: idle-dish
NARADR:
Inherits: ^Building
Buildable:
Queue: Building
BuildPaletteOrder: 90
Owner: nod
Prerequisites: anypower, factory
Valued:
Cost: 1000
Tooltip:
Name: Nod Radar
Description: Provides radar screen
ProvidesCustomPrerequisite:
Prerequisite: radar
Building:
Power: -50
Footprint: xx xx
Dimensions: 2,2
Health:
HP: 800
Armor:
Type: Wood
RequiresPower:
CanPowerDown:
ProvidesRadar:
Infiltratable:
Type: Exploration
InfiltrateForExploration:
DetectCloaked:
Range: 10
RenderDetectionCircle:
RevealsShroud:
Range: 10c0
WithIdleOverlay@DISH:
Sequence: idle-dish
GATECH:
Inherits: ^Building
Buildable:
Queue: Building
BuildPaletteOrder: 100
Owner: gdi
Prerequisites: garadr
Valued:
Cost: 2000
Tooltip:
Name: GDI Tech Center
Description: Required for high-\ntech research
ProvidesCustomPrerequisite:
Prerequisite: tech
Building:
Power: -150
Footprint: xxx xxx xxx
Dimensions: 3,3
Health:
HP: 500
Armor:
Type: Wood
RevealsShroud:
Range: 4c0
WithIdleOverlay@LIGHTS:
Sequence: idle-lights
NATECH:
Inherits: ^Building
Buildable:
Queue: Building
BuildPaletteOrder: 100
Owner: nod
Prerequisites: naradr
Valued:
Cost: 2000
Tooltip:
Name: Nod Tech Center
Description: Required for high-\ntech research
ProvidesCustomPrerequisite:
Prerequisite: tech
Building:
Power: -150
Footprint: xx xx
Dimensions: 2,2
Health:
HP: 500
Armor:
Type: Wood
RevealsShroud:
Range: 4c0
WithIdleOverlay@LIGHTS:
Sequence: idle-lights
GAHPAD:
Inherits: ^Building
Valued:
@@ -479,3 +668,17 @@ BARRACKS:
Name: Infantry Production
Description: Infantry Production
FACTORY:
Tooltip:
Name: Vehicle Production
Description: Vehicle Production
RADAR:
Tooltip:
Name: Radar
Description: Radar
TECH:
Tooltip:
Name: Tech Center
Description: Tech Center

View File

@@ -28,7 +28,7 @@ MCV:
IntoActor: gacnst
Offset: -1,-1
Facing: 96
TransformSounds:
TransformSounds: facbld1.aud
NoTransformSounds:
RenderSprites:
RenderVoxels:
@@ -104,7 +104,7 @@ HVR:
Description: Hover Multi-Launch Rocket System
Buildable:
Queue: Vehicle
BuildPaletteOrder: 30
BuildPaletteOrder: 50
Owner: gdi
Mobile:
Speed: 99
@@ -468,7 +468,7 @@ MMCH:
Name: Medium Mech
Buildable:
Queue: Vehicle
BuildPaletteOrder: 300
BuildPaletteOrder: 30
Owner: gdi
Mobile:
ROT: 5
@@ -501,7 +501,7 @@ HMEC:
Name: Mammoth Mk. II
Buildable:
Queue: Vehicle
BuildPaletteOrder: 40
BuildPaletteOrder: 80
Owner: gdi
Mobile:
ROT: 3
@@ -674,7 +674,7 @@ SONIC:
Name: Disruptor
Buildable:
Queue: Vehicle
BuildPaletteOrder: 40
BuildPaletteOrder: 70
Owner: gdi
Mobile:
ROT: 4

File diff suppressed because it is too large Load Diff

View File

@@ -139,6 +139,36 @@ gaweap:
dead: gtweap
Start: 2
ShadowStart: 5
idle-lights1: gtweap_a
Start: 0
Length: 8
Tick: 100
ZOffset: 2048
damaged-idle-lights1: gtweap_a
Start: 8
Length: 8
Tick: 100
ZOffset: 2048
idle-lights2: gtweap_b
Start: 0
Length: 4
Tick: 120
ZOffset: 2048
damaged-idle-lights2: gtweap_b
Start: 4
Length: 4
Tick: 120
ZOffset: 2048
idle-turbines: gtweap_c
Start: 0
Length: 4
Tick: 80
ZOffset: 2048
damaged-idle-turbines: gtweap_c
Start: 0
Length: 4
Tick: 80
ZOffset: 2048
build-top: gtweap_d
Start: 0
Length: 9
@@ -232,6 +262,16 @@ naweap:
dead: ntweap
Start: 2
ShadowStart: 5
idle-lights: ntweap_a
Start: 0
Length: 16
Tick: 100
ZOffset: 2048
damaged-idle-lights: ntweap_a
Start: 16
Length: 16
Tick: 100
ZOffset: 2048
build-top: ntweap_b
Start: 0
Length: 10
@@ -251,7 +291,115 @@ naweap:
ShadowStart: 22
icon: nwepicon
Start: 0
# TODO: ntweap_1 & ntweapbb & ntweap_a & ntweap_b & ntweap_c are unused
# TODO: ntweap_1 & ntweapbb & ntweap_b & ntweap_c are unused
naradr:
idle: ntradr
Start: 0
ShadowStart: 3
damaged-idle: ntradr
Start: 1
ShadowStart: 4
critical-idle: ntradr
Start: 2
ShadowStart: 5
idle-dish: ntradr_a
Start: 0
Length: 24
Tick: 120
damaged-idle-dish: ntradr_a
Start: 24
Length: 24
Tick: 120
make: ntradrmk
Start: 0
Length: 20
ShadowStart: 20
icon: nradicon
Start: 0
natech:
idle: nttech
Start: 0
ShadowStart: 3
damaged-idle: nttech
Start: 1
ShadowStart: 4
critical-idle: nttech
Start: 2
ShadowStart: 5
idle-lights: nttech_a
Start: 0
Length: 9
Tick: 120
damaged-idle-lights: nttech_a
Start: 0
Length: 9
Tick: 120
critical-idle-lights: nttech_a
Start: 0
Length: 9
Tick: 120
make: nttechmk
Start: 0
Length: 18
ShadowStart: 18
icon: ntchicon
Start: 0
garadr:
idle: gtradr
Start: 0
ShadowStart: 3
damaged-idle: gtradr
Start: 1
ShadowStart: 4
critical-idle: gtradr
Start: 2
ShadowStart: 5
idle-dish: gtradr_a # TODO: needs to ping-pong
Start: 0
Length: 15
Tick: 120
damaged-idle-dish: gtradr_a # TODO: needs to ping-pong
Start: 15
Length: 15
Tick: 160
make: gtradrmk
Start: 0
Length: 20
ShadowStart: 20
icon: radricon
Start: 0
gatech:
idle: gttech
Start: 0
ShadowStart: 3
damaged-idle: gttech
Start: 1
ShadowStart: 4
critical-idle: gttech
Start: 2
ShadowStart: 5
idle-lights: gttech_a
Start: 0
Length: 8
Tick: 200
damaged-idle-lights: gttech_a
Start: 8
Length: 8
Tick: 240
critical-idle-lights: gttech_a
Start: 8
Length: 8
Tick: 240
make: gttechmk
Start: 0
Length: 20
ShadowStart: 20
icon: techicon
Start: 0
gasand: # TODO frame order (horizontal seems busted)
idle: gtsand
@@ -265,6 +413,38 @@ gasand: # TODO frame order (horizontal seems busted)
icon: sbagicon
Start: 0
gawall: # TODO frame order (horizontal seems busted)
idle: gtwall
Start: 0
Length: 16
ShadowStart: 48
damaged-idle: gtwall
Start: 16
Length: 16
ShadowStart: 64
critical-idle: gtwall
Start: 32
Length: 16
ShadowStart: 80
icon: wallicon
Start: 0
nawall: # TODO frame order (horizontal seems busted)
idle: ntwall
Start: 0
Length: 16
ShadowStart: 48
damaged-idle: ntwall
Start: 16
Length: 16
ShadowStart: 64
critical-idle: ntwall
Start: 32
Length: 16
ShadowStart: 80
icon: nwalicon
Start: 0
gatick:
idle:
Start: 0

View File

@@ -78,14 +78,14 @@ Cyborg:
Select: 22-I000, 22-I002, 22-I006
Move: 22-I008, 22-I010, 22-I014, 22-I016, 22-I020
Attack: 22-I008, 22-I010, 22-I012, 22-I018
Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Die: 22-N104, 22-N106, 22-N108
CyborgCommando:
Voices:
Select: 23-I000, 23-I002, 23-I004, 23-I006
Move: 23-I008, 23-I010, 23-I012, 23-I016
Attack: 23-I014, 23-I018, 23-I020, 23-I022
Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Die: 22-N104, 22-N106, 22-N108
Mutant:
Voices:

View File

@@ -12,7 +12,7 @@ Minigun:
Heavy: 10%
Concrete: 10%
Explosion: piffpiff
InfDeath: 2
InfDeath: 1
Damage: 15
Grenade:
@@ -32,7 +32,7 @@ Grenade:
Wood: 100%
Light: 25%
Heavy: 5%
InfDeath: 2
InfDeath: 3
Damage: 40
Explosion: large_grey_explosion
ImpactSound: expnew13.aud
@@ -84,7 +84,7 @@ MultiCluster:
Wood: 75%
Light: 35%
Concrete: 20%
InfDeath: 2
InfDeath: 3
Damage: 65
Explosion: large_explosion
ImpactSound: expnew09.aud
@@ -119,7 +119,7 @@ Sniper:
Wood: 5%
Light: 5%
Heavy: 5%
InfDeath: 2
InfDeath: 1
M1Carbine:
ROF: 20
@@ -135,7 +135,7 @@ M1Carbine:
Light: 30%
Heavy: 10%
Explosion: piffpiff
InfDeath: 2
InfDeath: 1
Damage: 15
LtRail:
@@ -169,7 +169,7 @@ Vulcan3:
Heavy: 10%
Concrete: 10%
Explosion: piffpiff
InfDeath: 2
InfDeath: 1
Damage: 10
Vulcan2:
@@ -204,7 +204,7 @@ Vulcan:
Heavy: 10%
Concrete: 10%
Explosion: piffpiff
InfDeath: 2
InfDeath: 1
Damage: 20
FiendShard:
@@ -223,7 +223,7 @@ FiendShard:
Light: 30%
Heavy: 10%
Concrete: 10%
InfDeath: 2
InfDeath: 1
Damage: 35
JumpCannon:
@@ -240,7 +240,7 @@ JumpCannon:
Heavy: 10%
Concrete: 10%
Explosion: piffpiff
InfDeath: 2
InfDeath: 1
Damage: 15
HoverMissile:
@@ -316,7 +316,7 @@ MammothTusk:
Wood: 75%
Light: 75%
Heavy: 50%
InfDeath: 2
InfDeath: 3
Damage: 40
Explosion: medium_bang
ImpactSound: expnew12.aud
@@ -383,7 +383,7 @@ SuicideBomb:
Light: 100%
Heavy: 100%
Concrete: 100%
InfDeath: 3
InfDeath: 2
Damage: 70
Explosion: large_clsn
ImpactSound: expnew14.aud
@@ -417,7 +417,7 @@ AssaultCannon:
Heavy: 40%
Concrete: 10%
Explosion: piffpiff
InfDeath: 2
InfDeath: 1
Damage: 40
BikeMissile:
@@ -462,7 +462,7 @@ RaiderCannon:
Heavy: 10%
Concrete: 10%
Explosion: piffpiff
InfDeath: 2
InfDeath: 1
Damage: 40
FireballLauncher:
@@ -566,7 +566,7 @@ Dragon:
Light: 68%
Heavy: 35%
Concrete: 35%
InfDeath: 2
InfDeath: 3
Damage: 150
Explosion: large_explosion
ImpactSound: expnew09.aud
@@ -594,7 +594,7 @@ Hellfire:
Light: 150%
Heavy: 100%
Concrete: 30%
InfDeath: 3
InfDeath: 2
Damage: 30
Explosion: small_bang
ImpactSound: expnew12.aud
@@ -614,7 +614,7 @@ Bomb:
Light: 75%
Heavy: 32%
Concrete: 100%
InfDeath: 2
InfDeath: 3
Damage: 160
Explosion: large_explosion
ImpactSound: expnew09.aud
@@ -662,7 +662,7 @@ HarpyClaw:
Heavy: 10%
Concrete: 10%
Explosion: piffpiff
InfDeath: 2
InfDeath: 1
Damage: 60
Pistola:
@@ -679,6 +679,6 @@ Pistola:
Heavy: 25%
Concrete: 25%
Explosion: piff
InfDeath: 2
InfDeath: 1
Damage: 2