epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12133 from reaperrr/ts-misc02

Browse Source 
TS polishing pass: Ion Cannon, z-sorting, offsets, explosions
This commit is contained in:
abcdefg30
2016-10-22 19:32:01 +02:00
committed by GitHub
parent 0f02a6ba7c effeddda14
commit 42559f2358
10 changed files with 63 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mods/ts/rules/gdi-structures.yaml
View File

@@ -401,9 +401,11 @@ GAPLUG:
UpgradeTypes: plug.ioncannon
UpgradeMinEnabledLevel: 1
Icon: ioncannon
Effect: ionring
Effect: explosion
EffectSequence: ionring
EffectPalette: effectalpha75
WeaponDelay: 0
ChargeTime: 180
ChargeTime: 510
Description: Ion Cannon
LongDesc: Initiate an Ion Cannon strike.\nApplies instant damage to a small area.
EndChargeSpeechNotification: IonCannonReady

2
mods/ts/rules/nod-infantry.yaml
View File

@@ -17,7 +17,7 @@ E3:
Speed: 42
Armament@PRIMARY:
Weapon: Bazooka
LocalOffset: 128,0,640
LocalOffset: 252,0,684
AttackFrontal:
Voice: Attack
WithInfantryBody:

4
mods/ts/rules/nod-vehicles.yaml
View File

@@ -56,12 +56,12 @@ BIKE:
UpgradeTypes: eliteweapon
UpgradeMaxEnabledLevel: 0
UpgradeMaxAcceptedLevel: 1
LocalOffset: -128,-170,213, -128,170,213
LocalOffset: -108,-144,360, -108,144,360
Armament@ELITE:
Weapon: HoverMissile
UpgradeTypes: eliteweapon
UpgradeMinEnabledLevel: 1
LocalOffset: -128,-170,213, -128,170,213
LocalOffset: -108,-144,360, -108,144,360
AttackFrontal:
Voice: Attack
AutoTarget:

12
mods/ts/rules/palettes.yaml
View File

@@ -41,6 +41,18 @@
PaletteFromFile@effect:
Name: effect
Filename: anim.pal
PaletteFromPaletteWithAlpha@effectalpha25:
Name: effectalpha25
Alpha: 0.25
BasePalette: effect
PaletteFromPaletteWithAlpha@effectalpha50:
Name: effectalpha50
Alpha: 0.5
BasePalette: effect
PaletteFromPaletteWithAlpha@effectalpha75:
Name: effectalpha75
Alpha: 0.75
BasePalette: effect
PaletteFromFile@sidebar:
Name: sidebar
Filename: sidebar-nod|sidebar.pal

60
mods/ts/sequences/misc.yaml
View File

@@ -51,6 +51,7 @@ crate-effects:
Defaults:
Length: *
ZOffset: 2047
Offset: 0, 0, 24
dollar: money
reveal-map: reveal
hide-map: shroudx
@@ -132,38 +133,31 @@ explosion:
building: twlt070
Offset: 0, 0, 36
ionring: ring1
BlendMode: Additive
ZRamp: 1
Tick: 100
ionbeam: ionbeam
Offset: 0,-60
BlendMode: Additive
Length: *
Offset: 0, -60, 60
ZRamp: 1
Tick: 100
ionbeam2: ionbeam
Offset: 0,-180
BlendMode: Additive
Length: *
Offset: 0, -180, 60
ZRamp: 1
Tick: 100
ionbeam3: ionbeam
Offset: 0,-300
BlendMode: Additive
Length: *
Offset: 0, -300, 60
ZRamp: 1
Tick: 100
ionbeam4: ionbeam
Offset: 0,-420
BlendMode: Additive
Length: *
Offset: 0, -420, 60
ZRamp: 1
Tick: 100
ionbeam5: ionbeam
Offset: 0,-540
BlendMode: Additive
Length: *
Offset: 0, -540, 60
ZRamp: 1
Tick: 100
ionbeam6: ionbeam
Offset: 0,-660
BlendMode: Additive
Length: *
Offset: 0, -660, 60
ZRamp: 1
Tick: 100
pulse_explosion: pulsefx2
BlendMode: Additive
@@ -218,22 +212,26 @@ discus:
idle:
Length: *
ZOffset: 1023
Offset: 0, 0, 12
canister:
idle:
Length: *
ZOffset: 1023
Offset: 0, 0, 12
pulsball:
idle:
Length: *
BlendMode: Additive
ZOffset: 1023
Offset: 0, 0, 24
dragon:
idle:
Facings: 32
ZOffset: 1023
Offset: 0, 0, 6
crystal4:
idle:
@@ -241,15 +239,18 @@ crystal4:
ShadowStart: 15
UseTilesetExtension: true
ZOffset: 1023
Offset: 0, 0, 6
120mm:
idle:
ZOffset: 1023
Offset: 0, 0, 4
torpedo:
idle:
Length: *
ZOffset: 1023
Offset: 0, 0, 8
flameall:
idle:
@@ -257,42 +258,51 @@ flameall:
Facings: -8
Tick: 160
ZOffset: 1023
Offset: 0, 0, 24
largesmoke:
idle: lgrysmk1
Length: *
ZOffset: 1023
Offset: 0, 0, 24
smallsmoke:
idle: sgrysmk1
Length: *
ZOffset: 1023
Offset: 0, 0, 24
large_smoke_trail:
idle: smokey
Length: *
ZOffset: 1023
Offset: 0, 0, 24
small_smoke_trail:
idle: smokey2
Length: *
ZOffset: 1023
Offset: 0, 0, 24
largefire:
idle: fire1
Length: *
Offset: 0, 0, 36
mediumfire:
idle: fire2
Length: *
Offset: 0, 0, 24
smallfire:
idle: fire3
Length: *
Offset: 0, 0, 24
tinyfire:
idle: fire4
Length: *
Offset: 0, 0, 24
moveflsh:
idle: ring
@@ -424,18 +434,6 @@ clustermissile:
down: null # TODO
Length: *
ionbeam:
idle:
Length: *
Offset: 0, -78
ZOffset: 1023
ionring:
idle: ring1
Length: *
ZOffset: -512
Tick: 120
^rock:
idle:
ShadowStart: 1

