Merge pull request #3061 from psydev/bleed

fixed spice regen rate; rename some weapons to original names

mods/d2k/rules/atreides.yaml

@@ -200,7 +200,7 @@ SONICTANK:
 	RenderUnit:
 		Image: SONICTANK
 	Armament:
-		Weapon: TTankZap
+		Weapon: Sound
 		LocalOffset: 640,0,427
 	AttackFrontal:
 	AutoTarget:

mods/d2k/rules/harkonnen.yaml

@@ -218,7 +218,7 @@ DEVAST:
 		Range: 7
 	RenderUnit:
 	Armament:
-		Weapon: 120mm
+		Weapon: DevBullet
 		LocalOffset: 683,213,85, 683,-171,85
 	AttackFrontal:
 	AutoTarget:

mods/d2k/rules/infantry.yaml

@@ -17,7 +17,7 @@ RIFLE:
 	Mobile:
 		Speed: 5
 	Armament:
-		Weapon: M1Carbine
+		Weapon: LMG
 	AttackFrontal:
 	TakeCover:
 	-RenderInfantry:

mods/d2k/rules/ordos.yaml

@@ -160,7 +160,7 @@ TRIKEO:
 	RenderUnit:
 		Image: RAIDER
 	Armament:
-		Weapon: M60mgo
+		Weapon: HMGo
 		LocalOffset: 256,0,128
 	AttackFrontal:
 

mods/d2k/rules/structures.yaml

@@ -211,7 +211,7 @@ RESEARCH:
 	OreRefinery:
 		DockOffset: 2,1
 		DockAngle: 160
-		TickRate: 25
+		TickRate: 20
 	StoresOre:
 		PipColor: green
 		PipCount: 10

mods/d2k/rules/system.yaml

@@ -500,7 +500,7 @@ SPICEBLOOM:
 		Name: Spice Bloom
 	SeedsResource:
 		ResourceType: Spice
-		Interval: 100
+		Interval: 175
 	RadarColorFromTerrain:
 		Terrain: Spice
 

mods/d2k/rules/vehicles.yaml

@@ -132,7 +132,7 @@ HARVESTER.starport:
 	RenderUnit:
 	WithMuzzleFlash:
 	Armament:
-		Weapon: M60mg
+		Weapon: HMG
 		LocalOffset: 256,0,128
 	AttackFrontal:
 	AutoTarget:

mods/d2k/weapons.yaml

@@ -1,4 +1,4 @@
-M1Carbine:
+LMG:
 	ROF: 20
 	Range: 5
 	Report: MGUN2
@@ -150,7 +150,7 @@ Slung:
 		Damage: 30
 		ImpactSound: kaboom25
 
-M60mg:
+HMG:
 	ROF: 30
 	Range: 5
 	Burst: 2
@@ -173,7 +173,7 @@ M60mg:
 		InfDeath: 2
 		Damage: 30
 
-M60mgo:
+HMGo:
 	ROF: 30
 	Range: 5
 	Burst: 2
@@ -321,7 +321,7 @@ TowerMissile:
 		SmudgeType: SandCrater, RockCrater
 		Damage: 40
 
-120mm:
+DevBullet:
 	ROF: 70
 	Range: 6
 	Report: TANKHVY1
@@ -429,7 +429,7 @@ FakeMissile:
 		SmudgeType: SandCrater, RockCrater
 		Damage: 100
 
-TTankZap:
+Sound:
 	ROF: 85
 	Range: 8.5
 	Report: SONIC1