Merge pull request #9004 from reaperrr/quanbo

Introduce QuantizeFacingsFromSequence
This commit is contained in:
Matthias Mailänder
2015-08-28 22:46:29 +02:00
29 changed files with 196 additions and 80 deletions

View File

@@ -74,9 +74,10 @@
AttackMove:
DrawLineToTarget:
WithSmoke:
RenderSprites:
QuantizeFacingsFromSequence:
WithFacingSpriteBody:
AutoSelectionSize:
RenderSprites:
Explodes:
Weapon: UnitExplodeSmall
EmptyWeapon: UnitExplodeSmall
@@ -137,6 +138,7 @@
Guardable:
Tooltip:
GenericName: Helicopter
QuantizeFacingsFromSequence:
WithFacingSpriteBody:
AutoSelectionSize:
RenderSprites:
@@ -173,6 +175,8 @@
TargetableUnit:
TargetTypes: Ground, Infantry
RenderSprites:
QuantizeFacingsFromSequence:
Sequence: stand
WithInfantryBody:
WithDeathAnimation:
DeathTypes:
@@ -301,6 +305,8 @@
TargetableUnit:
TargetTypes: Ground
HiddenUnderFog:
QuantizeFacingsFromSequence:
Sequence: stand
WithInfantryBody:
AttackSequence: attack
WithDeathAnimation:
@@ -359,7 +365,9 @@
MuzzleSplitFacings: 8
AttackFrontal:
Voice: Attack
WithFacingSpriteBody:
BodyOrientation:
QuantizedFacings: 8
WithSpriteBody:
AutoSelectionSize:
RenderSprites:
WithMuzzleFlash:
@@ -367,8 +375,6 @@
Guard:
Voice: Move
Guardable:
BodyOrientation:
QuantizedFacings: 8
PoisonedByTiberium:
Weapon: Heal
Voiced:
@@ -383,6 +389,7 @@
ActorLostNotification:
AttackMove:
WithShadow:
QuantizeFacingsFromSequence:
WithFacingSpriteBody:
RenderSprites:
AutoSelectionSize:
@@ -424,6 +431,7 @@
SoundOnDamageTransition:
DamagedSounds: xplos.aud
DestroyedSounds: crumble.aud
QuantizeFacingsFromSequence:
RenderBuilding:
WithBuildingExplosion:
Delay: 1
@@ -480,6 +488,7 @@
Building:
Dimensions: 1,1
Footprint: x
QuantizeFacingsFromSequence:
RenderBuilding:
Tooltip:
Name: Civilian Building (Destroyed)
@@ -521,6 +530,7 @@
Name: Field (Destroyed)
GenericVisibility: None
BodyOrientation:
QuantizedFacings: 1
RenderSprites:
Palette: terrain
WithSpriteBody:
@@ -548,6 +558,8 @@
NodeTypes: wall
LineBuildNode:
Types: wall
BodyOrientation:
QuantizedFacings: 1
RenderBuildingWall:
Palette: staticterrain
GivesExperience:
@@ -555,13 +567,14 @@
Sellable:
SellSounds: cashturn.aud
Guardable:
BodyOrientation:
FrozenUnderFog:
ScriptTriggers:
^Tree:
Tooltip:
Name: Tree
BodyOrientation:
QuantizedFacings: 1
RenderSprites:
Palette: staticterrain
WithSpriteBody:
@@ -577,7 +590,6 @@
Armor:
Type: Wood
AutoTargetIgnore:
BodyOrientation:
FrozenUnderFog:
StartsRevealed: true
ScriptTriggers:
@@ -585,6 +597,8 @@
^TibTree:
Tooltip:
Name: Blossom Tree
BodyOrientation:
QuantizedFacings: 1
RenderBuilding:
Palette: staticterrain
Building:
@@ -593,7 +607,6 @@
AppearsOnRadar:
RadarColorFromTerrain:
Terrain: Tiberium
BodyOrientation:
FrozenUnderFog:
StartsRevealed: true
WithMakeAnimation:
@@ -601,6 +614,8 @@
^Rock:
Tooltip:
Name: Rock
BodyOrientation:
QuantizedFacings: 1
RenderSprites:
Palette: staticterrain
WithSpriteBody:
@@ -611,7 +626,6 @@
AppearsOnRadar:
RadarColorFromTerrain:
Terrain: Tree
BodyOrientation:
FrozenUnderFog:
StartsRevealed: true
ScriptTriggers:
@@ -627,6 +641,7 @@
Type: CenterPosition
AutoTargetIgnore:
BodyOrientation:
QuantizeFacingsFromSequence:
WithFacingSpriteBody:
AutoSelectionSize:
RenderSprites:
@@ -685,6 +700,7 @@
GenericName: Crate
Crate:
TerrainTypes: Clear, Rough, Road, Tiberium, BlueTiberium, Beach
QuantizeFacingsFromSequence:
RenderSprites:
Palette: effect
Image: crate

