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

Merge pull request #8712 from Phrohdoh/fix#rename-pwl

Browse Source 
Rename ProduceableWithLevel to ProducibleWithLevel.
This commit is contained in:
Oliver Brakmann
2015-07-14 21:22:57 +02:00
parent 2a248471a9 a3d740aa44
commit f7327418e4
10 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -481,7 +481,7 @@
<Compile Include="Traits\TransformOnPassenger.cs" />
<Compile Include="Traits\Transforms.cs" />
<Compile Include="Traits\Turreted.cs" />
<Compile Include="Traits\ProduceableWithLevel.cs" />
<Compile Include="Traits\ProducibleWithLevel.cs" />
<Compile Include="Traits\Upgrades\DeployToUpgrade.cs" />
<Compile Include="Traits\Upgrades\DisableUpgrade.cs" />
<Compile Include="Traits\Upgrades\UpgradableTrait.cs" />

10
OpenRA.Mods.Common/Traits/ProduceableWithLevel.cs → OpenRA.Mods.Common/Traits/ProducibleWithLevel.cs
View File

@@ -15,7 +15,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Actors possessing this trait should define the GainsExperience trait. When the prerequisites are fulfilled, ",
"this trait grants a level-up to newly spawned actors. If additionally the actor's owning player defines the ProductionIconOverlay ",
"trait, the production queue icon renders with an overlay defined in that trait.")]
public class ProduceableWithLevelInfo : ITraitInfo, Requires<GainsExperienceInfo>
public class ProducibleWithLevelInfo : ITraitInfo, Requires<GainsExperienceInfo>
{
public readonly string[] Prerequisites = { };
@@ -25,14 +25,14 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Should the level-up animation be suppressed when actor is created?")]
public readonly bool SuppressLevelupAnimation = true;
public object Create(ActorInitializer init) { return new ProduceableWithLevel(init, this); }
public object Create(ActorInitializer init) { return new ProducibleWithLevel(init, this); }
}
public class ProduceableWithLevel : INotifyCreated
public class ProducibleWithLevel : INotifyCreated
{
readonly ProduceableWithLevelInfo info;
readonly ProducibleWithLevelInfo info;
public ProduceableWithLevel(ActorInitializer init, ProduceableWithLevelInfo info)
public ProducibleWithLevel(ActorInitializer init, ProducibleWithLevelInfo info)
{
this.info = info;
}

2
OpenRA.Mods.Common/Traits/VeteranProductionIconOverlay.cs
View File

@@ -70,7 +70,7 @@ namespace OpenRA.Mods.Common.Traits
foreach (var a in self.World.Map.Rules.Actors.Values)
{
var uwc = a.Traits.GetOrDefault<ProduceableWithLevelInfo>();
var uwc = a.Traits.GetOrDefault<ProducibleWithLevelInfo>();
if (uwc != null)
ttc.Add(MakeKey(a.Name), uwc.Prerequisites, 0, this);
}

8
mods/ra/rules/aircraft.yaml
View File

@@ -122,7 +122,7 @@ MIG:
SmokeTrailWhenDamaged:
Offset: -853,0,171
Interval: 2
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: aircraft.upgraded
YAK:
@@ -180,7 +180,7 @@ YAK:
SmokeTrailWhenDamaged:
Offset: -853,0,0
Interval: 2
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: aircraft.upgraded
TRAN:
@@ -269,7 +269,7 @@ HELI:
HuskActor: HELI.Husk
SmokeTrailWhenDamaged:
Offset: -427,0,0
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: aircraft.upgraded
HIND:
@@ -323,7 +323,7 @@ HIND:
HuskActor: HIND.Husk
SmokeTrailWhenDamaged:
Offset: -427,0,0
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: aircraft.upgraded
U2:

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

@@ -67,7 +67,7 @@ E1:
AttackFrontal:
WithInfantryBody:
AttackSequence: shoot
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
E2:
@@ -100,7 +100,7 @@ E2:
Explodes:
Weapon: UnitExplodeSmall
Chance: 50
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
E3:
@@ -129,7 +129,7 @@ E3:
AttackFrontal:
WithInfantryBody:
AttackSequence: shoot
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
E4:
@@ -156,7 +156,7 @@ E4:
AttackFrontal:
WithInfantryBody:
AttackSequence: shoot
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
E6:
@@ -286,7 +286,7 @@ E7:
AnnounceOnKill:
Voiced:
VoiceSet: TanyaVoice
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
MEDI:
@@ -487,7 +487,7 @@ SHOK:
AttackSequence: shoot
Voiced:
VoiceSet: ShokVoice
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
SNIPER:
@@ -528,7 +528,7 @@ SNIPER:
DetectCloaked:
Range: 6
-MustBeDestroyed:
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
Zombie:

24
mods/ra/rules/vehicles.yaml
View File

@@ -29,7 +29,7 @@ V2RL:
WithAttackAnimation:
AimSequence: aim
ReloadPrefix: empty-
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: vehicles.upgraded
1TNK:
@@ -69,7 +69,7 @@ V2RL:
EmptyWeapon: UnitExplodeSmall
LeavesHusk:
HuskActor: 1TNK.Husk
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: vehicles.upgraded
2TNK:
@@ -111,7 +111,7 @@ V2RL:
HuskActor: 2TNK.Husk
SelectionDecorations:
VisualBounds: 28,28
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: vehicles.upgraded
3TNK:
@@ -153,7 +153,7 @@ V2RL:
HuskActor: 3TNK.Husk
SelectionDecorations:
VisualBounds: 28,28
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: vehicles.upgraded
4TNK:
@@ -209,7 +209,7 @@ V2RL:
DamageCooldown: 150
SelectionDecorations:
VisualBounds: 44,38,0,-4
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: vehicles.upgraded
ARTY:
@@ -242,7 +242,7 @@ ARTY:
Weapon: UnitExplode
Chance: 75
AutoTarget:
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: vehicles.upgraded
HARV:
@@ -366,7 +366,7 @@ JEEP:
Types: Infantry
MaxWeight: 1
PipCount: 1
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: vehicles.upgraded
APC:
@@ -400,7 +400,7 @@ APC:
Types: Infantry
MaxWeight: 5
PipCount: 5
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: vehicles.upgraded
MNLY.AP:
@@ -585,7 +585,7 @@ TTNK:
SelectionDecorations:
VisualBounds: 30,30
AutoTarget:
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: vehicles.upgraded
FTRK:
@@ -622,7 +622,7 @@ FTRK:
AutoTarget:
SelectionDecorations:
VisualBounds: 28,28
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: vehicles.upgraded
DTRK:
@@ -688,7 +688,7 @@ CTNK:
LocalYaw: -100
AttackFrontal:
PortableChrono:
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: vehicles.upgraded
QTNK:
@@ -759,6 +759,6 @@ STNK:
DetectCloaked:
Range: 6
-MustBeDestroyed:
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: vehicles.upgraded

8
mods/ts/rules/civilian-infantry.yaml
View File

@@ -41,7 +41,7 @@ UMAGON:
Voice: Attack
WithInfantryBody:
AttackSequence: shoot
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
CHAMSPY:
@@ -98,7 +98,7 @@ MUTANT:
Voice: Attack
WithInfantryBody:
AttackSequence: shoot
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
MWMN:
@@ -123,7 +123,7 @@ MWMN:
Voice: Attack
WithInfantryBody:
AttackSequence: shoot
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
MUTANT3:
@@ -148,7 +148,7 @@ MUTANT3:
Voice: Attack
WithInfantryBody:
AttackSequence: shoot
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
TRATOS:

6
mods/ts/rules/gdi-infantry.yaml
View File

@@ -21,7 +21,7 @@ E2:
Voice: Attack
WithInfantryBody:
AttackSequence: throw
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
MEDIC:
@@ -83,7 +83,7 @@ JUMPJET:
WithInfantryBody:
AttackSequence: shoot
-TakeCover:
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
GHOST:
@@ -121,6 +121,6 @@ GHOST:
Voice: Attack
WithInfantryBody:
AttackSequence: shoot
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded

6
mods/ts/rules/nod-infantry.yaml
View File

@@ -22,7 +22,7 @@ E3:
Voice: Attack
WithInfantryBody:
AttackSequence: shoot
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
CYBORG:
@@ -55,7 +55,7 @@ CYBORG:
Voice: Attack
SelectionDecorations:
VisualBounds: 16,31,0,-10
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
CYC2:
@@ -90,7 +90,7 @@ CYC2:
Voice: Attack
SelectionDecorations:
VisualBounds: 16,32,-1,-12
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
MHIJACK:

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

@@ -26,7 +26,7 @@ E1:
Voice: Attack
WithInfantryBody:
AttackSequence: shoot
ProduceableWithLevel:
ProducibleWithLevel:
Prerequisites: barracks.upgraded
ENGINEER: