Upgrade mod rules to match engine changes.

mods/ts/rules/aircraft.yaml

@@ -11,9 +11,9 @@ DPOD:
 	Helicopter:
 		LandWhenIdle: yes
 		ROT: 5
-		Speed: 16
+		Speed: 149
 		InitialFacing: 0
-		LandableTerrainTypes: Clear # TODO: add more
+		LandableTerrainTypes: Clear
 	Health:
 		HP: 60
 	Armor:
@@ -47,11 +47,11 @@ DSHP:
 		Owner: gdi
 		Prerequisites: gaweap
 	Helicopter:
-		LandWhenIdle: yes # TODO: use DROPUP1.AUD and DROPDWN1.AUD
+		LandWhenIdle: yes
 		ROT: 5
-		Speed: 18
+		Speed: 168
 		InitialFacing: 0
-		LandableTerrainTypes: Clear # TODO: add more
+		LandableTerrainTypes: Clear
 	Health:
 		HP: 200
 	Armor:
@@ -81,9 +81,9 @@ ORCA:
 	Selectable:
 		Bounds: 30,24
 	Helicopter:
-		RearmBuildings: gahpad # TODO: use ORCAUP1.AUD and ORCADWN1.AUD
+		RearmBuildings: gahpad
 		ROT: 5
-		Speed: 20
+		Speed: 186
 	Health:
 		HP: 200
 	Armor:
@@ -111,14 +111,14 @@ ORCAB:
 	Buildable:
 		Queue: Air
 		BuildPaletteOrder: 20
-		Prerequisites: gahpad#, gatech
+		Prerequisites: gahpad
 		Owner: gdi
 	Selectable:
 		Bounds: 30,24
 	Helicopter:
-		RearmBuildings: gahpad # TODO: use ORCAUP1.AUD and ORCADWN1.AUD
+		RearmBuildings: gahpad
 		ROT: 5
-		Speed: 12
+		Speed: 112
 	Health:
 		HP: 260
 	Armor:
@@ -149,11 +149,11 @@ ORCATRAN:
 		Owner: gdi
 		Prerequisites: gahpad
 	Helicopter:
-		LandWhenIdle: yes # TODO: use ORCAUP1.AUD and ORCADWN1.AUD
+		LandWhenIdle: yes
 		ROT: 5
-		Speed: 9
+		Speed: 84
 		InitialFacing: 0
-		LandableTerrainTypes: Clear # TODO: add more
+		LandableTerrainTypes: Clear
 	Health:
 		HP: 200
 	Armor:
@@ -168,7 +168,7 @@ ORCATRAN:
 	RenderVoxels:
 	WithVoxelBody:
 
-TRNSPORT: # TODO: set up the vehicle cargo traits, but beware of desyncs
+TRNSPORT:
 	Inherits: ^Helicopter
 	Valued:
 		Cost: 750
@@ -178,13 +178,13 @@ TRNSPORT: # TODO: set up the vehicle cargo traits, but beware of desyncs
 		Queue: Air
 		BuildPaletteOrder: 10
 		Owner: gdi
-		Prerequisites: gahpad#, gadept
+		Prerequisites: gahpad
 	Helicopter:
-		LandWhenIdle: yes # TODO: use DROPUP1.AUD and DROPDWN1.AUD
+		LandWhenIdle: yes
 		ROT: 5
-		Speed: 16
+		Speed: 149
 		InitialFacing: 0
-		LandableTerrainTypes: Clear # TODO: add more
+		LandableTerrainTypes: Clear
 	Health:
 		HP: 175
 	Armor:
@@ -204,14 +204,14 @@ SCRIN:
 	Buildable:
 		Queue: Air
 		BuildPaletteOrder: 20
-		Prerequisites: nahpad #, natech
+		Prerequisites: nahpad
 		Owner: nod
 	Selectable:
 		Bounds: 30,24
 	Helicopter:
-		RearmBuildings: nahpad # TODO: use DROPUP1.AUD and DROPDWN1.AUD
+		RearmBuildings: nahpad
 		ROT: 3
-		Speed: 18
+		Speed: 168
 	Health:
 		HP: 280
 	Armor:
@@ -246,7 +246,7 @@ APACHE:
 	Helicopter:
 		RearmBuildings: nahpad
 		ROT: 5
-		Speed: 14
+		Speed: 130
 	Health:
 		HP: 225
 	Armor:
@@ -265,4 +265,5 @@ APACHE:
 		Offset: 85,0,384
 	RenderSprites:
 	RenderVoxels:
-	WithVoxelBody:
+	WithVoxelBody:
+

mods/ts/rules/defaults.yaml

@@ -12,22 +12,20 @@
 	GivesBuildableArea:
 	Capturable:
 	SoundOnDamageTransition:
-		DamagedSound: #TODO
-		DestroyedSound: #TODO
+		DamagedSound:
+		DestroyedSound:
 	RenderBuilding:
 	WithBuildingExplosion:
 	RepairableBuilding:
 	EngineerRepairable:
-#	EmitInfantryOnSell:
 	MustBeDestroyed:
 	GivesExperience:
-#	FrozenUnderFog:
 	CaptureNotification:
 	EditorAppearance:
 		RelativeToTopLeft: yes
 	ShakeOnDeath:
 	ProximityCaptor:
-		Types:Building
+		Types: Building
 	Sellable:
 	AcceptsSupplies:
 	GivesBounty:
@@ -42,7 +40,7 @@
 ^Infantry:
 	AppearsOnRadar:
 	Health:
-		Radius: 3
+		Radius: 128
 	Armor:
 		Type: None
 	RevealsShroud:
@@ -94,21 +92,18 @@
 		Cost: 10
 	Tooltip:
 		Name: Civilian
-	Buildable: # TODO: remove this once the testing period is over
+	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 1000
 		Owner: gdi, nod
 	Health:
 		HP: 50
 	Mobile:
-		Speed: 5
+		Speed: 71
 	RevealsShroud:
 		Range: 2
 	Armament:
-		Weapon: Pistola # deviation from RULES.INI (only CTECH is armed)
-#	LimitedAmmo:
-#		Ammo: 10
-#		PipCount: 2
+		Weapon: Pistola
 	AttackFrontal:
 	ProximityCaptor:
 		Types: CivilianInfantry
