epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decompose RenderInfantry into WithInfantryBody and RenderSprites.

Browse Source
This commit is contained in:
Paul Chote
2015-03-10 20:08:07 +00:00
parent fa0264a73c
commit 4ea55809ca
25 changed files with 288 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mods/ra/maps/allies-03a/map.yaml
View File

@@ -1381,14 +1381,14 @@ Rules:
-ExternalCaptures:
Captures:
CaptureTypes: building
RenderInfantry:
Image: E6
Cloak@JAIL:
UpgradeTypes: jail
UpgradeMinEnabledLevel: 1
InitialDelay: 0
CloakDelay: 0
Palette:
RenderSprites:
Image: E6
MEDI:
Cloak@JAIL:
UpgradeTypes: jail
@@ -1398,11 +1398,11 @@ Rules:
Palette:
E7.noautotarget:
Inherits: E7
RenderInfantry:
Image: E7
AutoTarget:
EnableStances: false
-AttackMove:
RenderSprites:
Image: E7
PRISON:
Immobile:
OccupiesSpace: false
@@ -1430,7 +1430,7 @@ Rules:
Range: 8c0
AutoTarget:
ScanRadius: 7
RenderInfantry:
RenderSprites:
Image: E1
E2.Autotarget:
Inherits: E2
@@ -1440,7 +1440,7 @@ Rules:
Range: 8c0
AutoTarget:
ScanRadius: 7
RenderInfantry:
RenderSprites:
Image: E2
DOG:
RevealsShroud:

13
mods/ra/maps/allies-03b/map.yaml
View File

@@ -1276,14 +1276,15 @@ Rules:
-ExternalCaptures:
Captures:
CaptureTypes: building
RenderInfantry:
Image: E6
WithInfantryBody:
Cloak@JAIL:
UpgradeTypes: jail
UpgradeMinEnabledLevel: 1
InitialDelay: 0
CloakDelay: 0
Palette:
RenderSprites:
Image: E6
MEDI:
Cloak@JAIL:
UpgradeTypes: jail
@@ -1293,11 +1294,11 @@ Rules:
Palette:
E7.noautotarget:
Inherits: E7
RenderInfantry:
Image: E7
AutoTarget:
EnableStances: false
-AttackMove:
RenderSprites:
Image: E7
PRISON:
Immobile:
OccupiesSpace: false
@@ -1338,7 +1339,7 @@ Rules:
Range: 8c0
AutoTarget:
ScanRadius: 7
RenderInfantry:
RenderSprites:
Image: E1
E2.Autotarget:
Inherits: E2
@@ -1348,7 +1349,7 @@ Rules:
Range: 8c0
AutoTarget:
ScanRadius: 7
RenderInfantry:
RenderSprites:
Image: E2
DOG:
Buildable:

8
mods/ra/maps/allies-05a/map.yaml
View File

@@ -1687,11 +1687,11 @@ Rules:
TargetTypes: Ground, C4, DetonateAttack, Structure, Mission Objectives
E7.noautotarget:
Inherits: E7
RenderInfantry:
Image: E7
AutoTarget:
EnableStances: false
-AttackMove:
RenderSprites:
Image: E7
Colt:
-Huntable:
AutoTargetIgnore:
@@ -1727,7 +1727,7 @@ Rules:
Range: 8c0
AutoTarget:
ScanRadius: 7
RenderInfantry:
RenderSprites:
Image: E1
E2.Autotarget:
Inherits: E2
@@ -1737,7 +1737,7 @@ Rules:
Range: 8c0
AutoTarget:
ScanRadius: 7
RenderInfantry:
RenderSprites:
Image: E2
AFLD:
AirstrikePower@spyplane:

4
mods/ra/maps/fort-lonestar/map.yaml
View File

@@ -617,12 +617,12 @@ Rules:
Inherits: SNIPER
Buildable:
Prerequisites: ~disabled
RenderInfantry:
Image: SNIPER
MustBeDestroyed:
InvulnerabilityUpgrade@UNKILLABLE:
UpgradeTypes: unkillable
UpgradeMinEnabledLevel: 1
RenderSprites:
Image: SNIPER
SPY:
Inherits: ^Infantry
Buildable:

2
mods/ra/maps/intervention/map.yaml
View File

@@ -2240,7 +2240,7 @@ Rules:
Captures:
CaptureTypes: building
Sabotage: False
RenderInfantry:
RenderSprites:
Image: e6
E6:
Buildable:

4
mods/ra/maps/monster-tank-madness/map.yaml
View File

@@ -2145,10 +2145,10 @@ Rules:
Inherits: DELPHI
Tooltip:
Name: Dr. Demitri
RenderInfantry:
Image: DELPHI
Passenger:
CargoType: Demitri
RenderSprites:
Image: DELPHI
TRAN:
RevealsShroud:
Range: 0c0

21
mods/ra/rules/civilian.yaml
View File

