Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix or remove bogus yaml definitions from the default mods. #15253

Merged
merged 8 commits into from Jun 14, 2018
@@ -18,7 +18,7 @@ Player:
HQ:
AirstrikePower:
Prerequisites: ~disabled
Tooltip:
Buildable:
Description: Provides an overview of the battlefield.\nRequires power to operate.

CYCL:
Copy path View file
@@ -549,6 +549,3 @@ MOEBIUS:
VICE:
Inherits: ^Viceroid
AttackWander:
WanderMoveRadius: 2
MinMoveDelayInTicks: 25
MaxMoveDelayInTicks: 45
Copy path View file
@@ -897,17 +897,17 @@
Targetable:
TargetTypes: Trees
WithDamageOverlay@SmallBurn:
DamageType: Incendiary
DamageTypes: Incendiary
Image: burn-s
MinimumDamageState: Light
MaximumDamageState: Medium
WithDamageOverlay@MediumBurn:
DamageType: Incendiary
DamageTypes: Incendiary
Image: burn-m
MinimumDamageState: Medium
MaximumDamageState: Heavy
WithDamageOverlay@LargeBurn:
DamageType: Incendiary
DamageTypes: Incendiary
Image: burn-l
MinimumDamageState: Heavy
MaximumDamageState: Dead
Copy path View file
@@ -99,7 +99,6 @@
A: 180
ShroudPalette@shroud:
Name: shroud
Type: Shroud
ShroudPalette@fog:
Name: fog
Fog: true
@@ -293,7 +293,6 @@ PYLE:
ProductionQueue:
Type: Infantry.GDI
Group: Infantry
RequireOwner: false
LowPowerSlowdown: 3
LimitedAudio: BuildingInProgress
ProductionBar:
@@ -339,7 +338,6 @@ HAND:
ProductionQueue:
Type: Infantry.Nod
Group: Infantry
RequireOwner: false
LowPowerSlowdown: 3
LimitedAudio: BuildingInProgress
ProductionBar:
@@ -391,7 +389,6 @@ AFLD:
ProductionQueue:
Type: Vehicle.Nod
Group: Vehicle
RequireOwner: false
LowPowerSlowdown: 3
ReadyAudio:
LimitedAudio: BuildingInProgress
@@ -444,7 +441,6 @@ WEAP:
Produces: Vehicle.GDI
ProductionQueue:
Type: Vehicle.GDI
RequireOwner: false
Group: Vehicle
LowPowerSlowdown: 3
LimitedAudio: BuildingInProgress
Copy path View file
@@ -87,7 +87,6 @@ BIO:
ProductionQueue:
Type: Biolab
Group: Infantry
RequireOwner: false
LowPowerSlowdown: 3
LimitedAudio: BuildingInProgress
ProductionBar:
@@ -143,7 +143,13 @@ MammothMissiles:
Report: rocket1.aud
ValidTargets: Ground
TargetActorCenter: true
# Remove default Missile properties
-Projectile:
Projectile: Bullet
Blockable: false
Image: DRAGON
Shadow: true
TrailImage: smokey
Inaccuracy: 853
LaunchAngle: 62
ContrailLength: 10
Copy path View file
@@ -367,7 +367,6 @@
Selectable:
Priority: 2
RevealsShroud:
VisibilityType: CenterPosition

This comment has been minimized.

Copy link
@pchote

pchote Jun 12, 2018

Author Member

Related to #15231, which is not fixed here. This PR just removes the bogus definition.

Targetable:
TargetTypes: Ground, C4, Structure
HitShape:
@@ -596,7 +596,6 @@ outpost:
RequiresCondition: !severe-damaged
GrantConditionOnDamageState@STOPDISH:
Condition: severe-damaged
ValidDamageState: Medium, Heavy, Critical

This comment has been minimized.

Copy link
@pchote

pchote Jun 12, 2018

Author Member

The correct yaml name here would be ValidDamageStates, but this then produces the wrong behaviour ingame. We don't want to stop the dish on Medium; only on Heavy and Critical, which is already the default.