@@ -127,7 +122,7 @@
 			Beach: 40
 		ROT: 5
 	SelectionDecorations:
-	Selectable: 
+	Selectable:
 		Voice: Vehicle
 	TargetableUnit:
 		TargetTypes: Ground
@@ -141,9 +136,8 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 	ProximityCaptor:
-		Types:Vehicle
+		Types: Vehicle
 	GivesBounty:
-#	WithSmoke:
 	UpdatesPlayerStatistics:
 	CombatDebugOverlay:
 	Guard:
@@ -206,4 +200,5 @@
 	CombatDebugOverlay:
 	BodyOrientation:
 	Huntable:
-	LuaScriptEvents:
+	LuaScriptEvents:
+

mods/ts/rules/infantry.yaml

@@ -15,7 +15,7 @@ E1:
 	Health:
 		HP: 125
 	Mobile:
-		Speed: 5
+		Speed: 71
 	Armament:
 		Weapon: Minigun
 	AttackFrontal:
@@ -41,7 +41,7 @@ E2:
 	Health:
 		HP: 150
 	Mobile:
-		Speed: 4
+		Speed: 56
 	Armament:
 		Weapon: Grenade
 		LocalOffset: 0,0,555
@@ -70,7 +70,7 @@ E3:
 	Health:
 		HP: 100
 	Mobile:
-		Speed: 3
+		Speed: 42
 	Armament@PRIMARY:
 		Weapon: Bazooka
 		LocalOffset: 0,0,555
@@ -95,7 +95,7 @@ WEEDGUY:
 		Bounds: 12,17,0,-6
 		Voice: Weed
 	Mobile:
-		Speed: 3
+		Speed: 42
 	Health:
 		HP: 130
 	CrushableInfantry:
@@ -105,7 +105,6 @@ WEEDGUY:
 		LocalOffset: 85,0,384
 		FireDelay: 3
 	AttackFrontal:
-#	-PoisonedByTiberium:
 	-RenderInfantry:
 	RenderInfantryProne:
 	TakeCover:
@@ -125,7 +124,7 @@ MEDIC:
 		Bounds: 12,17,0,-6
 		Voice: Medic
 	Mobile:
-		Speed: 4
+		Speed: 56
 	Health:
 		HP: 125
 	CrushableInfantry:
@@ -156,7 +155,7 @@ ENGINEER:
 		Bounds: 12,17,0,-6
 		Voice: Engineer
 	Mobile:
-		Speed: 4
+		Speed: 56
 	Health:
 		HP: 500
 	Passenger:
@@ -189,11 +188,10 @@ UMAGON:
 		Bounds: 12,17,0,-6
 		Voice: Umagon
 	Mobile:
-		Speed: 5
+		Speed: 71
 	Health:
 		HP: 150
-	Passenger: # TODO:
-#		PipType: White
+	Passenger:
 	RevealsShroud:
 		Range: 7
 	Armament:
@@ -220,11 +218,10 @@ GHOST:
 		Bounds: 12,17,0,-6
 		Voice: Ghost
 	Mobile:
-		Speed: 4
+		Speed: 56
 	Health:
 		HP: 200
-	Passenger: # TODO:
-#		PipType: White
+	Passenger:
 	RevealsShroud:
 		Range: 6
 	Armament:
@@ -253,7 +250,7 @@ JUMPJET:
 		Bounds: 12,17,0,-6
 		Voice: JumpJet
 	Mobile:
-		Speed: 4
+		Speed: 56
 	Health:
 		HP: 120
 	Armor:
@@ -268,8 +265,6 @@ JUMPJET:
 	AttackFrontal:
 	TakeCover:
 	RenderInfantry:
-#	LeavesHusk: # TODO
-#	Transforms: # TODO
 
 CHAMSPY:
 	Inherits: ^Infantry
@@ -289,11 +284,10 @@ CHAMSPY:
 	Health:
 		HP: 120
 	Mobile:
-		Speed: 6
+		Speed: 85
 	RevealsShroud:
 		Range: 9
-	Passenger: # TODO
-#		PipType: White
+	Passenger:
 	TakeCover:
 	Spy:
 	Infiltrates:
@@ -321,16 +315,13 @@ CYBORG:
 	-CrushableInfantry:
 		CrushSound: squish2.aud
 	Selectable:
-		Bounds: 12,17,0,-6 # TODO: wrong
+		Bounds: 12,17,0,-6
 		Voice: Cyborg
 	Mobile:
-		Speed: 4
+		Speed: 56
 	Health:
 		HP: 300
-#	-PoisonedByTiberium:
-#	TiberiumHeal: # TODO
-	Passenger: # TODO:
-#		PipType: White
+	Passenger:
 	RevealsShroud:
 		Range: 5
 	Armament:
@@ -340,8 +331,6 @@ CYBORG:
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
-#	LeavesHusk: # TODO:
-#		CrawlingCyborg
 
 CYC2:
 	Inherits: ^Infantry
@@ -359,16 +348,13 @@ CYC2:
 	-CrushableInfantry:
 		CrushSound: squish2.aud
 	Selectable:
-		Bounds: 12,17,0,-6 # TODO: wrong
+		Bounds: 12,17,0,-6
 		Voice: CyborgCommando
 	Mobile:
-		Speed: 4
+		Speed: 56
 	Health:
 		HP: 500
-#	-PoisonedByTiberium:
-#	TiberiumHeal: # TODO
-	Passenger: # TODO:
-#		PipType: White
+	Passenger:
 	RevealsShroud:
 		Range: 7
 	Armament:
@@ -378,8 +364,6 @@ CYC2:
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
-#	LeavesHusk: # TODO:
-#		CrawlingCyborgCommando
 
 MUTANT:
 	Inherits: ^Infantry
@@ -398,7 +382,7 @@ MUTANT:
 	Health:
 		HP: 50
 	Mobile:
-		Speed: 4
+		Speed: 56
 	RevealsShroud:
 		Range: 4
 	Armament:
@@ -408,8 +392,6 @@ MUTANT:
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
-#	-PoisonedByTiberium:
-#	TiberiumHeal: # TODO
 
 MWMN:
 	Inherits: ^Infantry