1
mods/ts/weapons/bombsandgrenades.yaml
View File

@@ -53,6 +53,7 @@ Bomb:
DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
Warhead@2Eff: CreateEffect
Explosions: large_explosion
ExplosionPalette: effectalpha75
ImpactSounds: expnew09.aud
InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect

3
mods/ts/weapons/energyweapons.yaml
View File

@@ -125,7 +125,8 @@ CyCannon:
Concrete: 80
DamageTypes: Prone350Percent, TriggerProne, EnergyDeath
Warhead@2Eff: CreateEffect
Explosions: large_bang
Explosions: large_explosion
ExplosionPalette: effectalpha75
ImpactSounds: expnew12.aud
InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect

2
mods/ts/weapons/explosions.yaml
View File

@@ -11,6 +11,7 @@ UnitExplode:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosions: large_twlt
ExplosionPalette: effectalpha75
ImpactSounds: expnew09.aud
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater
@@ -53,6 +54,7 @@ TiberiumExplosion:
Size: 1,1
Warhead@3Eff: CreateEffect
Explosions: large_explosion
ExplosionPalette: effectalpha75
ImpactSounds: expnew09.aud
SmallDebris:

5
mods/ts/weapons/largeguns.yaml
View File

@@ -19,7 +19,7 @@
Concrete: 60
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosions: medium_clsn
Explosions: small_clsn
ImpactSounds: expnew14.aud
InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect
@@ -48,7 +48,7 @@
Concrete: 60
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosions: large_clsn
Explosions: medium_clsn
ImpactSounds: expnew14.aud
InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect
@@ -119,6 +119,7 @@
DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
Warhead@2Eff: CreateEffect
Explosions: large_explosion
ExplosionPalette: effectalpha75
ImpactSounds: expnew06.aud
InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect

8
mods/ts/weapons/superweapons.yaml
View File

@@ -77,17 +77,23 @@ IonCannon:
Delay: 3
Warhead@4Effect: CreateEffect
Explosions: ionbeam
ImpactSound: ion1.aud
ExplosionPalette: effectalpha75
ImpactSounds: ion1.aud
Warhead@5Effect: CreateEffect
Explosions: ionbeam2
ExplosionPalette: effectalpha75
Warhead@6Effect: CreateEffect
Explosions: ionbeam3
ExplosionPalette: effectalpha75
Warhead@7Effect: CreateEffect
Explosions: ionbeam4
ExplosionPalette: effectalpha75
Warhead@8Effect: CreateEffect
Explosions: ionbeam5
ExplosionPalette: effectalpha75
Warhead@9Effect: CreateEffect
Explosions: ionbeam6
ExplosionPalette: effectalpha75
EMPulseCannon:
ReloadDelay: 100