Merge pull request #2891 from psydev/patch-4

blossom trees: indestructible; blue slower
2013-03-30 00:58:21 -07:00
parent 2fe75b322d 42b606ca3c
commit 66d8bbb9b5
5 changed files with 55 additions and 36 deletions
--- a/mods/cnc/rules/aircraft.yaml
+++ b/mods/cnc/rules/aircraft.yaml
@@ -67,7 +67,7 @@ HELI:
 	Armor:
 		Type: Light
 	RevealsShroud:
-		Range: 8
+		Range: 10
 	Armament@PRIMARY:
 		Weapon: HeliAGGun
 		LocalOffset: 128,-213,-85, 128,213,-85
@@ -120,7 +120,7 @@ ORCA:
 	Armor:
 		Type: Light
 	RevealsShroud:
-		Range: 8
+		Range: 10
 	Armament@PRIMARY:
 		Weapon: OrcaAGMissiles
 		LocalOffset: 427,-171,-213, 427,171,-213
@@ -130,10 +130,10 @@ ORCA:
 	AttackHeli:
 		FacingTolerance: 20
 	LimitedAmmo:
-		Ammo: 10
-		PipCount: 5
+		Ammo: 6
+		PipCount: 6
 	Reloads:
-		Count: 2
+		Count: 1
 		Period: 100
 	RenderUnit:
 	WithShadow:
@@ -184,7 +184,7 @@ A10:
 	Armor:
 		Type: Heavy
 	RevealsShroud:
-		Range: 8
+		Range: 12
 	RenderUnit:
 	WithShadow:
 	LimitedAmmo:
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -257,7 +257,7 @@ AFLD:
 		Footprint: xxxx xxxx
 		Dimensions: 4,2
 	Health:
-		HP: 1500
+		HP: 1000
 	RevealsShroud:
 		Range: 7
 	Bib:
@@ -296,7 +296,7 @@ WEAP:
 		Footprint: ___ xxx ===
 		Dimensions: 3,3
 	Health:
-		HP: 1750
+		HP: 1000
 	RevealsShroud:
 		Range: 4
 	Bib:
@@ -361,6 +361,8 @@ HQ:
 		Name: Communications Center
 		Icon: hqicnh
 		Description: Provides an overview of the battlefield.\n  Requires power to operate.
+	ProvidesCustomPrerequisite:
+		Prerequisite: anyhq
 	Buildable:
 		BuildPaletteOrder: 70
 		Prerequisites: proc
@@ -423,6 +425,8 @@ EYE:
 		Name: Advanced Communications Center
 		Icon: eyeicnh
 		Description: Provides access to the Ion Cannon.\n  Requires power to operate.
+	ProvidesCustomPrerequisite:
+		Prerequisite: anyhq
 	Buildable:
 		BuildPaletteOrder: 100
 		Prerequisites: hq
@@ -432,7 +436,7 @@ EYE:
 		Footprint: x_ xx
 		Dimensions: 2,2
 	Health:
-		HP: 1000
+		HP: 1200
 	RevealsShroud:
 		Range: 10
 	Bib:
@@ -461,6 +465,8 @@ TMPL:
 		Name: Temple of Nod
 		Icon: tmplicnh
 		Description: Place of worship and secret missile silo.\n  Requires power to operate.
+	ProvidesCustomPrerequisite:
+		Prerequisite: anyhq
 	Buildable:
 		BuildPaletteOrder: 100
 		Prerequisites: hq
@@ -772,3 +778,8 @@ ANYPOWER:
 	Tooltip:
 		Name: Power Plant
 		Description: Power Plant
+
+ANYHQ:
+	Tooltip:
+		Name: a communications center
+		Description: a communications center
--- a/mods/cnc/rules/trees.yaml
+++ b/mods/cnc/rules/trees.yaml
@@ -9,6 +9,9 @@ SPLIT2:
 		Name: Blossom Tree
 	RadarColorFromTerrain:
 		Terrain: Tiberium
+	-Health:
+	-DeadBuildingState:
+	-Armor:

 SPLIT3:
 	Inherits: ^Tree
@@ -21,6 +24,9 @@ SPLIT3:
 		Name: Blossom Tree
 	RadarColorFromTerrain:
 		Terrain: Tiberium
+	-Health:
+	-DeadBuildingState:
+	-Armor:

 SPLITBLUE:
 	Inherits: ^Tree
@@ -28,11 +34,14 @@ SPLITBLUE:
 		Palette: staticterrain
 	SeedsResource:
 		ResourceType:BlueTiberium
-		Interval: 55
+		Interval: 95
 	Tooltip:
 		Name: Blossom Tree (blue)
 	RadarColorFromTerrain:
 		Terrain: BlueTiberium