View File

@@ -33,6 +33,7 @@ mpspawn:
RenderSpritesEditorOnly:
Palette: chrome
BodyOrientation:
QuantizedFacings: 1
waypoint:
AlwaysVisible:
@@ -42,6 +43,7 @@ waypoint:
RenderSpritesEditorOnly:
Palette: chrome
BodyOrientation:
QuantizedFacings: 1
^fact.colorpicker:
Inherits: FACT
@@ -86,4 +88,5 @@ FLARE:
Tooltip:
Name: Flare
BodyOrientation:
QuantizedFacings: 1

View File

@@ -23,6 +23,8 @@ BOAT:
LocalOffset: 85,-85,0, 85,85,0
AttackTurreted:
RenderSprites:
BodyOrientation:
QuantizedFacings: 2
WithGunboatBody:
Sequence: left # Just a work-around to avoid crash
Selectable:
@@ -64,6 +66,7 @@ LST:
Type: Heavy
RevealsShroud:
Range: 7c0
QuantizeFacingsFromSequence:
WithFacingSpriteBody:
WithRoof:
WithCargo:

View File

@@ -406,7 +406,6 @@ HTNK:
MuzzleSequence: muzzle
AttackTurreted:
WithMuzzleFlash:
WithFacingSpriteBody:
WithTurret:
AutoTarget:
SelfHealing:

View File

@@ -79,6 +79,7 @@
Guard:
Voice: Guard
Guardable:
QuantizeFacingsFromSequence:
WithFacingSpriteBody:
Demolishable:
TemporaryOwnerManager:
@@ -118,6 +119,7 @@
BodyOrientation:
AutoTargetIgnore:
ScriptTriggers:
QuantizeFacingsFromSequence:
WithFacingSpriteBody:
AutoSelectionSize:
RenderSprites:
@@ -191,6 +193,8 @@
UpgradeTypes: parachute
UpgradeMaxEnabledLevel: 0
RenderSprites:
QuantizeFacingsFromSequence:
Sequence: stand
WithInfantryBody:
TakeCover:
DamageModifiers:
@@ -245,6 +249,7 @@
DrawLineToTarget:
Voiced:
VoiceSet: GenericVoice
QuantizeFacingsFromSequence:
WithFacingSpriteBody:
AutoSelectionSize:
RenderSprites:
@@ -269,6 +274,7 @@
SoundOnDamageTransition:
DamagedSounds: EXPLSML1.WAV
DestroyedSounds: EXPLHG1.WAV
QuantizeFacingsFromSequence:
RenderBuilding:
WithBuildingExplosion:
RepairableBuilding:

View File

@@ -103,6 +103,7 @@ crate:
SelectionShares: 0
NoBaseSelectionShares: 9001
Units: mcv
QuantizeFacingsFromSequence:
RenderSprites:
Palette: effect
WithCrateBody:
@@ -117,6 +118,7 @@ mpspawn:
RenderSpritesEditorOnly:
WithSpriteBody:
BodyOrientation:
QuantizedFacings: 1
waypoint:
AlwaysVisible:
@@ -125,6 +127,7 @@ waypoint:
RenderSpritesEditorOnly:
WithSpriteBody:
BodyOrientation:
QuantizedFacings: 1
^carryall.colorpicker:
Inherits: carryall
@@ -152,6 +155,7 @@ wormspawner:
RenderSpritesEditorOnly:
WithSpriteBody:
BodyOrientation:
QuantizedFacings: 1
WormSpawner:
upgrade.conyard:

View File

@@ -123,6 +123,7 @@
Explodes:
Weapon: UnitExplodeSmall
EmptyWeapon: UnitExplodeSmall
QuantizeFacingsFromSequence:
WithFacingSpriteBody:
AutoSelectionSize:
RenderSprites:
@@ -184,6 +185,8 @@
TargetTypes: Ground, Infantry, Disguise
UpgradeTypes: parachute
UpgradeMaxEnabledLevel: 0
QuantizeFacingsFromSequence:
Sequence: stand
RenderSprites:
WithInfantryBody:
WithDeathAnimation:
@@ -322,6 +325,7 @@
ExcludeTilesets: INTERIOR
Voiced:
VoiceSet: VehicleVoice
QuantizeFacingsFromSequence:
AutoSelectionSize:
RenderSprites:
WithFacingSpriteBody:
@@ -359,6 +363,7 @@
Tooltip:
GenericName: Plane
WithShadow:
QuantizeFacingsFromSequence:
RenderSprites:
WithFacingSpriteBody:
AutoSelectionSize:
@@ -390,6 +395,7 @@
SoundOnDamageTransition:
DamagedSounds: kaboom1.aud
DestroyedSounds: kaboom22.aud
QuantizeFacingsFromSequence:
RenderBuilding:
WithBuildingExplosion:
CaptureNotification:
@@ -466,6 +472,7 @@
SellSounds: cashturn.aud
Guardable:
BodyOrientation:
QuantizedFacings: 1
FrozenUnderFog:
GpsRemoveFrozenActor:
ScriptTriggers:
@@ -551,6 +558,7 @@
Type: Wood
AutoTargetIgnore:
BodyOrientation:
QuantizedFacings: 1
FrozenUnderFog:
StartsRevealed: true
ScriptTriggers:
@@ -564,6 +572,7 @@
Type: Heavy
HiddenUnderFog:
Type: CenterPosition
QuantizeFacingsFromSequence:
BodyOrientation:
AutoTargetIgnore:
ScriptTriggers:
@@ -645,6 +654,7 @@
ProximityCaptor:
Types: Tree
BodyOrientation:
QuantizedFacings: 1
FrozenUnderFog:
StartsRevealed: true
ScriptTriggers:
@@ -689,4 +699,5 @@
ShadowSequence: idle
UpgradeManager:
BodyOrientation:
QuantizedFacings: 1

View File

@@ -25,6 +25,7 @@ MINP:
TargetableUnit:
TargetTypes: Ground
BodyOrientation:
QuantizedFacings: 1
Immobile:
OccupiesSpace: true
@@ -55,6 +56,7 @@ MINV:
TargetableUnit:
TargetTypes: Ground
BodyOrientation:
QuantizedFacings: 1
Immobile:
OccupiesSpace: true
@@ -179,6 +181,7 @@ CAMERA:
ProximityCaptor:
Types: Camera
BodyOrientation:
QuantizedFacings: 1
DetectCloaked:
Range: 10
WithSpriteBody:
@@ -227,6 +230,7 @@ FLARE:
Name: Flare
ShowOwnerRow: false
BodyOrientation:
QuantizedFacings: 1
MINE:
HiddenUnderShroud:
@@ -244,6 +248,7 @@ MINE:
Terrain: Ore
AutoTargetIgnore:
BodyOrientation:
QuantizedFacings: 1
SeedsResource:
GMINE:
@@ -262,6 +267,7 @@ GMINE:
Terrain: Gems
AutoTargetIgnore:
BodyOrientation:
QuantizedFacings: 1
SeedsResource:
ResourceType: Gems
@@ -278,6 +284,7 @@ RAILMINE:
Dimensions: 2,1
AutoTargetIgnore:
BodyOrientation:
QuantizedFacings: 1
EditorTilesetFilter:
ExcludeTilesets: INTERIOR
@@ -293,6 +300,7 @@ QUEE:
AutoSelectionSize:
AppearsOnRadar:
BodyOrientation:
QuantizedFacings: 1
EditorTilesetFilter:
RequireTilesets: INTERIOR
@@ -309,6 +317,7 @@ LAR1:
AutoSelectionSize:
AppearsOnRadar:
BodyOrientation:
QuantizedFacings: 1
EditorTilesetFilter:
RequireTilesets: INTERIOR
@@ -325,6 +334,7 @@ LAR2:
AutoSelectionSize:
AppearsOnRadar:
BodyOrientation:
QuantizedFacings: 1
EditorTilesetFilter:
RequireTilesets: INTERIOR
@@ -391,6 +401,7 @@ mpspawn:
WithSpriteBody:
RenderSpritesEditorOnly:
BodyOrientation:
QuantizedFacings: 1
waypoint:
AlwaysVisible:
@@ -399,6 +410,7 @@ waypoint:
WithSpriteBody:
RenderSpritesEditorOnly:
BodyOrientation:
QuantizedFacings: 1
^fact.colorpicker:
Inherits: FACT