@@ -428,7 +410,7 @@ MWMN:
 	Health:
 		HP: 50
 	Mobile:
-		Speed: 4
+		Speed: 56
 	RevealsShroud:
 		Range: 4
 	Armament:
@@ -438,8 +420,6 @@ MWMN:
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
-#	-PoisonedByTiberium:
-#	TiberiumHeal: # TODO
 
 MUTANT3:
 	Inherits: ^Infantry
@@ -458,7 +438,7 @@ MUTANT3:
 	Health:
 		HP: 50
 	Mobile:
-		Speed: 4
+		Speed: 56
 	RevealsShroud:
 		Range: 4
 	Armament:
@@ -468,10 +448,8 @@ MUTANT3:
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
-#	-PoisonedByTiberium:
-#	TiberiumHeal: # TODO
 
-MHIJACK: # TODO: does not work
+MHIJACK:
 	Inherits: ^Infantry
 	Buildable:
 		Queue: Infantry
@@ -488,7 +466,7 @@ MHIJACK: # TODO: does not work
 	Health:
 		HP: 300
 	Mobile:
-		Speed: 7
+		Speed: 99
 	RevealsShroud:
 		Range: 6
 	-AutoTarget:
@@ -497,8 +475,6 @@ MHIJACK: # TODO: does not work
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
-#	-PoisonedByTiberium:
-#	TiberiumHeal: # TODO
 
 TRATOS:
 	Inherits: ^Infantry
@@ -516,7 +492,7 @@ TRATOS:
 	Health:
 		HP: 200
 	Mobile:
-		Speed: 5
+		Speed: 71
 	RevealsShroud:
 		Range: 4
 	TakeCover:
@@ -525,8 +501,6 @@ TRATOS:
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
-#	-PoisonedByTiberium:
-#	TiberiumHeal: # TODO
 
 OXANNA:
 	Inherits: ^Infantry
@@ -544,7 +518,7 @@ OXANNA:
 	Health:
 		HP: 50
 	Mobile:
-		Speed: 4
+		Speed: 56
 	RevealsShroud:
 		Range: 4
 	TakeCover:
@@ -553,8 +527,6 @@ OXANNA:
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
-#	-PoisonedByTiberium:
-#	TiberiumHeal: # TODO
 
 SLAV:
 	Inherits: ^Infantry
@@ -572,7 +544,7 @@ SLAV:
 	Health:
 		HP: 300
 	Mobile:
-		Speed: 4
+		Speed: 56
 	RevealsShroud:
 		Range: 4
 	TakeCover:
@@ -581,8 +553,6 @@ SLAV:
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
-#	-PoisonedByTiberium:
-#	TiberiumHeal: # TODO
 
 DOGGIE:
 	Inherits: ^Infantry
@@ -593,7 +563,7 @@ DOGGIE:
 		BuildPaletteOrder: 100
 		Owner: None
 	Health:
-		Radius: 3
+		Radius: 128
 		HP: 250
 	Valued:
 		Cost: 100
@@ -602,9 +572,7 @@ DOGGIE:
 	RevealsShroud:
 		Range: 4
 	Mobile:
-		Speed: 8
-#	CrushableInfantry:
-#		CrushSound: squish2.aud
+		Speed: 113
 	Selectable:
 		Voice: Fiend
 	TargetableUnit:
@@ -613,8 +581,6 @@ DOGGIE:
 		Weapon: FiendShard
 	AttackFrontal:
 	AttackWander:
-#	-PoisonedByTiberium:
-#	TiberiumHeal: # TODO
 
 VISSML:
 	Inherits: ^Infantry
@@ -633,7 +599,7 @@ VISSML:
 	RevealsShroud:
 		Range: 0
 	Mobile:
-		Speed: 8
+		Speed: 113
 		ROT: 16
 	-CrushableInfantry:
 	Selectable:
@@ -642,8 +608,6 @@ VISSML:
 		TargetTypes: Ground
 	-AutoTarget:
 	-AttackMove:
-#	-PoisonedByTiberium:
-#	TiberiumHeal: # TODO
 	-RenderInfantry:
 	RenderUnit:
 
@@ -664,7 +628,7 @@ VISLRG:
 	RevealsShroud:
 		Range: 0
 	Mobile:
-		Speed: 8
+		Speed: 113
 		ROT: 16
 	-CrushableInfantry:
 	Selectable:
@@ -675,8 +639,6 @@ VISLRG:
 		Weapon: SlimeAttack
 	AttackFrontal:
 	AttackWander:
-#	-PoisonedByTiberium:
-#	TiberiumHeal: # TODO
 	-RenderInfantry:
 	RenderUnit:
 
@@ -687,4 +649,5 @@ CIV2:
 	Inherits: ^CivilianInfantry
 
 CIV3:
-	Inherits: ^CivilianInfantry
+	Inherits: ^CivilianInfantry
+

mods/ts/rules/structures.yaml

@@ -26,7 +26,7 @@ GACNST:
 	BaseBuilding:
 	Transforms:
 		IntoActor: mcv
-		Offset:1,1
+		Offset: 1,1
 		Facing: 96
 	ProductionBar:
 	-Sellable:
@@ -89,9 +89,8 @@ GAPILE:
 		Type: Wood
 	RevealsShroud:
 		Range: 5
-#	RallyPoint: #TODO: setup sequences
 	Exit@1:
-		SpawnOffset: -64,64,0
+		SpawnOffset: -2730,2730,0
 		ExitCell: 0,2
 	Production:
 		Produces: Infantry
@@ -112,8 +111,6 @@ GAWEAP:
 	Tooltip:
 		Name: GDI War Factory
 		Description: Assembly point for\nvehicle reinforcements
-#	ProvidesCustomPrerequisite:
-#		Prerequisite: VehicleProduction
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 50
@@ -128,11 +125,10 @@ GAWEAP:
 		Range: 4
 	-RenderBuilding:
 	RenderBuildingWarFactory:
-	RallyPoint: # TODO: setup sequences/palettes
+	RallyPoint:
 		RallyPoint: 6,5
-#		IndicatorPalettePrefix: effect
 	Exit@1:
-		SpawnOffset: -4,24
+		SpawnOffset: -170,1024,0
 		ExitCell: 3,3
 	Production:
 		Produces: Vehicle
