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

unbitrot cnc AGAIN; remove 'wood' and 'wall' flags from warheads

Browse Source
This commit is contained in:
Chris Forbes
2010-05-13 18:07:09 +12:00
parent 4bf7476044
commit 78d40b5bb0
4 changed files with 26 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,8 +29,6 @@ namespace OpenRA.GameRules
{ {
public readonly int Spread = 1; // distance (in pixels) from the explosion center at which damage is 1/2. public readonly int Spread = 1; // distance (in pixels) from the explosion center at which damage is 1/2.
public readonly float[] Verses = { 1, 1, 1, 1, 1 }; // damage vs each armortype public readonly float[] Verses = { 1, 1, 1, 1, 1 }; // damage vs each armortype
public readonly bool Wall = false; // can this damage walls?
public readonly bool Wood = false; // can this damage wood?
public readonly bool Ore = false; // can this damage ore? public readonly bool Ore = false; // can this damage ore?
public readonly int Explosion = 0; // explosion effect to use public readonly int Explosion = 0; // explosion effect to use
public readonly string SmudgeType = null; // type of smudge to apply public readonly string SmudgeType = null; // type of smudge to apply

31
mods/cnc/menus.yaml
View File

@@ -143,6 +143,13 @@ Container:
Width:300 Width:300
Height:20 Height:20
Text:Collect Sync Reports Text:Collect Sync Reports
Checkbox@SETTINGS_CHECKBOX_MUSICPLAYER:
Id:SETTINGS_CHECKBOX_MUSICPLAYER
X:100
Y:210
Width:300
Height:20
Text:Show Music Player
Button@SETTINGS_BUTTON_OK: Button@SETTINGS_BUTTON_OK:
Id:SETTINGS_BUTTON_OK Id:SETTINGS_BUTTON_OK
X:PARENT_RIGHT - 180 X:PARENT_RIGHT - 180
@@ -629,34 +636,48 @@ Container:
Background@MUSIC_BG: Background@MUSIC_BG:
Id:MUSIC_BG Id:MUSIC_BG
Delegate:MusicPlayerDelegate Delegate:MusicPlayerDelegate
X:WINDOW_RIGHT - 100 X:WINDOW_RIGHT - 175
Y:WINDOW_BOTTOM - 65 Y:WINDOW_BOTTOM - 65
Width: 90 Width: 160
Height: 55 Height: 55
Visible: true Visible: true
Children: Children:
Button@BUTTON_PLAY: Button@BUTTON_PLAY:
Id:BUTTON_PLAY Id:BUTTON_PLAY
Visible:false Visible:false
X:15 X:50
Y:15 Y:15
Width:25 Width:25
Height:25 Height:25
Text:|> Text:|>
Button@BUTTON_PAUSE: Button@BUTTON_PAUSE:
Id:BUTTON_PAUSE Id:BUTTON_PAUSE
X:15 X:50
Y:15 Y:15
Width:25 Width:25
Height:25 Height:25
Text:|| Text:||
Button@BUTTON_STOP: Button@BUTTON_STOP:
Id:BUTTON_STOP Id:BUTTON_STOP
X:50 X:85
Y:15 Y:15
Width:25 Width:25
Height:25 Height:25
Text:[] Text:[]
Button@BUTTON_NEXT:
Id:BUTTON_NEXT
X:120
Y:15
Width:25
Height:25
Text:>>
Button@BUTTON_PREV:
Id:BUTTON_PREV
X:15
Y:15
Width:25
Height:25
Text:<<

38
mods/cnc/weapons.yaml
View File

@@ -14,8 +14,6 @@ Atomic:
Warhead@impact: Warhead@impact:
Damage: 1000 Damage: 1000
Spread: 6 Spread: 6
Wall: true
Wood: true
Ore: true Ore: true
Verses: 90%,100%,60%,25%,50% Verses: 90%,100%,60%,25%,50%
Explosion: 6 Explosion: 6
@@ -25,8 +23,6 @@ Atomic:
Damage: 250 Damage: 250
SmudgeType: Scorch SmudgeType: Scorch
Size: 5,4 Size: 5,4
Wall: true
Wood: true
Ore: true Ore: true
Verses: 90%,100%,60%,25%,50% Verses: 90%,100%,60%,25%,50%
Delay: 3 Delay: 3
@@ -36,8 +32,6 @@ IonCannon:
Warhead@impact: Warhead@impact:
Damage: 500 Damage: 500
Spread: 6 Spread: 6
Wall: true
Wood: true
Ore: true Ore: true
Verses: 100%,100%,100%,100%,100% Verses: 100%,100%,100%,100%,100%
InfDeath: 4 InfDeath: 4
@@ -46,8 +40,6 @@ IonCannon:
Damage: 200 Damage: 200
SmudgeType: Scorch SmudgeType: Scorch
Size: 2,1 Size: 2,1
Wall: true
Wood: true
Ore: true Ore: true
Verses: 100%,100%,100%,100%,100% Verses: 100%,100%,100%,100%,100%
Delay: 3 Delay: 3
@@ -121,8 +113,6 @@ Rockets:
Speed: 25 Speed: 25
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: yes
Wood: yes
Verses: 30%,75%,75%,100%,50% Verses: 30%,75%,75%,100%,50%
InfDeath: 3 InfDeath: 3
Explosion: 4 Explosion: 4
@@ -138,7 +128,6 @@ Flamethrower:
Speed: 100 Speed: 100
Warhead: Warhead:
Spread: 8 Spread: 8
Wood: yes
Verses: 90%,100%,60%,25%,50% Verses: 90%,100%,60%,25%,50%
InfDeath: 4 InfDeath: 4
ImpactSound: flamer2 ImpactSound: flamer2
@@ -153,7 +142,6 @@ BigFlamer:
Speed: 100 Speed: 100
Warhead: Warhead:
Spread: 8 Spread: 8
Wood: yes
Verses: 90%,100%,60%,25%,50% Verses: 90%,100%,60%,25%,50%
InfDeath: 4 InfDeath: 4
Explosion: 3 Explosion: 3
@@ -170,8 +158,6 @@ Chemspray:
Warhead: Warhead:
Damage: 80 Damage: 80
Spread: 6 Spread: 6
Wall: yes
Wood: yes
Verses: 90%,75%,60%,25%,100% Verses: 90%,75%,60%,25%,100%
InfDeath: 2 InfDeath: 2
SmudgeType: Scorch SmudgeType: Scorch
@@ -188,8 +174,6 @@ Grenade:
Image: BOMB Image: BOMB
Warhead: Warhead:
Spread: 6 Spread: 6
Wall: yes
Wood: yes
Verses: 90%,75%,60%,25%,100% Verses: 90%,75%,60%,25%,100%
InfDeath: 2 InfDeath: 2
Explosion: 5 Explosion: 5
@@ -206,8 +190,6 @@ Grenade:
Speed: 40 Speed: 40
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: yes
Wood: yes
Verses: 30%,75%,75%,100%,50% Verses: 30%,75%,75%,100%,50%
InfDeath: 3 InfDeath: 3
Explosion: 4 Explosion: 4
@@ -224,8 +206,6 @@ Grenade:
Speed: 40 Speed: 40
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: yes
Wood: yes
Verses: 30%,75%,75%,100%,50% Verses: 30%,75%,75%,100%,50%
InfDeath: 3 InfDeath: 3
Explosion: 4 Explosion: 4
@@ -242,8 +222,6 @@ Grenade:
Speed: 40 Speed: 40
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: yes
Wood: yes
Verses: 30%,75%,75%,100%,50% Verses: 30%,75%,75%,100%,50%
InfDeath: 3 InfDeath: 3
Explosion: 4 Explosion: 4
@@ -260,8 +238,6 @@ TurretGun:
Speed: 40 Speed: 40
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: yes
Wood: yes
Verses: 30%,75%,75%,100%,50% Verses: 30%,75%,75%,100%,50%
InfDeath: 3 InfDeath: 3
Explosion: 4 Explosion: 4
@@ -286,8 +262,6 @@ MissilePack:
Speed: 25 Speed: 25
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: yes
Wood: yes
Verses: 30%,75%,75%,100%,50% Verses: 30%,75%,75%,100%,50%
InfDeath: 3 InfDeath: 3
Explosion: 4 Explosion: 4
@@ -312,8 +286,6 @@ MissilePack:
Speed: 20 Speed: 20
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: yes
Wood: yes
Verses: 30%,75%,75%,100%,50% Verses: 30%,75%,75%,100%,50%
InfDeath: 3 InfDeath: 3
Explosion: 4 Explosion: 4
@@ -334,8 +306,6 @@ Ballistic:
Warhead: Warhead:
Damage: 150 Damage: 150
Spread: 6 Spread: 6
Wall: yes
Wood: yes
Verses: 90%,75%,60%,25%,100% Verses: 90%,75%,60%,25%,100%
InfDeath: 2 InfDeath: 2
Explosion: 5 Explosion: 5
@@ -371,8 +341,6 @@ BoatMissile:
Speed: 20 Speed: 20
Warhead: Warhead:
Spread: 6 Spread: 6
Wall: yes
Wood: yes
Verses: 90%,75%,60%,25%,100% Verses: 90%,75%,60%,25%,100%
InfDeath: 2 InfDeath: 2
Explosion: 5 Explosion: 5
@@ -396,8 +364,6 @@ Tomahawk:
Speed: 25 Speed: 25
Warhead: Warhead:
Spread: 6 Spread: 6
Wall: yes
Wood: yes
Verses: 90%,75%,60%,25%,100% Verses: 90%,75%,60%,25%,100%
InfDeath: 2 InfDeath: 2
Explosion: 5 Explosion: 5
@@ -411,7 +377,6 @@ Napalm:
Image: BOMBLET Image: BOMBLET
Warhead: Warhead:
Spread: 8 Spread: 8
Wood: yes
Verses: 90%,100%,60%,25%,50% Verses: 90%,100%,60%,25%,50%
InfDeath: 4 InfDeath: 4
Explosion: 3 Explosion: 3
@@ -449,8 +414,6 @@ Nike:
Speed: 40 Speed: 40
Warhead: AP Warhead: AP
Spread: 3 Spread: 3
Wall: yes
Wood: yes
Verses: 30%,75%,75%,100%,50% Verses: 30%,75%,75%,100%,50%
InfDeath: 3 InfDeath: 3
Explosion: 4 Explosion: 4
@@ -472,7 +435,6 @@ HonestJohn:
Speed: 15 Speed: 15
Warhead: Warhead:
Spread: 8 Spread: 8
Wood: yes
Verses: 90%,100%,60%,25%,50% Verses: 90%,100%,60%,25%,50%
InfDeath: 4 InfDeath: 4
Explosion: 3 Explosion: 3

48
mods/ra/weapons.yaml
View File

@@ -90,8 +90,6 @@ Maverick:
RangeLimit: 20 RangeLimit: 20
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: true
Wood: true
Verses: 30%,75%,75%,100%,50% Verses: 30%,75%,75%,100%,50%
Explosion: 4 Explosion: 4
InfDeath: 3 InfDeath: 3
@@ -107,7 +105,6 @@ FireballLauncher:
Image: FB1 Image: FB1
Warhead: Warhead:
Spread: 4 Spread: 4
Wood: true
Verses: 90%,100%,60%,25%,50% Verses: 90%,100%,60%,25%,50%
Explosion: 3 Explosion: 3
InfDeath: 4 InfDeath: 4
@@ -124,7 +121,6 @@ Flamer:
Image: FB1 Image: FB1
Warhead: Warhead:
Spread: 4 Spread: 4
Wood: true
Verses: 90%,100%,60%,25%,50% Verses: 90%,100%,60%,25%,50%
Explosion: 3 Explosion: 3
InfDeath: 4 InfDeath: 4
@@ -189,8 +185,6 @@ Dragon:
RangeLimit: 35 RangeLimit: 35
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: true
Wood: true
Verses: 10%,75%,35%,100%,20% Verses: 10%,75%,35%,100%,20%
Explosion: 4 Explosion: 4
InfDeath: 3 InfDeath: 3
@@ -216,8 +210,6 @@ Hellfire:
RangeLimit: 20 RangeLimit: 20
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: true
Wood: true
Verses: 30%,75%,75%,100%,50% Verses: 30%,75%,75%,100%,50%
Explosion: 4 Explosion: 4
InfDeath: 3 InfDeath: 3
@@ -236,8 +228,6 @@ Grenade:
Image: BOMB Image: BOMB
Warhead: Warhead:
Spread: 6 Spread: 6
Wall: true
Wood: true
Verses: 50%,100%,25%,5%,100% Verses: 50%,100%,25%,5%,100%
Explosion: 5 Explosion: 5
InfDeath: 2 InfDeath: 2
@@ -254,8 +244,6 @@ Grenade:
Image: 120MM Image: 120MM
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: true
Wood: true
Verses: 20%,75%,75%,100%,50% Verses: 20%,75%,75%,100%,50%
Explosion: 4 Explosion: 4
InfDeath: 3 InfDeath: 3
@@ -271,8 +259,6 @@ Grenade:
Image: 120MM Image: 120MM
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: true
Wood: true
Verses: 20%,75%,75%,100%,50% Verses: 20%,75%,75%,100%,50%
Explosion: 4 Explosion: 4
InfDeath: 3 InfDeath: 3
@@ -290,8 +276,6 @@ Grenade:
Image: 120MM Image: 120MM
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: true
Wood: true
Verses: 20%,75%,75%,100%,50% Verses: 20%,75%,75%,100%,50%
Explosion: 4 Explosion: 4
InfDeath: 3 InfDeath: 3
@@ -308,8 +292,6 @@ Grenade:
Image: 120MM Image: 120MM
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: true
Wood: true
Verses: 20%,75%,75%,100%,50% Verses: 20%,75%,75%,100%,50%
Explosion: 4 Explosion: 4
InfDeath: 3 InfDeath: 3
@@ -325,8 +307,6 @@ TurretGun:
Image: 120MM Image: 120MM
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: true
Wood: true
Verses: 30%,75%,75%,100%,50% Verses: 30%,75%,75%,100%,50%
Explosion: 4 Explosion: 4
InfDeath: 3 InfDeath: 3
@@ -352,8 +332,6 @@ MammothTusk:
RangeLimit: 20 RangeLimit: 20
Warhead: Warhead:
Spread: 6 Spread: 6
Wall: true
Wood: true
Verses: 90%,75%,60%,25%,100% Verses: 90%,75%,60%,25%,100%
Explosion: 5 Explosion: 5
InfDeath: 2 InfDeath: 2
@@ -372,8 +350,6 @@ MammothTusk:
Image: 120MM Image: 120MM
Warhead: Warhead:
Spread: 8 Spread: 8
Wall: true
Wood: true
Verses: 90%,75%,60%,25%,100% Verses: 90%,75%,60%,25%,100%
Explosion: 5 Explosion: 5
InfDeath: 2 InfDeath: 2
@@ -404,7 +380,6 @@ Napalm:
Arm: 24 Arm: 24
Warhead: Warhead:
Spread: 4 Spread: 4
Wood: true
Verses: 90%,100%,60%,25%,50% Verses: 90%,100%,60%,25%,50%
Explosion: 3 Explosion: 3
InfDeath: 4 InfDeath: 4
@@ -415,7 +390,6 @@ Napalm:
CrateNapalm: CrateNapalm:
Warhead: Warhead:
Spread: 4 Spread: 4
Wood: yes
Verses: 90%,100%,60%,25%,50% Verses: 90%,100%,60%,25%,50%
Explosion: 3 Explosion: 3
InfDeath: 4 InfDeath: 4
@@ -462,8 +436,6 @@ Nike:
Speed: 35 Speed: 35
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: true
Wood: true
Verses: 90%,75%,60%,25%,100% Verses: 90%,75%,60%,25%,100%
Explosion: 5 Explosion: 5
InfDeath: 2 InfDeath: 2
@@ -487,8 +459,6 @@ RedEye:
Speed: 35 Speed: 35
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: true
Wood: true
Verses: 90%,75%,60%,25%,100% Verses: 90%,75%,60%,25%,100%
Explosion: 5 Explosion: 5
InfDeath: 2 InfDeath: 2
@@ -507,8 +477,6 @@ RedEye:
Image: 120MM Image: 120MM
Warhead: Warhead:
Spread: 6 Spread: 6
Wall: true
Wood: true
Verses: 90%,75%,60%,25%,100% Verses: 90%,75%,60%,25%,100%
Explosion: 5 Explosion: 5
InfDeath: 2 InfDeath: 2
@@ -533,8 +501,6 @@ Stinger:
Speed: 20 Speed: 20
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: true
Wood: true
Verses: 30%,75%,75%,100%,50% Verses: 30%,75%,75%,100%,50%
Explosion: 4 Explosion: 4
InfDeath: 3 InfDeath: 3
@@ -552,8 +518,6 @@ TorpTube:
Speed: 15 Speed: 15
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: true
Wood: true
Verses: 30%,75%,75%,100%,50% Verses: 30%,75%,75%,100%,50%
Explosion: 4 Explosion: 4
InfDeath: 3 InfDeath: 3
@@ -569,8 +533,6 @@ TorpTube:
Image: 120MM Image: 120MM
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: true
Wood: true
Verses: 30%,75%,75%,100%,50% Verses: 30%,75%,75%,100%,50%
Explosion: 4 Explosion: 4
InfDeath: 3 InfDeath: 3
@@ -589,8 +551,6 @@ DepthCharge:
Inaccuracy: 3 Inaccuracy: 3
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: true
Wood: true
Verses: 30%,75%,75%,100%,50% Verses: 30%,75%,75%,100%,50%
Explosion: 4 Explosion: 4
InfDeath: 3 InfDeath: 3
@@ -605,8 +565,6 @@ ParaBomb:
Image: PARABOMB Image: PARABOMB
Warhead: Warhead:
Spread: 3 Spread: 3
Wall: true
Wood: true
Verses: 30%,75%,75%,100%,50% Verses: 30%,75%,75%,100%,50%
Explosion: 8 Explosion: 8
InfDeath: 3 InfDeath: 3
@@ -651,8 +609,6 @@ SCUD:
Image: V2 Image: V2
Warhead: Warhead:
Spread: 6 Spread: 6
Wall: true
Wood: true
Verses: 90%,75%,60%,25%,100% Verses: 90%,75%,60%,25%,100%
Explosion: 5 Explosion: 5
InfDeath: 2 InfDeath: 2
@@ -665,8 +621,6 @@ Atomic:
Warhead@impact: Warhead@impact:
Damage: 1000 Damage: 1000
Spread: 6 Spread: 6
Wall: true
Wood: true
Ore: true Ore: true
Verses: 90%,100%,60%,25%,50% Verses: 90%,100%,60%,25%,50%
Explosion: 6 Explosion: 6
@@ -676,8 +630,6 @@ Atomic:
Damage: 250 Damage: 250
SmudgeType: Scorch SmudgeType: Scorch
Size: 5,4 Size: 5,4
Wall: true
Wood: true
Ore: true Ore: true
Verses: 90%,100%,60%,25%,50% Verses: 90%,100%,60%,25%,50%
Delay: 3 Delay: 3