Merge remote branch 'origin/master' into todo/master_20101125

data/base/stats/structures.txt

@@ -1,4 +1,4 @@
-Structure key,Type,Unused,Strength,Terrain Type,Base Width,Base Breadth,Foundation,Build points,Height,Armour,Body points,Repair system,Build power,Unused,Resistance,Unused,Size Modifier,ECM key,Sensor key,Weapon Slots,Structure model,Base model,Functions,Weapons
+Structure key,Type,Unused,Strength,Unused,Base Width,Base Breadth,Unused,Build points,Height,Armour,Body points,Unused,Build power,Unused,Resistance,Unused,Unused,ECM key,Sensor key,Weapon Slots,Structure model,Base model,Functions,Weapons
 A0ADemolishStructure,DEMOLISH,Level All,SOFT,0,1,1,Concrete,10,1,6,200,1,0,1,150,1,1,ZNULLECM,DefaultSensor1Mk1,1,icdozer.PIE,0,0,0
 A0BaBaBunker,DEFENSE,Level One-Two,BUNKER,0,1,1,Concrete,10,1,12,300,1,100,1,150,255,1,ZNULLECM,DefaultSensor1Mk1,1,blbrbbnk.PIE,0,0,1
 A0BabaCornerWall,CORNER WALL,Level All,SOFT,0,1,1,Concrete,3,2,5,150,10,20,1,0,255,0,ZNULLECM,ZNULLSENSOR,0,BLBRBCR1.PIE,0,0,0

data/base/stats/weapons.txt

@@ -1,3 +1,4 @@
+Weapon key,Unused,price,buildPoints,weight,Unused,Unused,HP,GfxFile,MountGfx,muzzleGfx,flightGfx,hitGfx,missGfx,waterGfx,trailGfx,shortRange,longRange,shortHit,longHit,firePause,Unused,numRounds,reloadTime,damage,splash radius,splash chance,splash damage,Unused,incenDamage,incenRadius,directLife,radiusLife,flightSpeed,Unused,fireOnMove,weaponClass,weaponSubClass,movement,weaponEffect,rotate,maxElevation,minElevation,facePlayer,faceInFlight,recoilValue,minRange,LightWorld,effectSize,surfaceToAir,numAttackRuns,designable,penetrate
 ZNULLWEAPON,Level All,0,250,0,0,0,0,Mibnkgun.pie,MIBNKTUR.PIE,FXLRocPd.PIE,FXMflare.PIE,FXMPExp.PIE,FXMPExp.PIE,FXSSplsh.PIE,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,20,NO,MISC,MACHINE GUN,DIRECT,ANTI PERSONNEL,0,90,-30,YES,YES,100,0,NO,100,0,0,0,0
 TUTMG,Level One,10,50,200,1,5,75,GNLMG1.PIE,TRLMG1.PIE,FXLMgun.PIE,FXTracer.PIE,FXMETHIT.PIE,FXDIRTsp.PIE,FXSSplsh.PIE,0,512,768,75,50,5,1,0,0,10,0,0,0,0,0,0,10,0,1000,20,YES,KINETIC,MACHINE GUN,DIRECT,ANTI PERSONNEL,180,90,-60,YES,NO,20,0,NO,100,100,0,1,0
 Superweapon2,Level All,10,50,100,1,5,9999,GNLMG1.PIE,TRLMG1.PIE,FXLMgun.PIE,FXTracer.PIE,FXGRDexl.PIE,FXDIRTsp.PIE,FXSSplsh.PIE,0,512,768,2,1,4,1,0,0,9999,1000,100,1000,0,0,0,10,100,1000,20,YES,KINETIC,CANNON,DIRECT,ANTI TANK,180,90,-60,YES,NO,20,0,NO,25,0,0,0,0

data/mp/stats/features.txt