Power:
Amount: -125
ProvidesPrerequisite@buildingname:
@@ -1117,7 +1116,7 @@ palace:
LongDesc: Launches an atomic missile at a target location
BeginChargeSpeechNotification: DeathHandMissilePrepping
EndChargeSpeechNotification: DeathHandMissileReady
MissileLaunchDetected: MissileLaunchDetected
LaunchSpeechNotification: MissileLaunchDetected
MissileWeapon: atomic
MissileDelay: 19
SpawnOffset: -512,1c171,0
@@ -1130,7 +1129,6 @@ palace:
RequiresCondition: !launchpad-damaged && harkonnen
GrantConditionOnDamageState@LAUNCHPADDAMAGED:
Condition: launchpad-damaged
ValidDamageState: Medium, Heavy, Critical

This comment has been minimized.

Copy link
@pchote

pchote Jun 12, 2018

Author Member

Likewise here.

ProduceActorPower@fremen:
Description: Recruit Fremen
LongDesc: Elite infantry unit armed with assault rifles and rockets\n Strong vs Infantry, Vehicles\n Weak vs Artillery\n Special Ability: Invisibility
@@ -17,6 +17,9 @@ World:
TechLevel: unrestricted
MPStartLocations:
SeparateTeamSpawnsCheckboxVisible: false
Locomotor@LIGHTTRACKED:
WaitAverage: 1
WaitSpread: 1

APWR:
Buildable:
@@ -118,8 +121,6 @@ MNLYR:
Type: Heavy
Mobile:
Speed: 128
WaitAverage: 1
WaitSpread: 1
TurnSpeed: 900
RevealsShroud:
Range: 40c0
@@ -48,9 +48,7 @@ LST:
Name: secondary
Weapon: M60mg
AttackFrontal:
WithMuzzleOverlay@PRIMARY:
WithMuzzleOverlay@SECONDARY:
Armament: secondary
WithMuzzleOverlay:
MustBeDestroyed:
RequiredForShortGame: true

@@ -30,9 +30,8 @@ powerproxy.paratroopers:

HBOX:
Buildable:
# Invalid targets for YakAttack
Prerequisites: ~disabled
EditorOnlyTooltip:
Description: invalid targets for YakAttack

E7:
Buildable:
@@ -182,7 +181,6 @@ GAP:

CAMERA.Large:
Inherits: CAMERA
# Required for YakAttack to work
RevealsShroud:
Range: 49c0
EditorOnlyTooltip:
Description: required for YakAttack to work
@@ -148,7 +148,6 @@ SCUD:
Range: 7c0
ReloadDelay: 280
Projectile: Bullet
Arm: 10
TrailImage: smokey
Blockable: false
Inaccuracy: 0c426
Copy path View file
@@ -219,6 +219,7 @@ BOXES01:
Palette: player
Tooltip:
Name: Boxes
EditorTilesetFilter:
Categories: Decoration

BOXES02:
Copy path View file
@@ -854,17 +854,17 @@
Targetable:
TargetTypes: Trees
WithDamageOverlay@SmallBurn:
DamageType: Incendiary
DamageTypes: Incendiary
Image: burn-s
MinimumDamageState: Light
MaximumDamageState: Medium
WithDamageOverlay@MediumBurn:
DamageType: Incendiary
DamageTypes: Incendiary
Image: burn-m
MinimumDamageState: Medium
MaximumDamageState: Heavy
WithDamageOverlay@LargeBurn:
DamageType: Incendiary
DamageTypes: Incendiary
Image: burn-l
MinimumDamageState: Heavy
MaximumDamageState: Dead
Copy path View file
@@ -506,7 +506,6 @@ THF:
Passenger:
PipType: Yellow
Infiltrates:
InfiltrateTypes: Cash

This comment has been minimized.

Copy link
@pchote

pchote Jun 12, 2018

Author Member

We don't define Cash as an infiltratable type, so renaming this to Types would still have been wrong.

PlayerExperience: 50
Voiced:
VoiceSet: ThiefVoice
@@ -706,7 +705,6 @@ Ant:
Mobile:
Speed: 99
TurnSpeed: 12
SharesCell: no

This comment has been minimized.

Copy link
@pchote

pchote Jun 12, 2018

Author Member