@@ -188,9 +184,8 @@ NAHAND:
 		Type: Wood
 	RevealsShroud:
 		Range: 5
-#	RallyPoint: #TODO: setup sequences
 	Exit@1:
-		SpawnOffset: -64,64,0
+		SpawnOffset: -2730,2730,0
 		ExitCell: 0,2
 	Production:
 		Produces: Infantry
@@ -209,8 +204,6 @@ NAWEAP:
 	Tooltip:
 		Name: Nod War Factory
 		Description: Assembly point for\nvehicle reinforcements
-#	ProvidesCustomPrerequisite:
-#		Prerequisite: VehicleProduction
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 50
@@ -225,11 +218,10 @@ NAWEAP:
 		Range: 4
 	-RenderBuilding:
 	RenderBuildingWarFactory:
-	RallyPoint: # TODO: setup sequences/palettes
+	RallyPoint:
 		RallyPoint: 6,5
-#		IndicatorPalettePrefix: effect
 	Exit@1:
-		SpawnOffset: -4,24
+		SpawnOffset: -170,1024,0
 		ExitCell: 3,3
 	Production:
 		Produces: Vehicle
@@ -287,16 +279,16 @@ GATICK:
 	RenderBuilding:
 	RenderVoxels:
 		Image: ttnk
-	WithVoxelBarrel: # TODO: offsets
-	WithVoxelTurret: # TODO: offsets
+	WithVoxelBarrel:
+	WithVoxelTurret:
 	Transforms:
 		IntoActor: ttnk
-		Offset: 1,1 # TODO
-		Facing: 96 # TODO
-		TransformSounds: # TODO
-		NoTransformSounds: # TODO
+		Offset: 1,1
+		Facing: 96
+		TransformSounds:
+		NoTransformSounds:
 
-GAICBM: # TODO: does not launch anything yet
+GAICBM:
 	Inherits: ^Building
 	Valued:
 		Cost: 800
@@ -304,8 +296,8 @@ GAICBM: # TODO: does not launch anything yet
 	Tooltip:
 		Name: Deployed ICBM
 	Building:
-		Footprint: _ x # TODO
-		Dimensions: 1,2 # TODO
+		Footprint: _ x
+		Dimensions: 1,2
 	-GivesBuildableArea:
 	Health:
 		HP: 400
@@ -315,10 +307,10 @@ GAICBM: # TODO: does not launch anything yet
 		Range: 5
 	Transforms:
 		IntoActor: icbm
-		Offset: 1,1 # TODO
-		Facing: 96 # TODO
-		TransformSounds: # TODO
-		NoTransformSounds: # TODO
+		Offset: 1,1
+		Facing: 96
+		TransformSounds:
+		NoTransformSounds:
 
 GADPSA:
 	Inherits: ^Building
@@ -328,8 +320,8 @@ GADPSA:
 	Tooltip:
 		Name: Deployed Sensor Array
 	Building:
-		Footprint: _ x # TODO
-		Dimensions: 1,2 # TODO
+		Footprint: _ x
+		Dimensions: 1,2
 	-GivesBuildableArea:
 	Health:
 		HP: 600
@@ -339,10 +331,10 @@ GADPSA:
 		Range: 8
 	Transforms:
 		IntoActor: lpst
-		Offset: 1,1 # TODO
-		Facing: 96 # TODO
-		TransformSounds: # TODO
-		NoTransformSounds: # TODO
+		Offset: 1,1
+		Facing: 96
+		TransformSounds:
+		NoTransformSounds:
 	RenderDetectionCircle:
 	DetectCloaked:
 		Range: 6
@@ -378,16 +370,16 @@ GAARTY:
 	RenderBuilding:
 	RenderVoxels:
 		Image: art2
-	WithVoxelBarrel: # TODO: offsets
-	WithVoxelTurret: # TODO: offsets
+	WithVoxelBarrel:
+	WithVoxelTurret:
 	Transforms:
 		IntoActor: art2
-		Offset: 1,1 # TODO
-		Facing: 96 # TODO
-		TransformSounds: # TODO
-		NoTransformSounds: # TODO
+		Offset: 1,1
+		Facing: 96
+		TransformSounds:
+		NoTransformSounds:
 
-GASPOT: # TODO: has moving spotlights
+GASPOT:
 	Inherits: ^Building
 	Buildable:
 		Queue: Defense
@@ -422,7 +414,6 @@ GAHPAD:
 		Description: Produces, rearms and\nrepairs helicopters
 	Buildable:
 		BuildPaletteOrder: 60
-#		Prerequisites: garadr
 		Owner: gdi
 		Queue: Building
 	Building:
@@ -434,13 +425,12 @@ GAHPAD:
 	RevealsShroud:
 		Range: 5
 	Exit@1:
-		SpawnOffset: 0,-6
+		SpawnOffset: 0,-256,0
 	Production:
 		Produces: Air
 	BelowUnits:
 	Reservable:
 	RepairsUnits:
-#	RallyPoint:
 	ProductionBar:
 	WithIdleOverlay@PLATFORM:
 		Sequence: idle-platform
@@ -456,7 +446,6 @@ NAHPAD:
 		Description: Produces, rearms and\nrepairs helicopters
 	Buildable:
 		BuildPaletteOrder: 60
-#		Prerequisites: naradr
 		Owner: nod
 		Queue: Building
 	Building:
@@ -468,20 +457,18 @@ NAHPAD:
 	RevealsShroud:
 		Range: 5
 	Exit@1:
-		SpawnOffset: 0,-6
+		SpawnOffset: 0,-256,0
 	Production:
 		Produces: Air
 	BelowUnits:
 	Reservable:
 	RepairsUnits:
-#	RallyPoint:
 	ProductionBar:
 	WithIdleOverlay@PLATFORM:
 		Sequence: idle-platform
 	WithIdleOverlay@LIGHTS:
 		Sequence: idle-lights
 
-# custom prerequisites:
 ANYPOWER:
 	Tooltip:
 		Name: Power Plant
@@ -490,4 +477,5 @@ ANYPOWER:
 BARRACKS:
 	Tooltip:
 		Name: Infantry Production
-		Description: Infantry Production
+		Description: Infantry Production
+

