Merge pull request #8210 from matija-hustic/ra2_veterancy_icon

Veteran unit production & unlocking through spies.
2015-07-06 09:38:09 +02:00
parent d9ac97a967 27e95eaa59
commit 4acb096416
23 changed files with 360 additions and 10 deletions
--- a/mods/ra/bits/cameo-chevron.pal
+++ b/mods/ra/bits/cameo-chevron.pal
--- a/mods/ra/bits/cameo-chevron.shp
+++ b/mods/ra/bits/cameo-chevron.shp
--- a/mods/ra/rules/aircraft.yaml
+++ b/mods/ra/rules/aircraft.yaml
@@ -122,6 +122,8 @@ MIG:
 	SmokeTrailWhenDamaged:
 		Offset: -853,0,171
 		Interval: 2
+	ProduceableWithLevel:
+		Prerequisites: aircraft.upgraded

 YAK:
 	Inherits: ^Plane
@@ -178,6 +180,8 @@ YAK:
 	SmokeTrailWhenDamaged:
 		Offset: -853,0,0
 		Interval: 2
+	ProduceableWithLevel:
+		Prerequisites: aircraft.upgraded

 TRAN:
 	Inherits: ^Helicopter
@@ -265,6 +269,8 @@ HELI:
 		HuskActor: HELI.Husk
 	SmokeTrailWhenDamaged:
 		Offset: -427,0,0
+	ProduceableWithLevel:
+		Prerequisites: aircraft.upgraded

 HIND:
 	Inherits: ^Helicopter
@@ -317,6 +323,8 @@ HIND:
 		HuskActor: HIND.Husk
 	SmokeTrailWhenDamaged:
 		Offset: -427,0,0
+	ProduceableWithLevel:
+		Prerequisites: aircraft.upgraded

 U2:
 	Inherits: ^Plane
--- a/mods/ra/rules/infantry.yaml
+++ b/mods/ra/rules/infantry.yaml
@@ -67,6 +67,8 @@ E1:
 	AttackFrontal:
 	WithInfantryBody:
 		AttackSequence: shoot
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 E2:
 	Inherits: ^Soldier
@@ -98,6 +100,8 @@ E2:
 	Explodes:
 		Weapon: UnitExplodeSmall
 		Chance: 50
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 E3:
 	Inherits: ^Soldier
@@ -125,6 +129,8 @@ E3:
 	AttackFrontal:
 	WithInfantryBody:
 		AttackSequence: shoot
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 E4:
 	Inherits: ^Soldier
@@ -150,6 +156,8 @@ E4:
 	AttackFrontal:
 	WithInfantryBody:
 		AttackSequence: shoot
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 E6:
 	Inherits: ^Soldier
@@ -278,6 +286,8 @@ E7:
 	AnnounceOnKill:
 	Voiced:
 		VoiceSet: TanyaVoice
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 MEDI:
 	Inherits: ^Soldier
@@ -477,6 +487,8 @@ SHOK:
 		AttackSequence: shoot
 	Voiced:
 		VoiceSet: ShokVoice
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 SNIPER:
 	Inherits: ^Soldier
@@ -516,6 +528,8 @@ SNIPER:
 	DetectCloaked:
 		Range: 6
 	-MustBeDestroyed:
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 Zombie:
 	Inherits: ^Soldier
--- a/mods/ra/rules/misc.yaml
+++ b/mods/ra/rules/misc.yaml
@@ -362,6 +362,18 @@ powerproxy.paratroopers:
 		DisplayBeacon: true
 		BeaconPoster: pinficon

+barracks.upgraded:
+	AlwaysVisible:
+	ProvidesPrerequisite:
+
+vehicles.upgraded:
+	AlwaysVisible:
+	ProvidesPrerequisite:
+
+aircraft.upgraded:
+	AlwaysVisible:
+	ProvidesPrerequisite:
+
 mpspawn:
 	AlwaysVisible:
 	Immobile:
--- a/mods/ra/rules/palettes.yaml
+++ b/mods/ra/rules/palettes.yaml
@@ -10,6 +10,10 @@
 		Filename: temperat.pal
 		ShadowIndex: 3
 		AllowModifiers: false
+	PaletteFromFile@cameo-chevron:
+		Name: cameo-chevron
+		Filename: cameo-chevron.pal
+		AllowModifiers: false
 	PaletteFromFile@effect:
 		Name: effect
 		Filename: temperat.pal