@@ -68,7 +68,7 @@ arizonatree5,1,1,1,10,50,arizonatree5.pie,TREE,1,0,1
 arizonatree6,1,1,1,10,50,arizonatree6.pie,TREE,1,0,1
 trapstraight,1,1,0,0,0,mitrapstr.pie,BOULDER,1,0,1
 trapcorner,1,1,0,0,0,MITRAPCR.pie,BOULDER,1,0,1
-hoverwreck,1,1,1,0,0,miarthov.pie,VEHICLE,1,1,0
+hoverwreck,1,1,1,0,10,miarthov.pie,VEHICLE,1,1,0
 barrier,1,1,1,1,5,MIBAR.pie,VEHICLE,1,1,0
 bridgeend,1,1,1,5,50,MiBridg1.PIE,BUILDING,1,0,1
 bridgemiddle,1,1,1,5,50,MiBridge.PIE,BUILDING,1,0,1

data/mp/stats/structures.txt

@@ -1,4 +1,4 @@
-Structure ID,Type,-,Strength,Terrain Type,Base Width,Base Breadth,Foundation,Build points,Height,Armour,Body points,Repair system,Build power,-,Resistance,-,Size Modifier,ECM key,Sensor key,Weapon Slots,Structure model,Base model,Functions,Weapons
+Structure key,Type,Unused,Strength,Unused,Base Width,Base Breadth,Unused,Build points,Height,Armour,Body points,Unused,Build power,Unused,Resistance,Unused,Unused,ECM key,Sensor key,Weapon Slots,Structure model,Base model,Functions,Weapons
 A0ADemolishStructure,DEMOLISH,Level All,SOFT,0,1,1,Concrete,10,1,6,400,1,0,1,150,1,1,ZNULLECM,DefaultSensor1Mk1,1,icdozer.PIE,0,0,0
 A0BaBaBunker,DEFENSE,Level One-Two,BUNKER,0,1,1,Concrete,10,1,12,600,1,100,1,150,255,1,ZNULLECM,DefaultSensor1Mk1,1,blbrbbnk.PIE,0,0,1
 A0BabaCornerWall,CORNER WALL,Level All,SOFT,0,1,1,Concrete,3,2,5,300,10,20,1,0,255,0,ZNULLECM,ZNULLSENSOR,0,BLBRBCR1.PIE,0,0,0

data/mp/stats/weapons.txt

@@ -1,4 +1,4 @@
-Weapon ID,-,price,buildPoints,weight,-,-,HP,GfxFile,MountGfx,muzzleGfx,flightGfx,hitGfx,missGfx,waterGfx,trailGfx,shortRange,longRange,shortHit,longHit,firePause,-,numRounds,reloadTime,damage,splash radius,splash chance,splash damage,incenTime,incenDamage,incenRadius,directLife,radiusLife,flightSpeed,indirectHeight,fireOnMove,weaponClass,weaponSubClass,movement,weaponEffect,rotate,maxElevation,minElevation,facePlayer,faceInFlight,recoilValue,minRange,LightWorld,effectSize,surfaceToAir,numAttackRuns,designable,penetrate
+Weapon key,Unused,price,buildPoints,weight,Unused,Unused,HP,GfxFile,MountGfx,muzzleGfx,flightGfx,hitGfx,missGfx,waterGfx,trailGfx,shortRange,longRange,shortHit,longHit,firePause,Unused,numRounds,reloadTime,damage,splash radius,splash chance,splash damage,Unused,incenDamage,incenRadius,directLife,radiusLife,flightSpeed,Unused,fireOnMove,weaponClass,weaponSubClass,movement,weaponEffect,rotate,maxElevation,minElevation,facePlayer,faceInFlight,recoilValue,minRange,LightWorld,effectSize,surfaceToAir,numAttackRuns,designable,penetrate
 ZNULLWEAPON,Level All,0,250,0,0,0,0,Mibnkgun.pie,MIBNKTUR.PIE,FXLRocPd.PIE,FXMflare.PIE,FXMPExp.PIE,FXMPExp.PIE,FXSSplsh.PIE,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,20,NO,MISC,MACHINE GUN,DIRECT,ANTI PERSONNEL,0,90,-30,YES,YES,100,0,NO,100,0,0,0,0
 TUTMG,Level One,10,50,200,1,5,75,GNLMG1.PIE,TRLMG1.PIE,FXLMgun.PIE,FXTracer.PIE,FXMETHIT.PIE,FXDIRTsp.PIE,FXSSplsh.PIE,0,512,768,75,50,5,1,0,0,10,0,0,0,0,0,0,10,0,1500,20,YES,KINETIC,MACHINE GUN,DIRECT,ANTI PERSONNEL,180,90,-60,YES,NO,20,0,NO,100,100,0,1,0
 Superweapon2,Level All,5,5,1,1,5,9999,GNWPFGSS.PIE,TRWPFGSS.PIE,FXSHgssM.PIE,FXSHgssA.PIE,FXFlech4.PIE,FXFlech4.PIE,FXVLSWav.PIE,0,256,11008,99,90,1,1,0,0,5000,640,100,1000,0,0,0,10,100,1800,20,YES,HEAT,ENERGY,HOMING-DIRECT,ALL ROUNDER,180,90,-60,YES,NO,100,0,YES,150,0,0,1,0

