Merge pull request #8478 from GraionDilach/disguise-pip

Closes #7466
2015-06-28 13:09:36 +02:00
parent ae59198363 32eed88de5
commit e4b3515663
10 changed files with 66 additions and 53 deletions
--- a/mods/ra/bits/pip-disguise.shp
+++ b/mods/ra/bits/pip-disguise.shp
--- a/mods/ra/rules/infantry.yaml
+++ b/mods/ra/rules/infantry.yaml
@@ -235,6 +235,15 @@ SPY:
 		AttackSequence: shoot
 		IdleSequences: idle1,idle2
 		StandSequences: stand,stand2
+	WithDecoration@disguise:
+		Image: pips
+		Sequence: pip-disguise
+		Palette: effect
+		ReferencePoint: Top, Right
+		Offset: 4, -2
+		ZOffset: 256
+		UpgradeTypes: disguise
+		UpgradeMinEnabledLevel: 1
 	Armament:
 		Weapon: SilencedPPK
 	AttackFrontal:
--- a/mods/ra/sequences/misc.yaml
+++ b/mods/ra/sequences/misc.yaml
@@ -84,6 +84,9 @@ pips:
 		Start: 4
 	pip-blue: pips2
 		Start: 5
+	pip-disguise: pip-disguise
+		Length: *
+		Tick: 300

 v2:
 	idle:
--- a/mods/ts/bits/pip-disguise.shp
+++ b/mods/ts/bits/pip-disguise.shp
--- a/mods/ts/rules/civilian-infantry.yaml
+++ b/mods/ts/rules/civilian-infantry.yaml
@@ -58,6 +58,15 @@ CHAMSPY:
 		Range: 9c0
 	Passenger:
 	Disguise:
+	WithDecoration@disguise:
+		Image: pips
+		Sequence: pip-disguise
+		Palette: pips
+		ReferencePoint: Top, Right
+		Offset: 4, -2
+		ZOffset: 256
+		UpgradeTypes: disguise
+		UpgradeMinEnabledLevel: 1
 	Infiltrates:
 		Types: SpyInfiltrate
 	-AutoTarget:
--- a/mods/ts/sequences/misc.yaml
+++ b/mods/ts/sequences/misc.yaml
@@ -94,6 +94,9 @@ pips:
 	pip-ammo: ammopips
 	pip-ammoempty: ammopips
 		Start: 1
+	pip-disguise: pip-disguise
+		Length: *
+		Tick: 300
 # TODO:
 	pip-empty-building:
 	pip-green-building: