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

fixed #2167 -- silly inconsistency between InfDeath and dieN sequence numbering

Browse Source
This commit is contained in:
Chris Forbes
2012-07-02 09:42:20 +12:00
parent e89ee2c131
commit 3dc39b2c9d
7 changed files with 124 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/GameRules/WeaponInfo.cs
View File

@@ -26,7 +26,7 @@ namespace OpenRA.GameRules
public readonly string WaterExplosion = null; // explosion effect on hitting water (usually a splash) public readonly string WaterExplosion = null; // explosion effect on hitting water (usually a splash)
public readonly string[] SmudgeType = { }; // type of smudge to apply public readonly string[] SmudgeType = { }; // type of smudge to apply
public readonly int[] Size = { 0, 0 }; // size of the explosion. provide 2 values for a ring effect (outer/inner) public readonly int[] Size = { 0, 0 }; // size of the explosion. provide 2 values for a ring effect (outer/inner)
public readonly int InfDeath = 0; // infantry death animation to use public readonly int InfDeath = 1; // infantry death animation to use
public readonly string ImpactSound = null; // sound to play on impact public readonly string ImpactSound = null; // sound to play on impact
public readonly string WaterImpactSound = null; // sound to play on impact with water public readonly string WaterImpactSound = null; // sound to play on impact with water
public readonly int Damage = 0; // how much (raw) damage to deal public readonly int Damage = 0; // how much (raw) damage to deal

2
OpenRA.Mods.Cnc/SpawnViceroid.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Cnc
[ActorReference] public readonly string ViceroidActor = "vice"; [ActorReference] public readonly string ViceroidActor = "vice";
public readonly int Probability = 10; public readonly int Probability = 10;
public readonly string Owner = "Creeps"; public readonly string Owner = "Creeps";
public readonly int InfDeath = 5; public readonly int InfDeath = 6;
public object Create(ActorInitializer init) { return new SpawnViceroid(this); } public object Create(ActorInitializer init) { return new SpawnViceroid(this); }
} }

2
OpenRA.Mods.RA/Render/RenderInfantry.cs
View File

@@ -127,7 +127,7 @@ namespace OpenRA.Mods.RA.Render
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
if (!self.Destroyed) if (!self.Destroyed)
w.Add(new Corpse(self, "die{0}".F(e.Warhead.InfDeath + 1))); w.Add(new Corpse(self, "die{0}".F(e.Warhead.InfDeath)));
}); });
} }
} }

