Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfixes' 

Thanks to NoQ for the conversion

Conflicts:
	data/mp/stats/assignweapons.txt
	data/mp/stats/functions.txt
	data/mp/stats/propulsion.txt
	data/mp/stats/research/multiplayer/prresearch.txt
	data/mp/stats/research/multiplayer/research.txt
	data/mp/stats/research/multiplayer/resultcomponent.txt
	data/mp/stats/structuremodifier.txt
	data/mp/stats/templates.txt
	data/mp/stats/weaponmodifier.txt
	data/mp/stats/weapons.txt
master
vexed 2013-11-16 00:20:41 -05:00
parent 4f5a7c3d2e cb407b558d
commit d2e1519908
5 changed files with 59 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/mp/stats/propulsion.ini
View File

@ -76,10 +76,10 @@ spinAngle = 45
[hover01]
name = Hover
buildPower = 100
buildPower = 150
buildPoints = 100
weight = 200
hitpoints = 150
hitpoints = 100
model = PRLHOV1.PIE
type = Hover
speed = 300

13
data/mp/stats/research.ini
View File

@ -268,8 +268,8 @@ resultStructures = A0HardcreteMk1Gate
[R-Wpn-Cannon1Mk1]
name = "Light Cannon"
researchPoints = 2400
researchPower = 75
researchPoints = 1800
researchPower = 56
keyTopic = 1
msgName = RES_CN1MK1
iconID = IMAGE_RES_WEAPONTECH
@ -670,7 +670,7 @@ iconID = IMAGE_RES_WEAPONTECH
statID = MG1Mk1
subgroupIconID = IMAGE_RES_GRPROF
requiredResearch = R-Struc-Factory-Upgrade01,R-Wpn-MG-Damage03
results = "MACHINE GUN:FirePause:-17"
results = "MACHINE GUN:FirePause:-20"
[R-Wpn-MG-Damage02]
name = "APDSB MG Bullets"
@ -692,7 +692,7 @@ iconID = IMAGE_RES_WEAPONTECH
statID = MG1Mk1
subgroupIconID = IMAGE_RES_GRPROF
requiredResearch = R-Wpn-MG-ROF01
results = "MACHINE GUN:FirePause:-17"
results = "MACHINE GUN:FirePause:-18"
[R-Wpn-MG-Damage03]
name = "APDSB MG Bullets Mk2"
@ -715,7 +715,7 @@ iconID = IMAGE_RES_WEAPONTECH
statID = MG1Mk1
subgroupIconID = IMAGE_RES_GRPROF
requiredResearch = R-Wpn-MG-ROF02
results = "MACHINE GUN:FirePause:-16"
results = "MACHINE GUN:FirePause:-8"
[R-Defense-WallUpgrade01]
name = "Improved Hardcrete"
@ -1464,7 +1464,7 @@ keyTopic = 1
msgName = RES_W_LAS1
iconID = IMAGE_RES_WEAPONTECH
statID = Laser3BEAMMk1
requiredResearch = R-Struc-Research-Upgrade08,R-Sys-Sensor-Upgrade03
requiredResearch = R-Struc-Research-Upgrade07,R-Sys-Sensor-Upgrade03
resultComponents = Cyb-Wpn-Laser,Laser3BEAM-VTOL,Laser3BEAMMk1
[R-Wpn-Laser02]
@ -1478,7 +1478,6 @@ statID = Laser2PULSEMk1
requiredResearch = R-Wpn-Laser01
redComponents = Laser3BEAM-VTOL,Laser3BEAMMk1
resultComponents = Laser2PULSE-VTOL,Laser2PULSEMk1
replacedComponents = Laser3BEAM-VTOL:Laser2PULSE-VTOL,Laser3BEAMMk1:Laser2PULSEMk1
[R-Wpn-Missile2A-T]
name = "Scourge Missile"

6
data/mp/stats/structuremodifier.ini
View File

@ -12,9 +12,9 @@ BUNKER = 75
[ANTI PERSONNEL]
SOFT = 160
MEDIUM = 80
HARD = 50
BUNKER = 75
MEDIUM = 65
HARD = 40
BUNKER = 50
[ANTI TANK]
SOFT = 75

4
data/mp/stats/weaponmodifier.ini
View File

@ -15,11 +15,11 @@ Tracked = 105
Wheeled = 125
[ANTI PERSONNEL]
Half-Tracked = 60
Half-Tracked = 50
Hover = 110
Legged = 150
Lift = 60
Tracked = 50
Tracked = 40
Wheeled = 100
[ANTI TANK]

92
data/mp/stats/weapons.ini
View File

@ -973,9 +973,9 @@ weaponWav = mgbar2.ogg
explosionWav = smlexpl.ogg
[PlasmiteFlamer]
buildPower = 130
buildPower = 160
buildPoints = 400
weight = 750
weight = 5000
hitpoints = 75
model = GNMFLMRP.PIE
mountModel = TRMFLMRP.PIE
@ -990,7 +990,7 @@ numExplosions = 1
minimumDamage = 33
damage = 63
periodicalDamageTime = 50
periodicalDamage = 50
periodicalDamage = 42
periodicalDamageRadius = 60
flightSpeed = 700
weaponClass = HEAT
@ -1220,12 +1220,12 @@ longHit = 50
firePause = 60
numExplosions = 2
minimumDamage = 33
damage = 90
damage = 80
radius = 160
radiusDamage = 70
radiusDamage = 50
periodicalDamageTime = 60
periodicalDamage = 22
periodicalDamageRadius = 192
periodicalDamageRadius = 128
periodicalDamageWeaponClass = HEAT
periodicalDamageWeaponSubClass = MORTARS
periodicalDamageWeaponEffect = "FLAMER"
@ -1490,7 +1490,7 @@ explosionWav = smlexpl.ogg
buildPower = 120
buildPoints = 500
weight = 600
hitpoints = 300
hitpoints = 125
model = Gnhmg1.PIE
mountModel = Trhmg.PIE
muzzleGfx = FXMgnVul.PIE
@ -1523,7 +1523,7 @@ weaponWav = asltmg.ogg
buildPower = 100
buildPoints = 500
weight = 600
hitpoints = 250
hitpoints = 125
model = GNMMG2.PIE
mountModel = TRMMG.PIE
muzzleGfx = FXMgnVul.PIE
@ -1556,7 +1556,7 @@ weaponWav = asltmg.ogg
buildPower = 100
buildPoints = 500
weight = 300
hitpoints = 250
hitpoints = 185
model = GNMMG2.PIE
mountModel = TRMMG.PIE
muzzleGfx = FXMgnVul.PIE
@ -1590,7 +1590,7 @@ weaponWav = asltmg.ogg
buildPower = 100
buildPoints = 500
weight = 600
hitpoints = 250
hitpoints = 175
muzzleGfx = FXMgnVul.PIE
flightGfx = fxtracerh.pie
hitGfx = FXMETHIT.PIE
@ -1619,7 +1619,7 @@ weaponWav = asltmg.ogg
buildPower = 50
buildPoints = 250
weight = 600
hitpoints = 150
hitpoints = 75
model = GNMMG1.PIE
mountModel = TRMMG.PIE
muzzleGfx = FXMgnVic.PIE
@ -1652,7 +1652,7 @@ weaponWav = mgheavy.ogg
buildPower = 50
buildPoints = 250
weight = 300
hitpoints = 150
hitpoints = 95
model = GNMMG1.PIE
mountModel = TRMMG.PIE
muzzleGfx = FXMgnVic.PIE
@ -1686,7 +1686,7 @@ weaponWav = mgheavy.ogg
buildPower = 50
buildPoints = 250
weight = 600
hitpoints = 150
hitpoints = 95
muzzleGfx = FXMgnVic.PIE
flightGfx = fxtracerh.pie
hitGfx = FXMETHIT.PIE
@ -1715,7 +1715,7 @@ weaponWav = mgheavy.ogg
buildPower = 25
buildPoints = 125
weight = 400
hitpoints = 125
hitpoints = 75
model = GNLMG2.PIE
mountModel = TRLMG2.PIE
muzzleGfx = FXLMgun2.PIE
@ -1748,7 +1748,7 @@ weaponWav = mgbar3.ogg
buildPower = 25
buildPoints = 125
weight = 350
hitpoints = 125
hitpoints = 95
model = GNLMG2.PIE
mountModel = TRLMG2.PIE
muzzleGfx = FXLMgun2.PIE
@ -1782,7 +1782,7 @@ weaponWav = mgbar3.ogg
buildPower = 25
buildPoints = 125
weight = 400
hitpoints = 125
hitpoints = 95
muzzleGfx = FXLMgun2.PIE
flightGfx = fxtracer_twin.pie
hitGfx = FXMETHIT.PIE
@ -1994,7 +1994,7 @@ longRange = 1536
firePause = 20
numExplosions = 1
minimumDamage = 33
damage = 80
damage = 100
flightSpeed = 3200
weaponClass = HEAT
weaponSubClass = ENERGY
@ -2136,7 +2136,7 @@ flightGfx = FXCAmmo.PIE
hitGfx = FXVLExp.PIE
missGfx = FXVLExp.PIE
waterGfx = FXLSplsh.PIE
longRange = 9984
longRange = 8192
longHit = 50
firePause = 250
numExplosions = 2
@ -2174,9 +2174,9 @@ flightGfx = FXCAmmo.PIE
hitGfx = FXLExp.PIE
missGfx = FXLExp.PIE
waterGfx = FXMSplsh.PIE
longRange = 4992
longRange = 5120
longHit = 50
firePause = 150
firePause = 110
numExplosions = 2
minimumDamage = 33
damage = 150
@ -2259,8 +2259,8 @@ damage = 200
radius = 192
radiusDamage = 200
periodicalDamageTime = 60
periodicalDamage = 32
periodicalDamageRadius = 256
periodicalDamage = 28
periodicalDamageRadius = 192
periodicalDamageWeaponClass = HEAT
periodicalDamageWeaponSubClass = HOWITZERS
periodicalDamageWeaponEffect = "FLAMER"
@ -2356,8 +2356,8 @@ explosionWav = lsrexpl.ogg
[Flame2]
buildPower = 110
buildPoints = 400
weight = 500
hitpoints = 75
weight = 5000
hitpoints = 45
model = GNMFLMR.PIE
mountModel = TRMFLMR.PIE
muzzleGfx = FXCan20m.PIE
@ -2371,7 +2371,7 @@ numExplosions = 1
minimumDamage = 33
damage = 40
periodicalDamageTime = 50
periodicalDamage = 32
periodicalDamage = 28
periodicalDamageRadius = 48
flightSpeed = 700
weaponClass = HEAT
@ -2391,10 +2391,10 @@ name = Inferno
weaponWav = flmthrow.ogg
[Flame1Mk1]
buildPower = 40
buildPower = 60
buildPoints = 200
weight = 250
hitpoints = 40
hitpoints = 10
model = GNLFLMR.PIE
mountModel = TRLFLMR.PIE
muzzleGfx = FXCan20m.PIE
@ -2408,7 +2408,7 @@ numExplosions = 1
minimumDamage = 33
damage = 28
periodicalDamageTime = 50
periodicalDamage = 28
periodicalDamage = 20
periodicalDamageRadius = 32
flightSpeed = 700
weaponClass = HEAT
@ -2530,10 +2530,10 @@ weaponWav = rocket.ogg
explosionWav = lrgexpl.ogg
[CyborgFlamer01]
buildPower = 50
buildPower = 55
buildPoints = 200
weight = 120
hitpoints = 40
hitpoints = 10
model = cy_flame.pie
mountModel = Cybody.pie
muzzleGfx = FXCan20m.PIE
@ -2547,7 +2547,7 @@ numExplosions = 1
minimumDamage = 33
damage = 22
periodicalDamageTime = 40
periodicalDamage = 22
periodicalDamage = 20
periodicalDamageRadius = 32
flightSpeed = 700
weaponClass = HEAT
@ -2633,7 +2633,7 @@ weaponWav = smlcan.ogg
explosionWav = smlexpl.ogg
[Cyb-Wpn-Thermite]
buildPower = 80
buildPower = 100
buildPoints = 320
weight = 120
hitpoints = 60
@ -2650,7 +2650,7 @@ numExplosions = 1
minimumDamage = 33
damage = 38
periodicalDamageTime = 40
periodicalDamage = 32
periodicalDamage = 26
periodicalDamageRadius = 32
flightSpeed = 700
weaponClass = HEAT
@ -2718,7 +2718,7 @@ longRange = 1536
firePause = 20
numExplosions = 1
minimumDamage = 33
damage = 70
damage = 90
flightSpeed = 3200
weaponClass = HEAT
weaponSubClass = ENERGY
@ -3136,9 +3136,9 @@ longRange = 1024
firePause = 15
numExplosions = 2
minimumDamage = 33
damage = 35
damage = 40
radius = 128
radiusDamage = 25
radiusDamage = 35
flightSpeed = 1600
weaponClass = KINETIC
weaponSubClass = CANNON
@ -3243,7 +3243,7 @@ hitGfx = FXGRDexl.PIE
missGfx = FXGRDexl.PIE
waterGfx = FXSSplsh.PIE
longRange = 1280
firePause = 50
firePause = 43
numExplosions = 2
minimumDamage = 33
damage = 70
@ -3385,7 +3385,7 @@ explosionWav = lrgexpl.ogg
buildPower = 75
buildPoints = 375
weight = 1000
hitpoints = 200
hitpoints = 250
model = GNLCAN.PIE
mountModel = TRLCAN.PIE
muzzleGfx = FXCan20m.PIE
@ -3422,7 +3422,7 @@ explosionWav = smlexpl.ogg
buildPower = 75
buildPoints = 375
weight = 1000
hitpoints = 200
hitpoints = 250
model = GNLCAN.PIE
mountModel = TRLCAN.PIE
muzzleGfx = FXCan20m.PIE
@ -3609,7 +3609,7 @@ weaponWav = emp.ogg
[Bomb5-VTOL-Plasmite]
buildPower = 225
buildPoints = 1000
buildPoints = 2000
weight = 15000
hitpoints = 600
mountModel = TRMVTLPL.PIE
@ -3624,9 +3624,9 @@ numExplosions = 1
minimumDamage = 33
damage = 1000
radius = 256
radiusDamage = 1000
radiusDamage = 875
periodicalDamageTime = 200
periodicalDamage = 140
periodicalDamage = 115
periodicalDamageRadius = 512
periodicalDamageWeaponClass = HEAT
periodicalDamageWeaponSubClass = BOMB
@ -3636,7 +3636,7 @@ flightSpeed = 475
weaponClass = HEAT
weaponSubClass = BOMB
movement = DIRECT
weaponEffect = "ALL ROUNDER"
weaponEffect = "ARTILLERY ROUND"
rotate = 180
minElevation = -80
facePlayer = 1
@ -3650,7 +3650,7 @@ weaponWav = flmthrow.ogg
[Bomb4-VTOL-HvyINC]
buildPower = 225
buildPoints = 1000
buildPoints = 1500
weight = 3800
hitpoints = 360
mountModel = trmvtlin.PIE
@ -3665,9 +3665,9 @@ numExplosions = 10
numRounds = 5
reloadTime = 100
minimumDamage = 33
damage = 400
damage = 370
periodicalDamageTime = 200
periodicalDamage = 120
periodicalDamage = 95
periodicalDamageRadius = 192
periodicalDamageWeaponClass = HEAT
periodicalDamageWeaponSubClass = BOMB