mods/ts/rules/system.yaml

@@ -148,4 +148,5 @@ mpspawn:
 waypoint:
 	Waypoint:
 	RenderEditorOnly:
-	BodyOrientation:
+	BodyOrientation:
+

mods/ts/rules/vehicles.yaml

@@ -18,7 +18,7 @@ MCV:
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 6
+		Speed: 85
 		Crushes: wall, crate, infantry
 	RevealsShroud:
 		Range: 4
@@ -27,10 +27,10 @@ MCV:
 	-AttackMove:
 	Transforms:
 		IntoActor: gacnst
-		Offset:-1,-1
+		Offset: -1,-1
 		Facing: 96
-		TransformSounds: # TODO
-		NoTransformSounds: # TODO
+		TransformSounds:
+		NoTransformSounds:
 	RenderSprites:
 	RenderVoxels:
 	WithVoxelBody:
@@ -40,7 +40,7 @@ APC:
 	Valued:
 		Cost: 600
 	Tooltip:
-		Name: Amphibious APC # TODO: not yet amphibious
+		Name: Amphibious APC
 		Description: Armored infantry transport and mobile AA\n  Strong vs Aircraft, Vehicles\n  Weak vs Infantry
 	Buildable:
 		Queue: Vehicle
@@ -48,7 +48,7 @@ APC:
 		Owner: gdi
 	Mobile:
 		ROT: 5
-		Speed: 8
+		Speed: 113
 	Health:
 		HP: 200
 	Armor:
@@ -67,7 +67,7 @@ APC:
 	RenderVoxels:
 	WithVoxelBody:
 
-HARV: # TODO: without back: HORV
+HARV:
 	Inherits: ^Vehicle
 	Valued:
 		Cost: 1400
@@ -77,28 +77,19 @@ HARV: # TODO: without back: HORV
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 10
-#		Prerequisites: proc
 		Owner: gdi,nod
 	Selectable:
 		Priority: 7
 		Bounds: 36,36
-#	Harvester:
-#		Resources: Tiberium, BlueTiberium
-#		PipCount: 7
-#		Capacity: 28
-#		LoadTicksPerBale: 6
-#		UnloadTicksPerBale: 12
-#		SearchFromProcRadius: 24
-#		SearchFromOrderRadius: 12
 	Mobile:
-		Speed: 5
+		Speed: 71
 	Health:
 		HP: 1000
 	SelfHealing:
 		Ticks: 10
 		HealIfBelow: 50%
 		DamageCooldown: 200
-	Armor: 
+	Armor:
 		Type: Heavy
 	RevealsShroud:
 		Range: 4
@@ -120,11 +111,11 @@ HVR:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
 		Owner: gdi
-	Mobile: # TODO: amphibious
-		Speed: 7
+	Mobile:
+		Speed: 99
 	Health:
 		HP: 230
-	Armor: 
+	Armor:
 		Type: Light
 	RevealsShroud:
 		Range: 7
@@ -151,7 +142,7 @@ HVR:
 		BuildPaletteOrder: 60
 		Owner: gdi
 	Mobile:
-		Speed: 4
+		Speed: 56
 		ROT: 5
 	Health:
 		HP: 600
@@ -177,7 +168,7 @@ HVR:
 	WithVoxelTurret:
 	WithVoxelBarrel:
 
-TRUCKB: # NOTE: TRUCKA is unloaded
+TRUCKB:
 	Inherits: ^Vehicle
 	Buildable:
 		Queue: Vehicle
@@ -193,7 +184,7 @@ TRUCKB: # NOTE: TRUCKA is unloaded
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 4
+		Speed: 56
 	RevealsShroud:
 		Range: 5
 	SupplyTruck:
@@ -219,7 +210,7 @@ LPST:
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 6
+		Speed: 85
 		ROT: 5
 	RevealsShroud:
 		Range: 10
@@ -230,10 +221,10 @@ LPST:
 	WithVoxelBody:
 	Transforms:
 		IntoActor: gadpsa
-		Offset: -1,-1 # TODO
-		Facing: 96 # TODO
-		TransformSounds: # TODO
-		NoTransformSounds: # TODO
+		Offset: -1,-1
+		Facing: 96
+		TransformSounds:
+		NoTransformSounds:
 
 ICBM:
 	Inherits: ^Vehicle
@@ -250,7 +241,7 @@ ICBM:
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 6
+		Speed: 85
 		ROT: 5
 	RevealsShroud:
 		Range: 7
@@ -261,10 +252,10 @@ ICBM:
 	WithVoxelBody:
 	Transforms:
 		IntoActor: gaicbm
-		Offset:-1,-1 # TODO
-		Facing: 96 # TODO
-		TransformSounds: # TODO
-		NoTransformSounds: # TODO
+		Offset: -1,-1
+		Facing: 96
+		TransformSounds:
+		NoTransformSounds:
 
 REPAIR:
 	Inherits: ^Vehicle
@@ -280,7 +271,7 @@ REPAIR:
 	Health:
 		HP: 200
 	Mobile:
-		Speed: 6
+		Speed: 85
 		ROT: 5
 	RevealsShroud:
 		Range: 5
@@ -309,7 +300,7 @@ ART2:
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 5
+		Speed: 71
 		ROT: 2
 	RevealsShroud:
 		Range: 9
@@ -320,10 +311,10 @@ ART2:
 	WithVoxelBody:
 	Transforms:
 		IntoActor: gaarty
-		Offset: -1,-1 # TODO
-		Facing: 96 # TODO
-		TransformSounds: # TODO
-		NoTransformSounds: # TODO
+		Offset: -1,-1
+		Facing: 96
+		TransformSounds:
+		NoTransformSounds:
 
 WEED:
 	Inherits: ^Vehicle
@@ -335,18 +326,9 @@ WEED:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 10
-#		Prerequisites: naweap, nawast
 		Owner: nod
-#	Harvester:
-#		Resources: Veins
-#		PipCount: 7
-#		Capacity: 28
-#		LoadTicksPerBale: 6
-#		UnloadTicksPerBale: 12
-#		SearchFromProcRadius: 24
-#		SearchFromOrderRadius: 12
 	Mobile:
-		Speed: 5
+		Speed: 71
 		ROT: 5
 	Health:
 		HP: 600
