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

Remove building lock from Sellable.

Browse Source
This commit is contained in:
Paul Chote
2018-10-27 16:56:24 +00:00
committed by abcdefg30
parent 492bcdd9a7
commit 94088d37a6
21 changed files with 30 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Traits/Sellable.cs
View File

@@ -58,10 +58,6 @@ namespace OpenRA.Mods.Common.Traits
if (IsTraitDisabled)
return;
var building = self.TraitOrDefault<Building>();
if (building != null && !building.Lock())
return;
self.CancelActivity();
foreach (var s in info.SellSounds)

3
OpenRA.Mods.Common/UpdateRules/Rules/20180923/RemovedNotifyBuildComplete.cs
View File

@@ -22,7 +22,7 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
get
{
return "Traits are no longer force-disabled while the WithMakeAnimation trait is active.\n" +
"This affects the With*Animation, With*Overlay, Transforms, Gate, and ConyardChronoReturn traits.\n" +
"This affects the With*Animation, With*Overlay, Transforms, Sellable, Gate, and ConyardChronoReturn traits.\n" +
"The AnnounceOnBuild trait has been replaced with a new VoiceAnnouncement trait.\n" +
"Affected actors are listed so that conditions may be manually defined.";
}
@@ -53,6 +53,7 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
"WithCrumbleOverlay",
"WithDeliveryOverlay",
"Transforms",
"Sellable",
"Gate",
"ConyardChronoReturn",
"VoiceAnnouncement"

6
mods/cnc/maps/gdi01/rules.yaml
View File

@@ -15,6 +15,8 @@ NUKE:
-Sellable:
Demolishable:
-Condition:
WithMakeAnimation:
-Condition:
Buildable:
BuildLimit: 1
@@ -22,13 +24,13 @@ PYLE:
-Sellable:
Demolishable:
-Condition:
WithMakeAnimation:
-Condition:
Buildable:
BuildLimit: 1
FACT:
-Sellable:
Demolishable:
-Condition:
PROC:
Buildable:

3
mods/cnc/rules/defaults.yaml
View File

@@ -747,12 +747,13 @@
Demolishable:
Condition: being-demolished
Sellable:
RequiresCondition: !being-demolished
RequiresCondition: !build-incomplete && !being-demolished
SellSounds: cashturn.aud
CaptureManager:
Capturable:
Types: building-sabotage
WithMakeAnimation:
Condition: build-incomplete
WithBuildingRepairDecoration:
Image: allyrepair
Sequence: repair

18
mods/cnc/rules/structures.yaml
View File

@@ -85,8 +85,6 @@ FACT:
Cooldown: 75
Range: 14c0
WithBuildingBib:
WithMakeAnimation:
Condition: build-incomplete
WithBuildingPlacedAnimation:
RequiresCondition: !build-incomplete
Power:
@@ -230,8 +228,6 @@ PROC:
SpawnOffset: 1,2
Facing: 64
WithBuildingBib:
WithMakeAnimation:
Condition: build-incomplete
WithResources:
RequiresCondition: !build-incomplete
Power:
@@ -261,8 +257,6 @@ SILO:
Range: 4c0
WithBuildingBib:
HasMinibib: Yes
WithMakeAnimation:
Condition: build-incomplete
WithSiloAnimation:
RequiresCondition: !build-incomplete
StoresResources:
@@ -422,8 +416,6 @@ AFLD:
ProductionAirdrop:
Produces: Vehicle.Nod
WithBuildingBib:
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@DISH:
RequiresCondition: !build-incomplete
Sequence: idle-dish
@@ -475,8 +467,6 @@ WEAP:
RevealsShroud:
Range: 4c0
WithBuildingBib:
WithMakeAnimation:
Condition: build-incomplete
WithProductionDoorOverlay:
RequiresCondition: !build-incomplete
Sequence: build-top
@@ -536,8 +526,6 @@ HPAD:
HpPerStep: 1000
PlayerExperience: 25
StartRepairingNotification: Repairing
WithMakeAnimation:
Condition: build-incomplete
WithResupplyAnimation:
RequiresCondition: !build-incomplete
RallyPoint:
@@ -665,8 +653,6 @@ FIX:
Range: 5c0
WithBuildingBib:
HasMinibib: Yes
WithMakeAnimation:
Condition: build-incomplete
WithResupplyAnimation:
RequiresCondition: !build-incomplete
Reservable:
@@ -799,8 +785,6 @@ TMPL:
ClockSequence: clock
CircleSequence: circles
WithBuildingBib:
WithMakeAnimation:
Condition: build-incomplete
WithNukeLaunchAnimation:
RequiresCondition: !build-incomplete
WithNukeLaunchOverlay:
@@ -931,8 +915,6 @@ OBLI:
Range: 8c0
WithBuildingBib:
HasMinibib: Yes
WithMakeAnimation:
Condition: build-incomplete
WithChargeAnimation:
RequiresCondition: !build-incomplete
Armament:

4
mods/d2k/rules/defaults.yaml
View File

@@ -412,7 +412,7 @@
Demolishable:
Condition: being-demolished
Sellable:
RequiresCondition: !being-demolished
RequiresCondition: !build-incomplete && !being-demolished
SellSounds: BUILD1.WAV
Guardable:
Range: 3c0
@@ -456,6 +456,8 @@
-WithCrumbleOverlay:
-Capturable:
-WithSpriteBody:
Sellable:
RequiresCondition: !being-demolished
WithWallSpriteBody:
LineBuildNode:
Types: turret

4
mods/ra/maps/allies-08a/rules.yaml
View File

@@ -77,6 +77,8 @@ ATEK:
-Sellable:
Demolishable:
-Condition:
WithMakeAnimation:
-Condition:
PDOX:
Inherits@IDISABLE: ^DisableOnLowPower
@@ -89,6 +91,8 @@ PDOX:
-Sellable:
Demolishable:
-Condition:
WithMakeAnimation:
-Condition:
IRON:
Buildable:

2
mods/ra/maps/fort-lonestar/rules.yaml
View File

@@ -172,6 +172,8 @@ TENT:
-Sellable:
Demolishable:
-Condition:
WithMakeAnimation:
-Condition:
BaseProvider:
Range: 12c0
Power:

4
mods/ra/maps/soviet-01/rules.yaml
View File

@@ -48,6 +48,8 @@ DOME:
-Sellable:
Demolishable:
-Condition:
WithMakeAnimation:
-Condition:
POWR:
CaptureManager:
@@ -55,3 +57,5 @@ POWR:
-Sellable:
Demolishable:
-Condition:
WithMakeAnimation:
-Condition:

2
mods/ra/maps/soviet-07/rules.yaml
View File

@@ -35,6 +35,8 @@ FTUR:
-Sellable:
Demolishable:
-Condition:
WithMakeAnimation:
-Condition:
PBOX:
-AutoTarget:

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

@@ -651,6 +651,7 @@
EngineerRepairable:
AcceptsDeliveredCash:
WithMakeAnimation:
Condition: build-incomplete
CaptureManager:
BeingCapturedCondition: being-captured
Capturable:
@@ -666,7 +667,7 @@
Demolishable:
Condition: being-demolished
Sellable:
RequiresCondition: !being-captured && !being-demolished
RequiresCondition: !build-incomplete && !being-captured && !being-demolished
SellSounds: cashturn.aud
WithBuildingRepairDecoration:
Image: allyrepair

2
mods/ra/rules/fakes.yaml
View File

@@ -145,8 +145,6 @@ WEAF:
RenderSprites:
Image: WEAP
WithBuildingBib:
WithMakeAnimation:
Condition: build-incomplete
WithProductionDoorOverlay:
RequiresCondition: !build-incomplete
Sequence: build-top

18
mods/ra/rules/structures.yaml
View File

@@ -60,8 +60,6 @@ MSLO:
Amount: -150
MustBeDestroyed:
RequiredForShortGame: false
WithMakeAnimation:
Condition: build-incomplete
WithNukeLaunchAnimation:
RequiresCondition: !build-incomplete
@@ -982,8 +980,6 @@ WEAP:
RevealsShroud@GAPGEN:
Range: 4c0
WithBuildingBib:
WithMakeAnimation:
Condition: build-incomplete
WithProductionDoorOverlay:
RequiresCondition: !build-incomplete
Sequence: build-top
@@ -1133,7 +1129,7 @@ FACT:
Offset: 1,1
Facing: 96
Sellable:
RequiresCondition: !chrono-vortex && !being-captured && !being-demolished
RequiresCondition: !build-incomplete && !chrono-vortex && !being-captured && !being-demolished
GrantConditionOnPrerequisite@GLOBALFACTUNDEPLOY:
Condition: factundeploy
Prerequisites: global-factundeploy
@@ -1146,8 +1142,6 @@ FACT:
PauseOnCondition: being-captured
Range: 16c0
WithBuildingBib:
WithMakeAnimation:
Condition: build-incomplete
WithBuildingPlacedAnimation:
RequiresCondition: !build-incomplete && !chrono-vortex
Power:
@@ -1216,8 +1210,6 @@ PROC:
Types: SpyInfiltrate
Notification: CreditsStolen
WithBuildingBib:
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@TOP:
RequiresCondition: !build-incomplete
Sequence: idle-top
@@ -1265,8 +1257,6 @@ SILO:
Range: 4c0
WithBuildingBib:
HasMinibib: Yes
WithMakeAnimation:
Condition: build-incomplete
WithSiloAnimation:
RequiresCondition: !build-incomplete
StoresResources:
@@ -1310,8 +1300,6 @@ HPAD:
RevealsShroud@GAPGEN:
Range: 4c0
WithBuildingBib:
WithMakeAnimation:
Condition: build-incomplete
WithResupplyAnimation:
RequiresCondition: !build-incomplete
Exit@1:
@@ -1513,8 +1501,6 @@ AFLD:
ReferencePoint: Top
ZOffset: 256
RequiresCondition: primary
WithMakeAnimation:
Condition: build-incomplete
WithResupplyAnimation:
RequiresCondition: !build-incomplete
@@ -1918,8 +1904,6 @@ FIX:
PlayerExperience: 15
WithBuildingBib:
HasMinibib: Yes
WithMakeAnimation:
Condition: build-incomplete
WithResupplyAnimation:
RequiresCondition: !build-incomplete
Power:

2
mods/ts/rules/civilian-structures.yaml
View File

@@ -1399,6 +1399,8 @@ GALITE:
Palette: terraindecoration
-WithMakeAnimation:
-WithDeathAnimation:
Sellable:
RequiresCondition: !being-demolished
Health:
HP: 60000
Armor:

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

@@ -372,9 +372,10 @@
Demolishable:
Condition: being-demolished
Sellable:
RequiresCondition: !being-demolished
RequiresCondition: !build-incomplete && !being-demolished
SellSounds: cashturn.aud
WithMakeAnimation:
Condition: build-incomplete
ThrowsShrapnel@SMALL:
Pieces: 3, 5
ThrowsShrapnel@LARGE:

16
mods/ts/rules/gdi-structures.yaml
View File

@@ -22,8 +22,6 @@ GAPOWR:
RevealsShroud:
Range: 4c0
MaxHeightDelta: 3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights
@@ -112,8 +110,6 @@ GAPILE:
PrimaryCondition: primary
SelectionNotification: PrimaryBuildingSelected
ProductionBar:
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete
Sequence: idle-lights
@@ -178,8 +174,6 @@ GAWEAP:
PrimaryCondition: primary
SelectionNotification: PrimaryBuildingSelected
ProductionBar:
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@ROOF:
RequiresCondition: !build-incomplete
Sequence: idle-roof
@@ -248,8 +242,6 @@ GAHPAD:
PlayerExperience: 15
StartRepairingNotification: Repairing
ProductionBar:
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@PLATFORM:
RequiresCondition: !build-incomplete
Sequence: idle-platform
@@ -306,8 +298,6 @@ GADEPT:
RallyPoint:
Palette: mouse
IsPlayerPalette: false
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHT:
RequiresCondition: !build-incomplete
Sequence: idle-light
@@ -373,8 +363,6 @@ GARADR:
RevealsShroud:
Range: 10c0
MaxHeightDelta: 3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@DISH:
RequiresCondition: !build-incomplete
PauseOnCondition: disabled || empdisable
@@ -414,8 +402,6 @@ GATECH:
RevealsShroud:
Range: 4c0
MaxHeightDelta: 3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights
@@ -443,8 +429,6 @@ GAPLUG:
Building:
Footprint: xxx xxx
Dimensions: 2,3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@DISH:
RequiresCondition: !build-incomplete
PauseOnCondition: disabled || empdisable

2
mods/ts/rules/gdi-support.yaml
View File

@@ -76,8 +76,6 @@ GACTWR:
AttackTurreted:
RequiresCondition: tower.vulcan || tower.rocket || tower.sam
PauseOnCondition: empdisable || disabled
WithMakeAnimation:
Condition: build-incomplete
WithSpriteTurret@VULC:
RequiresCondition: !build-incomplete && tower.vulcan
Recoils: false