Related to #15235, which is not fixed here. This PR just removes the bogus definition.

-Crushable:
AutoTarget:
ScanRadius: 5
Copy path View file
@@ -85,7 +85,6 @@
A: 180
ShroudPalette@shroud:
Name: shroud
Type: Shroud
ShroudPalette@fog:
Name: fog
Fog: true
Copy path View file
@@ -319,7 +319,7 @@ HARV:
OwnerType: InternalName
EffectiveOwnerFromOwner: true
HarvesterHuskModifier:
FullActor: HARV.FullHusk
FullHuskActor: HARV.FullHusk
FullnessThreshold: 50
SelfHealing:
Step: 100
Copy path View file
@@ -274,7 +274,6 @@ TorpTube:
Inaccuracy: 0c614
HorizontalRateOfTurn: 15
RangeLimit: 9c0
LaunchAngle: 120
Image: MISSILE
TrailImage: smokey
ContrailLength: 30
Copy path View file
@@ -3,7 +3,6 @@ CABHUT:
Tooltip:
Name: Bridge repair hut
Building:
Adjacent: 0
Footprint: x
Dimensions: 1, 1
BridgeHut:
Copy path View file
@@ -102,7 +102,7 @@ VISC_LRG:
MinMoveDelay: 25
MaxMoveDelay: 50
WithAttackAnimation:
AttackSequence: attack
Sequence: attack
RenderSprites:
Image: vislrg

@@ -130,7 +130,7 @@ JFISH:
MinMoveDelay: 250
MaxMoveDelay: 600
WithAttackAnimation:
AttackSequence: attack
Sequence: attack
RenderSprites:
Image: floater
Selectable:
Copy path View file
@@ -109,8 +109,6 @@
Sequence: emp-overlay
Palette: effect
RequiresCondition: empdisable
ShowToEnemies: true
ZOffset: 512
PowerMultiplier@EMPDISABLE:
RequiresCondition: empdisable
Modifier: 0
@@ -439,7 +437,6 @@
RenderSprites:
Palette: terraindecoration
WithCrateBody:
Images: crate
EditorTilesetFilter:
Categories: System
Interactable:
@@ -1112,7 +1109,6 @@
Targetable:
AlwaysVisible:
TunnelEntrance:
Dimensions: 3, 3
EditorTilesetFilter:
Categories: Tunnel
Interactable:
@@ -130,7 +130,7 @@ SMECH:
WithFacingSpriteBody:
Sequence: stand
WithAttackAnimation:
AttackSequence: shoot
Sequence: shoot
WithMoveAnimation:
MoveSequence: walk
Selectable:
Copy path View file
@@ -132,7 +132,6 @@
Alpha: 0.4
TSShroudPalette@shroud:
Name: shroud
Type: Shroud
VoxelNormalsPalette@normals:
Name: normals
Type: TiberianSun
@@ -147,7 +147,6 @@ LPST:
DeploySound: place2.aud
UndeploySound: clicky1.aud
WithVoxelBody:
Image: lpst
RequiresCondition: undeployed
WithSpriteBody@deployed:
RequiresCondition: !undeployed && real-actor
Copy path View file
@@ -374,5 +374,4 @@ EditorWorld:
EditorResourceLayer:
EditorSelectionLayer:
Palette: placebuilding
LineBuildSegmentPalette: placelinesegment
LoadWidgetAtGameStart:
@@ -3,9 +3,7 @@
Range: 6c0
Report: bigggun1.aud
Projectile: Railgun
Speed: 20c0
Duration: 15
Width: 80
Blockable: true
DamageActorsInLine: true
BeamColor: 0080FFC8
@@ -30,7 +28,6 @@ LtRail:
Range: 0, 32
Falloff: 50, 50 # Only does half damage to friendly units
Damage: 15000
InfDeath: 6
AffectsParent: false
ValidStances: Ally
Versus:
Copy path View file
@@ -88,7 +88,6 @@ MammothTusk:
ImpactActors: false
Explosions: medium_twlt
ImpactSounds: expnew07.aud
InvalidImpactTypes: Water
-Warhead@3EffWater: CreateEffect

BikeMissile:
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.