--- a/mods/ra/rules/player.yaml
+++ b/mods/ra/rules/player.yaml
@@ -65,4 +65,9 @@ Player:
 		Prerequisites: techlevel.infonly, techlevel.low, techlevel.medium, techlevel.unrestricted
 	GlobalUpgradeManager:
 	EnemyWatcher:
+	VeteranProductionIconOverlay:
+		Offset: 2, 2
+		Image: cameo-chevron
+		Sequence: idle
+		Palette: cameo-chevron

--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -855,6 +855,10 @@ WEAP:
 	Power:
 		Amount: -30
 	ProvidesPrerequisite@buildingname:
+	TargetableBuilding:
+		TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate
+	InfiltrateForSupportPower:
+		Proxy: vehicles.upgraded

 FACT:
 	Inherits: ^Building
@@ -1080,6 +1084,10 @@ HPAD:
 		RequiresPrerequisites: structures.germany
 		Prerequisite: aircraft.germany
 	ProvidesPrerequisite@buildingname:
+	TargetableBuilding:
+		TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate
+	InfiltrateForSupportPower:
+		Proxy: aircraft.upgraded

 AFLD:
 	Inherits: ^Building
@@ -1185,6 +1193,10 @@ AFLD:
 	Power:
 		Amount: -20
 	ProvidesPrerequisite@buildingname:
+	TargetableBuilding:
+		TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate
+	InfiltrateForSupportPower:
+		Proxy: aircraft.upgraded

 POWR:
 	Inherits: ^Building
@@ -1352,6 +1364,10 @@ BARR:
 	Power:
 		Amount: -20
 	ProvidesPrerequisite@buildingname:
+	InfiltrateForSupportPower:
+		Proxy: barracks.upgraded
+	TargetableBuilding:
+		TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate

 KENN:
 	Inherits: ^Building
@@ -1455,6 +1471,10 @@ TENT:
 	Power:
 		Amount: -20
 	ProvidesPrerequisite@buildingname:
+	InfiltrateForSupportPower:
+		Proxy: barracks.upgraded
+	TargetableBuilding:
+		TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate

 FIX:
 	Inherits: ^Building
--- a/mods/ra/rules/vehicles.yaml
+++ b/mods/ra/rules/vehicles.yaml
@@ -29,6 +29,8 @@ V2RL:
 	WithAttackAnimation:
 		AimSequence: aim
 		ReloadPrefix: empty-
+	ProduceableWithLevel:
+		Prerequisites: vehicles.upgraded

 1TNK:
 	Inherits: ^Tank
@@ -67,6 +69,8 @@ V2RL:
 		EmptyWeapon: UnitExplodeSmall
 	LeavesHusk:
 		HuskActor: 1TNK.Husk
+	ProduceableWithLevel:
+		Prerequisites: vehicles.upgraded

 2TNK:
 	Inherits: ^Tank
@@ -107,6 +111,8 @@ V2RL:
 		HuskActor: 2TNK.Husk
 	SelectionDecorations:
 		VisualBounds: 28,28
+	ProduceableWithLevel:
+		Prerequisites: vehicles.upgraded

 3TNK:
 	Inherits: ^Tank
@@ -147,6 +153,8 @@ V2RL:
 		HuskActor: 3TNK.Husk
 	SelectionDecorations:
 		VisualBounds: 28,28
+	ProduceableWithLevel:
+		Prerequisites: vehicles.upgraded

 4TNK:
 	Inherits: ^Tank
@@ -201,6 +209,8 @@ V2RL:
 		DamageCooldown: 150
 	SelectionDecorations:
 		VisualBounds: 44,38,0,-4
+	ProduceableWithLevel:
+		Prerequisites: vehicles.upgraded

 ARTY:
 	Inherits: ^Tank
@@ -232,6 +242,8 @@ ARTY:
 		Weapon: UnitExplode
 		Chance: 75
 	AutoTarget:
+	ProduceableWithLevel:
+		Prerequisites: vehicles.upgraded

 HARV:
 	Inherits: ^Vehicle
@@ -354,6 +366,8 @@ JEEP:
 		Types: Infantry
 		MaxWeight: 1
 		PipCount: 1
+	ProduceableWithLevel:
+		Prerequisites: vehicles.upgraded

 APC:
 	Inherits: ^Tank
@@ -386,6 +400,8 @@ APC:
 		Types: Infantry
 		MaxWeight: 5
 		PipCount: 5
+	ProduceableWithLevel:
+		Prerequisites: vehicles.upgraded

 MNLY.AP:
 	Inherits: ^Tank
@@ -569,6 +585,8 @@ TTNK:
 	SelectionDecorations:
 		VisualBounds: 30,30
 	AutoTarget:
+	ProduceableWithLevel:
+		Prerequisites: vehicles.upgraded

 FTRK:
 	Inherits: ^Vehicle
@@ -604,6 +622,8 @@ FTRK:
 	AutoTarget:
 	SelectionDecorations:
 		VisualBounds: 28,28
+	ProduceableWithLevel:
+		Prerequisites: vehicles.upgraded

 DTRK:
 	Inherits: ^Vehicle
@@ -668,6 +688,8 @@ CTNK:
 		LocalYaw: -100
 	AttackFrontal:
 	PortableChrono:
+	ProduceableWithLevel:
+		Prerequisites: vehicles.upgraded

 QTNK:
 	Inherits: ^Tank
@@ -737,4 +759,6 @@ STNK:
 	DetectCloaked:
 		Range: 6
 	-MustBeDestroyed:
+	ProduceableWithLevel:
+		Prerequisites: vehicles.upgraded

--- a/mods/ra/sequences/misc.yaml
+++ b/mods/ra/sequences/misc.yaml
@@ -382,6 +382,11 @@ rank:
 	rank:
 		Length: *

+cameo-chevron:
+	idle:
+		Length: *
+		BlendMode: Additive
+
 atomic:
 	up: atomicup
 		Length: *
--- a/mods/ts/rules/civilian-infantry.yaml
+++ b/mods/ts/rules/civilian-infantry.yaml
@@ -41,6 +41,8 @@ UMAGON:
 		Voice: Attack
 	WithInfantryBody:
 		AttackSequence: shoot
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 CHAMSPY:
 	Inherits: ^Soldier
@@ -96,6 +98,8 @@ MUTANT:
 		Voice: Attack
 	WithInfantryBody:
 		AttackSequence: shoot
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 MWMN:
 	Inherits: ^Soldier
@@ -119,6 +123,8 @@ MWMN:
 		Voice: Attack
 	WithInfantryBody:
 		AttackSequence: shoot
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 MUTANT3:
 	Inherits: ^Soldier
@@ -142,6 +148,8 @@ MUTANT3:
 		Voice: Attack
 	WithInfantryBody:
 		AttackSequence: shoot
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 TRATOS:
 	Inherits: ^Soldier
--- a/mods/ts/rules/civilian-structures.yaml
+++ b/mods/ts/rules/civilian-structures.yaml
@@ -641,6 +641,9 @@ CAARMR:
 		HP: 800
 	RenderBuilding:
 		Palette: player
+	ProvidesPrerequisite:
+		Prerequisite: barracks.upgraded
+	Capturable:

 CABHUT:
 	Inherits: ^CivBuilding
--- a/mods/ts/rules/gdi-infantry.yaml
+++ b/mods/ts/rules/gdi-infantry.yaml
@@ -21,6 +21,8 @@ E2:
 		Voice: Attack
 	WithInfantryBody:
 		AttackSequence: throw
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 MEDIC:
 	Inherits: ^Soldier
@@ -81,6 +83,8 @@ JUMPJET:
 	WithInfantryBody:
 		AttackSequence: shoot
 	-TakeCover:
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 GHOST:
 	Inherits: ^Soldier
@@ -117,4 +121,6 @@ GHOST:
 		Voice: Attack
 	WithInfantryBody:
 		AttackSequence: shoot
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

--- a/mods/ts/rules/nod-infantry.yaml
+++ b/mods/ts/rules/nod-infantry.yaml
@@ -22,6 +22,8 @@ E3:
 		Voice: Attack
 	WithInfantryBody:
 		AttackSequence: shoot
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 CYBORG:
 	Inherits: ^Cyborg
@@ -53,6 +55,8 @@ CYBORG:
 		Voice: Attack
 	SelectionDecorations:
 		VisualBounds: 16,31,0,-10
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 CYC2:
 	Inherits: ^Cyborg
@@ -86,6 +90,8 @@ CYC2:
 		Voice: Attack
 	SelectionDecorations:
 		VisualBounds: 16,32,-1,-12
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 MHIJACK:
 	Inherits: ^Soldier
--- a/mods/ts/rules/shared-infantry.yaml
+++ b/mods/ts/rules/shared-infantry.yaml
@@ -26,6 +26,8 @@ E1:
 		Voice: Attack
 	WithInfantryBody:
 		AttackSequence: shoot
+	ProduceableWithLevel:
+		Prerequisites: barracks.upgraded

 ENGINEER:
 	Inherits: ^Soldier