16
mods/ts/rules/nod-structures.yaml
View File

@@ -25,8 +25,6 @@ NAPOWR:
RevealsShroud:
Range: 4c0
MaxHeightDelta: 3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights
@@ -66,8 +64,6 @@ NAAPWR:
RevealsShroud:
Range: 4c0
MaxHeightDelta: 3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights
@@ -123,8 +119,6 @@ NAHAND:
PrimaryCondition: primary
SelectionNotification: PrimaryBuildingSelected
ProductionBar:
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete
Sequence: idle-lights
@@ -186,8 +180,6 @@ NAWEAP:
PrimaryCondition: primary
SelectionNotification: PrimaryBuildingSelected
ProductionBar:
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@ROOF:
RequiresCondition: !build-incomplete
Sequence: idle-roof
@@ -250,8 +242,6 @@ NAHPAD:
PlayerExperience: 15
StartRepairingNotification: Repairing
ProductionBar:
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@PLATFORM:
RequiresCondition: !build-incomplete
Sequence: idle-platform
@@ -310,8 +300,6 @@ NARADR:
RevealsShroud:
Range: 10c0
MaxHeightDelta: 3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@DISH:
RequiresCondition: !build-incomplete
PauseOnCondition: disabled || empdisable
@@ -351,8 +339,6 @@ NATECH:
RevealsShroud:
Range: 4c0
MaxHeightDelta: 3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights
@@ -393,8 +379,6 @@ NATMPL:
MaxHeightDelta: 3
Power:
Amount: -200
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights

14
mods/ts/rules/nod-support.yaml
View File

@@ -71,8 +71,6 @@ NAPOST:
Amount: -25
RevealsShroud:
Range: 4c0
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !disabled
Sequence: lights
@@ -175,8 +173,6 @@ NALASR:
Armament:
Weapon: TurretLaserFire
LocalOffset: 498,0,317
WithMakeAnimation:
Condition: build-incomplete
RenderVoxels:
WithVoxelTurret:
RequiresCondition: !build-incomplete
@@ -223,8 +219,6 @@ NAOBEL:
RequiresCondition: charging && !disabled
SoundFiles: obelpowr.aud
Interval: 30, 40
WithMakeAnimation:
Condition: build-incomplete
WithChargeOverlay:
RequiresCondition: !build-incomplete
Palette: player
@@ -265,8 +259,6 @@ NASAM:
InitialFacing: 224
AttackTurreted:
PauseOnCondition: empdisable || disabled
WithMakeAnimation:
Condition: build-incomplete
WithSpriteTurret:
RequiresCondition: !build-incomplete
Recoils: false
@@ -302,8 +294,6 @@ NASTLH:
RevealsShroud:
Range: 6c0
MaxHeightDelta: 3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@pulse:
RequiresCondition: !build-incomplete && !disabled
Sequence: pulse
@@ -352,8 +342,6 @@ NAMISL:
Type: Wood
RevealsShroud:
Range: 4c0
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights
@@ -422,8 +410,6 @@ NAWAST:
Actor: WEED
SpawnOffset: 3,1
Facing: 160
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@GLOW:
RequiresCondition: !build-incomplete
Sequence: idle-glow

6
mods/ts/rules/shared-structures.yaml
View File

@@ -41,8 +41,6 @@ GACNST:
ProductionType: Building
ProductionBar@Defense:
ProductionType: Defense
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@TOP:
RequiresCondition: !build-incomplete
Sequence: idle-top
@@ -104,8 +102,6 @@ PROC:
Actor: HARV
SpawnOffset: 2,1
Facing: 160
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@REDLIGHTS:
RequiresCondition: !build-incomplete
Sequence: idle-redlights
@@ -161,8 +157,6 @@ GASILO:
FactionImages:
gdi: gasilo.gdi
nod: gasilo.nod
WithMakeAnimation:
Condition: build-incomplete
WithSiloAnimation:
RequiresCondition: !build-incomplete
WithIdleOverlay@UNDERLAY:

2
mods/ts/rules/shared-support.yaml
View File

@@ -32,8 +32,6 @@ NAPULS:
Weapon: EMPulseCannon
LocalOffset: 212,0,1768
LocalYaw: 0,100
WithMakeAnimation:
Condition: build-incomplete
WithSpriteTurret:
RequiresCondition: !build-incomplete
Sequence: turret