@@ -13,43 +13,50 @@ C4:
Inherits: ^CivInfantry
Selectable:
Voice: CivilianFemaleVoice
RenderInfantry:
WithInfantryBody:
RenderSprites:
Image: C2
C5:
Inherits: ^CivInfantry
RenderInfantry:
WithInfantryBody:
RenderSprites:
Image: C1
C6:
Inherits: ^CivInfantry
Selectable:
Voice: CivilianFemaleVoice
RenderInfantry:
WithInfantryBody:
RenderSprites:
Image: C2
C7:
Inherits: ^CivInfantry
RenderInfantry:
WithInfantryBody:
RenderSprites:
Image: C1
C8:
Inherits: ^CivInfantry
Selectable:
Voice: CivilianFemaleVoice
RenderInfantry:
WithInfantryBody:
RenderSprites:
Image: C2
C9:
Inherits: ^CivInfantry
RenderInfantry:
WithInfantryBody:
RenderSprites:
Image: C1
C10:
Inherits: ^CivInfantry
Selectable:
Voice: CivilianFemaleVoice
RenderInfantry:
WithInfantryBody:
RenderSprites:
Image: C2
FCOM:

5
mods/ra/rules/defaults.yaml
View File

@@ -182,7 +182,8 @@
Voice: GenericVoice
TargetableUnit:
TargetTypes: Ground, Infantry, Disguise
RenderInfantry:
RenderSprites:
WithInfantryBody:
WithDeathAnimation:
AutoTarget:
AttackMove:
@@ -545,7 +546,7 @@
AttackFrontal:
ProximityCaptor:
Types: CivilianInfantry
RenderInfantry:
WithInfantryBody:
ScaredyCat:
^CivBuilding:

79
mods/ra/rules/infantry.yaml
View File

@@ -22,8 +22,8 @@ DOG:
Armament:
Weapon: DogJaw
AttackLeap:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
IgnoresDisguise:
DetectCloaked:
Range: 5
@@ -54,9 +54,9 @@ E1:
MuzzleSequence: garrison-muzzle
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
StandAnimations: stand,stand2
WithInfantryBody:
IdleSequences: idle1,idle2
StandSequences: stand,stand2
E2:
Inherits: ^Infantry
@@ -86,9 +86,9 @@ E2:
FireDelay: 15
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
StandAnimations: stand,stand2
WithInfantryBody:
IdleSequences: idle1,idle2
StandSequences: stand,stand2
Explodes:
Weapon: UnitExplodeSmall
Chance: 50
@@ -122,9 +122,9 @@ E3:
Weapon: Dragon
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
StandAnimations: stand,stand2
WithInfantryBody:
IdleSequences: idle1,idle2
StandSequences: stand,stand2
E4:
Inherits: ^Infantry
@@ -153,9 +153,9 @@ E4:
Weapon: Flamer
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
StandAnimations: stand,stand2
WithInfantryBody:
IdleSequences: idle1,idle2
StandSequences: stand,stand2
E6:
Inherits: ^Infantry
@@ -184,9 +184,9 @@ E6:
Type: building
TakeCover:
-AutoTarget:
RenderInfantry:
IdleAnimations: idle1,idle2
StandAnimations: stand,stand2
WithInfantryBody:
IdleSequences: idle1,idle2
StandSequences: stand,stand2
SPY:
Inherits: ^Infantry
@@ -218,24 +218,25 @@ SPY:
Infiltrates:
Types: SpyInfiltrate
-AutoTarget:
-RenderInfantry:
RenderDisguise:
IdleAnimations: idle1,idle2
StandAnimations: stand,stand2
-WithInfantryBody:
WithDisguisingInfantryBody:
IdleSequences: idle1,idle2
StandSequences: stand,stand2
Armament:
Weapon: SilencedPPK
AttackFrontal:
SPY.England:
Inherits: SPY
RenderDisguise:
Image: spy
WithDisguisingInfantryBody:
Buildable:
Prerequisites: ~infantry.england, dome, ~tent, ~techlevel.medium
Valued:
Cost: 250
DisguiseToolTip:
Name: British Spy
RenderSprites:
Image: spy
E7:
Inherits: ^Infantry
@@ -274,8 +275,8 @@ E7:
MuzzleSequence: garrison-muzzle
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
AnnounceOnBuild:
AnnounceOnKill:
@@ -310,9 +311,9 @@ MEDI:
OutsideRangeCursor: heal
TakeCover:
-AutoTarget:
RenderInfantry:
IdleAnimations: idle1,idle2
AttackAnimation: heal
WithInfantryBody:
IdleSequences: idle1,idle2
AttackSequence: heal
MECH:
Inherits: ^Infantry
@@ -347,9 +348,9 @@ MECH:
CaptureTypes: husk
TakeCover:
-AutoTarget:
RenderInfantry:
IdleAnimations: idle1,idle2
AttackAnimation: heal
WithInfantryBody:
IdleSequences: idle1,idle2
AttackSequence: heal
EINSTEIN:
Inherits: ^Infantry
@@ -369,7 +370,7 @@ EINSTEIN:
-AutoTarget:
ProximityCaptor:
Types: CivilianInfantry
RenderInfantry:
WithInfantryBody:
ScaredyCat:
DELPHI:
@@ -390,7 +391,7 @@ DELPHI:
-AutoTarget:
ProximityCaptor:
Types: CivilianInfantry
RenderInfantry:
WithInfantryBody:
ScaredyCat:
CHAN:
@@ -484,9 +485,9 @@ SHOK:
Weapon: PortaTesla
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
StandAnimations: stand,stand2
WithInfantryBody:
IdleSequences: idle1,idle2
StandSequences: stand,stand2
SNIPER:
Inherits: ^Infantry
@@ -520,9 +521,9 @@ SNIPER:
MuzzleSequence: garrison-muzzle
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
StandAnimations: stand,stand2
WithInfantryBody:
IdleSequences: idle1,idle2
StandSequences: stand,stand2
Cloak:
InitialDelay: 250
CloakDelay: 120