+	-Health:
+	-DeadBuildingState:
+	-Armor:

 ROCK1:
 	Inherits: ^Rock
--- a/mods/cnc/rules/vehicles.yaml
+++ b/mods/cnc/rules/vehicles.yaml
@@ -56,8 +56,9 @@ HARV:
 		Bounds: 36,36
 	Harvester:
 		Resources: Tiberium, BlueTiberium
-		PipCount: 5
-		Capacity: 15
+		PipCount: 7
+		Capacity: 20
+		UnloadTicksPerBale: 12		# hardcoded default is 4
 		# How far away from our linked proc (refinery) to find resources (in cells):
 		SearchFromProcRadius: 24
 		# How far away from last harvest order location to find more resources (in cells):
@@ -393,9 +394,10 @@ HTNK:
 		Owner: gdi
 	Mobile:
 		Crushes: wall, heavywall, crate, infantry
-		Speed: 3
+		Speed: 4
+		ROT: 3
 	Health:
-		HP: 600
+		HP: 800
 	Armor:
 		Type: Heavy
 	RevealsShroud:
@@ -442,9 +444,9 @@ MSAM:
 		Prerequisites: hq
 		Owner: gdi
 	Mobile:
-		Speed: 8
+		Speed: 7
 	Health:
-		HP: 120
+		HP: 115
 	Armor:
 		Type: Light
 	RevealsShroud:
@@ -496,6 +498,7 @@ MLRS:
 	AttackTurreted:
 	RenderUnitTurretedAim:
 	AutoTarget:
+		InitialStance: Defend
 	DebugRetiliateAgainstAggressor:
 	DebugNextAutoTargetScanTime:
 	Explodes:
--- a/mods/cnc/weapons.yaml
+++ b/mods/cnc/weapons.yaml
@@ -68,7 +68,7 @@ Atomic:
 			None: 90%
 			Wood: 60%
 			Light: 60%
-			Heavy: 25%
+			Heavy: 50%
 		Explosion: 6
 		InfDeath: 5
 		ImpactSound: nukexplo
@@ -82,33 +82,29 @@ Atomic:
 			None: 90%
 			Wood: 60%
 			Light: 60%
-			Heavy: 25%
+			Heavy: 50%
 		Delay: 3
 		InfDeath: 5
 		ImpactSound: xplobig4

 IonCannon:
+	ValidTargets: Ground, Air
 	Warhead@impact:
-		Damage: 500
-		Spread: 6
+		Damage: 900
+		Spread: 16
 		Ore: true
 		Versus: 
 			None: 100%
 			Wood: 100%
-			Light: 60%
-			Heavy: 45%
+			Light: 100%
+			Heavy: 100%
 		InfDeath: 5
 	Warhead@area:
 		DamageModel: PerCell
-		Damage: 200
+		Damage: 0
 		SmudgeType: Scorch
 		Size: 2,1
 		Ore: true
-		Versus: 
-			None: 90%
-			Wood: 60%
-			Light: 60%
-			Heavy: 25%
 		Delay: 3
 		InfDeath: 5

@@ -129,13 +125,13 @@ Sniper:
 		InfDeath: 2

 HighV:
-	ROF: 40
+	ROF: 30
 	Range: 6
 	Report: GUN8
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
-		Damage: 40
+		Damage: 50
 		Spread: 3
 		Versus: 
 			None: 100%
@@ -234,7 +230,7 @@ Rockets:
 		ROT: 15
 		Trail: smokey
 		Speed: 35
-		RangeLimit: 40
+		RangeLimit: 30
 	Warhead:
 		Spread: 3
 		Versus: 
@@ -283,7 +279,7 @@ BikeRockets:

 OrcaAGMissiles:
 	ROF: 10
-	Burst: 2
+	Burst: 1
 	BurstDelay: 0
 	Range: 5
 	Report: BAZOOK1
@@ -310,11 +306,11 @@ OrcaAGMissiles:
 		Explosion: 4
 		ImpactSound: xplos
 		SmudgeType: Crater
-		Damage: 20
+		Damage: 40

 OrcaAAMissiles:
 	ROF: 10
-	Burst: 2
+	Burst: 1
 	BurstDelay: 0
 	Range: 5
 	Report: BAZOOK1
@@ -341,7 +337,7 @@ OrcaAAMissiles:
 		Explosion: 4
 		ImpactSound: xplos
 		SmudgeType: Crater
-		Damage: 20
+		Damage: 40

 Flamethrower:
 	ROF: 50
@@ -613,7 +609,7 @@ MammothMissiles:
 		Spread: 3
 		Versus:
 			None: 35%
-			Wood: 90%
+			Wood: 50%
 			Light: 100%
 			Heavy: 90%
 		InfDeath: 4