2
OpenRA.Mods.RA/TeslaInstantKills.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.RA
{ {
public float GetDamageModifier(Actor attacker, WarheadInfo warhead ) public float GetDamageModifier(Actor attacker, WarheadInfo warhead )
{ {
if( warhead != null && warhead.InfDeath == 5 ) if( warhead != null && warhead.InfDeath == 6 )
return 1000f; return 1000f;
return 1f; return 1f;
} }

78
mods/cnc/weapons.yaml
View File

@@ -8,7 +8,7 @@ UnitExplode:
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
Explosion: 8 Explosion: 8
InfDeath: 3 InfDeath: 4
ImpactSound: xplobig6 ImpactSound: xplobig6
UnitExplodeSmall: UnitExplodeSmall:
@@ -21,7 +21,7 @@ UnitExplodeSmall:
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
Explosion: 8 Explosion: 8
InfDeath: 3 InfDeath: 4
ImpactSound: xplos ImpactSound: xplos
GrenadierExplode: GrenadierExplode:
@@ -34,7 +34,7 @@ GrenadierExplode:
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
Explosion: 8 Explosion: 8
InfDeath: 2 InfDeath: 3
ImpactSound: xplos ImpactSound: xplos
Atomic: Atomic:
@@ -48,7 +48,7 @@ Atomic:
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
Explosion: 6 Explosion: 6
InfDeath: 4 InfDeath: 5
ImpactSound: nukexplo ImpactSound: nukexplo
Warhead@areanuke: Warhead@areanuke:
DamageModel: PerCell DamageModel: PerCell
@@ -62,7 +62,7 @@ Atomic:
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
Delay: 3 Delay: 3
InfDeath: 4 InfDeath: 5
ImpactSound: xplobig4 ImpactSound: xplobig4
IonCannon: IonCannon:
@@ -75,7 +75,7 @@ IonCannon:
Wood: 60% Wood: 60%
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
InfDeath: 4 InfDeath: 5
Warhead@area: Warhead@area:
DamageModel: PerCell DamageModel: PerCell
Damage: 200 Damage: 200
@@ -88,7 +88,7 @@ IonCannon:
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
Delay: 3 Delay: 3
InfDeath: 4 InfDeath: 5
Sniper: Sniper:
Report: RAMGUN2 Report: RAMGUN2
@@ -104,7 +104,7 @@ Sniper:
Wood: 5% Wood: 5%
Light: 5% Light: 5%
Heavy: 5% Heavy: 5%
InfDeath: 1 InfDeath: 2
HighV: HighV:
ROF: 40 ROF: 40
@@ -120,7 +120,7 @@ HighV:
Wood: 50% Wood: 50%
Light: 50% Light: 50%
Heavy: 25% Heavy: 25%
InfDeath: 1 InfDeath: 2
Explosion: 1 Explosion: 1
HeliAGGun: HeliAGGun:
@@ -140,7 +140,7 @@ HeliAGGun:
Wood: 50% Wood: 50%
Light: 50% Light: 50%
Heavy: 25% Heavy: 25%
InfDeath: 1 InfDeath: 2
Explosion: 1 Explosion: 1
HeliAAGun: HeliAAGun:
@@ -160,7 +160,7 @@ HeliAAGun:
Wood: 50% Wood: 50%
Light: 50% Light: 50%
Heavy: 25% Heavy: 25%
InfDeath: 1 InfDeath: 2
Explosion: 1 Explosion: 1
Pistol: Pistol:
@@ -176,7 +176,7 @@ Pistol:
Wood: 50% Wood: 50%
Light: 50% Light: 50%
Heavy: 25% Heavy: 25%
InfDeath: 1 InfDeath: 2
Explosion: 1 Explosion: 1
Damage: 1 Damage: 1
@@ -194,7 +194,7 @@ M16:
Light: 30% Light: 30%
Heavy: 10% Heavy: 10%
Explosion: 1 Explosion: 1
InfDeath: 1 InfDeath: 2
Damage: 15 Damage: 15
Rockets: Rockets:
@@ -220,7 +220,7 @@ Rockets:
Wood: 75% Wood: 75%
Light: 75% Light: 75%
Heavy: 50% Heavy: 50%
InfDeath: 3 InfDeath: 4
Explosion: 4 Explosion: 4
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -251,7 +251,7 @@ BikeRockets:
Wood: 30% Wood: 30%
Light: 75% Light: 75%
Heavy: 30% Heavy: 30%
InfDeath: 3 InfDeath: 4
Explosion: 4 Explosion: 4
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -282,7 +282,7 @@ OrcaAGMissiles:
Wood: 75% Wood: 75%
Light: 75% Light: 75%
Heavy: 50% Heavy: 50%
InfDeath: 3 InfDeath: 4
Explosion: 4 Explosion: 4
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -313,7 +313,7 @@ OrcaAAMissiles:
Wood: 75% Wood: 75%
Light: 75% Light: 75%
Heavy: 50% Heavy: 50%
InfDeath: 3 InfDeath: 4
Explosion: 4 Explosion: 4
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -332,7 +332,7 @@ Flamethrower:
Wood: 200% Wood: 200%
Light: 75% Light: 75%
Heavy: 25% Heavy: 25%
InfDeath: 4 InfDeath: 5
ImpactSound: flamer2 ImpactSound: flamer2
SmudgeType: Scorch SmudgeType: Scorch
Damage: 35 Damage: 35
@@ -352,7 +352,7 @@ BigFlamer:
Wood: 200% Wood: 200%
Light: 75% Light: 75%
Heavy: 25% Heavy: 25%
InfDeath: 4 InfDeath: 5
Explosion: 3 Explosion: 3
ImpactSound: flamer2 ImpactSound: flamer2
SmudgeType: Scorch SmudgeType: Scorch
@@ -372,7 +372,7 @@ Chemspray:
Wood: 75% Wood: 75%
Light: 75% Light: 75%
Heavy: 50% Heavy: 50%
InfDeath: 5 InfDeath: 6
SmudgeType: Scorch SmudgeType: Scorch
ImpactSound: xplos ImpactSound: xplos
@@ -392,7 +392,7 @@ Grenade:
Wood: 75% Wood: 75%
Light: 75% Light: 75%
Heavy: 50% Heavy: 50%
InfDeath: 2 InfDeath: 3
Explosion: 5 Explosion: 5
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -412,7 +412,7 @@ Grenade:
Wood: 75% Wood: 75%
Light: 75% Light: 75%
Heavy: 50% Heavy: 50%
InfDeath: 3 InfDeath: 4
Explosion: 4 Explosion: 4
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -432,7 +432,7 @@ Grenade:
Wood: 75% Wood: 75%
Light: 75% Light: 75%
Heavy: 50% Heavy: 50%
InfDeath: 3 InfDeath: 4
Explosion: 4 Explosion: 4
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -452,7 +452,7 @@ Grenade:
Wood: 75% Wood: 75%
Light: 75% Light: 75%
Heavy: 50% Heavy: 50%
InfDeath: 3 InfDeath: 4
Explosion: 4 Explosion: 4
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -473,7 +473,7 @@ Grenade:
Wood: 75% Wood: 75%
Light: 75% Light: 75%
Heavy: 50% Heavy: 50%
InfDeath: 3 InfDeath: 4
Explosion: 4 Explosion: 4
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -493,7 +493,7 @@ TurretGun:
Wood: 75% Wood: 75%
Light: 75% Light: 75%
Heavy: 50% Heavy: 50%
InfDeath: 3 InfDeath: 4
Explosion: 4 Explosion: 4
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -523,7 +523,7 @@ MammothMissiles:
Wood: 75% Wood: 75%
Light: 75% Light: 75%
Heavy: 50% Heavy: 50%
InfDeath: 3 InfDeath: 4
Explosion: 4 Explosion: 4
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -554,7 +554,7 @@ MammothMissiles:
Wood: 50% Wood: 50%
Light: 100% Light: 100%
Heavy: 50% Heavy: 50%
InfDeath: 3 InfDeath: 4
Explosion: 4 Explosion: 4
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -585,7 +585,7 @@ MammothMissiles:
Wood: 75% Wood: 75%
Light: 75% Light: 75%
Heavy: 50% Heavy: 50%
InfDeath: 3 InfDeath: 4
Explosion: 4 Explosion: 4
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -611,7 +611,7 @@ ArtilleryShell:
Wood: 75% Wood: 75%
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
InfDeath: 2 InfDeath: 3
Explosion: 8 Explosion: 8
SmudgeType: Crater SmudgeType: Crater
ImpactSound: XPLOSML2 ImpactSound: XPLOSML2
@@ -629,7 +629,7 @@ MachineGun:
Wood: 50% Wood: 50%
Light: 50% Light: 50%
Heavy: 25% Heavy: 25%
InfDeath: 1 InfDeath: 2
Explosion: 1 Explosion: 1
Damage: 15 Damage: 15
@@ -657,7 +657,7 @@ BoatMissile:
Wood: 75% Wood: 75%
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
InfDeath: 2 InfDeath: 3
Explosion: 5 Explosion: 5
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -688,7 +688,7 @@ TowerMissle:
Wood: 75% Wood: 75%
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
InfDeath: 2 InfDeath: 3
Explosion: 5 Explosion: 5
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -705,7 +705,7 @@ Napalm:
Wood: 100% Wood: 100%
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
InfDeath: 4 InfDeath: 5
Explosion: 3 Explosion: 3
ImpactSound: flamer2 ImpactSound: flamer2
SmudgeType: Scorch SmudgeType: Scorch
@@ -719,7 +719,7 @@ Napalm.Crate:
Wood: 100% Wood: 100%
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
InfDeath: 4 InfDeath: 5
Explosion: 3 Explosion: 3
ImpactSound: flamer2 ImpactSound: flamer2
SmudgeType: Scorch SmudgeType: Scorch
@@ -734,7 +734,7 @@ Laser:
BeamRadius: 1 BeamRadius: 1
Warhead: Warhead:
Spread: 1 Spread: 1
InfDeath: 4 InfDeath: 5
SmudgeType: Scorch SmudgeType: Scorch
Damage: 200 Damage: 200
@@ -760,7 +760,7 @@ SAMMissile:
Wood: 75% Wood: 75%
Light: 75% Light: 75%
Heavy: 50% Heavy: 50%
InfDeath: 3 InfDeath: 4
Explosion: 4 Explosion: 4
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -788,7 +788,7 @@ HonestJohn:
Wood: 75% Wood: 75%
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
InfDeath: 2 InfDeath: 3
Explosion: 5 Explosion: 5
ImpactSound: xplos ImpactSound: xplos
SmudgeType: Crater SmudgeType: Crater
@@ -798,7 +798,7 @@ Tiberium:
ROF: 4 ROF: 4
Warhead: Warhead:
Spread: 1 Spread: 1
InfDeath: 5 InfDeath: 6
Damage: 1 Damage: 1
PreventProne: yes PreventProne: yes

58
mods/d2k/weapons.yaml
View File

@@ -12,7 +12,7 @@ M1Carbine:
Heavy: 10% Heavy: 10%
Concrete: 10% Concrete: 10%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 15 Damage: 15
Dragon: Dragon:
@@ -41,7 +41,7 @@ Dragon:
Concrete: 20% Concrete: 20%
Explosion: med_explosion Explosion: med_explosion
WaterExplosion: med_splash WaterExplosion: med_splash
InfDeath: 3 InfDeath: 4
SmudgeType: SandCrater, RockCrater SmudgeType: SandCrater, RockCrater
Damage: 50 Damage: 50
ImpactSound: kaboom12 ImpactSound: kaboom12
@@ -71,7 +71,7 @@ QuadRockets:
Wood: 30% Wood: 30%
Light: 75% Light: 75%
Heavy: 30% Heavy: 30%
InfDeath: 3 InfDeath: 4
Explosion: med_explosion Explosion: med_explosion
WaterExplosion: med_splash WaterExplosion: med_splash
ImpactSound: kaboom12 ImpactSound: kaboom12
@@ -93,7 +93,7 @@ TurretGun:
Light: 75% Light: 75%
Concrete: 50% Concrete: 50%
Explosion: small_explosion Explosion: small_explosion
InfDeath: 3 InfDeath: 4
SmudgeType: SandCrater, RockCrater SmudgeType: SandCrater, RockCrater
Damage: 60 Damage: 60
@@ -122,7 +122,7 @@ TowerMissle:
Wood: 75% Wood: 75%
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
InfDeath: 2 InfDeath: 3
Explosion: small_explosion Explosion: small_explosion
ImpactSound: kaboom12 ImpactSound: kaboom12
SmudgeType: SandCrater, RockCrater SmudgeType: SandCrater, RockCrater
@@ -143,7 +143,7 @@ TowerMissle:
Heavy: 40% Heavy: 40%
Concrete: 30% Concrete: 30%
Explosion: small_explosion Explosion: small_explosion
InfDeath: 3 InfDeath: 4
SmudgeType: SandCrater, RockCrater SmudgeType: SandCrater, RockCrater
Damage: 16 Damage: 16
@@ -162,7 +162,7 @@ TowerMissle:
Light: 75% Light: 75%
Concrete: 50% Concrete: 50%
Explosion: small_explosion Explosion: small_explosion
InfDeath: 3 InfDeath: 4
SmudgeType: SandCrater, RockCrater SmudgeType: SandCrater, RockCrater
Damage: 30 Damage: 30
@@ -183,7 +183,7 @@ TowerMissle:
Light: 75% Light: 75%
Concrete: 50% Concrete: 50%
Explosion: small_explosion Explosion: small_explosion
InfDeath: 3 InfDeath: 4
SmudgeType: SandCrater, RockCrater SmudgeType: SandCrater, RockCrater
Damage: 40 Damage: 40
@@ -203,7 +203,7 @@ TowerMissle:
Light: 75% Light: 75%
Concrete: 50% Concrete: 50%
Explosion: small_explosion Explosion: small_explosion
InfDeath: 3 InfDeath: 4
SmudgeType: SandCrater, RockCrater SmudgeType: SandCrater, RockCrater
Damage: 50 Damage: 50
@@ -232,7 +232,7 @@ TowerMissle:
Wood: 75% Wood: 75%
Light: 75% Light: 75%
Heavy: 50% Heavy: 50%
InfDeath: 3 InfDeath: 4
Explosion: med_explosion Explosion: med_explosion
WaterExplosion: med_splash WaterExplosion: med_splash
ImpactSound: kaboom12 ImpactSound: kaboom12
@@ -286,7 +286,7 @@ FakeMissile:
Concrete: 50% Concrete: 50%
Explosion: large_explosion Explosion: large_explosion
WaterExplosion: med_splash WaterExplosion: med_splash
InfDeath: 2 InfDeath: 3
SmudgeType: SandCrater, RockCrater SmudgeType: SandCrater, RockCrater
Damage: 220 Damage: 220
@@ -298,7 +298,7 @@ TTankZap:
Projectile: TeslaZap Projectile: TeslaZap
Warhead: Warhead:
Spread: 1 Spread: 1
InfDeath: 5 InfDeath: 6
Damage: 100 Damage: 100
ChainGun: ChainGun:
@@ -317,7 +317,7 @@ ChainGun:
Heavy: 25% Heavy: 25%
Concrete: 25% Concrete: 25%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 20 Damage: 20
M60mg: M60mg:
@@ -335,7 +335,7 @@ M60mg:
Heavy: 10% Heavy: 10%
Concrete: 10% Concrete: 10%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 15 Damage: 15
Demolish: Demolish:
@@ -359,7 +359,7 @@ Atomic:
Heavy: 25% Heavy: 25%
Concrete: 50% Concrete: 50%
Explosion: nuke Explosion: nuke
InfDeath: 4 InfDeath: 5
ImpactSound: EXPLSML2 ImpactSound: EXPLSML2
Warhead@areanuke: Warhead@areanuke:
DamageModel: PerCell DamageModel: PerCell
@@ -373,7 +373,7 @@ Atomic:
Heavy: 25% Heavy: 25%
Concrete: 50% Concrete: 50%
Delay: 4 Delay: 4
InfDeath: 4 InfDeath: 5
ImpactSound: EXPLLG2 ImpactSound: EXPLLG2
CrateNuke: CrateNuke:
@@ -387,7 +387,7 @@ CrateNuke:
Heavy: 25% Heavy: 25%
Concrete: 50% Concrete: 50%
Explosion: nuke Explosion: nuke
InfDeath: 4 InfDeath: 5
ImpactSound: EXPLSML2 ImpactSound: EXPLSML2
Warhead@areanuke: Warhead@areanuke:
DamageModel: PerCell DamageModel: PerCell
@@ -401,7 +401,7 @@ CrateNuke:
Heavy: 25% Heavy: 25%
Concrete: 50% Concrete: 50%
Delay: 4 Delay: 4
InfDeath: 4 InfDeath: 5
ImpactSound: EXPLLG2 ImpactSound: EXPLLG2
CrateExplosion: CrateExplosion:
@@ -415,7 +415,7 @@ CrateExplosion:
Heavy: 25% Heavy: 25%
Explosion: self_destruct Explosion: self_destruct
WaterExplosion: self_destruct WaterExplosion: self_destruct
InfDeath: 3 InfDeath: 4
ImpactSound: EXPLSML4 ImpactSound: EXPLSML4
UnitExplode: UnitExplode:
@@ -429,7 +429,7 @@ UnitExplode:
Heavy: 25% Heavy: 25%
Explosion: self_destruct Explosion: self_destruct
WaterExplosion: large_splash WaterExplosion: large_splash
InfDeath: 3 InfDeath: 4
ImpactSound: EXPLMD1 ImpactSound: EXPLMD1
UnitExplodeSmall: UnitExplodeSmall:
@@ -442,7 +442,7 @@ UnitExplodeSmall:
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
Explosion: large_explosion Explosion: large_explosion
InfDeath: 3 InfDeath: 4
ImpactSound: EXPLSML2 ImpactSound: EXPLSML2
WormJaw: WormJaw:
@@ -480,7 +480,7 @@ RedEye:
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
Explosion: med_explosion Explosion: med_explosion
InfDeath: 2 InfDeath: 3
SmudgeType: SandCrater, RockCrater SmudgeType: SandCrater, RockCrater
Damage: 40 Damage: 40
@@ -498,7 +498,7 @@ Sniper:
Wood: 5% Wood: 5%
Light: 5% Light: 5%
Heavy: 5% Heavy: 5%
InfDeath: 1 InfDeath: 2
Vulcan: Vulcan:
ROF: 30 ROF: 30
@@ -515,7 +515,7 @@ Vulcan:
Heavy: 25% Heavy: 25%
Concrete: 25% Concrete: 25%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 10 Damage: 10
Warhead@2: Warhead@2:
Spread: 3 Spread: 3
@@ -525,7 +525,7 @@ Vulcan:
Heavy: 25% Heavy: 25%
Concrete: 25% Concrete: 25%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 10 Damage: 10
Delay: 2 Delay: 2
Warhead@3: Warhead@3:
@@ -536,7 +536,7 @@ Vulcan:
Heavy: 25% Heavy: 25%
Concrete: 25% Concrete: 25%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 10 Damage: 10
Delay: 4 Delay: 4
Warhead@4: Warhead@4:
@@ -547,7 +547,7 @@ Vulcan:
Heavy: 25% Heavy: 25%
Concrete: 25% Concrete: 25%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 10 Damage: 10
Delay: 6 Delay: 6
Warhead@5: Warhead@5:
@@ -558,7 +558,7 @@ Vulcan:
Heavy: 25% Heavy: 25%
Concrete: 25% Concrete: 25%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 10 Damage: 10
Delay: 8 Delay: 8
Warhead@6: Warhead@6:
@@ -569,6 +569,6 @@ Vulcan:
Heavy: 25% Heavy: 25%
Concrete: 25% Concrete: 25%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 10 Damage: 10
Delay: 10 Delay: 10

104
mods/ra/weapons.yaml
View File

@@ -12,7 +12,7 @@ Colt45:
Heavy: 5% Heavy: 5%
Concrete: 5% Concrete: 5%
Explosion: piff Explosion: piff
InfDeath: 1 InfDeath: 2
Damage: 50 Damage: 50
ZSU-23: ZSU-23:
@@ -48,7 +48,7 @@ Vulcan:
Heavy: 25% Heavy: 25%
Concrete: 25% Concrete: 25%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 10 Damage: 10
Warhead@2: Warhead@2:
Spread: 3 Spread: 3
@@ -58,7 +58,7 @@ Vulcan:
Heavy: 25% Heavy: 25%
Concrete: 25% Concrete: 25%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 10 Damage: 10
Delay: 2 Delay: 2
Warhead@3: Warhead@3:
@@ -69,7 +69,7 @@ Vulcan:
Heavy: 25% Heavy: 25%
Concrete: 25% Concrete: 25%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 10 Damage: 10
Delay: 4 Delay: 4
Warhead@4: Warhead@4:
@@ -80,7 +80,7 @@ Vulcan:
Heavy: 25% Heavy: 25%
Concrete: 25% Concrete: 25%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 10 Damage: 10
Delay: 6 Delay: 6
Warhead@5: Warhead@5:
@@ -91,7 +91,7 @@ Vulcan:
Heavy: 25% Heavy: 25%
Concrete: 25% Concrete: 25%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 10 Damage: 10
Delay: 8 Delay: 8
Warhead@6: Warhead@6:
@@ -102,7 +102,7 @@ Vulcan:
Heavy: 25% Heavy: 25%
Concrete: 25% Concrete: 25%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 10 Damage: 10
Delay: 10 Delay: 10
@@ -135,7 +135,7 @@ Maverick:
Concrete: 50% Concrete: 50%
Explosion: med_explosion Explosion: med_explosion
WaterExplosion: med_splash WaterExplosion: med_splash
InfDeath: 3 InfDeath: 4
SmudgeType: Crater SmudgeType: Crater
Damage: 70 Damage: 70
@@ -157,7 +157,7 @@ FireballLauncher:
Concrete: 50% Concrete: 50%
Explosion: napalm Explosion: napalm
WaterExplosion: napalm WaterExplosion: napalm
InfDeath: 4 InfDeath: 5
SmudgeType: Scorch SmudgeType: Scorch
ImpactSound: firebl3 ImpactSound: firebl3
Damage: 150 Damage: 150
@@ -183,7 +183,7 @@ Flamer:
Concrete: 50% Concrete: 50%
Explosion: small_napalm Explosion: small_napalm
WaterExplosion: small_napalm WaterExplosion: small_napalm
InfDeath: 4 InfDeath: 5
SmudgeType: Scorch SmudgeType: Scorch
ImpactSound: firebl3 ImpactSound: firebl3
Damage: 8 Damage: 8
@@ -205,7 +205,7 @@ ChainGun:
Concrete: 25% Concrete: 25%
Explosion: piffs Explosion: piffs
WaterExplosion: small_splash WaterExplosion: small_splash
InfDeath: 1 InfDeath: 2
Damage: 20 Damage: 20
ChainGun.Yak: ChainGun.Yak:
@@ -225,7 +225,7 @@ ChainGun.Yak:
Concrete: 25% Concrete: 25%
Explosion: piffs Explosion: piffs
WaterExplosion: small_splash WaterExplosion: small_splash
InfDeath: 1 InfDeath: 2
Damage: 40 Damage: 40
Pistol: Pistol:
@@ -242,7 +242,7 @@ Pistol:
Heavy: 25% Heavy: 25%
Concrete: 25% Concrete: 25%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 1 Damage: 1
M1Carbine: M1Carbine:
@@ -259,7 +259,7 @@ M1Carbine:
Heavy: 10% Heavy: 10%
Concrete: 10% Concrete: 10%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 15 Damage: 15
Dragon: Dragon:
@@ -288,7 +288,7 @@ Dragon:
Concrete: 20% Concrete: 20%
Explosion: med_explosion Explosion: med_explosion
WaterExplosion: med_splash WaterExplosion: med_splash
InfDeath: 3 InfDeath: 4
SmudgeType: Crater SmudgeType: Crater
Damage: 50 Damage: 50
ImpactSound: kaboom12 ImpactSound: kaboom12
@@ -321,7 +321,7 @@ HellfireAG:
Concrete: 50% Concrete: 50%
Explosion: med_explosion Explosion: med_explosion
WaterExplosion: med_splash WaterExplosion: med_splash
InfDeath: 3 InfDeath: 4
SmudgeType: Crater SmudgeType: Crater
Damage: 40 Damage: 40
@@ -353,7 +353,7 @@ HellfireAA:
Concrete: 50% Concrete: 50%
Explosion: med_explosion Explosion: med_explosion
WaterExplosion: med_splash WaterExplosion: med_splash
InfDeath: 3 InfDeath: 4
SmudgeType: Crater SmudgeType: Crater
Damage: 40 Damage: 40
@@ -376,7 +376,7 @@ Grenade:
Heavy: 5% Heavy: 5%
Explosion: med_explosion Explosion: med_explosion
WaterExplosion: small_splash WaterExplosion: small_splash
InfDeath: 2 InfDeath: 3
SmudgeType: Crater SmudgeType: Crater
Damage: 60 Damage: 60
ImpactSound: kaboom12 ImpactSound: kaboom12
@@ -397,7 +397,7 @@ Grenade:
Concrete: 30% Concrete: 30%
Explosion: small_explosion Explosion: small_explosion
WaterExplosion: small_splash WaterExplosion: small_splash
InfDeath: 3 InfDeath: 4
SmudgeType: Crater SmudgeType: Crater
Damage: 16 Damage: 16
@@ -417,7 +417,7 @@ Grenade:
Concrete: 50% Concrete: 50%
Explosion: small_explosion Explosion: small_explosion
WaterExplosion: small_splash WaterExplosion: small_splash
InfDeath: 3 InfDeath: 4
SmudgeType: Crater SmudgeType: Crater
Damage: 30 Damage: 30
@@ -439,7 +439,7 @@ Grenade:
Concrete: 50% Concrete: 50%
Explosion: small_explosion Explosion: small_explosion
WaterExplosion: small_splash WaterExplosion: small_splash
InfDeath: 3 InfDeath: 4
SmudgeType: Crater SmudgeType: Crater
Damage: 40 Damage: 40
@@ -460,7 +460,7 @@ Grenade:
Concrete: 50% Concrete: 50%
Explosion: small_explosion Explosion: small_explosion
WaterExplosion: small_splash WaterExplosion: small_splash
InfDeath: 3 InfDeath: 4
SmudgeType: Crater SmudgeType: Crater
Damage: 50 Damage: 50
@@ -480,7 +480,7 @@ TurretGun:
Concrete: 50% Concrete: 50%
Explosion: small_explosion Explosion: small_explosion
WaterExplosion: small_splash WaterExplosion: small_splash
InfDeath: 3 InfDeath: 4
SmudgeType: Crater SmudgeType: Crater
Damage: 60 Damage: 60
@@ -511,7 +511,7 @@ MammothTusk:
Heavy: 25% Heavy: 25%
Explosion: med_explosion Explosion: med_explosion
WaterExplosion: med_splash WaterExplosion: med_splash
InfDeath: 2 InfDeath: 3
SmudgeType: Crater SmudgeType: Crater
Damage: 45 Damage: 45
@@ -537,7 +537,7 @@ MammothTusk:
Concrete: 50% Concrete: 50%
Explosion: large_explosion Explosion: large_explosion
WaterExplosion: med_splash WaterExplosion: med_splash
InfDeath: 2 InfDeath: 3
SmudgeType: Crater SmudgeType: Crater
Damage: 220 Damage: 220
@@ -557,7 +557,7 @@ M60mg:
Concrete: 10% Concrete: 10%
Explosion: piffs Explosion: piffs
WaterExplosion: small_splash WaterExplosion: small_splash
InfDeath: 1 InfDeath: 2
Damage: 15 Damage: 15
Napalm: Napalm:
@@ -578,7 +578,7 @@ Napalm:
Concrete: 50% Concrete: 50%
Explosion: napalm Explosion: napalm
WaterExplosion: med_splash WaterExplosion: med_splash
InfDeath: 4 InfDeath: 5
SmudgeType: Scorch SmudgeType: Scorch
ImpactSound: firebl3 ImpactSound: firebl3
Damage: 100 Damage: 100
@@ -593,7 +593,7 @@ CrateNapalm:
Concrete: 50% Concrete: 50%
Explosion: napalm Explosion: napalm
WaterExplosion: napalm WaterExplosion: napalm
InfDeath: 4 InfDeath: 5
SmudgeType: Scorch SmudgeType: Scorch
ImpactSound: firebl3 ImpactSound: firebl3
Damage: 600 Damage: 600
@@ -609,7 +609,7 @@ CrateExplosion:
Heavy: 25% Heavy: 25%
Explosion: self_destruct Explosion: self_destruct
WaterExplosion: self_destruct WaterExplosion: self_destruct
InfDeath: 3 InfDeath: 4
ImpactSound: kaboom15 ImpactSound: kaboom15
CrateNuke: CrateNuke:
@@ -624,7 +624,7 @@ CrateNuke:
Concrete: 50% Concrete: 50%
Explosion: nuke Explosion: nuke
WaterExplosion: nuke WaterExplosion: nuke
InfDeath: 4 InfDeath: 5
ImpactSound: kaboom1 ImpactSound: kaboom1
Warhead@areanuke: Warhead@areanuke:
DamageModel: PerCell DamageModel: PerCell
@@ -638,7 +638,7 @@ CrateNuke:
Heavy: 25% Heavy: 25%
Concrete: 50% Concrete: 50%
Delay: 4 Delay: 4
InfDeath: 4 InfDeath: 5
ImpactSound: kaboom22 ImpactSound: kaboom22
@@ -650,7 +650,7 @@ TeslaZap:
Projectile: TeslaZap Projectile: TeslaZap
Warhead: Warhead:
Spread: 1 Spread: 1
InfDeath: 5 InfDeath: 6
Damage: 100 Damage: 100
Nike: Nike:
@@ -678,7 +678,7 @@ Nike:
Heavy: 50% Heavy: 50%
Concrete: 0% Concrete: 0%
Explosion: med_explosion Explosion: med_explosion
InfDeath: 2 InfDeath: 3
SmudgeType: Crater SmudgeType: Crater
Damage: 100 Damage: 100
@@ -706,7 +706,7 @@ RedEye:
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
Explosion: med_explosion Explosion: med_explosion
InfDeath: 2 InfDeath: 3
SmudgeType: Crater SmudgeType: Crater
Damage: 40 Damage: 40
@@ -732,7 +732,7 @@ RedEye:
Heavy: 25% Heavy: 25%
Explosion: large_explosion Explosion: large_explosion
WaterExplosion: large_splash WaterExplosion: large_splash
InfDeath: 2 InfDeath: 3
SmudgeType: Crater SmudgeType: Crater
Damage: 250 Damage: 250
ImpactSound: kaboom12 ImpactSound: kaboom12
@@ -760,7 +760,7 @@ SubMissile:
Heavy: 30% Heavy: 30%
Explosion: large_explosion Explosion: large_explosion
WaterExplosion: large_splash WaterExplosion: large_splash
InfDeath: 2 InfDeath: 3
SmudgeType: Crater SmudgeType: Crater
Damage: 300 Damage: 300
ImpactSound: kaboom12 ImpactSound: kaboom12
@@ -794,7 +794,7 @@ Stinger:
Concrete: 50% Concrete: 50%
Explosion: med_explosion Explosion: med_explosion
WaterExplosion: med_splash WaterExplosion: med_splash
InfDeath: 3 InfDeath: 4
SmudgeType: Crater SmudgeType: Crater
Damage: 30 Damage: 30
@@ -821,7 +821,7 @@ TorpTube:
Light: 75% Light: 75%
Concrete: 50% Concrete: 50%
WaterExplosion: large_splash WaterExplosion: large_splash
InfDeath: 3 InfDeath: 4
SmudgeType: Crater SmudgeType: Crater
Damage: 180 Damage: 180
@@ -841,7 +841,7 @@ TorpTube:
Concrete: 50% Concrete: 50%
Explosion: small_explosion Explosion: small_explosion
WaterExplosion: med_splash WaterExplosion: med_splash
InfDeath: 3 InfDeath: 4
SmudgeType: Crater SmudgeType: Crater
Damage: 25 Damage: 25
@@ -863,7 +863,7 @@ DepthCharge:
Light: 75% Light: 75%
Concrete: 50% Concrete: 50%
WaterExplosion: large_splash WaterExplosion: large_splash
InfDeath: 3 InfDeath: 4
SmudgeType: Crater SmudgeType: Crater
Damage: 80 Damage: 80
@@ -882,7 +882,7 @@ ParaBomb:
Concrete: 50% Concrete: 50%
Explosion: self_destruct Explosion: self_destruct
WaterExplosion: small_splash WaterExplosion: small_splash
InfDeath: 3 InfDeath: 4
SmudgeType: Crater SmudgeType: Crater
Damage: 500 Damage: 500
ImpactSound: kaboom15 ImpactSound: kaboom15
@@ -898,7 +898,7 @@ DogJaw:
Light: 0% Light: 0%
Heavy: 0% Heavy: 0%
Concrete: 0% Concrete: 0%
InfDeath: 0 InfDeath: 1
Damage: 100 Damage: 100
Heal: Heal:
@@ -914,7 +914,7 @@ Heal:
Light: 0% Light: 0%
Heavy: 0% Heavy: 0%
Concrete: 0% Concrete: 0%
InfDeath: 0 InfDeath: 1
Damage: -50 Damage: -50
SilencedPPK: SilencedPPK:
@@ -931,7 +931,7 @@ SilencedPPK:
Heavy: 0% Heavy: 0%
Concrete: 0% Concrete: 0%
Explosion: piffs Explosion: piffs
InfDeath: 1 InfDeath: 2
Damage: 150 Damage: 150
SCUD: SCUD:
@@ -958,7 +958,7 @@ SCUD:
Heavy: 25% Heavy: 25%
Explosion: napalm Explosion: napalm
WaterExplosion: large_splash WaterExplosion: large_splash
InfDeath: 2 InfDeath: 3
SmudgeType: Crater SmudgeType: Crater
Damage: 600 Damage: 600
ImpactSound: firebl3 ImpactSound: firebl3
@@ -976,7 +976,7 @@ Atomic:
Concrete: 50% Concrete: 50%
Explosion: nuke Explosion: nuke
WaterExplosion: nuke WaterExplosion: nuke
InfDeath: 4 InfDeath: 5
ImpactSound: kaboom1 ImpactSound: kaboom1
Warhead@areanuke: Warhead@areanuke:
DamageModel: PerCell DamageModel: PerCell
@@ -990,7 +990,7 @@ Atomic:
Heavy: 25% Heavy: 25%
Concrete: 50% Concrete: 50%
Delay: 4 Delay: 4
InfDeath: 4 InfDeath: 5
ImpactSound: kaboom22 ImpactSound: kaboom22
UnitExplode: UnitExplode:
@@ -1004,7 +1004,7 @@ UnitExplode:
Heavy: 25% Heavy: 25%
Explosion: self_destruct Explosion: self_destruct
WaterExplosion: large_splash WaterExplosion: large_splash
InfDeath: 3 InfDeath: 4
ImpactSound: kaboom22 ImpactSound: kaboom22
UnitExplodeSmall: UnitExplodeSmall:
@@ -1017,7 +1017,7 @@ UnitExplodeSmall:
Light: 60% Light: 60%
Heavy: 25% Heavy: 25%
Explosion: large_explosion Explosion: large_explosion
InfDeath: 3 InfDeath: 4
ImpactSound: kaboom15 ImpactSound: kaboom15
Crush: Crush:
@@ -1044,7 +1044,7 @@ APMine:
Heavy: 0% Heavy: 0%
Concrete: 0% Concrete: 0%
ImpactSound: mine1 ImpactSound: mine1
InfDeath: 2 InfDeath: 3
Explosion: napalm Explosion: napalm
Demolish: Demolish:
@@ -1061,7 +1061,7 @@ PortaTesla:
Projectile: TeslaZap Projectile: TeslaZap
Warhead: Warhead:
Spread: 1 Spread: 1
InfDeath: 5 InfDeath: 6
Damage: 45 Damage: 45
TTankZap: TTankZap:
@@ -1072,7 +1072,7 @@ TTankZap:
Projectile: TeslaZap Projectile: TeslaZap
Warhead: Warhead:
Spread: 1 Spread: 1
InfDeath: 5 InfDeath: 6
Damage: 100 Damage: 100
FLAK-23: FLAK-23: