diff --git a/OpenRa.FileFormats/FieldLoader.cs b/OpenRa.FileFormats/FieldLoader.cs index ab521d305c..d40a746b0a 100644 --- a/OpenRa.FileFormats/FieldLoader.cs +++ b/OpenRa.FileFormats/FieldLoader.cs @@ -11,8 +11,9 @@ namespace OpenRa.FileFormats foreach (var x in ini) { var field = self.GetType().GetField(x.Key.Trim()); - if( field != null ) - field.SetValue(self, GetValue(field.FieldType, x.Value.Trim())); + if (field == null) + throw new NotImplementedException("Missing field `{0}` on `{1}`".F(x.Key.Trim(), self.GetType().Name)); + field.SetValue(self, GetValue(field.FieldType, x.Value.Trim())); } } diff --git a/OpenRa.Game/GameRules/WeaponInfo.cs b/OpenRa.Game/GameRules/WeaponInfo.cs index 6664939b2c..b8e91986e6 100755 --- a/OpenRa.Game/GameRules/WeaponInfo.cs +++ b/OpenRa.Game/GameRules/WeaponInfo.cs @@ -3,9 +3,7 @@ namespace OpenRa.GameRules { public class WeaponInfo { - public readonly string Anim = null; public readonly int Burst = 1; - public readonly bool Camera = false; public readonly bool Charges = false; public readonly int Damage = 0; public readonly string Projectile = "Invisible"; @@ -13,7 +11,6 @@ namespace OpenRa.GameRules public readonly float Range = 0; public readonly string Report = null; public readonly int Speed = -1; - public readonly bool Supress = false; public readonly bool TurboBoost = false; public readonly string Warhead = null; diff --git a/mods/cnc/minimal.ini b/mods/cnc/minimal.ini index 5b45ded674..40ec05ee6e 100644 --- a/mods/cnc/minimal.ini +++ b/mods/cnc/minimal.ini @@ -12,8 +12,6 @@ BuildSpeed=.1 ; general build speed [time (in minutes) to produce a 10 GemValue=50 ; gem credits per 'bail' carried by a harvester GoldValue=25 ; gold credits per 'bail' carried by a harvester -GrowthRate=.3 ; minutes between ore (Tiberium) growth -BailCount=28 ; number of 'bails' carried by a harvester LowPowerSlowdown=3 ; slowdown factor for low power GapRegenInterval=.1 ; gap generators will regenerate their shroud at this time interval diff --git a/mods/cnc/weapons.ini b/mods/cnc/weapons.ini index 7c7f783279..199cab513d 100644 --- a/mods/cnc/weapons.ini +++ b/mods/cnc/weapons.ini @@ -16,7 +16,6 @@ Projectile=Invisible Speed=100 Warhead=SA Report=GUN13 -Anim=MINIGUN [Laser] Damage=100 @@ -58,7 +57,6 @@ Projectile=Cannon Speed=40 Warhead=AP Report=CANNON2 -Anim=GUNFIRE [120mm] Damage=40 @@ -68,7 +66,6 @@ Projectile=Cannon Speed=40 Warhead=AP Report=CANNON1 -Anim=GUNFIRE Burst=2 [ProjectileTypes] diff --git a/mods/ra/rules.ini b/mods/ra/rules.ini index 1937a50348..6d128e44b7 100644 --- a/mods/ra/rules.ini +++ b/mods/ra/rules.ini @@ -7,20 +7,6 @@ [General] -; crates -CrateMinimum=1 ; crates are normally one per human player but never below this number -CrateMaximum=255 ; crates can never exceed this quantity -CrateRadius=3.0 ; radius (cells) for area effect crate powerup bonuses -CrateRegen=3 ; average minutes between random powerup crate regeneration -UnitCrateType=none ; specifies specific unit type for unit type crate ['none' means pick randomly] -WaterCrateChance=20% ; chance that a water crate will be generated rather than land crate [multiplay only] -SoloCrateMoney=2000 ; money to give for money crate in solo play missions -SilverCrate=HealBase ; solo play silver crate bonus -WaterCrate=Money ; solo play water crate bonus -WoodCrate=Money ; solo play wood crate bonus - -; This section probably dies --chrisf - ; special weapons GapRegenInterval=.1 ; gap generators will regenerate their shroud at this time interval BadgerBombCount=1 ; number of badgers used to drop parabombs @@ -44,9 +30,6 @@ URepairStep=10 ; [units only] hit points to heal per repair 'tick' for ; combat and damage TurboBoost=1.5 ; speed multiplier for turbo-boosted weapons when firing upon aircraft -APMineDamage=1000 ; damage to inflict when anti-personnel mine explodes -AVMineDamage=1200 ; damage to inflict when anti-vehicle mine explodes -AtomDamage=1000 ; damage points when nuclear bomb explodes (regardless of source) BallisticScatter=1.0 ; maximum scatter distance (cells) for inaccurate ballistic projectiles C4Delay=.03 ; minutes to delay after placing C4 before building will explode ExpSpread=.3 ; cell damage spread per 256 damage points for exploding object types [if Explodes=yes] @@ -64,7 +47,6 @@ Incoming=10 ; If an incoming projectile is as slow or slower than th ; parachute bombs have this characteristic. ; income and production -BailCount=28 ; number of 'bails' carried by a harvester BuildSpeed=.8 ; general build speed [time (in minutes) to produce a 1000 credit cost item] BuildupTime=.06 ; average minutes that building build-up animation runs GemValue=50 ; gem credits per 'bail' carried by a harvester @@ -114,9 +96,7 @@ LowPowerSlowdown=3 ; The weapons specified here are attached to the various combat ; units and buildings. -; Anim = animation to display as a firing effect ; Burst = number of rapid succession shots from this weapon (def=1) -; Camera = Reveals area around firer (def=no)? ; Charges = Does it have charge-up-before-firing logic (def=no)? ; Damage = the amount of damage (unattenuated) dealt with every bullet ; Projectile = projectile characteristic to use @@ -125,7 +105,6 @@ LowPowerSlowdown=3 ; Report = sound to play when firing ; Speed = speed of projectile to target (100 is maximum) ; Warhead = warhead to attach to projectile -; Supress = Should nearby friendly buildings be scanned for and if found, discourage firing on target (def=no)? ; TurboBoost = Should the weapon get a boosted speed bonus when firing upon aircraft? ; Tanya pistol @@ -146,7 +125,6 @@ Range=6 Projectile=Ack Speed=100 Warhead=AP -Anim=GUNFIRE Report=AACANON3 ; rapid fire machine gun @@ -158,7 +136,6 @@ Projectile=Invisible Speed=100 Warhead=SA Report=GUN13 -Anim=MINIGUN ; air-to-surface homing missile (launched from jet) [Maverick] @@ -170,16 +147,6 @@ Speed=30 Warhead=AP Report=MISSILE7 -; camera -[Camera] -Damage=0 -ROF=10 -Range=2.75 -Projectile=Inivisble -Speed=100 -Warhead=Super -Camera=yes - ; fireball from flame turret [FireballLauncher] Damage=125 @@ -217,7 +184,6 @@ Projectile=Invisible Speed=100 Warhead=SA Report=GUN13 -Anim=MINIGUN ; civilian pistol [Pistol] @@ -277,7 +243,6 @@ Projectile=Cannon Speed=40 Warhead=AP Report=CANNON2 -Anim=GUNFIRE ; light anti-armor cannon [90mm] @@ -288,7 +253,6 @@ Projectile=Cannon Speed=40 Warhead=AP Report=CANNON1 -Anim=GUNFIRE ; medium anti-armor cannon [105mm] @@ -299,7 +263,6 @@ Projectile=Cannon Speed=40 Warhead=AP Report=CANNON1 -Anim=GUNFIRE ; large anti-armor cannon [120mm] @@ -310,7 +273,6 @@ Projectile=Cannon Speed=40 Warhead=AP Report=CANNON1 -Anim=GUNFIRE Burst=2 ; turret cannon @@ -322,7 +284,6 @@ Projectile=Cannon Speed=40 Warhead=AP Report=TURRET1 -Anim=GUNFIRE ; Vehicle carried anti-tank missile [MammothTusk] @@ -344,7 +305,6 @@ Projectile=Ballistic Speed=12 Warhead=HE Report=TANK5 -Anim=GUNFIRE ; vehicle mounted machine gun [M60mg] @@ -355,7 +315,6 @@ Projectile=Invisible Speed=100 Warhead=SA Report=PILLBOX1 -Anim=MINIGUN ; napalm bomblets (dropped from plane) [Napalm] @@ -386,7 +345,6 @@ Projectile=AAMissile Speed=50 Warhead=AP Report=MISSILE1 -Anim=SAMFIRE ; man-packed surface to air missile [RedEye] @@ -397,7 +355,6 @@ Projectile=AAMissile Speed=50 Warhead=AP Report=MISSILE1 -Anim=SAMFIRE ; 8 inch cruiser cannon [8Inch] @@ -408,8 +365,6 @@ Projectile=Ballistic Speed=6 Warhead=HE Report=TURRET1 -Anim=GUNFIRE -Supress=yes ; gunboat mounted anti-aircraft rocket [Stinger] @@ -442,7 +397,6 @@ Projectile=Cannon Speed=25 Warhead=AP Report=CANNON2 -Anim=GUNFIRE ; anti-submarine weapon [DepthCharge] @@ -895,7 +849,6 @@ Colt45 ZSU-23 Vulcan Maverick -Camera FireballLauncher Flamer Sniper diff --git a/settings-netplay-cnc.ini b/settings-netplay-cnc.ini index 33aca0eb41..b40701d25f 100644 --- a/settings-netplay-cnc.ini +++ b/settings-netplay-cnc.ini @@ -1,5 +1,4 @@ [Settings] NetworkHost=localhost NetworkPort=1234 -UseAftermath=yes InitialMods=cnc \ No newline at end of file diff --git a/settings-netplay-local.ini b/settings-netplay-local.ini deleted file mode 100644 index 7d13c14222..0000000000 --- a/settings-netplay-local.ini +++ /dev/null @@ -1,3 +0,0 @@ -[Settings] -NetworkHost=localhost -NetworkPort=1234 \ No newline at end of file diff --git a/settings-netplay-local-aftermath.ini b/settings-netplay-ra.ini similarity index 72% rename from settings-netplay-local-aftermath.ini rename to settings-netplay-ra.ini index fef7a12f8c..be73876bc4 100644 --- a/settings-netplay-local-aftermath.ini +++ b/settings-netplay-ra.ini @@ -1,4 +1,4 @@ [Settings] NetworkHost=localhost NetworkPort=1234 -UseAftermath=yes \ No newline at end of file +InitialMods=ra \ No newline at end of file