@@ -373,7 +355,7 @@ BUS:
 		Owner: gdi
 	Mobile:
 		ROT: 5
-		Speed: 8
+		Speed: 113
 	Health:
 		HP: 100
 	Armor:
@@ -402,7 +384,7 @@ PICK:
 		Owner: gdi
 	Mobile:
 		ROT: 5
-		Speed: 8
+		Speed: 113
 	Health:
 		HP: 100
 	Armor:
@@ -431,7 +413,7 @@ CAR:
 		Owner: gdi
 	Mobile:
 		ROT: 5
-		Speed: 8
+		Speed: 113
 	Health:
 		HP: 100
 	Armor:
@@ -460,7 +442,7 @@ GGHUNT:
 		Queue: Vehicle
 	Mobile:
 		ROT: 16
-		Speed: 25
+		Speed: 355
 	Health:
 		HP: 500
 	Armor:
@@ -487,7 +469,7 @@ WINI:
 		Owner: gdi
 	Mobile:
 		ROT: 5
-		Speed: 8
+		Speed: 113
 	Health:
 		HP: 200
 	Armor:
@@ -516,7 +498,7 @@ MMCH:
 		Owner: gdi
 	Mobile:
 		ROT: 5
-		Speed: 4
+		Speed: 56
 	Health:
 		HP: 400
 	Armor:
@@ -549,7 +531,7 @@ HMEC:
 		Owner: gdi
 	Mobile:
 		ROT: 3
-		Speed: 3
+		Speed: 42
 	Health:
 		HP: 800
 	SelfHealing:
@@ -581,7 +563,7 @@ SMECH:
 		Owner: gdi
 	Mobile:
 		ROT: 5
-		Speed: 7
+		Speed: 99
 	Health:
 		HP: 800
 	Armor:
@@ -609,7 +591,7 @@ BIKE:
 		Owner: nod
 	Mobile:
 		ROT: 8
-		Speed: 12
+		Speed: 170
 	Health:
 		HP: 150
 	Armor:
@@ -639,7 +621,7 @@ BGGY:
 		Owner: nod
 	Mobile:
 		ROT: 8
-		Speed: 10
+		Speed: 142
 	Health:
 		HP: 220
 	Armor:
@@ -659,7 +641,7 @@ SAPC:
 	Valued:
 		Cost: 800
 	Tooltip:
-		Name: Subterranean APC # TODO: not yet subterranean
+		Name: Subterranean APC
 		Description: Armored infantry transport and mobile AA\n  Strong vs Aircraft, Vehicles\n  Weak vs Infantry
 	Buildable:
 		Queue: Vehicle
@@ -667,7 +649,7 @@ SAPC:
 		Owner: nod
 	Mobile:
 		ROT: 5
-		Speed: 5
+		Speed: 71
 	Health:
 		HP: 175
 	Armor:
@@ -697,7 +679,7 @@ SUBTANK:
 		Owner: nod
 	Mobile:
 		ROT: 6
-		Speed: 5
+		Speed: 71
 	Health:
 		HP: 300
 	Armor:
@@ -724,7 +706,7 @@ SONIC:
 		Owner: gdi
 	Mobile:
 		ROT: 4
-		Speed: 4
+		Speed: 56
 	Health:
 		HP: 500
 	Armor:
@@ -753,7 +735,7 @@ TTNK:
 		Owner: nod
 	Mobile:
 		ROT: 5
-		Speed: 6
+		Speed: 85
 	Health:
 		HP: 350
 	Armor:
@@ -766,10 +748,10 @@ TTNK:
 	WithVoxelBody:
 	Transforms:
 		IntoActor: gatick
-		Offset:-1,-1 # TODO
-		Facing: 96 # TODO
-		TransformSounds: # TODO
-		NoTransformSounds: # TODO
+		Offset: -1,-1
+		Facing: 96
+		TransformSounds:
+		NoTransformSounds:
 
 STNK:
 	Inherits: ^Vehicle
@@ -784,7 +766,7 @@ STNK:
 		Owner: nod
 	Mobile:
 		ROT: 5
-		Speed: 6
+		Speed: 85
 	Health:
 		HP: 180
 	Armor:
@@ -794,8 +776,8 @@ STNK:
 	Cloak:
 		InitialDelay: 90
 		CloakDelay: 90
-		CloakSound: # TODO
-		UncloakSound: # TODO
+		CloakSound:
+		UncloakSound:
 	Armament:
 		Weapon: Dragon
 		LocalOffset: 213,43,128, 213,-43,128
@@ -804,4 +786,5 @@ STNK:
 		InitialStance: HoldFire
 	RenderSprites:
 	RenderVoxels:
-	WithVoxelBody:
+	WithVoxelBody:
+

mods/ts/weapons.yaml

@@ -1,11 +1,11 @@
 Minigun:
 	ROF: 21
-	Range: 4
+	Range: 4c0
 	Report: INFGUN2.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			Wood: 25%
 			Light: 30%
@@ -17,16 +17,16 @@ Minigun:
 
 Grenade:
 	ROF: 60
-	Range: 4.5
+	Range: 4c512
 	Projectile: Bullet
-		Speed: 5
+		Speed: 85
 		High: yes
 		Shadow: yes
-		Angle: 0.1
-		Inaccuracy: 13
+		Angle: 62
+		Inaccuracy: 554
 		Image: DISCUS
 	Warhead:
-		Spread: 6
+		Spread: 256
 		Versus:
 			None: 50%
 			Wood: 100%
@@ -39,20 +39,20 @@ Grenade:
 
 Bazooka:
 	ROF: 60
-	Range: 6
+	Range: 6c0
 	Report: RKETINF1.AUD
 	ValidTargets: Ground, Air
 	Projectile: Missile
-		Speed: 25
+		Speed: 213
 		Arm: 2
 		High: yes
 		Shadow: yes
-		Inaccuracy: 3
+		Inaccuracy: 128
 		Image: DRAGON
 		ROT: 8
 		RangeLimit: 35
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 10%
 			Wood: 75%
@@ -65,20 +65,20 @@ Bazooka:
 
 MultiCluster:
 	ROF: 80