src/oprint.c

@@ -193,17 +193,12 @@ static void printWeaponInfo(const WEAPON_STATS* psStats)
 				(UBYTE)selectedPlayer), weaponFirePause(psStats,(UBYTE)selectedPlayer),
 				weaponDamage(psStats, (UBYTE)selectedPlayer)));
 	CONPRINTF(ConsoleString,(ConsoleString,"   rad %d radHt %d radDam %d\n"
-			  "   inTime %d inDam %d inRad %d\n",
+			  "   inDam %d inRad %d\n",
 				psStats->radius, psStats->radiusHit, psStats->radiusDamage,
-				psStats->incenTime, psStats->incenDamage, psStats->incenRadius));
-	CONPRINTF(ConsoleString,(ConsoleString,"   flSpd %d inHt %d %s\n",
-				psStats->flightSpeed, psStats->indirectHeight,
-				psStats->fireOnMove ? "fireOnMove" : "not fireOnMove"));
+				psStats->incenDamage, psStats->incenRadius));
+	CONPRINTF(ConsoleString,(ConsoleString,"   flSpd %d %s\n",
+				psStats->flightSpeed, psStats->fireOnMove ? "fireOnMove" : "not fireOnMove"));
 	CONPRINTF(ConsoleString,(ConsoleString,"   %s %s %s\n", pWC, pWSC, pMM));
