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

Merge pull request #7638 from pchote/infantry-body

Browse Source 
Decompose RenderInfantry into WithInfantryBody and RenderSprites.
This commit is contained in:
Oliver Brakmann
2015-03-21 15:22:53 +01:00
parent cf92d0ea24 4ea55809ca
commit 919c0fd359
26 changed files with 292 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mods/ts/rules/civilian.yaml
View File

@@ -80,7 +80,7 @@ ABAN06:
Health:
HP: 500
EditorTilesetFilter:
ExcludeTilesets: TEMPERAT
ExcludeTilesets: TEMPERAT
ABAN07:
Inherits: ^CivBuilding
@@ -94,7 +94,7 @@ ABAN07:
Health:
HP: 350
EditorTilesetFilter:
ExcludeTilesets: TEMPERAT
ExcludeTilesets: TEMPERAT
ABAN08:
Inherits: ^CivBuilding
@@ -108,7 +108,7 @@ ABAN08:
Health:
HP: 500
EditorTilesetFilter:
ExcludeTilesets: TEMPERAT
ExcludeTilesets: TEMPERAT
ABAN09:
Inherits: ^CivBuilding
@@ -122,7 +122,7 @@ ABAN09:
Health:
HP: 350
EditorTilesetFilter:
ExcludeTilesets: TEMPERAT
ExcludeTilesets: TEMPERAT
ABAN10:
Inherits: ^CivBuilding
@@ -136,7 +136,7 @@ ABAN10:
Health:
HP: 500
EditorTilesetFilter:
ExcludeTilesets: TEMPERAT
ExcludeTilesets: TEMPERAT
ABAN11:
Inherits: ^CivBuilding
@@ -150,7 +150,7 @@ ABAN11:
Health:
HP: 400
EditorTilesetFilter:
ExcludeTilesets: TEMPERAT
ExcludeTilesets: TEMPERAT
ABAN12:
Inherits: ^CivBuilding
@@ -164,7 +164,7 @@ ABAN12:
Health:
HP: 400
EditorTilesetFilter:
ExcludeTilesets: TEMPERAT
ExcludeTilesets: TEMPERAT
ABAN13:
Inherits: ^CivBuilding
@@ -178,7 +178,7 @@ ABAN13:
Health:
HP: 400
EditorTilesetFilter:
ExcludeTilesets: TEMPERAT
ExcludeTilesets: TEMPERAT
ABAN14:
Inherits: ^CivBuilding
@@ -192,7 +192,7 @@ ABAN14:
Health:
HP: 300
EditorTilesetFilter:
ExcludeTilesets: TEMPERAT
ExcludeTilesets: TEMPERAT
ABAN15:
Inherits: ^CivBuilding
@@ -206,7 +206,7 @@ ABAN15:
Health:
HP: 400
EditorTilesetFilter:
ExcludeTilesets: TEMPERAT
ExcludeTilesets: TEMPERAT
ABAN16:
Inherits: ^CivBuilding
@@ -220,7 +220,7 @@ ABAN16:
Health:
HP: 400
EditorTilesetFilter:
ExcludeTilesets: TEMPERAT
ExcludeTilesets: TEMPERAT
ABAN17:
Inherits: ^CivBuilding
@@ -234,7 +234,7 @@ ABAN17:
Health:
HP: 400
EditorTilesetFilter:
ExcludeTilesets: TEMPERAT
ExcludeTilesets: TEMPERAT
ABAN18:
Inherits: ^CivBuilding
@@ -1081,7 +1081,7 @@ CTDAM:
Building:
Footprint: xx xx xx xx xx
Dimensions: 2, 5
Power:
Power:
Amount: 200
Armor:
Type: heavy
@@ -1220,7 +1220,7 @@ GASPOT:
Building:
Footprint: x
Dimensions: 1, 1
Power:
Power:
Amount: -10
Armor:
Type: wood
@@ -1250,7 +1250,7 @@ NTPYRA:
Building:
Footprint: xxxx xxxx xxxx xxxx
Dimensions: 4, 4
Power:
Power:
Amount: -40
Armor:
Type: heavy

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

@@ -166,7 +166,8 @@
Voice: Infantry
TargetableUnit:
TargetTypes: Ground, Infantry
RenderInfantry:
RenderSprites:
WithInfantryBody:
WithDeathAnimation:
AutoTarget:
AttackMove:
@@ -248,7 +249,7 @@
AttackFrontal:
ProximityCaptor:
Types: CivilianInfantry
RenderInfantry:
WithInfantryBody:
ScaredyCat:
-MustBeDestroyed:

86
mods/ts/rules/infantry.yaml
View File

@@ -26,8 +26,8 @@ E1:
UpgradeMinEnabledLevel: 1
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
E2:
Inherits: ^Infantry
@@ -52,8 +52,8 @@ E2:
FireDelay: 5
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
E3:
Inherits: ^Infantry
@@ -78,8 +78,8 @@ E3:
LocalOffset: 128,0,640
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
WEEDGUY:
Inherits: ^Infantry
@@ -106,7 +106,7 @@ WEEDGUY:
Weapon: FireballLauncher
LocalOffset: 85,0,384
AttackFrontal:
RenderInfantry:
WithInfantryBody:
TakeCover:
MEDIC:
@@ -133,9 +133,9 @@ MEDIC:
Weapon: Heal
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
AttackAnimation: heal
WithInfantryBody:
IdleSequences: idle1,idle2
AttackSequence: heal
SelfHealing:
Passenger:
PipType: Red
@@ -165,8 +165,8 @@ ENGINEER:
Captures:
CaptureTypes: building
-AutoTarget:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
TakeCover:
-GainsExperience:
@@ -197,8 +197,8 @@ UMAGON:
Weapon: Sniper
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
GHOST:
Inherits: ^Infantry
@@ -233,8 +233,8 @@ GHOST:
C4Demolition:
C4Delay: 45
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
JUMPJET:
Inherits: ^Infantry
@@ -264,7 +264,7 @@ JUMPJET:
-Crushable:
AttackFrontal:
TakeCover:
RenderInfantry:
WithInfantryBody:
CHAMSPY:
Inherits: ^Infantry
@@ -292,9 +292,9 @@ CHAMSPY:
Infiltrates:
Types: SpyInfiltrate
-AutoTarget:
-RenderInfantry:
RenderDisguise:
IdleAnimations: idle1,idle2
-WithInfantryBody:
WithDisguisingInfantryBody:
IdleSequences: idle1,idle2
CYBORG:
Inherits: ^Infantry
@@ -326,8 +326,8 @@ CYBORG:
Weapon: Vulcan3
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
CYC2:
Inherits: ^Infantry
@@ -360,8 +360,8 @@ CYC2:
LocalOffset: 170,85,683
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
MUTANT:
Inherits: ^Infantry
@@ -388,8 +388,8 @@ MUTANT:
Weapon: Vulcan
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
MWMN:
Inherits: ^Infantry
@@ -416,8 +416,8 @@ MWMN:
Weapon: Vulcan
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
MUTANT3:
Inherits: ^Infantry
@@ -444,8 +444,8 @@ MUTANT3:
Weapon: Vulcan
AttackFrontal:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
MHIJACK:
Inherits: ^Infantry
@@ -471,8 +471,8 @@ MHIJACK:
Range: 6c0
-AutoTarget:
TakeCover:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
TRATOS:
Inherits: ^Infantry
@@ -496,8 +496,8 @@ TRATOS:
Range: 4c0
TakeCover:
-AutoTarget:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
OXANNA:
Inherits: ^Infantry
@@ -519,8 +519,8 @@ OXANNA:
Range: 4c0
TakeCover:
-AutoTarget:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
SLAV:
Inherits: ^Infantry
@@ -542,8 +542,8 @@ SLAV:
Range: 4c0
TakeCover:
-AutoTarget:
RenderInfantry:
IdleAnimations: idle1,idle2
WithInfantryBody:
IdleSequences: idle1,idle2
DOGGIE:
Inherits: ^Infantry
@@ -603,9 +603,10 @@ VISSML:
TargetableUnit:
TargetTypes: Ground
-AutoTarget:
-RenderInfantry:
RenderUnit:
-RenderSprites:
-WithInfantryBody:
-WithDeathAnimation:
RenderUnit:
VISLRG:
Inherits: ^Infantry
@@ -639,9 +640,10 @@ VISLRG:
WanderMoveRadius: 2
MinMoveDelayInTicks: 25
MaxMoveDelayInTicks: 45
-RenderInfantry:
RenderUnit:
-RenderSprites:
-WithInfantryBody:
-WithDeathAnimation:
RenderUnit:
CIV1:
Inherits: ^CivilianInfantry

10
mods/ts/rules/misc.yaml
View File

@@ -16,13 +16,14 @@ waypoint:
InitialFacing: 160
Turreted:
InitialFacing: 160
RenderInfantry:
Image: mmch
StandAnimations: run
Palette: colorpicker
WithInfantryBody:
StandSequences: run
RenderVoxels:
Image: mmch
Palette: colorpicker
RenderSprites:
Image: mmch
Palette: colorpicker
CAMERA:
Immobile:
@@ -66,3 +67,4 @@ TROCK04:
TROCK05:
Inherits: ^Rock

8
mods/ts/rules/vehicles.yaml
View File

@@ -168,7 +168,7 @@ HVR:
Buildable:
Queue: Vehicle
BuildPaletteOrder: 60
Prerequisites: ~gaweap
Prerequisites: ~gaweap
Mobile:
Speed: 56
ROT: 5
@@ -518,7 +518,8 @@ MMCH:
Type: Heavy
RevealsShroud:
Range: 8c0
RenderInfantry:
RenderSprites:
WithInfantryBody:
Turreted:
ROT: 5
AttackTurreted:
@@ -590,7 +591,8 @@ SMECH:
AutoTarget:
Armament:
Weapon: AssaultCannon
RenderInfantry:
RenderSprites:
WithInfantryBody:
Selectable:
Voices: Mech
Bounds: 16, 32