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

Merge pull request #12566 from reaperrr/ts-weapons-misc1

Browse Source 
Various minor TS weapon cleanups
This commit is contained in:
reaperrr
2017-01-22 16:40:41 +01:00
committed by GitHub
parent e4fd10e46b d435cbc0c2
commit c470e04988
6 changed files with 108 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mods/ts/mod.yaml
View File

@@ -85,11 +85,10 @@ Rules:
ts|rules/bridges.yaml
Weapons:
ts|weapons/bombsandgrenades.yaml
ts|weapons/ballisticweapons.yaml
ts|weapons/energyweapons.yaml
ts|weapons/explosions.yaml
ts|weapons/healweapons.yaml
ts|weapons/largeguns.yaml
ts|weapons/missiles.yaml
ts|weapons/otherweapons.yaml
ts|weapons/smallguns.yaml

68
mods/ts/weapons/largeguns.yaml → mods/ts/weapons/ballisticweapons.yaml
View File

@@ -130,3 +130,71 @@
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater
InvalidTargets: Vehicle, Building, Wall
Grenade:
ReloadDelay: 60
Range: 4c512
Projectile: Bullet
Speed: 160
Blockable: true
Shadow: true
LaunchAngle: 60
Inaccuracy: 0
Image: DISCUS
BounceCount: 2
Warhead@1Dam: SpreadDamage
Spread: 192
Damage: 40
Versus:
None: 100
Wood: 85
Light: 70
Heavy: 35
Concrete: 28
DamageTypes: Prone70Percent, TriggerProne, ExplosionDeath
Warhead@2Eff: CreateEffect
Explosions: large_grey_explosion
ImpactSounds: expnew13.aud
InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect
Explosions: small_watersplash
ExplosionPalette: player
ImpactSounds: ssplash3.aud
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater
InvalidTargets: Vehicle, Building, Wall
RPGTower:
ReloadDelay: 80
Range: 8c0
Report: glnch4.aud
Projectile: Bullet
Speed: 384
Blockable: false
Shadow: true
LaunchAngle: 62
Image: canister
Palette: player
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 110
Versus:
None: 30
Wood: 75
Light: 90
Heavy: 100
Concrete: 70
DamageTypes: Prone70Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosions: large_clsn
ImpactSounds: expnew14.aud
InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect
Explosions: small_watersplash
ExplosionPalette: player
ImpactSounds: ssplash2.aud
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater
InvalidTargets: Vehicle, Building, Wall

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

@@ -1,101 +0,0 @@
Grenade:
ReloadDelay: 60
Range: 4c512
Projectile: Bullet
Speed: 160
Blockable: true
Shadow: true
LaunchAngle: 60
Inaccuracy: 0
Image: DISCUS
BounceCount: 2
Warhead@1Dam: SpreadDamage
Spread: 192
Damage: 40
Versus:
None: 100
Wood: 85
Light: 70
Heavy: 35
Concrete: 28
DamageTypes: Prone70Percent, TriggerProne, ExplosionDeath
Warhead@2Eff: CreateEffect
Explosions: large_grey_explosion
ImpactSounds: expnew13.aud
InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect
Explosions: small_watersplash
ExplosionPalette: player
ImpactSounds: ssplash3.aud
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater
InvalidTargets: Vehicle, Building, Wall
Bomb:
ReloadDelay: 60
Burst: 5
BurstDelay: 5
Range: 2c0
Projectile: GravityBomb
Speed: 170
Image: 120mm
Shadow: true
Palette: ra
Warhead@1Dam: SpreadDamage
Spread: 298
Damage: 160
Versus:
None: 200
Wood: 90
Light: 75
Heavy: 32
Concrete: 100
DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
Warhead@2Eff: CreateEffect
Explosions: large_explosion
ExplosionPalette: effectalpha75
ImpactSounds: expnew09.aud
InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect
Explosions: small_watersplash
ExplosionPalette: player
ImpactSounds: ssplash3.aud
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater
InvalidTargets: Vehicle, Building, Wall
RPGTower:
ReloadDelay: 80
Range: 8c0
Report: glnch4.aud
Projectile: Bullet
Speed: 384
Blockable: false
Shadow: true
LaunchAngle: 62
Image: canister
Palette: player
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 110
Versus:
None: 30
Wood: 75
Light: 90
Heavy: 100
Concrete: 70
DamageTypes: Prone70Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosions: large_clsn
ImpactSounds: expnew14.aud
InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect
Explosions: small_watersplash
ExplosionPalette: player
ImpactSounds: ssplash2.aud
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater
InvalidTargets: Vehicle, Building, Wall

13
mods/ts/weapons/missiles.yaml
View File

@@ -35,17 +35,13 @@
Warhead@2Eff: CreateEffect
Explosions: small_clsn
ImpactSounds: expnew12.aud
InvalidImpactTypes: Water, Air, AirHit
InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect
Explosions: small_watersplash
ExplosionPalette: player
ImpactSounds: ssplash3.aud
ValidImpactTypes: Water
Warhead@4EffAir: CreateEffect
ValidImpactTypes: Air, AirHit
Explosions: tiny_twlt
ImpactSounds: expnew05.aud
Warhead@5Smu: LeaveSmudge
Warhead@Smu: LeaveSmudge
SmudgeType: SmallCrater
InvalidTargets: Vehicle, Building, Wall
@@ -93,8 +89,6 @@ MammothTusk:
ExplosionPalette: player
ImpactSounds: ssplash3.aud
ValidImpactTypes: Water
-Warhead@4EffAir:
-Warhead@5Smu:
BikeMissile:
Inherits: ^DefaultMissile
@@ -154,6 +148,3 @@ RedEye2:
Warhead@2Eff: CreateEffect
Explosions: large_grey_explosion
ImpactSounds: expnew13.aud
-Warhead@3EffWater:
-Warhead@4EffAir:
-Warhead@5Smu:

34
mods/ts/weapons/otherweapons.yaml
View File

@@ -22,6 +22,40 @@ FireballLauncher:
SmudgeType: SmallScorch
InvalidTargets: Vehicle, Building, Wall
Bomb:
ReloadDelay: 60
Burst: 5
BurstDelay: 5
Range: 2c0
Projectile: GravityBomb
Speed: 170
Image: 120mm
Shadow: true
Palette: ra
Warhead@1Dam: SpreadDamage
Spread: 298
Damage: 160
Versus:
None: 200
Wood: 90
Light: 75
Heavy: 32
Concrete: 100
DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
Warhead@2Eff: CreateEffect
Explosions: large_explosion
ExplosionPalette: effectalpha75
ImpactSounds: expnew09.aud
InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect
Explosions: small_watersplash
ExplosionPalette: player
ImpactSounds: ssplash3.aud
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater
InvalidTargets: Vehicle, Building, Wall
FiendShard:
ReloadDelay: 30
Burst: 3

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

@@ -56,19 +56,19 @@ SuicideBomb:
Warhead@2Res: DestroyResource
IonCannon:
ValidTargets: Ground, Air
ValidTargets: Ground, Water, Air
Warhead@1Dam_impact: SpreadDamage
Spread: 1c0
Damage: 100
Falloff: 1000, 368, 135, 50, 18, 7, 0
ValidTargets: Ground, Air
ValidTargets: Ground, Water, Air
DamageTypes: Prone100Percent, TriggerProne, EnergyDeath
Warhead@2Dam_area: SpreadDamage
Spread: 1c0
Damage: 250
Falloff: 100, 50, 25, 0
Delay: 3
ValidTargets: Ground, Air
ValidTargets: Ground, Water, Air
DamageTypes: Prone50Percent, TriggerProne, EnergyDeath
Warhead@3Smu_area: LeaveSmudge
SmudgeType: SmallScorch