-	/*CONPRINTF(ConsoleString,(ConsoleString,"   %shoming %srotate recoil %d\n"
-			  "   dLife %d radLife %d\n",
-			  psStats->homingRound ? "" : "not ", psStats->rotate ? "" : "not ",
-			  psStats->recoilValue, psStats->directLife, psStats->radiusLife));*/
 	CONPRINTF(ConsoleString,(ConsoleString,"   %srotate recoil %d\n"
 			  "   dLife %d radLife %d\n",
 			  psStats->rotate ? "" : "not ",

src/stats.c

@@ -385,9 +385,9 @@ BOOL loadWeaponStats(const char *pWeaponData, UDWORD bufferSize)
 			&psStats->longRange,&psStats->shortHit, &psStats->longHit,
 			&psStats->firePause, &psStats->numExplosions, &numRounds,
 			&psStats->reloadTime, &psStats->damage, &psStats->radius,
-			&psStats->radiusHit, &psStats->radiusDamage, &psStats->incenTime,
+			&psStats->radiusHit, &psStats->radiusDamage, &dummyVal,
 			&psStats->incenDamage, &psStats->incenRadius, &psStats->directLife,
-			&psStats->radiusLife, &psStats->flightSpeed, &psStats->indirectHeight,
+			&psStats->radiusLife, &psStats->flightSpeed, &dummyVal,
 			(char *)&fireOnMove, (char *)&weaponClass, (char *)&weaponSubClass, (char *)&movement, (char *)&weaponEffect,
 			&rotate, &maxElevation, &minElevation, (char *)&facePlayer, (char *)&faceInFlight,
 			&psStats->recoilValue, &psStats->minRange,	(char *)&lightWorld,

src/statsdef.h

@@ -350,7 +350,6 @@ typedef struct WEAPON_STATS
 	UDWORD			incenDamage;			///< Damage done each burn cycle
 	UDWORD			incenRadius;			///< Burn radius of	the round
 	UDWORD			flightSpeed;			///< speed ammo travels at
-	UDWORD			indirectHeight;			///< how high	the ammo travels for indirect	fire
 	FIREONMOVE		fireOnMove;				///< indicates whether the droid has to stop before firing
 	WEAPON_CLASS	weaponClass;			///< the class of weapon
 	WEAPON_SUBCLASS weaponSubClass;			///< the subclass to which the weapon	belongs

src/structure.c

@@ -603,13 +603,13 @@ BOOL loadStructureStats(const char *pStructData, UDWORD bufferSize)
 		sscanf(pStructData,"%[^','],%[^','],%[^','],%[^','],%d,%d,%d,%[^','],\
 			%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%[^','],%[^','],%d,%[^','],%[^','],\
 			%d,%d",
-			StructureName, type, dummy, strength, &psStructure->terrainType,
+			StructureName, type, dummy, strength, &dummyVal,
 			&psStructure->baseWidth, &psStructure->baseBreadth, foundation,
 			&psStructure->buildPoints, &psStructure->height,
 			&psStructure->armourValue, &psStructure->bodyPoints,
-			&psStructure->repairSystem, &psStructure->powerToBuild,
+			&dummyVal, &psStructure->powerToBuild,
 			&dummyVal, &psStructure->resistance,
-			&dummyVal, &psStructure->sizeModifier,
+			&dummyVal, &dummyVal,
 			ecmType, sensorType, &weapSlots, GfxFile,
 			baseIMD, &psStructure->numFuncs, &numWeaps);
 

src/structuredef.h

@@ -117,11 +117,8 @@ typedef struct _structure_stats
 	STATS_BASE;						/* basic stats */
 	STRUCTURE_TYPE	type;				/* the type of structure */
 	STRUCT_STRENGTH	strength;		/* strength against the weapon effects */
-	UDWORD		terrainType;		/*The type of terrain the structure has to be
-									  built next to - may be none*/
 	UDWORD		baseWidth;			/*The width of the base in tiles*/
 	UDWORD		baseBreadth;		/*The breadth of the base in tiles*/
-	UDWORD		foundationType;		/*The type of foundation for the structure*/
 	UDWORD		buildPoints;		/*The number of build points required to build
 									  the structure*/
 	UDWORD		height;				/*The height above/below the terrain - negative
@@ -130,14 +127,10 @@ typedef struct _structure_stats
 									  upgraded */
 	UDWORD		bodyPoints;			/*The structure's body points - A structure goes
 									  off-line when 50% of its body points are lost*/
-	UDWORD		repairSystem;		/*The repair system points are added to the body
-									  points until fully restored . The points are
-									  then added to the Armour Points*/
 	UDWORD		powerToBuild;		/*How much power the structure requires to build*/
 	UDWORD		resistance;			/*The number used to determine whether a
 									  structure can resist an enemy takeover -
 									  0 = cannot be attacked electrically*/
-	UDWORD		sizeModifier;		/*The larger the target, the easier to hit*/
 	iIMDShape	*pIMD;		/*The IMD to draw for this structure */
 	iIMDShape	*pBaseIMD;	/*The base IMD to draw for this structure */
 	struct ECM_STATS	*pECM;		/*Which ECM is standard for the structure -