-	Range: 6
+	Range: 6c0
 	Report: MISL1.AUD
 	ValidTargets: Ground
 	Projectile: Missile
-		Speed: 20
+		Speed: 170
 		Arm: 2
 		High: yes
 		Shadow: yes
-		Inaccuracy: 3
+		Inaccuracy: 128
 		Image: DRAGON
 		ROT: 8
 		RangeLimit: 35
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 10%
 			Wood: 75%
@@ -91,12 +91,12 @@ MultiCluster:
 
 Heal:
 	ROF: 80
-	Range: 2.83
+	Range: 2c849
 	Report: HEALER1.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
-		Spread: 5
+		Spread: 213
 		Versus:
 			Wood: 0%
 			Light: 0%
@@ -107,13 +107,13 @@ Heal:
 
 Sniper:
 	ROF: 60
-	Range: 6.75
+	Range: 6c768
 	Report: SILENCER.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
 		Damage: 150
-		Spread: 1
+		Spread: 42
 		Versus:
 			None: 100%
 			Wood: 5%
@@ -123,12 +123,12 @@ Sniper:
 
 M1Carbine:
 	ROF: 20
-	Range: 4
+	Range: 4c0
 	Report: INFGUN3.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 100%
 			Wood: 25%
@@ -140,13 +140,13 @@ M1Carbine:
 
 LtRail:
 	ROF: 60
-	Range: 6
+	Range: 6c0
 	Report: BIGGGUN1.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
 		Damage: 150
-		Spread: 1
+		Spread: 42
 		Versus:
 			None: 100%
 			Wood: 5%
@@ -157,12 +157,12 @@ LtRail:
 Vulcan3:
 	ROF: 30
 	Burst: 3
-	Range: 4
+	Range: 4c0
 	Report: CYGUN1.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			Wood: 25%
 			Light: 30%
@@ -175,12 +175,12 @@ Vulcan3:
 Vulcan2:
 	ROF: 50
 	Burst: 3
-	Range: 6
+	Range: 6c0
 	Report: TSGUN4.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 100%
 			Wood: 60%
@@ -193,10 +193,10 @@ Vulcan2:
 
 Vulcan:
 	ROF: 60
-	Range: 4
+	Range: 4c0
 	Report: CHAINGN1.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
 		Versus:
 			Wood: 25%
@@ -210,13 +210,13 @@ Vulcan:
 FiendShard:
 	ROF: 30
 	Burst: 3
-	Range: 5
+	Range: 5c0
 	Report: FIEND2.AUD
 	Projectile: Missile
-		Speed: 25
+		Speed: 213
 		Image: CRYSTAL4
 		Shadow: yes
-		Angle: 0.15
+		Angle: 88
 	Warhead:
 		Versus:
 			Wood: 25%
@@ -229,10 +229,10 @@ FiendShard:
 JumpCannon:
 	ROF: 40
 	Burst: 2
-	Range: 5
+	Range: 5c0
 	Report: JUMPJET1.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
 		Versus:
 			Wood: 25%
@@ -246,20 +246,20 @@ JumpCannon:
 HoverMissile:
 	ROF: 68
 	Burst: 2
-	Range: 8
+	Range: 8c0
 	Report: HOVRMIS1.AUD
 	ValidTargets: Ground, Air
 	Projectile: Missile
-		Speed: 30
+		Speed: 256
 		Arm: 2
 		High: yes
 		Shadow: yes
-		Inaccuracy: 3
+		Inaccuracy: 128
 		Image: DRAGON
 		ROT: 8
 		RangeLimit: 35
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 10%
 			Wood: 75%
@@ -272,17 +272,17 @@ HoverMissile:
 
 120mmx:
 	ROF: 80
-	Range: 6.75
+	Range: 6c768
 	Report: 120MMF.AUD
 	Burst: 2
 	BurstDelay: 5
 	Projectile: Bullet
-		Speed: 40
+		Speed: 682
 		Image: 120mm
 		Shadow: yes
-		Angle: 0.1
+		Angle: 62
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 30%
 			Wood: 75%
@@ -296,7 +296,7 @@ HoverMissile:
 
 MammothTusk:
 	ROF: 80
-	Range: 6
+	Range: 6c0
 	Report: MISL1.AUD
 	ValidTargets: Air
 	Burst: 2
@@ -304,13 +304,13 @@ MammothTusk:
 		Arm: 0
 		High: yes
 		Shadow: yes
-		Inaccuracy: 3
+		Inaccuracy: 128
 		Image: DRAGON
 		ROT: 10
-		Speed: 20
+		Speed: 170
 		RangeLimit: 35
 	Warhead:
-		Spread: 6
+		Spread: 256
 		Versus:
 			None: 40%
 			Wood: 75%
@@ -323,12 +323,12 @@ MammothTusk:
 
 Repair:
 	ROF: 80
-	Range: 1.8
+	Range: 1c819
 	Report: REPAIR11.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
-		Spread: 5
+		Spread: 213
 		Versus:
 			None: 0%
 			Wood: 0%
@@ -341,10 +341,10 @@ Repair:
 SlimeAttack:
 	ROF: 80
 	Burst: 3
-	Range: 5
+	Range: 5c0
 	Report: VICER1.AUD
 	Projectile: Bullet
-		Speed: 25
+		Speed: 426
 	Warhead:
 		Versus:
 			Wood: 25%
@@ -356,11 +356,11 @@ SlimeAttack:
 
 SuicideBomb:
 	ROF: 1
-	Range: 0.5
+	Range: 0c512
 	Report: HUNTER2.AUD
 	Warhead:
 		Damage: 11000
-		Spread: 6
+		Spread: 256
 		Ore: true
 		Versus:
 			None: 90%
@@ -371,12 +371,12 @@ SuicideBomb:
 
 120mm:
 	ROF: 80
-	Range: 6.75
+	Range: 6c768
 	Report: 120MMF.AUD
 	Projectile: Bullet
-		Speed: 90
+		Speed: 1c512
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 30%
 			Wood: 75%
@@ -390,7 +390,7 @@ SuicideBomb:
 
 MechRailgun:
 	ROF: 60
-	Range: 8
+	Range: 8c0
 	Burst: 2
 	BurstDelay: 10
 	Charges: yes