View File

@@ -62,6 +62,7 @@
SoundOnDamageTransition:
DamagedSounds: expnew01.aud
DestroyedSounds: crmble2.aud
QuantizeFacingsFromSequence:
RenderBuilding:
WithBuildingExplosion:
Sequences: building, large_bang, large_brnl, verylarge_clsn, large_tumu
@@ -227,6 +228,7 @@
VoiceSet: Infantry
TargetableUnit:
TargetTypes: Ground, Infantry
QuantizeFacingsFromSequence:
RenderSprites:
WithInfantryBody:
WithDeathAnimation@normal:
@@ -419,11 +421,15 @@
^VoxelVehicle:
Inherits: ^Vehicle
BodyOrientation:
QuantizedFacings: 0
RenderVoxels:
WithVoxelBody:
^VoxelTank:
Inherits: ^Tank
BodyOrientation:
QuantizedFacings: 0
RenderVoxels:
WithVoxelBody:
@@ -452,6 +458,7 @@
Voice: Move
ActorLostNotification:
BodyOrientation:
QuantizedFacings: 0
CameraPitch: 90
Guard:
Voice: Move
@@ -511,6 +518,8 @@
PoisonedByTiberium:
Weapon: TiberiumHeal
Guardable:
BodyOrientation:
QuantizedFacings: 1
RenderSprites:
WithSpriteBody:
AutoSelectionSize:
@@ -528,6 +537,7 @@
Terrain: Tiberium
BodyOrientation:
UseClassicPerspectiveFudge: False
QuantizedFacings: 1
FrozenUnderFog:
StartsRevealed: true
SeedsResource:
@@ -537,6 +547,9 @@
^Tree:
HiddenUnderShroud:
BodyOrientation:
UseClassicPerspectiveFudge: False
QuantizedFacings: 1
RenderSprites:
Palette: terraindecoration
WithSpriteBody:
@@ -547,13 +560,14 @@
AppearsOnRadar:
RadarColorFromTerrain:
Terrain: Tree
BodyOrientation:
UseClassicPerspectiveFudge: False
Tooltip:
Name: Tree
^Rock:
HiddenUnderShroud:
BodyOrientation:
UseClassicPerspectiveFudge: False
QuantizedFacings: 1
RenderSprites:
Palette: terraindecoration
WithSpriteBody:
@@ -564,8 +578,6 @@
AppearsOnRadar:
RadarColorFromTerrain:
Terrain: Rock
BodyOrientation:
UseClassicPerspectiveFudge: False
Tooltip:
Name: Rock

View File

@@ -106,6 +106,8 @@ SMECH:
Weapon: AssaultCannon
Voiced:
VoiceSet: Mech
QuantizeFacingsFromSequence:
Sequence: stand
WithFacingSpriteBody:
Sequence: stand
WithAttackAnimation:
@@ -136,6 +138,8 @@ MMCH:
Type: Heavy
RevealsShroud:
Range: 8c0
BodyOrientation:
QuantizedFacings: 32
WithInfantryBody:
Turreted:
ROT: 5

View File

@@ -5,6 +5,7 @@ mpspawn:
RenderSpritesEditorOnly:
WithSpriteBody:
BodyOrientation:
QuantizedFacings: 1
waypoint:
AlwaysVisible:
@@ -13,6 +14,7 @@ waypoint:
RenderSpritesEditorOnly:
WithSpriteBody:
BodyOrientation:
QuantizedFacings: 1
^mmch.colorpicker:
Inherits: MMCH