@@ -399,19 +399,18 @@ MechRailgun:
 		Color: 200,0,255,255
 		BeamWidth: 2
 	Warhead:
-		Spread: 1
+		Spread: 42
 		InfDeath: 5
-#		SmudgeType: Scorch
 		Damage: 200
 
 AssaultCannon:
 	ROF: 50
-	Range: 5
+	Range: 5c0
 	Report: TSGUN4.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			Wood: 100%
 			Light: 60%
@@ -425,20 +424,20 @@ BikeMissile:
 	ROF: 60
 	Burst: 2
 	BurstDelay: 60
-	Range: 5
+	Range: 5c0
 	Report: MISL1.AUD
 	ValidTargets: Ground
 	Projectile: Missile
 		Arm: 2
 		High: yes
 		Shadow: yes
-		Inaccuracy: 3
+		Inaccuracy: 128
 		Image: DRAGON
 		ROT: 8
-		Speed: 30
+		Speed: 256
 		RangeLimit: 35
 	Warhead:
-		Spread: 6
+		Spread: 256
 		Versus:
 			None: 40%
 			Wood: 75%
@@ -451,12 +450,12 @@ BikeMissile:
 
 RaiderCannon:
 	ROF: 55
-	Range: 4
+	Range: 4c0
 	Report: CHAINGN1.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			Wood: 25%
 			Light: 30%
@@ -466,16 +465,16 @@ RaiderCannon:
 		InfDeath: 2
 		Damage: 40
 
-FireballLauncher: # TODO: add fire particles
+FireballLauncher:
 	ROF: 50
-	Range: 4.25
+	Range: 4c256
 	Report: FLAMTNK1.AUD
 	Projectile: Bullet
-		Speed: 20
+		Speed: 341
 	Burst: 2
 	BurstDelay: 25
 	Warhead:
-		Spread: 8
+		Spread: 341
 		Versus:
 			None: 100%
 			Wood: 100%
@@ -487,37 +486,36 @@ FireballLauncher: # TODO: add fire particles
 
 SonicZap:
 	ROF: 120
-	Range: 6
+	Range: 6c0
 	Burst: 2
 	BurstDelay: 10
 	Charges: yes
 	Report: SONIC4.AUD
-	Projectile: LaserZap # TODO: SonicBeam
+	Projectile: LaserZap
 		Color: 200,0,255,255
 		BeamWidth: 10
 	Warhead:
-		Spread: 1
+		Spread: 42
 		InfDeath: 5
-#		SmudgeType: Scorch
 		Damage: 100
 
 Dragon:
 	ROF: 50
-	Range: 6
+	Range: 6c0
 	Burst: 2
 	Report: MISL1.AUD
 	ValidTargets: Ground, Air
 	Projectile: Missile
-		Speed: 25
+		Speed: 213
 		Arm: 2
 		High: yes
 		Shadow: yes
-		Inaccuracy: 3
+		Inaccuracy: 128
 		Image: DRAGON
 		ROT: 8
 		RangeLimit: 35
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 10%
 			Wood: 75%
@@ -530,15 +528,15 @@ Dragon:
 
 90mm:
 	ROF: 50
-	Range: 6.75
+	Range: 6c768
 	Report: 120MMF.AUD
 	Projectile: Bullet
-		Speed: 40
+		Speed: 682
 		Image: 120mm
 		Shadow: yes
-		Angle: 0.1
+		Angle: 62
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 30%
 			Wood: 75%
@@ -552,16 +550,16 @@ Dragon:
 
 155mm:
 	ROF: 110
-	Range: 18
+	Range: 18c0
 	Report: 120MMF.AUD
 	Projectile: Bullet
-		Speed: 10
+		Speed: 170
 		Image: 120mm
-		Angle: 0.4
+		Angle: 165
 		Shadow: yes
-	MinRange: 5
+	MinRange: 5c0
 	Warhead:
-		Spread: 7
+		Spread: 298
 		Versus:
 			None: 100%
 			Wood: 85%
@@ -575,21 +573,21 @@ Dragon:
 
 Hellfire:
 	ROF: 50
-	Range: 6
+	Range: 6c0
 	Report: ORCAMIS1.AUD
 	Burst: 2
 	ValidTargets: Ground, Air
 	Projectile: Missile
-		Speed: 30
+		Speed: 256
 		Arm: 2
 		High: yes
 		Shadow: yes
-		Inaccuracy: 3
+		Inaccuracy: 128
 		Image: DRAGON
 		ROT: 8
 		RangeLimit: 35
 	Warhead:
-		Spread: 2
+		Spread: 85
 		Versus:
 			None: 30%
 			Wood: 65%
@@ -603,13 +601,13 @@ Hellfire:
 
 Bomb:
 	ROF: 10
-	Range: 5
+	Range: 5c0
 	Projectile: Bullet
-		Speed: 10
+		Speed: 170
 		Image: 120MM
 		Shadow: yes
 	Warhead:
-		Spread: 7
+		Spread: 298
 		Versus:
 			None: 200%
 			Wood: 90%
@@ -623,21 +621,21 @@ Bomb:
 
 Proton:
 	ROF: 3
-	Range: 5
+	Range: 5c0
 	Report: SCRIN5B.AUD
 	Burst: 2
 	ValidTargets: Ground, Air
 	Projectile: Missile
-		Speed: 30
+		Speed: 256
 		Arm: 2
 		High: yes
 		Shadow: yes
-		Inaccuracy: 3
+		Inaccuracy: 128
 		Image: TORPEDO
 		ROT: 1
 		RangeLimit: 35
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 25%
 			Wood: 65%
@@ -651,13 +649,13 @@ Proton:
 
 HarpyClaw:
 	ROF: 36
-	Range: 5
+	Range: 5c0
 	Report: CYGUN1.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	ValidTargets: Ground, Air
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			Wood: 25%
 			Light: 30%
@@ -669,12 +667,12 @@ HarpyClaw:
 
 Pistola:
 	ROF: 20
-	Range: 3
+	Range: 3c0
 	Report: GUN18.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			Wood: 50%
 			Light: 60%
@@ -682,4 +680,5 @@ Pistola:
 			Concrete: 25%
 		Explosion: piff
 		InfDeath: 2
-		Damage: 2
+		Damage: 2
+